From 4214bffb16a5c0c2c4814f4809f380fefdb1a4d7 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 10 Nov 2013 20:29:02 +0100 Subject: CSS : menus de conf à gauche des flux cliquables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/themes/default/freshrss.css | 1 + 1 file changed, 1 insertion(+) (limited to 'public/themes/default') diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css index a3fbb4569..bc6399260 100644 --- a/public/themes/default/freshrss.css +++ b/public/themes/default/freshrss.css @@ -180,6 +180,7 @@ } .categories .feeds .item .dropdown-toggle i { background-image: none; + cursor: pointer; } .categories .feeds .item .dropdown-target:target ~ .dropdown-toggle i, .categories .feeds .item:hover .dropdown-toggle i, -- cgit v1.2.3 From cf3373f1d73b33966cbf4f0057cc577edcb9e93f Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 10 Nov 2013 20:40:48 +0100 Subject: Améliorations vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Lien vers flux RSS généré déplacé en bas du menu déroulant * Le champs de recherche a été un peu agrandi de façon à voir le placeholder en entier --- app/layout/nav_menu.phtml | 15 ++++++++------- public/themes/default/freshrss.css | 4 ++-- public/themes/flat-design/freshrss.css | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) (limited to 'public/themes/default') diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 6af9ebc11..55da1c204 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -121,11 +121,6 @@ -
  • - - - -
  • @@ -148,8 +143,6 @@ -
  • -
  • + +
  • + +
  • + + + +
  • diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css index bc6399260..a323bf5b4 100644 --- a/public/themes/default/freshrss.css +++ b/public/themes/default/freshrss.css @@ -29,11 +29,11 @@ text-decoration: none; } .header > .item.search input { - width: 200px; + width: 230px; transition: width 200ms linear; } .header .item.search input:focus { - width: 300px; + width: 330px; } .header > .item.configure { width: 100px; diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css index f837f7fe0..df9a0ed82 100644 --- a/public/themes/flat-design/freshrss.css +++ b/public/themes/flat-design/freshrss.css @@ -32,11 +32,11 @@ body { text-decoration: none; } .header > .item.search input { - width: 200px; + width: 230px; transition: width 200ms linear; } .header .item.search input:focus { - width: 300px; + width: 330px; } .header > .item.configure { width: 100px; -- cgit v1.2.3 From 8a52d3cc8ed1970ffa014808e78bf20f6fa78dbd Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 10 Nov 2013 20:49:58 +0100 Subject: Notifications devant "boite d'actualisation" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Puisque les notifications peuvent être fermées, autant les mettre devant, ainsi on peut voir les notifications puis l'avancement de l'actualisation des flux Voir issue #196 --- public/themes/default/freshrss.css | 1 + public/themes/flat-design/freshrss.css | 1 + 2 files changed, 2 insertions(+) (limited to 'public/themes/default') diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css index a323bf5b4..34ec1395c 100644 --- a/public/themes/default/freshrss.css +++ b/public/themes/default/freshrss.css @@ -586,6 +586,7 @@ background: #ddd; color: #666; font-weight: bold; + z-index: 10; } .notification.good { background: #f4f899; diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css index df9a0ed82..23d1d93ea 100644 --- a/public/themes/flat-design/freshrss.css +++ b/public/themes/flat-design/freshrss.css @@ -577,6 +577,7 @@ body { background: #ddd; color: #666; font-weight: bold; + z-index: 10; } .notification.good { background: #1abc9c; -- 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/themes/default') 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 168dbefc0adebb5494297ce32912e7c47524ed3b Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 14 Nov 2013 18:20:08 +0100 Subject: Page "à propos" accessible aux visiteurs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Voir #266 --- app/i18n/en.php | 1 + app/i18n/fr.php | 1 + app/layout/aside_flux.phtml | 2 ++ app/views/index/index.phtml | 1 + public/themes/default/freshrss.css | 1 - public/themes/flat-design/freshrss.css | 1 - 6 files changed, 5 insertions(+), 2 deletions(-) (limited to 'public/themes/default') diff --git a/app/i18n/en.php b/app/i18n/en.php index 6147b268a..98665c5b6 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -12,6 +12,7 @@ return array ( 'category' => 'Category', 'shortcuts' => 'Shortcuts', 'about' => 'About', + 'about_freshrss' => 'About FreshRSS', 'your_rss_feeds' => 'Your RSS feeds', 'add_rss_feed' => 'Add a RSS feed', diff --git a/app/i18n/fr.php b/app/i18n/fr.php index e260cdf50..ca7dade41 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -12,6 +12,7 @@ return array ( 'category' => 'Catégorie', 'shortcuts' => 'Raccourcis', 'about' => 'À propos', + 'about_freshrss' => 'À propos de FreshRSS', 'your_rss_feeds' => 'Vos flux RSS', 'add_rss_feed' => 'Ajouter un flux RSS', diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml index 9471f1f7e..51cb3dcf7 100644 --- a/app/layout/aside_flux.phtml +++ b/app/layout/aside_flux.phtml @@ -9,6 +9,8 @@
    + conf)) { ?> +
  • diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml index 73e5fcc4d..bd18d2d77 100644 --- a/app/views/index/index.phtml +++ b/app/views/index/index.phtml @@ -23,6 +23,7 @@ if(!login_is_conf ($this->conf) ||

    +

    .item.title a:hover { text-decoration: none; diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css index 32dd72c42..96bb0d455 100644 --- a/public/themes/flat-design/freshrss.css +++ b/public/themes/flat-design/freshrss.css @@ -26,7 +26,6 @@ body { .header > .item.title h1 { display: inline-block; margin: 0; - vertical-align: middle; } .header > .item.title a:hover { text-decoration: none; -- 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/themes/default') 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/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 @@