diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2012-08-18 03:44:54 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2012-08-18 03:44:54 +0200 |
| commit | d3dd6fa63e7f664b0a69b66e29737a8e6768cb98 (patch) | |
| tree | 8df926bc53647e6e75b836557f002fd63053efae | |
| parent | 4c0b359fbe2abd1b22e50221244408c9a64860d2 (diff) | |
added eyebutton
| -rw-r--r-- | css/news.css | 25 | ||||
| -rw-r--r-- | js/news.js | 12 | ||||
| -rw-r--r-- | templates/main.php | 17 |
3 files changed, 49 insertions, 5 deletions
diff --git a/css/news.css b/css/news.css index 0bdbc2f03..ac4e5a8bc 100644 --- a/css/news.css +++ b/css/news.css @@ -357,10 +357,31 @@ div.add_parentfolder { width: 100%; } + #feed_settings .controls > li { + display: inline-block; + float: left; + width: 3em; + } + + #feed_settings #view button { + width: 3em; + height: 2.5em; + padding-top: .2em; + background-size: 80%; + background-position: center; + background-repeat: no-repeat; + } + + #feed_settings #view.show_all button { + background-image: url('%appswebroot%/news/img/eye_all.svg'); + } + + #feed_settings #view.show_unread button { + background-image: url('%appswebroot%/news/img/eye_unread.svg'); + } + #feed_settings #addfeedfolder { margin: 0 .3em .3em .3em; - float: left; - } #feed_settings #addfeedfolder #addfolder { diff --git a/js/news.js b/js/news.js index c5236b39e..1ae753fa2 100644 --- a/js/news.js +++ b/js/news.js @@ -741,8 +741,16 @@ $(document).ready(function(){ bindItemEventListeners(); // filter for newest or all items - $('#feed_filter').change(function(){ - News.Feed.filter($(this).val()); + $('#view').click(function(){ + var term; + if($(this).hasClass('show_all')){ + term = 'unread'; + $(this).addClass('show_unread').removeClass('show_all'); + } else { + term = 'all'; + $(this).addClass('show_all').removeClass('show_unread'); + } + News.Feed.filter(term); }); // mark items whose title was hid under the top edge as read diff --git a/templates/main.php b/templates/main.php index 2855ec8b4..96e419eeb 100644 --- a/templates/main.php +++ b/templates/main.php @@ -5,6 +5,18 @@ <?php if ($_['feedid']){ +$showAll = OCP\Config::getUserValue(OCP\USER::getUser(), 'news', 'showAll'); + +if($showAll){ + $viewButtonImg = 'eye_all.svg'; + $viewButtonTitle = $l->t('Show everything'); + $viewButtonClass = 'show_all'; +} else { + $viewButtonImg = 'eye_unread.svg'; + $viewButtonTitle = $l->t('Show only unread'); + $viewButtonClass = 'show_unread'; +} + ?> <div id="leftcontent" class="leftcontent"> @@ -18,12 +30,15 @@ if ($_['feedid']){ <div id="feed_settings"> <ul class="controls"> <li id="addfeedfolder" title="<?php echo $l->t('Add feed or folder'); ?>"> - <button class="svg"><img class="svg" src="<?php echo OCP\Util::linkTo('news', 'img/add.svg'); ?>" alt="<?php echo $l->t('Add Feed/Folder'); ?>" /></button> + <button class="svg"><img class="svg" src="<?php echo OCP\Util::linkTo('news', 'img/add.svg'); ?>" alt="<?php echo $l->t('Add Feed/Folder'); ?>" /></button> <ul class="menu" id="feedfoldermenu"> <li id="addfeed"><?php echo $l->t('Feed'); ?></li> <li id="addfolder"><?php echo $l->t('Folder'); ?></li> </ul> </li> + <li id="view" title="<?php echo $viewButtonTitle; ?>" class="<?php echo $viewButtonClass; ?>"> + <button class="svg"></button> + </li> <li style="float: right"> <button class="svg" id="settingsbtn" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core','actions/settings.png'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></button> </li> |