blob: cff1fc45454912a777ed0928e5786bceda0f38b4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
<? use Studip\LinkButton; ?>
<form action="<?= $controller->url_for('help_content/admin_conflicts') ?>" method="post">
<?= CSRFProtection::tokenTag(); ?>
<? if (count($conflicts)) : ?>
<? foreach ($conflicts as $conflict) : ?>
<table class="default">
<colgroup>
<col width="50%">
<col width="50%">
</colgroup>
<thead>
<? $keys = array_keys($conflict); ?>
<tr>
<th colspan="2"><?= _('Seite:') ?> <?= $conflict[$keys[0]]->route ?></th>
</tr>
</thead>
<tbody>
<tr>
<th><?= sprintf(_("Lokale Version (%s)"), $conflict[$keys[0]]->studip_version) ?></th>
<th><?= sprintf(_("Offizielle Version (%s)"), $conflict[$keys[1]]->studip_version) ?></th>
</tr>
<tr>
<td>
<?= $conflict[$keys[0]]->content ?>
</td>
<td>
<?= $conflict[$keys[1]]->content ?>
</td>
</tr>
<tr>
</tr>
</tbody>
<tfoot>
<tr>
<td><?= LinkButton::create(_('Übernehmen'), $controller->url_for('help_content/resolve_conflict/' . $conflict[$keys[0]]->getId() . '/accept')) ?></td>
<td><?= LinkButton::create(_('Übernehmen'), $controller->url_for('help_content/resolve_conflict/' . $conflict[$keys[0]]->getId() . '/delete')) ?></td>
</tr>
</tfoot>
</table>
<? endforeach ?>
<? else : ?>
<?= MessageBox::info(_('Keine Konflikte vorhanden.')) ?>
<? endif ?>
</form>
|
