From 8769931a68d0dddb134674c86a43dec75b39bf83 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 23 Oct 2014 09:32:02 +0200 Subject: [PATCH] Rename aside_flux in aside_feed. --- .../{aside_flux.phtml => aside_feed.phtml} | 2 +- app/layout/nav_menu.phtml | 2 +- app/views/index/normal.phtml | 2 +- p/scripts/main.js | 26 +++++++++---------- p/themes/Origine/origine.css | 8 +++--- p/themes/base-theme/base.css | 8 +++--- p/themes/base-theme/template.css | 22 ++++++++-------- 7 files changed, 35 insertions(+), 35 deletions(-) rename app/layout/{aside_flux.phtml => aside_feed.phtml} (98%) diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_feed.phtml similarity index 98% rename from app/layout/aside_flux.phtml rename to app/layout/aside_feed.phtml index 30f362348..66b7b51af 100644 --- a/app/layout/aside_flux.phtml +++ b/app/layout/aside_feed.phtml @@ -7,7 +7,7 @@ } ?> -
+
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 2c9f8724d..6f555c3d0 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -2,7 +2,7 @@
- + diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml index 36adef2f2..02d621bd0 100644 --- a/app/views/index/normal.phtml +++ b/app/views/index/normal.phtml @@ -1,6 +1,6 @@ partial('aside_flux'); +$this->partial('aside_feed'); $this->partial('nav_menu'); if (!empty($this->entries)) { diff --git a/p/scripts/main.js b/p/scripts/main.js index 1e13ff16a..f4b3898db 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -80,7 +80,7 @@ function incUnreadsFeed(article, feed_id, nb) { //Update unread: all if (feed_priority > 0) { - elem = $('#aside_flux .all').children(':first').get(0); + elem = $('#aside_feed .all').children(':first').get(0); if (elem) { feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0; elem.setAttribute('data-unread', numberFormat(feed_unreads + nb)); @@ -89,7 +89,7 @@ function incUnreadsFeed(article, feed_id, nb) { //Update unread: favourites if (article && article.closest('div').hasClass('favorite')) { - elem = $('#aside_flux .favorites').children(':first').get(0); + elem = $('#aside_feed .favorites').children(':first').get(0); if (elem) { feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0; elem.setAttribute('data-unread', numberFormat(feed_unreads + nb)); @@ -202,7 +202,7 @@ function mark_favorite(active) { } if (active.closest('div').hasClass('not_read')) { - var elem = $('#aside_flux .favorites').children(':first').get(0), + var elem = $('#aside_feed .favorites').children(':first').get(0), feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0; if (elem) { elem.setAttribute('data-unread', numberFormat(feed_unreads + inc)); @@ -292,7 +292,7 @@ function next_entry() { } function prev_feed() { - var active_feed = $("#aside_flux .feeds li.active"); + var active_feed = $("#aside_feed .feeds li.active"); if (active_feed.length > 0) { active_feed.prevAll(':visible:first').find('a.feed').each(function(){this.click();}); } else { @@ -301,7 +301,7 @@ function prev_feed() { } function next_feed() { - var active_feed = $("#aside_flux .feeds li.active"); + var active_feed = $("#aside_feed .feeds li.active"); if (active_feed.length > 0) { active_feed.nextAll(':visible:first').find('a.feed').each(function(){this.click();}); } else { @@ -310,21 +310,21 @@ function next_feed() { } function first_feed() { - var feed = $("#aside_flux .feeds.active li:visible:first"); + var feed = $("#aside_feed .feeds.active li:visible:first"); if (feed.length > 0) { feed.find('a')[1].click(); } } function last_feed() { - var feed = $("#aside_flux .feeds.active li:visible:last"); + var feed = $("#aside_feed .feeds.active li:visible:last"); if (feed.length > 0) { feed.find('a')[1].click(); } } function prev_category() { - var active_cat = $("#aside_flux .category.stick.active"); + var active_cat = $("#aside_feed .category.stick.active"); if (active_cat.length > 0) { var prev_cat = active_cat.parent('li').prevAll(':visible:first').find('.category.stick a.btn'); @@ -338,7 +338,7 @@ function prev_category() { } function next_category() { - var active_cat = $("#aside_flux .category.stick.active"); + var active_cat = $("#aside_feed .category.stick.active"); if (active_cat.length > 0) { var next_cat = active_cat.parent('li').nextAll(':visible:first').find('.category.stick a.btn'); @@ -352,14 +352,14 @@ function next_category() { } function first_category() { - var cat = $("#aside_flux .category.stick:visible:first"); + var cat = $("#aside_feed .category.stick:visible:first"); if (cat.length > 0) { cat.find('a.btn')[0].click(); } } function last_category() { - var cat = $("#aside_flux .category.stick:visible:last"); + var cat = $("#aside_feed .category.stick:visible:last"); if (cat.length > 0) { cat.find('a.btn')[0].click(); } @@ -487,7 +487,7 @@ function init_column_categories() { if (context['current_view'] !== 'normal') { return; } - $('#aside_flux').on('click', '.category>a.dropdown-toggle', function () { + $('#aside_feed').on('click', '.category>a.dropdown-toggle', function () { $(this).children().each(function() { if (this.alt === '▽') { this.src = this.src.replace('/icons/down.', '/icons/up.'); @@ -500,7 +500,7 @@ function init_column_categories() { $(this).parent().next(".feeds").slideToggle(); return false; }); - $('#aside_flux').on('click', '.feeds .dropdown-toggle', function () { + $('#aside_feed').on('click', '.feeds .dropdown-toggle', function () { if ($(this).nextAll('.dropdown-menu').length === 0) { var feed_id = $(this).closest('li').attr('id').substr(2), feed_web = $(this).data('fweb'), diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index c46f72bf8..e6d50c2e9 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -552,20 +552,20 @@ a.btn { border-right: 1px solid #aaa; background: #fff; } -.aside.aside_flux { +.aside.aside_feed { padding: 10px 0 50px; text-align: center; } /*=== Aside main page (categories) */ -.aside.aside_flux .tree { +.aside.aside_feed .tree { text-align: left; } -.aside_flux .tree-folder-title { +.aside_feed .tree-folder-title { position: relative; margin: 5px 0; } -.aside_flux .tree-folder-title > a:not([data-unread="0"]):after { +.aside_feed .tree-folder-title > a:not([data-unread="0"]):after { position: absolute; top: 3px; right: 3px; padding: 0 5px; diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index bd01a5d70..0b0a04c9a 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -402,19 +402,19 @@ a.btn { } .aside { } -.aside.aside_flux { +.aside.aside_feed { padding: 10px 0 50px; text-align: center; } /*=== Aside main page (categories) */ -.aside.aside_flux .tree { +.aside.aside_feed .tree { text-align: left; } -.aside_flux .tree-folder-title { +.aside_feed .tree-folder-title { position: relative; } -.aside_flux .tree-folder-title > a:not([data-unread="0"]):after { +.aside_feed .tree-folder-title > a:not([data-unread="0"]):after { position: absolute; top: 3px; right: 3px; padding: 1px 5px; diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 1eb67c15d..40ff8140a 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -386,36 +386,36 @@ a.btn { width: 250px; vertical-align: top; } -.aside.aside_flux { +.aside.aside_feed { background: #fff; } /*=== Aside main page (categories) */ -.aside_flux.state_unread .tree-folder:not(.active)[data-unread="0"], -.aside_flux.state_unread .tree-folder .item:not(.active)[data-unread="0"] { +.aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"], +.aside_feed.state_unread .tree-folder .item:not(.active)[data-unread="0"] { display: none; } -.aside_flux .tree-folder-title > a:not([data-unread="0"]):after { +.aside_feed .tree-folder-title > a:not([data-unread="0"]):after { content: attr(data-unread); } /*=== Aside main page (feeds) */ -.aside_flux .tree-folder-items:not(.active) { +.aside_feed .tree-folder-items:not(.active) { display: none; } -.aside_flux .tree-folder-items .item > a:not([data-unread="0"]):before { +.aside_feed .tree-folder-items .item > a:not([data-unread="0"]):before { content: "(" attr(data-unread) ") "; } -.aside_flux .tree-folder-items .dropdown-menu { +.aside_feed .tree-folder-items .dropdown-menu { left: 0; } -.aside_flux .tree-folder-items .item .dropdown-toggle > .icon { +.aside_feed .tree-folder-items .item .dropdown-toggle > .icon { visibility: hidden; cursor: pointer; } -.aside_flux .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon, -.aside_flux .tree-folder-items .item:hover .dropdown-toggle > .icon, -.aside_flux .tree-folder-items .item.active .dropdown-toggle > .icon { +.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon, +.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon, +.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon { visibility: visible; }