diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 18:04:35 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 18:04:35 +0200 |
| commit | 60623c63ff82541bbaaf9f4b6bc503e356c1d0ac (patch) | |
| tree | b3d326a1ada2de7194f213bf57de351fca12caa7 | |
| parent | 6193260f3e761782906917fefcba659bb5cfc294 (diff) | |
| parent | 25e247cdb2f42a9212f240cc6a23308365c631cd (diff) | |
Merge branch 'bigMarkAsRead' of https://github.com/Alkarex/FreshRSS into Alkarex-bigMarkAsRead
| -rwxr-xr-x | app/views/helpers/pagination.phtml | 6 | ||||
| -rw-r--r-- | app/views/javascript/main.phtml | 6 | ||||
| -rw-r--r-- | public/themes/default/freshrss.css | 15 | ||||
| -rw-r--r-- | public/themes/flat-design/freshrss.css | 15 |
4 files changed, 41 insertions, 1 deletions
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml index 80c0976ad..0018a951e 100755 --- a/app/views/helpers/pagination.phtml +++ b/app/views/helpers/pagination.phtml @@ -10,7 +10,11 @@ <?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 } else { ?> - <?php echo Translate::t ('nothing_to_load'); ?> + <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> <?php } ?> </li> </ul> diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml index 24d66c1dc..f5f9c7a27 100644 --- a/app/views/javascript/main.phtml +++ b/app/views/javascript/main.phtml @@ -221,6 +221,12 @@ function init_posts () { $(this).attr ('target', '_blank'); }); + $(".bigMarkAsRead").click(function() { + url = $(".nav_menu a.read_all").attr ("href"); + redirect (url, false); + return false; + }); + <?php if ($mark['site'] == 'yes') { ?> $(".flux .link a").click (function () { mark_read($(this).parent().parent().parent(), true); diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css index 3f0b3c23c..92eaafaf0 100644 --- a/public/themes/default/freshrss.css +++ b/public/themes/default/freshrss.css @@ -491,6 +491,21 @@ font-size: 0; } +.bigMarkAsRead { + background:#CCC; + color:#FFF; + cursor:pointer; + height:32em; + text-shadow: 0 -1px 0 #AAA; +} +.bigMarkAsRead:hover { + background:#06C; +} +.bigTick { + font-size:72pt; + margin:32px 0 8px 0; +} + /*** NOTIFICATION ***/ .notification { position: fixed; diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css index efbee8967..45a333b47 100644 --- a/public/themes/flat-design/freshrss.css +++ b/public/themes/flat-design/freshrss.css @@ -494,6 +494,21 @@ body { font-size: 0; } +.bigMarkAsRead { + background:#34495E; + color:#FFF; + cursor:pointer; + height:32em; + text-shadow: 0 -1px 0 #AAA; +} +.bigMarkAsRead:hover { + background:#D04200; +} +.bigTick { + font-size:72pt; + margin:32px 0 8px 0; +} + /*** NOTIFICATION ***/ .notification { position: fixed; |