diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-11-14 21:55:53 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-11-14 21:55:53 +0100 |
| commit | 9efb9388df7e07311b6e1e0696f43419c702cd2f (patch) | |
| tree | 8daecdbf9e2993c01e638da25cb5188e51f95967 /app | |
| parent | 0843e5b6914c51b2263ad9bfd462cc1e4f1cea5f (diff) | |
bigMarkAsRead : utilisation sans JavaScript
et différent si l'utilisateur n'est pas connecté
Implémente https://github.com/marienfressinaud/FreshRSS/issues/249
Diffstat (limited to 'app')
| -rw-r--r-- | app/layout/nav_menu.phtml | 6 | ||||
| -rwxr-xr-x | app/views/helpers/pagination.phtml | 16 |
2 files changed, 15 insertions, 7 deletions
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 55da1c204..5c5ee876a 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -53,10 +53,12 @@ break; } } + $markReadUrl = _url ('entry', 'read', 'is_read', 1, 'get', $get, 'nextGet', $nextGet); + Session::_param ('markReadUrl', $markReadUrl); ?> <div class="stick" id="nav_menu_read_all"> - <a class="read_all btn" href="<?php echo _url ('entry', 'read', 'is_read', 1, 'get', $get, 'nextGet', $nextGet); ?>"><?php echo Translate::t ('mark_read'); ?></a> + <a class="read_all btn" href="<?php echo $markReadUrl; ?>"><?php echo Translate::t ('mark_read'); ?></a> <div class="dropdown"> <div id="dropdown-read" class="dropdown-target"></div> @@ -64,7 +66,7 @@ <ul class="dropdown-menu"> <li class="dropdown-close"><a href="#close"> </a></li> - <li class="item"><a href="<?php echo _url ('entry', 'read', 'is_read', 1, 'get', $get, 'nextGet', $nextGet); ?>"><?php echo $string_mark; ?></a></li> + <li class="item"><a href="<?php echo $markReadUrl; ?>"><?php echo $string_mark; ?></a></li> <li class="separator"></li> <?php $date = getdate (); diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml index 0018a951e..9cd877f82 100755 --- a/app/views/helpers/pagination.phtml +++ b/app/views/helpers/pagination.phtml @@ -2,6 +2,8 @@ $c = Request::controllerName (); $a = Request::actionName (); $params = Request::params (); + $markReadUrl = Session::param ('markReadUrl'); + Session::_param ('markReadUrl', false); ?> <ul class="pagination"> @@ -9,12 +11,16 @@ <?php if ($this->next != '') { ?> <?php $params[$getteur] = $this->next; ?> <a id="load_more" href="<?php echo Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo Translate::t ('load_more'); ?></a> + <?php } elseif ($markReadUrl) { ?> + <a class="bigMarkAsRead" href="<?php echo $markReadUrl; ?>"> + <?php echo Translate::t ('nothing_to_load'); ?><br /> + <span class="bigTick">✔</span><br /> + <?php echo Translate::t ('mark_all_read'); ?> + </a> <?php } else { ?> - <div class="bigMarkAsRead"> - <p><?php echo Translate::t ('nothing_to_load'); ?></p> - <p class="bigTick">✔</p> - <p><?php echo Translate::t ('mark_all_read'); ?></p> - </div> + <a class="bigMarkAsRead" href="."> + <?php echo Translate::t ('nothing_to_load'); ?><br /> + </a> <?php } ?> </li> </ul> |