diff --git a/app/views/calendar/single/_include_month.php b/app/views/calendar/single/_include_month.php
index c749c2b6a6f57c5945fa8435a537d2ad1d52ba1a..6942d2f02be67d5633ba655007b593af9ba21922 100644
--- a/app/views/calendar/single/_include_month.php
+++ b/app/views/calendar/single/_include_month.php
@@ -107,20 +107,24 @@
                         <? switch ($hday['col']) {
                             case 1:
                                 ?><a class="<?= $style ?>day" href="<?= $controller->url_for($href, ['atime' => $i]) ?>" <?= tooltip($hday['name']) . $js_inc ?>>
-                                   <?= $aday ?>
+                                <?= $aday ?>
                                 </a><?
                                 break;
                             case 2:
                             case 3;
                                 ?><a class="<?= $style ?>hday" href="<?= $controller->url_for($href, ['atime' => $i]) ?>" <?= tooltip($hday['name']) . $js_inc ?>>
-                                    <?= $aday ?>
+                                <?= $aday ?>
                                 </a><?
                                 break;
                             default:
                                 ?><a class="<?= $style ?>day" href="<?= $controller->url_for($href, ['atime' => $i]) ?>" <?= $js_inc ?>>
-                                    <?= $aday ?>
+                                <?= $aday ?>
                                 </a>
-                        <?}?>
+                            <?}?>
+                    <? else : ?>
+                        <a class="<?= $style ?>day" href="<?= $controller->url_for($href, ['atime' => $i]) ?>" <?= $js_inc ?>>
+                            <?= $aday ?>
+                        </a>
                     <? endif ?>
                     </td>
                 <? endif; ?>
diff --git a/app/views/calendar/single/year.php b/app/views/calendar/single/year.php
index 7f81fa79a96d1ee5d7a014a2e7492bc6dca36baf..0ebafe1431e387cffe983578dd5a5ff4d976b13c 100644
--- a/app/views/calendar/single/year.php
+++ b/app/views/calendar/single/year.php
@@ -95,15 +95,15 @@
                                                 <? else : ?>
                                                     <a style="font-weight:bold;" class="hday" href="<?= $controller->url_for('calendar/single/day', ['atime' => $aday]) ?>"><?= $i ?></a> <?= $weekday; ?>
                                                 <? 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 : ?>
-                                                <? 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 : ?>
-                                                    <a style="font-weight:bold;" class="day" href="<?= $controller->url_for('calendar/single/day', ['atime' => $aday]) ?>"><?= $i ?></a> <?= $weekday; ?>
-                                                <? endif; ?>
+                                                <a style="font-weight:bold;" class="day" href="<?= $controller->url_for('calendar/single/day', ['atime' => $aday]) ?>"><?= $i ?></a> <?= $weekday; ?>
                                             <? endif; ?>
-                                        <? endif ?>
+                                        <? endif; ?>
                                     </span>
 
                                     <? if (isset($count_list[$iday]) && count($count_list[$iday])) : ?>