From 1ab5fa83c3b25d773b203a54e319eb71bd3a69da Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sat, 15 Feb 2014 19:15:07 +0100 Subject: Update themes: global view and not read categories Category header is better when some articles are not read --- p/themes/Dark/freshrss.css | 6 ++++-- p/themes/Flat/freshrss.css | 6 ++++-- p/themes/Origine/freshrss.css | 8 ++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) (limited to 'p/themes') diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css index 380dee877..e448f081f 100644 --- a/p/themes/Dark/freshrss.css +++ b/p/themes/Dark/freshrss.css @@ -354,13 +354,15 @@ font-size: 120%; } #stream.global .btn:not([data-unread="0"]) { - font-weight:bold; + background: #34495e; + color: #fff; + font-weight: bold; } #stream.global .btn:first-child:not([data-unread="0"]):after { top: 0; right: 5px; border: 0; background: none; - color: #666; + color: #fff; font-weight: bold; box-shadow: none; } diff --git a/p/themes/Flat/freshrss.css b/p/themes/Flat/freshrss.css index edd67e17c..c23743843 100644 --- a/p/themes/Flat/freshrss.css +++ b/p/themes/Flat/freshrss.css @@ -350,13 +350,15 @@ body { font-size: 120%; } #stream.global .btn:not([data-unread="0"]) { - font-weight:bold; + background: #3498db; + color: #fff; + font-weight: bold; } #stream.global .btn:first-child:not([data-unread="0"]):after { top: 0; right: 5px; border: 0; background: none; - color: #333; + color: #fff; font-weight: bold; box-shadow: none; } diff --git a/p/themes/Origine/freshrss.css b/p/themes/Origine/freshrss.css index 80fac05cd..e605465dc 100644 --- a/p/themes/Origine/freshrss.css +++ b/p/themes/Origine/freshrss.css @@ -364,15 +364,19 @@ font-size: 120%; } #stream.global .btn:not([data-unread="0"]) { - font-weight:bold; + background: #0084CC; + color: #fff; + font-weight: bold; + text-shadow: none; } #stream.global .btn:first-child:not([data-unread="0"]):after { top: 0; right: 5px; border: 0; background: none; - color: #666; + color: #fff; font-weight: bold; box-shadow: none; + text-shadow: none; } #stream.global .box-category .feeds { display: block; -- cgit v1.2.3 From e50fb4179f91ec3711b0fd602a749c447d0e141d Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 18 Feb 2014 19:56:26 +0100 Subject: Improve notification design on mobile Impact all themes: - Notification is extended from left to right and top (0px) - Close button is hidden: by clicking (or touching) notification it will close the notification See #427 --- p/themes/Dark/freshrss.css | 37 +++++++++++++++++++++---------------- p/themes/Flat/freshrss.css | 25 ++++++++++++++++++++----- p/themes/Origine/freshrss.css | 23 ++++++++++++++++++----- 3 files changed, 59 insertions(+), 26 deletions(-) (limited to 'p/themes') diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css index e448f081f..f6577c645 100644 --- a/p/themes/Dark/freshrss.css +++ b/p/themes/Dark/freshrss.css @@ -572,35 +572,25 @@ box-shadow: 0 0 5px #666; background: #1a1a1a; color: #888; + border: 1px solid #f4f899; font-weight: bold; z-index: 10; } #notification.closed { display: none; } - #notification.good { - border:1px solid #f4f899; - } - #notification.bad { - border:1px solid #f4a899; - } #notification a.close { + position: absolute; + top: -10px; right: -10px; display: inline-block; width: 16px; height: 16px; - float: right; - margin: -20px -20px 0 0; padding: 5px; background: #1a1a1a; border-radius: 50px; line-height: 16px; - } - #notification.good a.close{ border:1px solid #f4f899; } - #notification.bad a.close{ - border:1px solid #f4a899; - } .toggle_aside, .btn.toggle_aside { display: none; @@ -782,10 +772,25 @@ select.number option { text-shadow: none; } - .notification, + #notification, .actualizeProgress { - left: 10px; - right: 10px; + top: 0; + left: 0; + right: 0; + border-radius: 0; + border: none; + border-bottom: 1px solid #f4f899; + } + #notification a.close { + left: 0; right: 0; + top: 0; bottom: 0; + width: auto; + height: auto; + background: transparent; + border: none; + } + #notification a.close .icon { + display: none; } } diff --git a/p/themes/Flat/freshrss.css b/p/themes/Flat/freshrss.css index c23743843..1d551d8fb 100644 --- a/p/themes/Flat/freshrss.css +++ b/p/themes/Flat/freshrss.css @@ -589,11 +589,11 @@ body { color: #fff; } #notification a.close { + position: absolute; + top: -6px; right: -6px; display: inline-block; width: 16px; height: 16px; - float: right; - margin: -16px -16px 0 0; padding: 5px; border-radius: 3px; line-height: 16px; @@ -790,10 +790,25 @@ select.number option { text-shadow: none; } - .notification, + #notification, .actualizeProgress { - left: 10px; - right: 10px; + top: 0; + left: 0; + right: 0; + border-radius: 0; + } + #notification a.close, + #notification.good a.close, + #notification.bad a.close { + left: 0; right: 0; + top: 0; bottom: 0; + width: auto; + height: auto; + background: transparent; + border: none; + } + #notification a.close .icon { + display: none; } } diff --git a/p/themes/Origine/freshrss.css b/p/themes/Origine/freshrss.css index e605465dc..86bd508df 100644 --- a/p/themes/Origine/freshrss.css +++ b/p/themes/Origine/freshrss.css @@ -598,11 +598,11 @@ background: #f4a899; } #notification a.close { + position: absolute; + top: -10px; right: -10px; display: inline-block; width: 16px; height: 16px; - float: right; - margin: -20px -20px 0 0; padding: 5px; background: #fff; border-radius: 50px; @@ -790,10 +790,23 @@ select.number option { text-shadow: none; } - .notification, + #notification, .actualizeProgress { - left: 10px; - right: 10px; + top: 0; + left: 0; + right: 0; + border-radius: 0; + } + #notification a.close { + left: 0; right: 0; + top: 0; bottom: 0; + width: auto; + height: auto; + background: transparent; + border: none; + } + #notification a.close .icon { + display: none; } } -- cgit v1.2.3 From 2871f531d38211cf9edca3fd85f7f72e50174c0a Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Fri, 7 Mar 2014 22:10:38 -0500 Subject: Optimize SVG files See #341 First step was to save from Inkscape in optimize SVG format. The used parameters are the following: * Simplify colors -> true * Style to xml -> true * Group collapsing -> true * Enable id stripping -> true * Embed rasters -> true * Keep editor data -> false * Enable view boxing -> false * Strip xml prolog -> true * Set precision -> 5 * Indent -> None Second step was to edit the file and remove meta-data, title, extra carriage return and unnecessary namespaces. --- p/themes/icons/add.svg | 35 ++-------- p/themes/icons/all.svg | 39 ++--------- p/themes/icons/bookmark.svg | 37 ++-------- p/themes/icons/category-white.svg | 38 ++--------- p/themes/icons/category.svg | 38 ++--------- p/themes/icons/close.svg | 35 ++-------- p/themes/icons/configure.svg | 36 ++-------- p/themes/icons/down.svg | 36 ++-------- p/themes/icons/favicon.svg | 4 -- p/themes/icons/help.svg | 39 ++--------- p/themes/icons/icon.svg | 3 - p/themes/icons/link.svg | 40 ++--------- p/themes/icons/login.svg | 39 ++--------- p/themes/icons/logout.svg | 39 ++--------- p/themes/icons/next.svg | 36 ++-------- p/themes/icons/non-starred.svg | 37 ++-------- p/themes/icons/prev.svg | 36 ++-------- p/themes/icons/read.svg | 36 ++-------- p/themes/icons/refresh.svg | 36 ++-------- p/themes/icons/rss.svg | 38 ++--------- p/themes/icons/search.svg | 38 ++--------- p/themes/icons/share.svg | 42 +++--------- p/themes/icons/starred.svg | 37 ++-------- p/themes/icons/tag.svg | 139 ++------------------------------------ p/themes/icons/unread.svg | 36 ++-------- p/themes/icons/up.svg | 36 ++-------- 26 files changed, 140 insertions(+), 865 deletions(-) (limited to 'p/themes') diff --git a/p/themes/icons/add.svg b/p/themes/icons/add.svg index 425c9b4aa..652491775 100644 --- a/p/themes/icons/add.svg +++ b/p/themes/icons/add.svg @@ -1,30 +1,5 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/p/themes/icons/all.svg b/p/themes/icons/all.svg index 2180f7a4b..aeaa96277 100644 --- a/p/themes/icons/all.svg +++ b/p/themes/icons/all.svg @@ -1,32 +1,7 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/p/themes/icons/bookmark.svg b/p/themes/icons/bookmark.svg index d6e2cebb5..63a44908f 100644 --- a/p/themes/icons/bookmark.svg +++ b/p/themes/icons/bookmark.svg @@ -1,32 +1,5 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/p/themes/icons/category-white.svg b/p/themes/icons/category-white.svg index 5e61aeea5..5bb5cecd9 100644 --- a/p/themes/icons/category-white.svg +++ b/p/themes/icons/category-white.svg @@ -1,31 +1,7 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/p/themes/icons/category.svg b/p/themes/icons/category.svg index 71f95490e..b5470d84a 100644 --- a/p/themes/icons/category.svg +++ b/p/themes/icons/category.svg @@ -1,31 +1,7 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/p/themes/icons/close.svg b/p/themes/icons/close.svg index c0c786fd6..20d1577ab 100644 --- a/p/themes/icons/close.svg +++ b/p/themes/icons/close.svg @@ -1,28 +1,7 @@ - - - - - Gnome Symbolic Icon Theme - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/p/themes/icons/configure.svg b/p/themes/icons/configure.svg index 52df8bca7..2957a7abe 100644 --- a/p/themes/icons/configure.svg +++ b/p/themes/icons/configure.svg @@ -1,31 +1,5 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/p/themes/icons/down.svg b/p/themes/icons/down.svg index 06d031fae..8a234ee99 100644 --- a/p/themes/icons/down.svg +++ b/p/themes/icons/down.svg @@ -1,31 +1,5 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/p/themes/icons/favicon.svg b/p/themes/icons/favicon.svg index a44f0a1c0..a252050b9 100644 --- a/p/themes/icons/favicon.svg +++ b/p/themes/icons/favicon.svg @@ -1,11 +1,7 @@ - Logo FreshRSS - - - diff --git a/p/themes/icons/help.svg b/p/themes/icons/help.svg index b103ec46d..9a0022f76 100644 --- a/p/themes/icons/help.svg +++ b/p/themes/icons/help.svg @@ -1,32 +1,7 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/p/themes/icons/icon.svg b/p/themes/icons/icon.svg index 742c04b6e..caa987dac 100644 --- a/p/themes/icons/icon.svg +++ b/p/themes/icons/icon.svg @@ -1,9 +1,6 @@ - Logo FreshRSS - - diff --git a/p/themes/icons/link.svg b/p/themes/icons/link.svg index ddc8e0706..e5290af76 100644 --- a/p/themes/icons/link.svg +++ b/p/themes/icons/link.svg @@ -1,33 +1,7 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/p/themes/icons/login.svg b/p/themes/icons/login.svg index 0a8af162f..954a0b74b 100644 --- a/p/themes/icons/login.svg +++ b/p/themes/icons/login.svg @@ -1,33 +1,6 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/p/themes/icons/logout.svg b/p/themes/icons/logout.svg index 284a67578..8dd4ef08b 100644 --- a/p/themes/icons/logout.svg +++ b/p/themes/icons/logout.svg @@ -1,33 +1,6 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/p/themes/icons/next.svg b/p/themes/icons/next.svg index 72637b4e6..d504d096c 100644 --- a/p/themes/icons/next.svg +++ b/p/themes/icons/next.svg @@ -1,31 +1,5 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/p/themes/icons/non-starred.svg b/p/themes/icons/non-starred.svg index 346717f78..4ebcfccbd 100644 --- a/p/themes/icons/non-starred.svg +++ b/p/themes/icons/non-starred.svg @@ -1,32 +1,5 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/p/themes/icons/prev.svg b/p/themes/icons/prev.svg index 67685c50c..ea4372098 100644 --- a/p/themes/icons/prev.svg +++ b/p/themes/icons/prev.svg @@ -1,31 +1,5 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/p/themes/icons/read.svg b/p/themes/icons/read.svg index 932bfd860..d72c198df 100644 --- a/p/themes/icons/read.svg +++ b/p/themes/icons/read.svg @@ -1,31 +1,5 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/p/themes/icons/refresh.svg b/p/themes/icons/refresh.svg index 11728fc5d..62fe56c1e 100644 --- a/p/themes/icons/refresh.svg +++ b/p/themes/icons/refresh.svg @@ -1,31 +1,5 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/p/themes/icons/rss.svg b/p/themes/icons/rss.svg index ceaddceee..6db5b3eae 100644 --- a/p/themes/icons/rss.svg +++ b/p/themes/icons/rss.svg @@ -1,32 +1,6 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/p/themes/icons/search.svg b/p/themes/icons/search.svg index acfb364cc..35a28dfca 100644 --- a/p/themes/icons/search.svg +++ b/p/themes/icons/search.svg @@ -1,32 +1,6 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/p/themes/icons/share.svg b/p/themes/icons/share.svg index 443321882..db7a3649c 100644 --- a/p/themes/icons/share.svg +++ b/p/themes/icons/share.svg @@ -1,34 +1,8 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/p/themes/icons/starred.svg b/p/themes/icons/starred.svg index d6e2cebb5..63a44908f 100644 --- a/p/themes/icons/starred.svg +++ b/p/themes/icons/starred.svg @@ -1,32 +1,5 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/p/themes/icons/tag.svg b/p/themes/icons/tag.svg index 688aca7a4..0d6db6ed8 100644 --- a/p/themes/icons/tag.svg +++ b/p/themes/icons/tag.svg @@ -1,134 +1,5 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/p/themes/icons/unread.svg b/p/themes/icons/unread.svg index f541fb25b..dc1cc609c 100644 --- a/p/themes/icons/unread.svg +++ b/p/themes/icons/unread.svg @@ -1,30 +1,6 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/p/themes/icons/up.svg b/p/themes/icons/up.svg index dab31a20d..4819c9205 100644 --- a/p/themes/icons/up.svg +++ b/p/themes/icons/up.svg @@ -1,31 +1,5 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - + + + + + \ No newline at end of file -- cgit v1.2.3 From 1af723ca68e2558232ef4c4eb5a7c8f41a07bd0c Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Sat, 15 Mar 2014 07:08:58 -0400 Subject: Add a button to reveal/hide password I add a button on the configure user interface to reveal the password for 2 seconds and hide it after that period. See #442 I am not sure if the fallback unicode text for the icon is correct. I can not make it work. --- app/Models/Themes.php | 1 + app/views/configure/users.phtml | 2 ++ p/scripts/main.js | 12 ++++++++++++ p/themes/icons/key.svg | 7 +++++++ 4 files changed, 22 insertions(+) create mode 100644 p/themes/icons/key.svg (limited to 'p/themes') diff --git a/app/Models/Themes.php b/app/Models/Themes.php index c7099a1df..ed746b7e9 100644 --- a/app/Models/Themes.php +++ b/app/Models/Themes.php @@ -77,6 +77,7 @@ class FreshRSS_Themes extends Minz_Model { 'down' => '▽', 'favorite' => '★', 'help' => 'ⓘ', + 'key' => '⚿', 'link' => '↗', 'login' => '🔒', 'logout' => '🔓', diff --git a/app/views/configure/users.phtml b/app/views/configure/users.phtml index 1a02b0e90..fdc94cd18 100644 --- a/app/views/configure/users.phtml +++ b/app/views/configure/users.phtml @@ -21,6 +21,7 @@
/> +
@@ -178,6 +179,7 @@
+
diff --git a/p/scripts/main.js b/p/scripts/main.js index 799d46625..57618c29b 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -998,6 +998,17 @@ function init_feed_observers() { }); }; +function init_password_observers() { + $('input[type="password"] + a.btn.toggle-password').on('click', function(e){ + e.preventDefault(); + var passwordField = $(this).siblings('input[type="password"]'); + passwordField.attr('type','text'); + setTimeout(function(){ + passwordField.attr('type','password'); + },2000); + }); +}; + function init_all() { if (!(window.$ && window.url_freshrss && ((!full_lazyload) || $.fn.lazyload))) { if (window.console) { @@ -1030,6 +1041,7 @@ function init_all() { } else { init_share_observers(); init_feed_observers(); + init_password_observers(); } if (window.console) { diff --git a/p/themes/icons/key.svg b/p/themes/icons/key.svg new file mode 100644 index 000000000..9193f4552 --- /dev/null +++ b/p/themes/icons/key.svg @@ -0,0 +1,7 @@ + + + + + + + -- cgit v1.2.3 From b5e60062a528f6ace5c67f280443819470e0225a Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 6 Apr 2014 13:23:35 +0200 Subject: Add link to article title https://github.com/marienfressinaud/FreshRSS/issues/469 --- app/views/helpers/view/normal_view.phtml | 2 +- p/themes/Dark/freshrss.css | 2 +- p/themes/Flat/freshrss.css | 2 +- p/themes/Origine/freshrss.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'p/themes') diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml index b0f90b4c9..b5cdd3039 100644 --- a/app/views/helpers/view/normal_view.phtml +++ b/app/views/helpers/view/normal_view.phtml @@ -88,7 +88,7 @@ if (!empty($this->entries)) {
-

title (); ?>

+

title (); ?>

author (); echo $author != '' ? '
' . Minz_Translate::t ('by_author', $author) . '
' : ''; diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css index f6577c645..6275d8938 100644 --- a/p/themes/Dark/freshrss.css +++ b/p/themes/Dark/freshrss.css @@ -290,7 +290,7 @@ .flux .item.title { background: inherit; } - .flux .item.title a { + .flux .title a { color: #888; outline: none; } diff --git a/p/themes/Flat/freshrss.css b/p/themes/Flat/freshrss.css index 1d551d8fb..1f297309b 100644 --- a/p/themes/Flat/freshrss.css +++ b/p/themes/Flat/freshrss.css @@ -286,7 +286,7 @@ body { .flux .item.title { background: inherit; } - .flux .item.title a { + .flux .title a { color: #333; outline: none; } diff --git a/p/themes/Origine/freshrss.css b/p/themes/Origine/freshrss.css index 86bd508df..662e085d6 100644 --- a/p/themes/Origine/freshrss.css +++ b/p/themes/Origine/freshrss.css @@ -300,7 +300,7 @@ .flux .item.title { background: inherit; } - .flux .item.title a { + .flux .title a { color: #000; outline: none; } -- cgit v1.2.3 From 5ab6b7d2b13604f4b60f622f91482cc3fc304854 Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Thu, 10 Apr 2014 21:59:31 -0400 Subject: Fix small color bug There was a small bug color in Dark theme. --- p/themes/Dark/freshrss.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'p/themes') diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css index 6275d8938..be8d6b86a 100644 --- a/p/themes/Dark/freshrss.css +++ b/p/themes/Dark/freshrss.css @@ -506,10 +506,10 @@ font-style: italic; } .pagination:first-child .item { - border-bottom: 1px solid #aaa; + border-bottom: 1px solid #2f2f2f; } .pagination:last-child .item { - border-top: 1px solid #aaa; + border-top: 1px solid #2f2f2f; } #nav_entries { -- cgit v1.2.3 From 3e665bcf9aefe40499b5d16e901d0c7427e367af Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Sat, 12 Apr 2014 11:51:44 -0400 Subject: Delete favorite button I extract drop-down menu actions to make them as button action in the page header. I removed the favorite button on the category list because it is a duplicate from the button action. Now button action act as filters and you can combine them. It is a test to see if we can keep it like that. There is still work to do to extract other actions from the drop-down list. I did not want to change everything if we don't keep it. See #376 and #277 --- app/Controllers/indexController.php | 7 +-- app/Models/Configuration.php | 9 +++- app/Models/EntryDAO.php | 32 ++++++----- app/i18n/en.php | 4 +- app/i18n/fr.php | 2 +- app/layout/aside_flux.phtml | 9 ---- app/layout/nav_menu.phtml | 102 +++++++++++++++++++++++------------- app/views/configure/reading.phtml | 2 +- p/themes/Dark/freshrss.css | 5 ++ p/themes/Dark/global.css | 6 --- p/themes/Flat/freshrss.css | 5 ++ p/themes/Flat/global.css | 6 --- p/themes/Origine/freshrss.css | 5 ++ p/themes/Origine/global.css | 6 --- 14 files changed, 111 insertions(+), 89 deletions(-) (limited to 'p/themes') diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index 9da1e5022..243d887ac 100755 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -91,14 +91,11 @@ class FreshRSS_index_Controller extends Minz_ActionController { $nb = Minz_Request::param ('nb', $this->view->conf->posts_per_page); $first = Minz_Request::param ('next', ''); - if ($state === 'not_read') { //Any unread article in this category at all? + if ($state === FreshRSS_Configuration::STATE_NOT_READ) { //Any unread article in this category at all? switch ($getType) { case 'a': $hasUnread = $this->view->nb_not_read > 0; break; - case 's': - $hasUnread = $this->view->nb_favorites['unread'] > 0; - break; case 'c': $hasUnread = (!isset($this->view->cat_aside[$getId])) || ($this->view->cat_aside[$getId]->nbNotRead() > 0); break; @@ -128,7 +125,7 @@ class FreshRSS_index_Controller extends Minz_ActionController { // Si on a récupéré aucun article "non lus" // on essaye de récupérer tous les articles - if ($state === 'not_read' && empty($entries) && ($state_param === null)) { + if ($state === FreshRSS_Configuration::STATE_NOT_READ && empty($entries) && ($state_param === null)) { Minz_Log::record ('Conflicting information about nbNotRead!', Minz_Log::DEBUG); $this->view->state = 'all'; $entries = $entryDAO->listWhere($getType, $getId, 'all', $order, $nb, $first, $filter, $date_min, true, $keepHistoryDefault); diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index 80031369e..f9ea47be6 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -1,6 +1,11 @@ '', //CRYPT_BLOWFISH 'posts_per_page' => 20, 'view_mode' => 'normal', - 'default_view' => 'not_read', + 'default_view' => self::STATE_NOT_READ, 'auto_load_more' => true, 'display_posts' => false, 'onread_jump_next' => true, @@ -131,7 +136,7 @@ class FreshRSS_Configuration { } } public function _default_view ($value) { - $this->data['default_view'] = $value === 'all' ? 'all' : 'not_read'; + $this->data['default_view'] = $value === 'all' ? 'all' : self::STATE_NOT_READ; } public function _display_posts ($value) { $this->data['display_posts'] = ((bool)$value) && $value !== 'no'; diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index 6d00967fc..2f5a9e1f6 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -415,9 +415,6 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { $where .= 'f.priority > 0 '; $joinFeed = true; break; - case 's': - $where .= 'e1.is_favorite = 1 '; - break; case 'c': $where .= 'f.category = ? '; $values[] = intval($id); @@ -433,21 +430,28 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { default: throw new FreshRSS_EntriesGetter_Exception ('Bad type in Entry->listByType: [' . $type . ']!'); } - switch ($state) { - case 'all': - break; - case 'not_read': + + if ($state & FreshRSS_Configuration::STATE_NOT_READ) { + if (!($state & FreshRSS_Configuration::STATE_READ)) { $where .= 'AND e1.is_read = 0 '; - break; - case 'read': + } + } + if ($state & FreshRSS_Configuration::STATE_READ) { + if (!($state & FreshRSS_Configuration::STATE_NOT_READ)) { $where .= 'AND e1.is_read = 1 '; - break; - case 'favorite': + } + } + if ($state & FreshRSS_Configuration::STATE_NOT_FAVORITE) { + if (!($state & FreshRSS_Configuration::STATE_FAVORITE)) { + $where .= 'AND e1.is_favorite = 0 '; + } + } + if ($state & FreshRSS_Configuration::STATE_FAVORITE) { + if (!($state & FreshRSS_Configuration::STATE_NOT_FAVORITE)) { $where .= 'AND e1.is_favorite = 1 '; - break; - default: - throw new FreshRSS_EntriesGetter_Exception ('Bad state in Entry->listByType: [' . $state . ']!'); + } } + switch ($order) { case 'DESC': case 'ASC': diff --git a/app/i18n/en.php b/app/i18n/en.php index d6096bbe8..01f31eca7 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -27,7 +27,6 @@ return array ( 'subscription_management' => 'Subscriptions management', 'main_stream' => 'Main stream', 'all_feeds' => 'All feeds', - 'favorite_feeds' => 'Favourites (%d)', 'not_read' => '%d unread', 'not_reads' => '%d unread', @@ -51,7 +50,8 @@ return array ( 'show_all_articles' => 'Show all articles', 'show_not_reads' => 'Show only unread', 'show_read' => 'Show only read', - 'show_favorite' => 'Show favorites', + 'show_favorite' => 'Show only favorites', + 'show_not_favorite' => 'Show all but favorites', 'older_first' => 'Oldest first', 'newer_first' => 'Newer first', diff --git a/app/i18n/fr.php b/app/i18n/fr.php index d89cbb098..299d4d242 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -27,7 +27,6 @@ return array ( 'subscription_management' => 'Gestion des abonnements', 'main_stream' => 'Flux principal', 'all_feeds' => 'Tous les flux', - 'favorite_feeds' => 'Favoris (%d)', 'not_read' => '%d non lu', 'not_reads' => '%d non lus', @@ -52,6 +51,7 @@ return array ( 'show_not_reads' => 'Afficher les non lus', 'show_read' => 'Afficher les lus', 'show_favorite' => 'Afficher les favoris', + 'show_not_favorite' => 'Afficher tout sauf les favoris', 'older_first' => 'Plus anciens en premier', 'newer_first' => 'Plus récents en premier', diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml index 817dae676..0542e6b66 100644 --- a/app/layout/aside_flux.phtml +++ b/app/layout/aside_flux.phtml @@ -28,15 +28,6 @@
-
  • -
    - - - nb_favorites['all'])); ?> - -
    -
    • - cat_aside as $cat) { $feeds = $cat->feeds (); diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index ffdc95b24..129647607 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -11,6 +11,70 @@ loginOk) { ?> + url; + if ($this->state & FreshRSS_Configuration::STATE_READ) { + $url_state['params']['state'] = $this->state - FreshRSS_Configuration::STATE_READ; + $checked = 'true'; + } else { + $url_state['params']['state'] = $this->state + FreshRSS_Configuration::STATE_READ; + $checked = 'false'; + } + ?> + + + + state & FreshRSS_Configuration::STATE_NOT_READ) { + $url_state['params']['state'] = $this->state - FreshRSS_Configuration::STATE_NOT_READ; + $checked = 'true'; + } else { + $url_state['params']['state'] = $this->state + FreshRSS_Configuration::STATE_NOT_READ; + $checked = 'false'; + } + ?> + + + + state & FreshRSS_Configuration::STATE_FAVORITE) { + $url_state['params']['state'] = $this->state - FreshRSS_Configuration::STATE_FAVORITE; + $checked = 'true'; + } else { + $url_state['params']['state'] = $this->state + FreshRSS_Configuration::STATE_FAVORITE; + $checked = 'false'; + } + ?> + + + + state & FreshRSS_Configuration::STATE_NOT_FAVORITE) { + $url_state['params']['state'] = $this->state - FreshRSS_Configuration::STATE_NOT_FAVORITE; + $checked = 'true'; + } else { + $url_state['params']['state'] = $this->state + FreshRSS_Configuration::STATE_NOT_FAVORITE; + $checked = 'false'; + } + ?> + + +
  • ❌
    • -
    • +
  • today; @@ -132,42 +196,6 @@
  • - url; - $url_state['params']['state'] = 'all'; - ?> - - - - - - - - -
  • -
  • url; diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml index c32c59305..b778a4d22 100644 --- a/app/views/configure/reading.phtml +++ b/app/views/configure/reading.phtml @@ -36,7 +36,7 @@
    • diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css index be8d6b86a..d7da91bb8 100644 --- a/p/themes/Dark/freshrss.css +++ b/p/themes/Dark/freshrss.css @@ -88,6 +88,11 @@ .nav_menu .search { display:none; } + .nav_menu .btn[aria-checked="true"]:before{ + content: '✓'; + font-size: 2.5rem; + position: absolute; + } .favicon { height: 16px; diff --git a/p/themes/Dark/global.css b/p/themes/Dark/global.css index e296f2188..0f1baa216 100644 --- a/p/themes/Dark/global.css +++ b/p/themes/Dark/global.css @@ -416,12 +416,6 @@ input, select, textarea { background: #26303F; color: #888; } - .dropdown-menu > .item[aria-checked="true"] > a:before { - content: '✓ '; - font-weight: bold; - margin: 0 0 0 -1.2em; - padding: 0 0.2em 0 0; - } .dropdown-menu > .item:hover > a { color: #888; text-decoration: none; diff --git a/p/themes/Flat/freshrss.css b/p/themes/Flat/freshrss.css index 1f297309b..f1737d23e 100644 --- a/p/themes/Flat/freshrss.css +++ b/p/themes/Flat/freshrss.css @@ -87,6 +87,11 @@ body { .nav_menu .search { display:none; } + .nav_menu .btn[aria-checked="true"]:before{ + content: '✓'; + font-size: 2.5rem; + position: absolute; + } .favicon { height: 16px; diff --git a/p/themes/Flat/global.css b/p/themes/Flat/global.css index 4044dd781..68e9fa359 100644 --- a/p/themes/Flat/global.css +++ b/p/themes/Flat/global.css @@ -412,12 +412,6 @@ input, select, textarea { background: #2980b9; color: #fff; } - .dropdown-menu > .item[aria-checked="true"] > a:before { - content: '✓ '; - font-weight: bold; - margin: 0 0 0 -1.2em; - padding: 0 0.2em 0 0; - } .dropdown-menu > .item:hover > a { color: #fff; text-decoration: none; diff --git a/p/themes/Origine/freshrss.css b/p/themes/Origine/freshrss.css index 662e085d6..d33ee4f54 100644 --- a/p/themes/Origine/freshrss.css +++ b/p/themes/Origine/freshrss.css @@ -89,6 +89,11 @@ .nav_menu .search { display:none; } + .nav_menu .btn[aria-checked="true"]:before{ + content: '✓'; + font-size: 2.5rem; + position: absolute; + } .favicon { height: 16px; diff --git a/p/themes/Origine/global.css b/p/themes/Origine/global.css index 5792c9e4d..7fb3a8f95 100644 --- a/p/themes/Origine/global.css +++ b/p/themes/Origine/global.css @@ -428,12 +428,6 @@ input, select, textarea { background: #0062BE; color: #fff; } - .dropdown-menu > .item[aria-checked="true"] > a:before { - content: '✓ '; - font-weight: bold; - margin: 0 0 0 -1.2em; - padding: 0 0.2em 0 0; - } .dropdown-menu > .item:hover > a { color: #fff; text-decoration: none; -- cgit v1.2.3 From 135486f4ef89fee7eeaeec09e149948ddef1a4c8 Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Sat, 12 Apr 2014 22:09:10 -0400 Subject: Change activate button layout --- p/themes/Dark/freshrss.css | 7 +++---- p/themes/Flat/freshrss.css | 7 +++---- p/themes/Origine/freshrss.css | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) (limited to 'p/themes') diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css index d7da91bb8..cd51b1a06 100644 --- a/p/themes/Dark/freshrss.css +++ b/p/themes/Dark/freshrss.css @@ -88,10 +88,9 @@ .nav_menu .search { display:none; } - .nav_menu .btn[aria-checked="true"]:before{ - content: '✓'; - font-size: 2.5rem; - position: absolute; + .nav_menu .btn[aria-checked="true"]{ + border-color: #2f2f2f; + box-shadow: 0 0 10px 3px #2f2f2f inset; } .favicon { diff --git a/p/themes/Flat/freshrss.css b/p/themes/Flat/freshrss.css index f1737d23e..91da094be 100644 --- a/p/themes/Flat/freshrss.css +++ b/p/themes/Flat/freshrss.css @@ -87,10 +87,9 @@ body { .nav_menu .search { display:none; } - .nav_menu .btn[aria-checked="true"]:before{ - content: '✓'; - font-size: 2.5rem; - position: absolute; + .nav_menu .btn[aria-checked="true"]{ + background-color: #2980B9; + border-bottom-color: #3498DB; } .favicon { diff --git a/p/themes/Origine/freshrss.css b/p/themes/Origine/freshrss.css index d33ee4f54..9cf1a7cba 100644 --- a/p/themes/Origine/freshrss.css +++ b/p/themes/Origine/freshrss.css @@ -89,10 +89,9 @@ .nav_menu .search { display:none; } - .nav_menu .btn[aria-checked="true"]:before{ - content: '✓'; - font-size: 2.5rem; - position: absolute; + .nav_menu .btn[aria-checked="true"]{ + border-color: #aaa #ddd #ddd #aaa; + box-shadow: 0 0 10px 3px #ddd inset; } .favicon { -- cgit v1.2.3 From d25afa9def1b02b7989b12c861e33da5c90ccba1 Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Sat, 12 Apr 2014 22:46:35 -0400 Subject: Extract RSS feed from menu The RSS action has now its own button. I also reorganized the button display order to be more natural. I did not find an appropriate Unicode replacement for the Rss icon. --- app/Models/Themes.php | 1 + app/layout/nav_menu.phtml | 22 +++++++++------------- p/themes/Flat/icons/rss.svg | 6 ++++++ p/themes/icons/rss.svg | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 p/themes/Flat/icons/rss.svg (limited to 'p/themes') diff --git a/app/Models/Themes.php b/app/Models/Themes.php index ed746b7e9..898595016 100644 --- a/app/Models/Themes.php +++ b/app/Models/Themes.php @@ -85,6 +85,7 @@ class FreshRSS_Themes extends Minz_Model { 'non-starred' => '☆', 'prev' => '⏪', 'read' => '☑', + 'rss' => '0', 'unread' => '☐', 'refresh' => '🔃', //↻ 'search' => '🔍', diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 600d6dfa8..67539c747 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -6,10 +6,6 @@ - loginOk || Minz_Configuration::allowAnonymousRefresh()) { ?> - - - loginOk) { ?> url; if ($this->state & FreshRSS_Configuration::STATE_READ) { @@ -214,15 +210,6 @@ - -
  • - -
  • - - - - -
    • @@ -247,4 +234,13 @@ + + + + + + + loginOk || Minz_Configuration::allowAnonymousRefresh()) { ?> + + diff --git a/p/themes/Flat/icons/rss.svg b/p/themes/Flat/icons/rss.svg new file mode 100644 index 000000000..4d4faf7ae --- /dev/null +++ b/p/themes/Flat/icons/rss.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/p/themes/icons/rss.svg b/p/themes/icons/rss.svg index 6db5b3eae..2a8713be3 100644 --- a/p/themes/icons/rss.svg +++ b/p/themes/icons/rss.svg @@ -1,5 +1,5 @@ - + -- cgit v1.2.3 From a8fb7452720bdcb742f83952fed9caa7841a1ecf Mon Sep 17 00:00:00 2001 From: tomgue Date: Thu, 17 Apr 2014 18:20:18 +0200 Subject: Add to homescreen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajout d’un icon iPhone/iPad + balise link et meta --- app/layout/layout.phtml | 3 +++ p/themes/icons/apple-touch-icon.png | Bin 0 -> 5588 bytes 2 files changed, 3 insertions(+) create mode 100644 p/themes/icons/apple-touch-icon.png (limited to 'p/themes') diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index 1501df3c3..d9e21a610 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -25,6 +25,9 @@ + + + diff --git a/p/themes/icons/apple-touch-icon.png b/p/themes/icons/apple-touch-icon.png new file mode 100644 index 000000000..1db69dcbe Binary files /dev/null and b/p/themes/icons/apple-touch-icon.png differ -- cgit v1.2.3 From 615d5a4534f3ebe5978d84d7146a14f0635e8dac Mon Sep 17 00:00:00 2001 From: tomgue Date: Fri, 18 Apr 2014 11:58:36 +0200 Subject: Correction icon --- p/themes/icons/apple-touch-icon.png | Bin 5588 -> 5648 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'p/themes') diff --git a/p/themes/icons/apple-touch-icon.png b/p/themes/icons/apple-touch-icon.png index 1db69dcbe..0bbab07ea 100644 Binary files a/p/themes/icons/apple-touch-icon.png and b/p/themes/icons/apple-touch-icon.png differ -- cgit v1.2.3