| = _('Feld') ?> |
= sprintf(_('Lokale Version (%s)'), $conflict[$keys[0]]->studip_version) ?> |
= sprintf(_('Offizielle Version (%s)'), $conflict[$keys[1]]->studip_version) ?> |
| = _('Titel') ?> |
= htmlReady($conflict[$keys[0]]->name) ?> |
= htmlReady($conflict[$keys[1]]->name) ?> |
foreach ($diff_fields as $field => $title) : ?>
if ($conflict[$keys[0]]->$field !== $conflict[$keys[1]]->$field) : ?>
| = htmlReady($title) ?> |
= htmlReady($conflict[$keys[0]]->$field) ?> |
= htmlReady($conflict[$keys[1]]->$field) ?> |
endif ?>
endforeach ?>
$max_steps = max(
count($conflict[$keys[0]]->steps),
count($conflict[$keys[1]]->steps)
); ?>
for ($nr = 1; $nr <= $max_steps; $nr++) : ?>
foreach ($diff_step_fields as $field => $title) : ?>
if ($conflict[$keys[0]]->steps[$nr]->$field != $conflict[$keys[1]]->steps[$nr]->$field) : ?>
| = htmlReady($title) ?> = sprintf(_('(Schritt %s)'), $nr) ?> |
= htmlReady($conflict[$keys[0]]->steps[$nr]->$field) ?> |
= htmlReady($conflict[$keys[1]]->steps[$nr]->$field) ?> |
endif ?>
endforeach ?>
endfor ?>