From a5240e085596e969429cd0ac255a92747b686333 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 12 Nov 2013 21:09:16 +0100 Subject: Fade out pour les notifications MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fluidifie un peu leur fermeture (le slideUp faisait disparaître la notification avant qu'elle ne soit totalement refermée) --- public/scripts/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'public/scripts') diff --git a/public/scripts/main.js b/public/scripts/main.js index 2f3ed38f1..21831bc9b 100644 --- a/public/scripts/main.js +++ b/public/scripts/main.js @@ -457,7 +457,7 @@ function init_actualize() { } function closeNotification() { - $(".notification").slideUp(200, function () { + $(".notification").fadeOut(600, function () { $(".notification").remove(); }); } -- cgit v1.2.3 From 5bd52cdcb64cdb53aded1dd0bcd6044ca7e98eb4 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Tue, 12 Nov 2013 23:21:13 +0100 Subject: Mise à jour de la vue globale MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Nombre de non lus mis à jour automatiquement * Mise à jour structure HTML * Mise à jour design Fusion manuelle depuis la 0.6-beta https://github.com/marienfressinaud/FreshRSS/commit/0c96d3489b3a74e10804206f1be0789fb63a6949 --- app/views/helpers/view/global_view.phtml | 20 ++++++--------- public/scripts/global_view.js | 4 ++- public/scripts/main.js | 12 ++++++--- public/themes/default/freshrss.css | 36 +++++++++++++++++++------- public/themes/flat-design/freshrss.css | 43 ++++++++++++++++++++++---------- 5 files changed, 75 insertions(+), 40 deletions(-) (limited to 'public/scripts') diff --git a/app/views/helpers/view/global_view.phtml b/app/views/helpers/view/global_view.phtml index 0eb29b11a..9a47100eb 100644 --- a/app/views/helpers/view/global_view.phtml +++ b/app/views/helpers/view/global_view.phtml @@ -1,30 +1,24 @@ partial ('nav_menu'); ?> -
+
cat_aside as $cat) { $feeds = $cat->feeds (); - $catNotRead = $cat->nbNotRead (); if (!empty ($feeds)) { ?> -
-
- - name(); ?> 0 ? ' (' . $catNotRead . ')' : ''; ?> +
+ -
    nbNotRead (); ?> -
  • +
  • ✇ - - - 0 ? '' : ''; ?> + name(); ?> - 0 ? ' (' . $not_read . ')' : ''; ?> - 0 ? '' : ''; ?>
  • diff --git a/public/scripts/global_view.js b/public/scripts/global_view.js index 2c95bdfb7..94580dc0d 100644 --- a/public/scripts/global_view.js +++ b/public/scripts/global_view.js @@ -35,11 +35,13 @@ function init_close_panel() { init_close_panel(); $("#panel").slideToggle(); $("#overlay").fadeOut(); + + return false; }); } function init_global_view() { - $("#stream .category a").click(function () { + $("#stream .box-category a").click(function () { var link = $(this).attr("href"); load_panel(link); diff --git a/public/scripts/main.js b/public/scripts/main.js index 21831bc9b..b86b1c856 100644 --- a/public/scripts/main.js +++ b/public/scripts/main.js @@ -68,15 +68,19 @@ function mark_read(active, only_not_read) { //Update unread: all if (feed_priority > 0) { elem = $('#aside_flux .all').children(':first').get(0); - feed_unread = elem ? (parseInt(elem.getAttribute('data-unread'), 10) || 0) : 0; - elem.setAttribute('data-unread', Math.max(0, feed_unread + inc)); + if (elem) { + feed_unread = elem ? (parseInt(elem.getAttribute('data-unread'), 10) || 0) : 0; + elem.setAttribute('data-unread', Math.max(0, feed_unread + inc)); + } } //Update unread: favourites if (active.closest('div').hasClass('favorite')) { elem = $('#aside_flux .favorites').children(':first').get(0); - feed_unread = elem ? (parseInt(elem.getAttribute('data-unread'), 10) || 0) : 0; - elem.setAttribute('data-unread', Math.max(0, feed_unread + inc)); + if (elem) { + feed_unread = elem ? (parseInt(elem.getAttribute('data-unread'), 10) || 0) : 0; + elem.setAttribute('data-unread', Math.max(0, feed_unread + inc)); + } } //Update unread: title diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css index 34ec1395c..650f8eef6 100644 --- a/public/themes/default/freshrss.css +++ b/public/themes/default/freshrss.css @@ -100,9 +100,8 @@ } .category { display: block; - padding: 5px 0; width: 220px; - margin: 5px auto; + margin: 10px auto; text-align: left; overflow: hidden; white-space: nowrap; @@ -362,7 +361,7 @@ #stream.global { text-align: center; } - #stream.global .category { + #stream.global .box-category { display: inline-block; width: 280px; margin: 20px 10px; @@ -373,29 +372,48 @@ text-align: left; box-shadow: 0 0 5px #bbb; } - #stream.global .cat_header { + #stream.global .category { + width: 100%; + margin: 0; + } + #stream.global .btn { + display: block; + width: auto; height: 35px; + margin: 0; padding: 0 10px; background: #eee; + border: none; border-bottom: 1px solid #aaa; border-radius: 5px 5px 0 0; line-height: 35px; font-size: 120%; } - #stream.global .cat_header a { - color: #333; - text-shadow: 0 -1px 0px #aaa; + #stream.global .btn:not([data-unread="0"]) { + font-weight:bold; + } + #stream.global .btn:first-child:not([data-unread="0"]):after { + top: 0; right: 5px; + border: 0; + background: none; + color: #666; + font-weight: bold; + box-shadow: none; } - #stream.global .category .feeds { + #stream.global .box-category .feeds { + display: block; max-height: 250px; margin: 0; list-style: none; overflow: auto; } - #stream.global .category .feeds .item { + #stream.global .box-category .feeds .item { padding: 2px 10px; font-size: 90%; } + #stream.global .box-category .feed { + width: 220px; + } .content { min-height: 300px; diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css index 5c5d4e078..32dd72c42 100644 --- a/public/themes/flat-design/freshrss.css +++ b/public/themes/flat-design/freshrss.css @@ -94,9 +94,8 @@ body { } .category { display: block; - padding: 5px 0; width: 220px; - margin: 5px auto; + margin: 10px auto; text-align: left; overflow: hidden; white-space: nowrap; @@ -123,7 +122,7 @@ body { display:none; } .categories .feeds { - width: 220px; + width: 100%; margin: 0 auto; list-style: none; } @@ -347,39 +346,57 @@ body { #stream.global { text-align: center; } - #stream.global .category { + #stream.global .box-category { display: inline-block; width: 280px; margin: 20px 10px; vertical-align: top; - border: 1px solid #aaa; + border: 1px solid #ddd; border-radius: 5px; text-align: left; - box-shadow: 0 0 5px #bbb; } - #stream.global .cat_header { + #stream.global .category { + width: 100%; + margin: 0; + } + #stream.global .btn { + display: block; + width: auto; height: 35px; + margin: 0; padding: 0 10px; - background: #eee; - border-bottom: 1px solid #aaa; + background: #ecf0f1; + color: #333; + border-bottom: 1px solid #ddd; border-radius: 5px 5px 0 0; line-height: 35px; font-size: 120%; } - #stream.global .cat_header a { + #stream.global .btn:not([data-unread="0"]) { + font-weight:bold; + } + #stream.global .btn:first-child:not([data-unread="0"]):after { + top: 0; right: 5px; + border: 0; + background: none; color: #333; - text-shadow: 0 -1px 0px #aaa; + font-weight: bold; + box-shadow: none; } - #stream.global .category .feeds { + #stream.global .box-category .feeds { + display: block; max-height: 250px; margin: 0; list-style: none; overflow: auto; } - #stream.global .category .feeds .item { + #stream.global .box-category .feeds .item { padding: 2px 10px; font-size: 90%; } + #stream.global .box-category .feed { + width: 220px; + } .content { min-height: 300px; -- cgit v1.2.3 From 9efb9388df7e07311b6e1e0696f43419c702cd2f Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Thu, 14 Nov 2013 21:55:53 +0100 Subject: bigMarkAsRead : utilisation sans JavaScript MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit et différent si l'utilisateur n'est pas connecté Implémente https://github.com/marienfressinaud/FreshRSS/issues/249 --- app/layout/nav_menu.phtml | 6 ++++-- app/views/helpers/pagination.phtml | 16 +++++++++++----- public/scripts/main.js | 6 ------ public/themes/default/freshrss.css | 13 ++++++++----- public/themes/flat-design/freshrss.css | 13 ++++++++----- 5 files changed, 31 insertions(+), 23 deletions(-) (limited to 'public/scripts') 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); ?> +
    + +
    + +
    +
    +
    diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml index 58cb3c5ac..e9deaf71c 100644 --- a/app/views/helpers/javascript_vars.phtml +++ b/app/views/helpers/javascript_vars.phtml @@ -16,7 +16,8 @@ 'mark_favorite:"', $s['mark_favorite'], '",', 'go_website:"', $s['go_website'], '",', 'prev_entry:"', $s['prev_entry'], '",', - 'next_entry:"', $s['next_entry'], '"', + 'next_entry:"', $s['next_entry'], '",', + 'collapse_entry:"', $s['collapse_entry'], '"', "},\n"; $mail = Session::param ('mail', 'null'); diff --git a/public/scripts/main.js b/public/scripts/main.js index 2794e2913..b798f918c 100644 --- a/public/scripts/main.js +++ b/public/scripts/main.js @@ -214,6 +214,10 @@ function next_entry() { } } +function collapse_entry() { + $(".flux.active").removeClass("active"); +} + function inMarkViewport(flux, box_to_follow, relative_follow) { var top = flux.position().top; if (relative_follow) { @@ -319,6 +323,9 @@ function init_shortcuts() { }, { 'disable_in_input': true }); + shortcut.add(shortcuts.collapse_entry, function () { + collapse_entry(); + }); // Touches de navigation shortcut.add(shortcuts.prev_entry, prev_entry, { -- cgit v1.2.3 From 305f1436e3ca2907e5234ed77f62348cf4303b79 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Thu, 21 Nov 2013 22:23:23 +0100 Subject: Accessibilité : Quelques alternative Unicode aux icônes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FreshRSS est maintenant utilisable en bonne partie sans CSS. Ce patch inclut un caractère Unicode approprié en plus de certaines icônes définies en tant qu'image en CSS. Contribue à https://github.com/marienfressinaud/FreshRSS/issues/284 Il manque encore certaines icônes, et les alternatives Unicode ne sont pour l'instant pas montrées si la CSS est chargée mais que les images ne le sont pas. --- app/layout/aside_flux.phtml | 6 ++--- app/views/configure/display.phtml | 4 +-- app/views/helpers/view/normal_view.phtml | 45 +++++++++++++++++++++++--------- public/scripts/main.js | 21 ++++++++------- public/themes/default/global.css | 3 ++- public/themes/flat-design/global.css | 3 ++- 6 files changed, 52 insertions(+), 30 deletions(-) (limited to 'public/scripts') diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml index 51cb3dcf7..9fa08d647 100644 --- a/app/layout/aside_flux.phtml +++ b/app/layout/aside_flux.phtml @@ -6,7 +6,7 @@
  • - +
  • conf)) { ?> @@ -16,7 +16,7 @@
  • @@ -25,7 +25,7 @@
  • diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml index c67cec331..292df41eb 100644 --- a/app/views/configure/display.phtml +++ b/app/views/configure/display.phtml @@ -162,8 +162,8 @@   -   -   + + diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml index faa52179a..ba4bd3169 100644 --- a/app/views/helpers/view/normal_view.phtml +++ b/app/views/helpers/view/normal_view.phtml @@ -37,19 +37,28 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
    -
      - conf) || is_logged ()) { ?> - conf->toplineRead ()) { ?>
    •  
    • - conf->toplineFavorite ()) { ?>
    •  
    • - conf) || is_logged ()) { + if ($this->conf->toplineRead ()) { + ?>
    • isRead () ? '☑' : '✉'; ?>
    • cat_aside, $item->feed ()); //We most likely already have the feed object in cache - if (empty($feed)) $feed = $item->feed (true); + if ($this->conf->toplineFavorite ()) { + ?>
    • isFavorite () ? '★' : '☆'; ?>
    • cat_aside, $item->feed ()); //We most likely already have the feed object in cache + if (empty($feed)) $feed = $item->feed (true); ?>
    • ✇ name(); ?>
    • title (); ?>
    • conf->toplineDate ()) { ?>
    • date (); ?> 
    • - conf->toplineLink ()) { ?> + conf->toplineLink ()) { ?>
    @@ -65,11 +74,21 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) { } ?>
    -
      - conf) || is_logged ()) { ?> - conf->bottomlineRead ()) { ?>
    •  
    • - conf->bottomlineFavorite ()) { ?>
    •  
    • - +
        conf) || is_logged ()) { + if ($this->conf->bottomlineRead ()) { + ?>
      • isRead () ? '☑' : '☐'; ?>
      • conf->bottomlineFavorite ()) { + ?>
      • isFavorite () ? '★' : '☆'; ?>
      • conf->bottomlineSharing ()) { diff --git a/public/scripts/main.js b/public/scripts/main.js index b798f918c..3a9fa0196 100644 --- a/public/scripts/main.js +++ b/public/scripts/main.js @@ -39,15 +39,15 @@ function mark_read(active, only_not_read) { url: url, data : { ajax: true } }).done(function (data) { - var res = $.parseJSON(data); - - active.find("a.read").attr("href", res.url); - - var inc = 0; + var res = $.parseJSON(data), + $r = active.find("a.read").attr("href", res.url), + inc = 0; if (active.hasClass("not_read")) { + $r.text('☑'); active.removeClass("not_read"); inc--; } else if (only_not_read !== true || active.hasClass("not_read")) { + $r.text('☐'); active.addClass("not_read"); inc++; } @@ -109,15 +109,16 @@ function mark_favorite(active) { url: url, data : { ajax: true } }).done(function (data) { - var res = $.parseJSON(data); - - active.find("a.bookmark").attr("href", res.url); - var inc = 0; + var res = $.parseJSON(data), + $b = active.find("a.bookmark").attr("href", res.url), + inc = 0; if (active.hasClass("favorite")) { + $b.text('☆'); active.removeClass("favorite"); inc--; } else { - active.addClass("favorite"); + $b.text('★'); + active.addClass("favorite").find('.bookmark'); inc++; } diff --git a/public/themes/default/global.css b/public/themes/default/global.css index 94c11b957..d4de7df50 100644 --- a/public/themes/default/global.css +++ b/public/themes/default/global.css @@ -477,8 +477,9 @@ input, select, textarea { color: #844; } -/* ICONES */ +/* ICÔNES */ .icon { + font-size: 0; display: inline-block; width: 16px; height: 16px; diff --git a/public/themes/flat-design/global.css b/public/themes/flat-design/global.css index 1952cc097..87c4ace6f 100644 --- a/public/themes/flat-design/global.css +++ b/public/themes/flat-design/global.css @@ -469,8 +469,9 @@ input, select, textarea { color: #844; } -/* ICONES */ +/* ICÔNES */ .icon { + font-size: 0; display: inline-block; width: 16px; height: 16px; -- cgit v1.2.3 From de4e9d5a85dfb99dcfe7fac765c5af6cd5b5f720 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 23 Nov 2013 15:13:01 +0100 Subject: Corrige bug recherche dû au raccourci pour fermer un article MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Corrige https://github.com/marienfressinaud/FreshRSS/issues/286 --- public/scripts/main.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'public/scripts') diff --git a/public/scripts/main.js b/public/scripts/main.js index 3a9fa0196..da6684544 100644 --- a/public/scripts/main.js +++ b/public/scripts/main.js @@ -326,6 +326,8 @@ function init_shortcuts() { }); shortcut.add(shortcuts.collapse_entry, function () { collapse_entry(); + }, { + 'disable_in_input': true }); // Touches de navigation -- cgit v1.2.3 From 6236f2a803185c06331ddd3e5cbdb4499629e1ef Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 23 Nov 2013 17:29:23 +0100 Subject: Encore des alternatives Unicode aux icônes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Contribue à https://github.com/marienfressinaud/FreshRSS/issues/284 --- app/layout/aside_feed.phtml | 6 +++--- app/layout/aside_flux.phtml | 8 ++++---- app/layout/header.phtml | 16 ++++++++-------- app/layout/layout.phtml | 2 +- app/layout/nav_entries.phtml | 6 +++--- app/layout/nav_menu.phtml | 12 ++++++------ app/views/configure/categorize.phtml | 2 +- app/views/configure/display.phtml | 4 ++-- app/views/configure/feed.phtml | 10 +++++----- app/views/helpers/view/global_view.phtml | 2 +- app/views/helpers/view/normal_view.phtml | 8 ++++---- public/install.php | 2 +- public/scripts/global_view.js | 3 +-- public/scripts/main.js | 2 +- public/themes/default/global.css | 1 + public/themes/flat-design/global.css | 1 + 16 files changed, 43 insertions(+), 42 deletions(-) (limited to 'public/scripts') diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index f737d1e31..a622ce8a3 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -7,9 +7,9 @@ - +
  • diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml index 9fa08d647..3e057789f 100644 --- a/app/layout/aside_flux.phtml +++ b/app/layout/aside_flux.phtml @@ -1,5 +1,5 @@
    - +
      conf) || is_logged ()) { ?> @@ -38,7 +38,7 @@ get_c == $cat->id ()) { $c_active = true; } ?>
        @@ -49,7 +49,7 @@
      • ✇ @@ -66,7 +66,7 @@