Skip to content
Snippets Groups Projects
Commit 66b68226 authored by Peter Thienel's avatar Peter Thienel Committed by André Noack
Browse files

Resolve "Terminkalender Ansichten Jahr und Tag defekt", fixes #2219 

Closes #2219

Merge request studip/studip!1451
parent 8ffa5652
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/views/calendar/single/_include_month.php
+ 8
− 4
View file @ 66b68226
...@@ -107,20 +107,24 @@ ...@@ -107,20 +107,24 @@
<? switch ($hday['col']) { <? switch ($hday['col']) {
case 1: case 1:
?><a class="<?= $style ?>day" href="<?= $controller->url_for($href, ['atime' => $i]) ?>" <?= tooltip($hday['name']) . $js_inc ?>> ?><a class="<?= $style ?>day" href="<?= $controller->url_for($href, ['atime' => $i]) ?>" <?= tooltip($hday['name']) . $js_inc ?>>
<?= $aday ?> <?= $aday ?>
</a><? </a><?
break; break;
case 2: case 2:
case 3; case 3;
?><a class="<?= $style ?>hday" href="<?= $controller->url_for($href, ['atime' => $i]) ?>" <?= tooltip($hday['name']) . $js_inc ?>> ?><a class="<?= $style ?>hday" href="<?= $controller->url_for($href, ['atime' => $i]) ?>" <?= tooltip($hday['name']) . $js_inc ?>>
<?= $aday ?> <?= $aday ?>
</a><? </a><?
break; break;
default: default:
?><a class="<?= $style ?>day" href="<?= $controller->url_for($href, ['atime' => $i]) ?>" <?= $js_inc ?>> ?><a class="<?= $style ?>day" href="<?= $controller->url_for($href, ['atime' => $i]) ?>" <?= $js_inc ?>>
<?= $aday ?> <?= $aday ?>
</a> </a>
<?}?> <?}?>
<? else : ?>
<a class="<?= $style ?>day" href="<?= $controller->url_for($href, ['atime' => $i]) ?>" <?= $js_inc ?>>
<?= $aday ?>
</a>
<? endif ?> <? endif ?>
</td> </td>
<? endif; ?> <? endif; ?>
......
app/views/calendar/single/year.php
+ 7
− 7
View file @ 66b68226
...@@ -95,15 +95,15 @@ ...@@ -95,15 +95,15 @@
<? else : ?> <? else : ?>
<a style="font-weight:bold;" class="hday" href="<?= $controller->url_for('calendar/single/day', ['atime' => $aday]) ?>"><?= $i ?></a> <?= $weekday; ?> <a style="font-weight:bold;" class="hday" href="<?= $controller->url_for('calendar/single/day', ['atime' => $aday]) ?>"><?= $i ?></a> <?= $weekday; ?>
<? endif; ?> <? endif; ?>
<? endif ?>
<? else : ?>
<? if (date('w', $aday) == '0') : ?>
<a style="font-weight:bold;" class="sday" href="<?= $controller->url_for('calendar/single/day', ['atime' => $aday]) ?>"><?= $i ?></a> <?= $weekday; ?>
<? $count++; ?>
<? else : ?> <? else : ?>
<? if (date('w', $aday) == '0') : ?> <a style="font-weight:bold;" class="day" href="<?= $controller->url_for('calendar/single/day', ['atime' => $aday]) ?>"><?= $i ?></a> <?= $weekday; ?>
<a style="font-weight:bold;" class="sday" href="<?= $controller->url_for('calendar/single/day', ['atime' => $aday]) ?>"><?= $i ?></a> <?= $weekday; ?>
<? $count++; ?>
<? else : ?>
<a style="font-weight:bold;" class="day" href="<?= $controller->url_for('calendar/single/day', ['atime' => $aday]) ?>"><?= $i ?></a> <?= $weekday; ?>
<? endif; ?>
<? endif; ?> <? endif; ?>
<? endif ?> <? endif; ?>
</span> </span>
<? if (isset($count_list[$iday]) && count($count_list[$iday])) : ?> <? if (isset($count_list[$iday]) && count($count_list[$iday])) : ?>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment