From 5ef50596b201ccd23274a275ea708ef55fa9ee2f Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Fri, 17 Aug 2012 21:24:10 +0200 Subject: bumped db version --- appinfo/version | 2 +- css/news.css | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/appinfo/version b/appinfo/version index be4cea5e2..a88f81184 100644 --- a/appinfo/version +++ b/appinfo/version @@ -1 +1 @@ -7.2 \ No newline at end of file +7.3 \ No newline at end of file diff --git a/css/news.css b/css/news.css index 1e05c61e9..ec5059f52 100644 --- a/css/news.css +++ b/css/news.css @@ -100,7 +100,6 @@ div.feed_controls { display: block; float: left; min-width: 1.2em; - display: none; } div.feed_controls .unreaditemcounter.all_read { -- cgit v1.2.3 From 3f524eac6cdac79e1a63f4a36ff24ded229e3cca Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Fri, 17 Aug 2012 21:29:55 +0200 Subject: removed edit feed because it has no function --- appinfo/version | 2 +- templates/part.listfeed.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/appinfo/version b/appinfo/version index a88f81184..9904c6614 100644 --- a/appinfo/version +++ b/appinfo/version @@ -1 +1 @@ -7.3 \ No newline at end of file +7.4 \ No newline at end of file diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index e06dcd38c..e8d91ecb8 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -19,6 +19,5 @@ if($unreadItemsCount == 0){ echo '
  • '; echo '' . $feed->getTitle() .''; echo '' . $unreadItemsCount . ''; -echo ''; echo ''; echo '
    • '; -- cgit v1.2.3 From 47625e6a3011180518cae57bf719654450ac20c9 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Fri, 17 Aug 2012 21:31:32 +0200 Subject: made unreadcounter invisble again --- css/news.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/news.css b/css/news.css index ec5059f52..1e05c61e9 100644 --- a/css/news.css +++ b/css/news.css @@ -100,6 +100,7 @@ div.feed_controls { display: block; float: left; min-width: 1.2em; + display: none; } div.feed_controls .unreaditemcounter.all_read { -- cgit v1.2.3 From a88d3ed057f292e1275e5ed65a036aadd4168f06 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 18 Aug 2012 01:40:56 +0200 Subject: increased font size, limited length to 55em --- css/news.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/css/news.css b/css/news.css index 1e05c61e9..44be1c144 100644 --- a/css/news.css +++ b/css/news.css @@ -598,7 +598,7 @@ div.feed_controls { */ .feed_item h1.item_title { font-size: 1.5em; - margin: 0 13em 0 1.6em; + margin: 0 13em 0 1.75em; font-weight: bold; } @@ -626,7 +626,7 @@ div.feed_controls { */ .feed_item h2.item_author { color: #aaa; - margin-left: 2.5em; + margin-left: 2.7em; } /** @@ -644,7 +644,10 @@ div.feed_controls { * Body of the feed item */ .feed_item div.body { + overflow-y: hidden; padding: .5em 2.5em 0 2.5em; + max-width: 55em; + font-size: 1.1em; } .feed_item div.body p { -- cgit v1.2.3 From 4c0b359fbe2abd1b22e50221244408c9a64860d2 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 18 Aug 2012 02:52:16 +0200 Subject: removed top bar above feed items, aligned the title with the star --- css/news.css | 101 ++-------------------------------------- js/news.js | 10 ---- templates/main.php | 2 - templates/part.items.header.php | 51 -------------------- 4 files changed, 3 insertions(+), 161 deletions(-) delete mode 100644 templates/part.items.header.php diff --git a/css/news.css b/css/news.css index 44be1c144..0bdbc2f03 100644 --- a/css/news.css +++ b/css/news.css @@ -69,88 +69,6 @@ div.add_parentfolder { padding-left: 1.8em; } - -/** - * View above the feeds which shows the feed title - * and the controls - */ -div.feed_controls { - box-sizing: border-box; - -moz-box-sizing: border-box; - background: none repeat scroll 0 0 #f7f7f7; - border-bottom: 1px solid #ccc; - box-shadow: 0 4px 4px -3px #ccc; - overflow: hidden; - position: fixed; - left: 34.1em; - right: 0; - top: 3.5em; - z-index: 1; - height: 3.3em; -} - - div.feed_controls .unreaditemcounter { - background: #5E5E5E; - border-radius: 5px; - padding: 2px 5px; - color: white; - text-align: center; - font-weight: normal; - margin: .7em 0 0 .6em; - display: block; - float: left; - min-width: 1.2em; - display: none; - } - - div.feed_controls .unreaditemcounter.all_read { - display: none; - } - - - div.feed_controls div.subscriptions_title { - display: inline-block; - padding-left: .8em; - padding-bottom: .6em; - width: 22.4em; - border-right: 1px solid #ddd; - } - - div.feed_controls div.feed_title { - padding-left: 10px; - display: inline-block; - } - - div.feed_controls div.feed_title h1 { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - font-size: 1.2em; - line-height: 2.6em; - font-weight: bold; - color: #333; - } - - @media all and (min-width: 1280px){ - div.feed_controls div.feed_title h1 { max-width: 450px; } - } - - @media all and (max-width: 1279px) and (min-width: 1024px){ - div.feed_controls div.feed_title h1 { max-width: 230px; } - } - - @media all and (max-width: 1023px) and (min-width: 950px){ - div.feed_controls div.feed_title h1 { max-width: 130px; } - } - - @media all and (max-width: 949px){ - div.feed_controls div.feed_title h1 { display: none; } - } - - div.feed_controls .controls { - float: right; - } - /* feed/folder list */ #leftcontent { @@ -163,20 +81,6 @@ div.feed_controls { bottom: 0; } - /* - #leftcontent h1 { - background-color: #DBDBDB; - border-bottom: 1px solid #CCCCCC; - border-top: 1px solid #D4D4D4; - color: #333333; - font-weight: bold; - display: block; - font-size: 1.2em; - max-width: 100%; - padding: 0 0.8em; - text-shadow: 0 1px 0 #F8F8F8; - line-height: 2.6em; - }*/ #feeds { background-color: #f8f8f8; @@ -509,7 +413,6 @@ div.feed_controls { top: 3.5em !important; box-sizing: border-box; -moz-box-sizing: border-box; - margin-top: 3.5em; left: 34.1em; } @@ -552,7 +455,8 @@ div.feed_controls { .utils { height: 2em; margin: 0; - padding: 0.6em 0.5em 0.5em 0.5em; + padding: 1.1em 0.5em 0.5em 0.5em; + float: left; background-color: #f8f8f8; background-image: linear-gradient(top, rgb(248,248,248) 0%, rgb(255,255,255) 100%); background-image: -o-linear-gradient(top, rgb(248,248,248) 0%, rgb(255,255,255) 100%); @@ -600,6 +504,7 @@ div.feed_controls { font-size: 1.5em; margin: 0 13em 0 1.75em; font-weight: bold; + padding-top: .8em; } .feed_item h1.item_title a { diff --git a/js/news.js b/js/news.js index b3229e947..c5236b39e 100644 --- a/js/news.js +++ b/js/news.js @@ -388,7 +388,6 @@ News={ var _activeFeedId = News.Feed.activeFeedId; var _$feed = $('li.feed[data-id="'+feedId+'"]'); var _$feedUnreadCounter = _$feed.find('.unreaditemcounter'); - var _$feedUnreadCounterUtil = $('.feed_controls .unreaditemcounter'); var _$feedLink = _$feed.children('a'); /** @@ -457,24 +456,15 @@ News={ if(count === 0){ _$feedLink.addClass('all_read'); _$feedUnreadCounter.addClass('all_read'); - if(_activeFeedId == _feedId){ - _$feedUnreadCounterUtil.addClass('all_read'); - } } else { var currentCount = _getUnreadCount(); // if the previous count was 0 we need to remove certain classes if(currentCount === 0){ _$feedLink.removeClass('all_read'); _$feedUnreadCounter.removeClass('all_read'); - if(_activeFeedId == _feedId){ - _$feedUnreadCounterUtil.removeClass('all_read'); - } } } _$feedUnreadCounter.html(count); - if(_activeFeedId == _feedId){ - _$feedUnreadCounterUtil.html(count); - } }; // public diff --git a/templates/main.php b/templates/main.php index 3ec909b7d..2855ec8b4 100644 --- a/templates/main.php +++ b/templates/main.php @@ -5,8 +5,6 @@ inc("part.items.header"); - ?>
    diff --git a/templates/part.items.header.php b/templates/part.items.header.php deleted file mode 100644 index 0a49b9e91..000000000 --- a/templates/part.items.header.php +++ /dev/null @@ -1,51 +0,0 @@ -t('Starred'); - $unreadItemCount = $itemMapper->countAllStatus($feedId, OCA\News\StatusFlag::IMPORTANT); - break; - - case -2: - $feedTitle = $l->t('New articles'); - $unreadItemCount = $itemMapper->countEveryItemByStatus(OCA\News\StatusFlag::UNREAD); - break; - - default: - $feedMapper = new OCA\News\FeedMapper(); - $feed = $feedMapper->findById($feedId); - $feedTitle = $feed->getTitle(); - $unreadItemCount = $itemMapper->countAllStatus($feedId, OCA\News\StatusFlag::UNREAD); - break; - } - - if($unreadItemCount > 0){ - $readClass = ''; - } else { - $readClass = 'all_read'; - } -} else { - $feedTitle = ''; - $unreadItemCount = 0; -} - -$showAll = OCP\Config::getUserValue(OCP\USER::getUser(), 'news', 'showAll'); - -?> - -
    - -
    -

    -
    -
    - - -
    -
    \ No newline at end of file -- cgit v1.2.3 From d3dd6fa63e7f664b0a69b66e29737a8e6768cb98 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 18 Aug 2012 03:44:54 +0200 Subject: added eyebutton --- css/news.css | 25 +++++++++++++++++++++++-- js/news.js | 12 ++++++++++-- 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 @@ t('Show everything'); + $viewButtonClass = 'show_all'; +} else { + $viewButtonImg = 'eye_unread.svg'; + $viewButtonTitle = $l->t('Show only unread'); + $viewButtonClass = 'show_unread'; +} + ?>
    @@ -18,12 +30,15 @@ if ($_['feedid']){
    • - +
      • +
    • + +
      • -- cgit v1.2.3 From 4aee7c9291fb0b985982825d5d6cf6a6d106d9d4 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 18 Aug 2012 03:48:02 +0200 Subject: moved timestamp furhter down --- css/news.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/news.css b/css/news.css index ac4e5a8bc..0eaf40948 100644 --- a/css/news.css +++ b/css/news.css @@ -561,7 +561,7 @@ div.add_parentfolder { .timeago { float: right; color: #aaa; - margin: .6em 1.2em 0 0; + margin: 1em 1.2em 0 0; line-height: 1.5em; font-size: 1em; } -- cgit v1.2.3 From a08a85def663a84d33e504a02b608601760bd841 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 18 Aug 2012 03:57:51 +0200 Subject: fixed top gradients --- css/news.css | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/css/news.css b/css/news.css index 0eaf40948..0b7a9032b 100644 --- a/css/news.css +++ b/css/news.css @@ -464,6 +464,11 @@ div.add_parentfolder { .feed_item { border-top: 1px solid #ccc; min-height: 100px; + background-image: linear-gradient(top, rgb(240,240,240) 0, rgb(255,255,255) 5em); + background-image: -o-linear-gradient(top, rgb(240,240,240) 0, rgb(255,255,255) 5em); + background-image: -moz-linear-gradient(top, rgb(240,240,240) 0, rgb(255,255,255) 5em); + background-image: -webkit-linear-gradient(top, rgb(240,240,240) 0, rgb(255,255,255) 5em); + background-image: -ms-linear-gradient(top, rgb(240,240,240) 0, rgb(255,255,255) 5em); } .feed_item:first-child { @@ -478,12 +483,6 @@ div.add_parentfolder { margin: 0; padding: 1.1em 0.5em 0.5em 0.5em; float: left; - background-color: #f8f8f8; - background-image: linear-gradient(top, rgb(248,248,248) 0%, rgb(255,255,255) 100%); - background-image: -o-linear-gradient(top, rgb(248,248,248) 0%, rgb(255,255,255) 100%); - background-image: -moz-linear-gradient(top, rgb(248,248,248) 0%, rgb(255,255,255) 100%); - background-image: -webkit-linear-gradient(top, rgb(248,248,248) 0%, rgb(255,255,255) 100%); - background-image: -ms-linear-gradient(top, rgb(248,248,248) 0%, rgb(255,255,255) 100%); } /** -- cgit v1.2.3 From 316b1dc44050d8d44960787318a9acb57fa8fcf8 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 18 Aug 2012 04:00:28 +0200 Subject: made gradient lighter --- css/news.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/css/news.css b/css/news.css index 0b7a9032b..6ee5321f8 100644 --- a/css/news.css +++ b/css/news.css @@ -464,11 +464,11 @@ div.add_parentfolder { .feed_item { border-top: 1px solid #ccc; min-height: 100px; - background-image: linear-gradient(top, rgb(240,240,240) 0, rgb(255,255,255) 5em); - background-image: -o-linear-gradient(top, rgb(240,240,240) 0, rgb(255,255,255) 5em); - background-image: -moz-linear-gradient(top, rgb(240,240,240) 0, rgb(255,255,255) 5em); - background-image: -webkit-linear-gradient(top, rgb(240,240,240) 0, rgb(255,255,255) 5em); - background-image: -ms-linear-gradient(top, rgb(240,240,240) 0, rgb(255,255,255) 5em); + background-image: linear-gradient(top, rgb(245,245,245) 0, rgb(255,255,255) 6em); + background-image: -o-linear-gradient(top, rgb(245,245,245) 0, rgb(255,255,255) 6em); + background-image: -moz-linear-gradient(top, rgb(245,245,245) 0, rgb(255,255,255) 6em); + background-image: -webkit-linear-gradient(top, rgb(245,245,245) 0, rgb(255,255,255) 6em); + background-image: -ms-linear-gradient(top, rgb(245,245,245) 0, rgb(255,255,255) 6em); } .feed_item:first-child { -- cgit v1.2.3 From fc0e90f26a259abd63d8c421c601978530abe6bf Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 18 Aug 2012 04:01:35 +0200 Subject: made gradient lighter --- css/news.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/css/news.css b/css/news.css index 6ee5321f8..a671b5786 100644 --- a/css/news.css +++ b/css/news.css @@ -464,11 +464,11 @@ div.add_parentfolder { .feed_item { border-top: 1px solid #ccc; min-height: 100px; - background-image: linear-gradient(top, rgb(245,245,245) 0, rgb(255,255,255) 6em); - background-image: -o-linear-gradient(top, rgb(245,245,245) 0, rgb(255,255,255) 6em); - background-image: -moz-linear-gradient(top, rgb(245,245,245) 0, rgb(255,255,255) 6em); - background-image: -webkit-linear-gradient(top, rgb(245,245,245) 0, rgb(255,255,255) 6em); - background-image: -ms-linear-gradient(top, rgb(245,245,245) 0, rgb(255,255,255) 6em); + background-image: linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 6em); + background-image: -o-linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 6em); + background-image: -moz-linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 6em); + background-image: -webkit-linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 6em); + background-image: -ms-linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 6em); } .feed_item:first-child { -- cgit v1.2.3 From 91dff3767b957a59cd150be4c8126452964c5826 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 18 Aug 2012 04:06:33 +0200 Subject: added svg images --- img/eye_all.svg | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++ img/eye_unread.svg | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+) create mode 100644 img/eye_all.svg create mode 100644 img/eye_unread.svg diff --git a/img/eye_all.svg b/img/eye_all.svg new file mode 100644 index 000000000..939ec3b32 --- /dev/null +++ b/img/eye_all.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/img/eye_unread.svg b/img/eye_unread.svg new file mode 100644 index 000000000..c30a84046 --- /dev/null +++ b/img/eye_unread.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + -- cgit v1.2.3