From 46ae0a3f5ada751c9442eca275e15450fad85509 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Sep 2014 14:33:28 +0200
Subject: BREAK CATEGORIZE SYSTEM!

And begin big changes.

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 p/themes/base-theme/template.css | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'p/themes/base-theme/template.css')

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index dc011503d..792eac299 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -559,6 +559,8 @@ br + br + br {
 /*=== GLOBAL VIEW */
 /*================*/
 /*=== Category boxes */
+
+/* TODO <delete> */
 #stream.global .box-category {
 	display: inline-block;
 	width: 19em;
@@ -581,6 +583,24 @@ br + br + br {
 	width: 19em;
 	max-width: 90%;
 }
+/* TODO </delete */
+
+.box {
+	display: inline-block;
+	width: 19em;
+	max-width: 95%;
+	margin: 20px 10px;
+	border: 1px solid #ccc;
+	vertical-align: top;
+}
+.box .box-content {
+	display: block;
+	overflow: auto;
+}
+.box .box-content .item {
+	width: 19em;
+	max-width: 90%;
+}
 
 /*=== Panel */
 #overlay {
-- 
cgit v1.2.3


From 0d5a1f3a659b6f407b47859c794a662075e3f48e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Sep 2014 19:45:49 +0200
Subject: Improve design of .box

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/layout/aside_feed.phtml          | 16 -----------
 app/views/configure/categorize.phtml | 24 +++++++++--------
 p/themes/Dark/dark.css               | 29 ++++++++++++++++++++
 p/themes/Flat/flat.css               | 30 +++++++++++++++++++++
 p/themes/Origine/origine.css         | 30 +++++++++++++++++++++
 p/themes/Pafat/pafat.css             | 29 ++++++++++++++++++++
 p/themes/Screwdriver/screwdriver.css | 34 ++++++++++++++++++++++++
 p/themes/base-theme/base.css         | 24 +++++++++++++++++
 p/themes/base-theme/template.css     | 51 ++++++++++++++++++++++++------------
 9 files changed, 223 insertions(+), 44 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index c72710c2d..c028c4918 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -57,20 +57,4 @@
 	<li class="item<?php echo Minz_Request::actionName() == 'categorize' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('configure', 'categorize'); ?>"><?php echo _t('categories_management'); ?></a>
 	</li>
-
-	<li class="separator"></li>
-
-	<?php if (!empty($this->feeds)) { ?>
-	<?php foreach ($this->feeds as $feed) { ?>
-	<?php $nbEntries = $feed->nbEntries(); ?>
-	<li class="item<?php echo (isset($this->flux) && $this->flux->id() == $feed->id()) ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $nbEntries == 0 ? ' empty' : ''; ?>">
-		<a href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>">
-			<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
-			<?php echo $feed->name(); ?>
-		</a>
-	</li>
-	<?php } ?>
-	<?php } else { ?>
-	<li class="item disable"><?php echo _t('no_rss_feed'); ?></li>
-	<?php } ?>
 </ul>
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index b9d04ddb8..8f77f9724 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -12,12 +12,12 @@
 	<div class="box">
 		<div class="box-title"><label for="new-category"><?php echo _t('add_category'); ?></label></div>
 
-		<div class="box-content">
+		<ul class="box-content box-content-centered">
 			<form action="<?php echo _url('category', 'create'); ?>" method="post">
-				<input type="text" id="new-category" name="new-category" placeholder="<?php echo _t('new_category'); ?>" />
-				<input type="submit" value="<?php echo _t('submit'); ?>" />
+				<li class="item"><input type="text" id="new-category" name="new-category" placeholder="<?php echo _t('new_category'); ?>" /></li>
+				<li class="item"><button class="btn btn-important" type="submit"><?php echo _t('submit'); ?></button></li>
 			</form>
-		</div>
+		</ul>
 	</div>
 
 	<form id="controller-category" method="post" style="display: none;"></form>
@@ -27,10 +27,9 @@
 			$feeds = $cat->feeds();
 	?>
 	<div class="box">
-		<div class="box-title stick">
+		<div class="box-title">
 			<form action="<?php echo _url('category', 'update', 'id', $cat->id()); ?>" method="post">
 				<input type="text" name="name" value="<?php echo $cat->name(); ?>" />
-				<button class="btn" type="submit">✓</button>
 
 				<div class="dropdown">
 					<div id="dropdown-cat-<?php echo $cat->id(); ?>" class="dropdown-target"></div>
@@ -39,6 +38,10 @@
 					<ul class="dropdown-menu">
 						<li class="dropdown-close"><a href="#close">❌</a></li>
 
+						<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo _t('filter'); ?></a></li>
+
+						<li class="separator"></li>
+
 						<?php if (!empty($feeds)) { ?>
 						<li class="item">
 							<button class="as-link confirm"
@@ -69,15 +72,14 @@
 						$error = $feed->inError() ? ' error' : '';
 						$empty = $feed->nbEntries() == 0 ? ' empty' : '';
 			?>
-			<li id="f_<?php echo $feed->id(); ?>" class="item<?php echo $error, $empty; ?>">
-				<a href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
+			<li class="item<?php echo $error, $empty; ?>">
+				<a class="configure" href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
 				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?>
 			</li>
-			<?php
-					}
+			<?php 	}
 				} else {
 			?>
-			<li>Empty</li>
+			<li class="item"><?php echo _t('category_empty'); ?></li>
 			<?php } ?>
 		</ul>
 	</div>
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 10f6e655b..f3790614e 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -435,6 +435,35 @@ a.btn {
 	font-size: 0;
 }
 
+/*=== Boxes */
+.box {
+	border: 1px solid #000;
+	border-radius: 5px;
+}
+.box .box-title {
+	margin: 0;
+	padding: 5px 10px;
+	background: #26303F;
+	border-bottom: 1px solid #000;
+	border-radius: 5px 5px 0 0;
+}
+.box .box-content {
+	max-height: 260px;
+}
+
+.box .box-content .item {
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 2.5em;
+}
+
+.box .box-content .item .configure {
+	visibility: hidden;
+}
+.box .box-content .item:hover .configure {
+	visibility: visible;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 484cee9f3..d0ac46fd5 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -438,6 +438,36 @@ a.btn {
 	background: url("loader.gif") center center no-repeat #34495e;
 }
 
+/*=== Boxes */
+.box {
+	border: 1px solid #ddd;
+	border-radius: 5px;
+}
+.box .box-title {
+	margin: 0;
+	padding: 5px 10px;
+	background: #ecf0f1;
+	color: #333;
+	border-bottom: 1px solid #ddd;
+	border-radius: 5px 5px 0 0;
+}
+.box .box-content {
+	max-height: 260px;
+}
+
+.box .box-content .item {
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 2.5em;
+}
+
+.box .box-content .item .configure {
+	visibility: hidden;
+}
+.box .box-content .item:hover .configure {
+	visibility: visible;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 08fc08379..e3ae85075 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -467,6 +467,36 @@ a.btn {
 	font-size: 0;
 }
 
+/*=== Boxes */
+.box {
+	background: #fff;
+	border-radius: 5px;
+	box-shadow: 0 0 3px #bbb;
+}
+.box .box-title {
+	margin: 0;
+	padding: 5px 10px;
+	background: #f6f6f6;
+	border-bottom: 1px solid #ddd;
+	border-radius: 5px 5px 0 0;
+}
+.box .box-content {
+	max-height: 260px;
+}
+
+.box .box-content .item {
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 2.5em;
+}
+
+.box .box-content .item .configure {
+	visibility: hidden;
+}
+.box .box-content .item:hover .configure {
+	visibility: visible;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index a35ac861d..28b17e15f 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -491,6 +491,35 @@ a.btn {
 	font-size: 0;
 }
 
+/*=== Boxes */
+.box {
+	border: 1px solid #aaa;
+	border-radius: 5px;
+}
+.box .box-title {
+	margin: 0;
+	padding: 5px 10px;
+	background: #f6f6f6;
+	border-bottom: 1px solid #aaa;
+	border-radius: 5px 5px 0 0;
+}
+.box .box-content {
+	max-height: 260px;
+}
+
+.box .box-content .item {
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 2.5em;
+}
+
+.box .box-content .item .configure {
+	visibility: hidden;
+}
+.box .box-content .item:hover .configure {
+	visibility: visible;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 37fa18e10..6206504d1 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -497,6 +497,40 @@ a.btn {
 	font-size: 0;
 }
 
+/*=== Boxes */
+.box {
+	background: #EDE7DE;
+	border-radius: 4px 4px 0 0;
+}
+.box .box-title {
+	margin: 0;
+	padding: 5px 10px;
+	background: linear-gradient(0deg, #EDE7DE 0%, #fff 100%) #171717;
+	background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #fff 100%);
+	box-shadow: 0px -1px #fff inset,0 -2px #ccc inset;
+	color: #888;
+	text-shadow: 0 1px #ccc;
+	border-radius: 4px 4px 0 0;
+	font-size: 1.1rem;
+	font-weight: normal;
+}
+.box .box-content {
+	max-height: 260px;
+}
+
+.box .box-content .item {
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 2.5em;
+}
+
+.box .box-content .item .configure {
+	visibility: hidden;
+}
+.box .box-content .item:hover .configure {
+	visibility: visible;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index ccfab10df..3f6ae956d 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -329,6 +329,30 @@ a.btn {
 	font-size: 0;
 }
 
+/*=== Boxes */
+.box {
+}
+.box .box-title {
+	margin: 0;
+	padding: 5px 10px;
+}
+.box .box-content {
+	max-height: 260px;
+}
+
+.box .box-content .item {
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 2.5em;
+}
+
+.box .box-content .item .configure {
+	visibility: hidden;
+}
+.box .box-content .item:hover .configure {
+	visibility: visible;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 792eac299..a5a29ab23 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -280,6 +280,40 @@ a.btn {
 	width: 100px;
 }
 
+/*=== Boxes */
+.box {
+	display: inline-block;
+	width: 20rem;
+	max-width: 95%;
+	margin: 20px 10px;
+	border: 1px solid #ccc;
+	vertical-align: top;
+}
+.box .box-title {
+	font-size: 1.2rem;
+	font-weight: bold;
+	text-align: center;
+}
+.box .box-title form {
+	margin: 0;
+}
+.box .box-content {
+	display: block;
+	overflow: auto;
+}
+.box .box-content .item {
+	display: block;
+}
+
+.box .box-content-centered {
+	padding: 30px 5px;
+	text-align: center;
+}
+.box .box-content-centered .btn {
+	margin: 20px 0 0;
+}
+
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -585,23 +619,6 @@ br + br + br {
 }
 /* TODO </delete */
 
-.box {
-	display: inline-block;
-	width: 19em;
-	max-width: 95%;
-	margin: 20px 10px;
-	border: 1px solid #ccc;
-	vertical-align: top;
-}
-.box .box-content {
-	display: block;
-	overflow: auto;
-}
-.box .box-content .item {
-	width: 19em;
-	max-width: 90%;
-}
-
 /*=== Panel */
 #overlay {
 	display: none;
-- 
cgit v1.2.3


From 7481887db746fd2d6eefab021776b8abd4076429 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 1 Oct 2014 10:06:04 +0200
Subject: Load feed configuration on the same page

Need improvements

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/configureController.php |  4 ++++
 app/views/configure/categorize.phtml    |  5 ++++-
 app/views/configure/feed.phtml          |  8 ++++++--
 p/scripts/main.js                       | 30 ++++++++++++++++++++++++++++++
 p/themes/base-theme/template.css        |  5 +++++
 5 files changed, 49 insertions(+), 3 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index a7def6d9a..dd7a0a441 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -90,6 +90,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * Default values are empty strings unless specified.
 	 */
 	public function feedAction() {
+		if (Minz_Request::param('ajax')) {
+			$this->view->_useLayout(false);
+		}
+
 		$catDAO = new FreshRSS_CategoryDAO();
 		$this->view->categories = $catDAO->listCategories(false);
 
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index 8f77f9724..008dc8c98 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -73,7 +73,7 @@
 						$empty = $feed->nbEntries() == 0 ? ' empty' : '';
 			?>
 			<li class="item<?php echo $error, $empty; ?>">
-				<a class="configure" href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
+				<a class="configure open-slider" href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
 				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?>
 			</li>
 			<?php 	}
@@ -85,3 +85,6 @@
 	</div>
 	<?php } ?>
 </div>
+
+<div id="slider">
+</div>
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index e96a28739..f58ac65af 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -1,8 +1,12 @@
-<?php $this->partial ('aside_feed'); ?>
+<?php
+	if (!Minz_Request::param('ajax')) {
+		$this->partial('aside_feed');
+	}
+?>
 
 <?php if ($this->flux) { ?>
 <div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a> <?php echo Minz_Translate::t ('or'); ?> <a href="<?php echo _url ('index', 'index', 'get', 'f_' . $this->flux->id ()); ?>"><?php echo Minz_Translate::t ('filter'); ?></a>
+	<!-- <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a> <?php echo Minz_Translate::t ('or'); ?> <a href="<?php echo _url ('index', 'index', 'get', 'f_' . $this->flux->id ()); ?>"><?php echo Minz_Translate::t ('filter'); ?></a> -->
 
 	<h1><?php echo $this->flux->name (); ?></h1>
 	<?php echo $this->flux->description (); ?>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index f6d5d2907..7fed7a819 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1240,6 +1240,35 @@ function faviconNbUnread(n) {
 	}
 }
 
+function init_slider_observers() {
+	var slider = $('#slider');
+	if (slider.length < 1) {
+		return;
+	}
+
+	$('.open-slider').on('click', function() {
+		if (ajax_loading) {
+			return false;
+		}
+
+		ajax_loading = true;
+
+		var url_slide = $(this).attr('href');
+
+		$.ajax({
+			type: 'GET',
+			url: url_slide,
+			data : { ajax: true }
+		}).done(function (data) {
+			slider.html(data);
+			slider.show();
+			ajax_loading = false;
+		});
+
+		return false;
+	})
+}
+
 function init_all() {
 	if (!(window.$ && window.url_freshrss)) {
 		if (window.console) {
@@ -1275,6 +1304,7 @@ function init_all() {
 		init_feed_observers();
 		init_password_observers();
 		init_stats_observers();
+		init_slider_observers();
 	}
 
 	if (window.console) {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index a5a29ab23..397f943a6 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -645,6 +645,11 @@ br + br + br {
 	display: none;
 }
 
+/*=== Slider */
+#slider {
+	min-height: 50px;
+}
+
 /*=== DIVERS */
 /*===========*/
 .nav-login,
-- 
cgit v1.2.3


From 405f23050b18e8388edb6f8be90aa59c17ada421 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 1 Oct 2014 13:55:30 +0200
Subject: Design of the slider

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/views/subscription/index.phtml |  5 +++--
 p/scripts/main.js                  | 14 ++++++++++----
 p/themes/base-theme/template.css   | 24 +++++++++++++++++++++++-
 3 files changed, 36 insertions(+), 7 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 2d55890f7..10578bdd3 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -134,9 +134,10 @@
 	<?php } ?>
 </div>
 
-<div id="slider">
+<a id="close-slider"></a>
+<div id="slider"<?php echo isset($this->feed) ? ' class="active"' : ''; ?>>
 <?php
-	if (isset($this->feed) && $this->feed) {
+	if (isset($this->feed)) {
 		$this->renderHelper('feed/update');
 	}
 ?>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 7fed7a819..925a93650 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1241,7 +1241,8 @@ function faviconNbUnread(n) {
 }
 
 function init_slider_observers() {
-	var slider = $('#slider');
+	var slider = $('#slider'),
+	    closer = $('#close-slider');
 	if (slider.length < 1) {
 		return;
 	}
@@ -1252,7 +1253,6 @@ function init_slider_observers() {
 		}
 
 		ajax_loading = true;
-
 		var url_slide = $(this).attr('href');
 
 		$.ajax({
@@ -1261,12 +1261,18 @@ function init_slider_observers() {
 			data : { ajax: true }
 		}).done(function (data) {
 			slider.html(data);
-			slider.show();
+			closer.addClass('active');
+			slider.addClass('active');
 			ajax_loading = false;
 		});
 
 		return false;
-	})
+	});
+
+	closer.on('click', function() {
+		closer.removeClass('active');
+		slider.removeClass('active');
+	});
 }
 
 function init_all() {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 397f943a6..e6c832ee4 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -647,7 +647,29 @@ br + br + br {
 
 /*=== Slider */
 #slider {
-	min-height: 50px;
+	position: fixed;
+	top: 0; bottom: 0;
+	left: 100%; right: 0;
+	overflow: auto;
+	background: #fff;
+	border-left: 1px solid #aaa;
+	transition: left 200ms linear;
+	-moz-transition: left 200ms linear;
+	-webkit-transition: left 200ms linear;
+	-o-transition: left 200ms linear;
+	-ms-transition: left 200ms linear;
+}
+#slider.active {
+	left: 40%;
+}
+#close-slider {
+	position: fixed;
+	top: 0; bottom: 0;
+	left: 100%; right: 0;
+	cursor: pointer;
+}
+#close-slider.active {
+	left: 0;
 }
 
 /*=== DIVERS */
-- 
cgit v1.2.3


From 6effa82cef4ea8fd98178e72b270de6ea4f9f80f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 15:02:42 +0200
Subject: Improve drag and drop

- Refactoring
- Better design
- Item doesn't disappear if action is not completed

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/views/subscription/index.phtml | 11 ++++---
 p/scripts/category.js              | 63 +++++++++++++++++++++++++++++---------
 p/themes/Origine/origine.css       |  9 ------
 p/themes/base-theme/template.css   | 12 ++++++++
 4 files changed, 67 insertions(+), 28 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 3a79a34e6..2c56f79ed 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -1,6 +1,6 @@
 <?php $this->partial('aside_subscription'); ?>
 
-<div class="post">
+<div class="post drop-section">
 	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<h2><?php echo _t('subscription_management'); ?></h2>
@@ -113,21 +113,24 @@
 			</form>
 		</div>
 
-		<ul class="box-content" dropzone="move" data-cat-id="<?php echo $cat->id(); ?>">
+		<ul class="box-content" data-cat-id="<?php echo $cat->id(); ?>">
 			<?php if (!empty($feeds)) { ?>
 			<?php
 					foreach ($feeds as $feed) {
 						$error = $feed->inError() ? ' error' : '';
 						$empty = $feed->nbEntries() == 0 ? ' empty' : '';
 			?>
-			<li class="item feed<?php echo $error, $empty; ?>" draggable="true" data-feed-id="<?php echo $feed->id(); ?>">
+			<li class="item feed<?php echo $error, $empty; ?>"
+			    draggable="true"
+			    data-feed-id="<?php echo $feed->id(); ?>"
+			    dropzone="move">
 				<a class="configure open-slider" href="<?php echo _url('subscription', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
 				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?>
 			</li>
 			<?php 	}
 				} else {
 			?>
-			<li class="item"><?php echo _t('category_empty'); ?></li>
+			<li class="item disabled" dropzone="move"><?php echo _t('category_empty'); ?></li>
 			<?php } ?>
 		</ul>
 	</div>
diff --git a/p/scripts/category.js b/p/scripts/category.js
index 4378aa9cd..37ad36b17 100644
--- a/p/scripts/category.js
+++ b/p/scripts/category.js
@@ -1,38 +1,66 @@
 "use strict";
 
+var loading = false,
+	dnd_successful = false;
+
+function dragend_process(t) {
+	if (loading) {
+		window.setTimeout(function() {
+			dragend_process(t);
+		}, 50);
+	}
+
+	if (!dnd_successful) {
+		t.style.opacity = 1.0;
+	} else {
+		t.parentNode.removeChild(t);
+	}
+}
+
 
 function init_draggable() {
+	if (!(window.$ && window.url_freshrss)) {
+		if (window.console) {
+			console.log('FreshRSS waiting for JS…');
+		}
+		window.setTimeout(init_draggable, 50);
+		return;
+	}
+
 	$.event.props.push('dataTransfer');
 
-	var feeds_draggable = '.box-content > .feed',
-	    box_dropzone = '.box-content';
+	var draggable = '[draggable="true"]',
+	    dropzone = '[dropzone="move"]';
 
-	$('.box').on('dragstart', feeds_draggable, function(e) {
+	$('.drop-section').on('dragstart', draggable, function(e) {
 		e.dataTransfer.effectAllowed = 'move';
-		e.dataTransfer.setData('html', e.target.outerHTML);
-		e.dataTransfer.setData('feed-id', e.target.getAttribute('data-feed-id'));
+		e.dataTransfer.setData('text/html', e.target.outerHTML);
+		e.dataTransfer.setData('text', e.target.getAttribute('data-feed-id'));
+		e.target.style.opacity = 0.3;
+
+		dnd_successful = false;
 	});
-	$('.box').on('dragend', feeds_draggable, function(e) {
-		var parent = e.target.parentNode;
-		parent.removeChild(e.target);
-		
+	$('.drop-section').on('dragend', draggable, function(e) {
+		dragend_process(e.target);
 	});
 
-	$('.box').on('dragenter', box_dropzone, function(e) {
+	$('.drop-section').on('dragenter', dropzone, function(e) {
 		$(e.target).addClass('drag-hover');
 	});
-	$('.box').on('dragleave', box_dropzone, function(e) {
+	$('.drop-section').on('dragleave', dropzone, function(e) {
 		$(e.target).removeClass('drag-hover');
 	});
-	$('.box').on('dragover', box_dropzone, function(e) {
+	$('.drop-section').on('dragover', dropzone, function(e) {
 		e.dataTransfer.dropEffect = "move";
 
 		return false;
 	});
-	$('.box').on('drop', box_dropzone, function(e) {
-		var feed_id = e.dataTransfer.getData('feed-id'),
+	$('.drop-section').on('drop', dropzone, function(e) {
+		var feed_id = e.dataTransfer.getData('text'),
 		    cat_id = e.target.parentNode.getAttribute('data-cat-id');
 
+		loading = true;
+
 		$.ajax({
 			type: 'POST',
 			url: './?c=feed&a=move',
@@ -40,10 +68,15 @@ function init_draggable() {
 				f_id: feed_id,
 				c_id: cat_id
 			}
+		}).success(function() {
+			$(e.target).after(e.dataTransfer.getData('text/html'));
+			loading = false;
+		}).complete(function() {
+			dnd_successful = true;
 		});
 
-		$(e.target).after(e.dataTransfer.getData('html'));
 		$(e.target).removeClass('drag-hover');
+
 		return false;
 	});
 }
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index c79f6cc4c..b25deab0c 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -498,15 +498,6 @@ a.btn {
 	visibility: visible;
 }
 
-/*=== Draggable */
-.drag-hover {
-	background: #dfd;
-	transition: all linear 0.2s;
-}
-[draggable=true] {
-	cursor: grab;
-}
-
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index e6c832ee4..06874c9fe 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -304,6 +304,10 @@ a.btn {
 .box .box-content .item {
 	display: block;
 }
+.box .box-content .item.disabled {
+	text-align: center;
+	font-style: italic;
+}
 
 .box .box-content-centered {
 	padding: 30px 5px;
@@ -313,6 +317,14 @@ a.btn {
 	margin: 20px 0 0;
 }
 
+/*=== Draggable */
+.drag-hover {
+	margin: 0 0 5px;
+	border-bottom: 2px solid #ccc;
+}
+[draggable=true] {
+	cursor: grab;
+}
 
 /*=== STRUCTURE */
 /*===============*/
-- 
cgit v1.2.3


From 9f8d3d0527988b768f739fd4c0e61de68dfdd822 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 3 Oct 2014 12:18:43 +0200
Subject: Fix configure icon on Flat design

See https://github.com/marienfressinaud/FreshRSS/issues/468
---
 p/themes/Flat/flat.css           | 5 +++++
 p/themes/base-theme/template.css | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index d0ac46fd5..7b2695781 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -464,6 +464,11 @@ a.btn {
 .box .box-content .item .configure {
 	visibility: hidden;
 }
+.box .box-content .item .configure .icon {
+	vertical-align: middle;
+	background-color: #95a5a6;
+	border-radius: 3px;
+}
 .box .box-content .item:hover .configure {
 	visibility: visible;
 }
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 06874c9fe..1a96f1e2f 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -73,7 +73,9 @@ label {
 input {
 	width: 180px;
 }
-textarea {
+textarea,
+input[type="file"],
+input.extend:focus {
 	width: 300px;
 }
 input, select, textarea {
@@ -85,9 +87,6 @@ input[type="checkbox"] {
 	width: 15px !important;
 	min-height: 15px !important;
 }
-input.extend:focus {
-	width: 300px;
-}
 button.as-link,
 button.as-link:hover,
 button.as-link:active {
-- 
cgit v1.2.3


From e37a126b9de20a11f306d29c8f3d5052eb4310dd Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 23:41:36 +0200
Subject: Fix some parts of aside_flux

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/layout/aside_flux.phtml      | 37 ++++++++++++++++++------
 p/themes/base-theme/base.css     | 16 +++++++++++
 p/themes/base-theme/template.css | 61 ++++++++++++++++++++--------------------
 3 files changed, 75 insertions(+), 39 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index e572e9d48..30f362348 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -1,4 +1,13 @@
-<div class="aside aside-flux" id="aside-flux">
+<?php
+	$class = '';
+	if (FreshRSS_Context::$conf->hide_read_feeds &&
+			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
+			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
+		$class = ' state_unread';
+	}
+?>
+
+<div class="aside aside_flux<?php echo $class; ?>" id="aside_flux">
 	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
 
 	<?php if (FreshRSS_Auth::hasAccess()) { ?>
@@ -14,24 +23,36 @@
 
 	<ul class="tree">
 		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
-			<a class="tree-folder-title" data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _i('all'), ' ', _t('main_stream'); ?></a>
+			<div class="tree-folder-title">
+				<?php echo _i('all'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('main_stream'); ?></a>
+			</div>
 		</li>
 
 		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
-			<a class="tree-folder-title" data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _i('bookmark'), ' ', _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
+			<div class="tree-folder-title">
+				<?php echo _i('bookmark'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
+			</div>
 		</li>
 
 		<?php
 			foreach ($this->categories as $cat) {
 				$feeds = $cat->feeds();
 				if (!empty($feeds)) {
+					$c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id());
+					$c_show = $c_active && (!FreshRSS_Context::$conf->display_categories ||
+					                        FreshRSS_Context::$current_get['feed']);
 		?>
-		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('c_' . $cat->id()) ? ' active' : ''; ?>">
-			<a class="tree-folder-title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo _i('category'), ' ', $cat->name(); ?></a>
+		<li class="tree-folder<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
+			<div class="tree-folder-title">
+				<?php echo _i('category'); ?> <a data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
+			</div>
 
-			<ul class="items">
-				<?php foreach ($feeds as $feed) { ?>
-				<li class="item<?php echo FreshRSS_Context::isCurrentGet('f_' . $feed->id()) ? ' active' : ''; ?>">
+			<ul class="tree-folder-items<?php echo $c_show ? ' active' : ''; ?>">
+				<?php
+					foreach ($feeds as $feed) {
+						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
+				?>
+				<li class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>">
 					<div class="dropdown">
 						<div class="dropdown-target"></div>
 						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 3f6ae956d..3b79a0822 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -353,6 +353,22 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1.2rem;
+	font-weight: bold;
+}
+.tree-folder-items .item {
+	padding: 0 5px 0 20px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 1a96f1e2f..1eb67c15d 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -325,6 +325,26 @@ a.btn {
 	cursor: grab;
 }
 
+/*=== Tree */
+.tree {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+.tree-folder-title {
+	display: block;
+}
+.tree-folder-items {
+	padding: 0;
+	list-style: none;
+}
+.tree-folder-items .item {
+	display: block;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -371,52 +391,31 @@ a.btn {
 }
 
 /*=== Aside main page (categories) */
-.categories {
-	list-style: none;
-	margin: 0;
-}
-.state_unread li:not(.active)[data-unread="0"] {
+.aside_flux.state_unread .tree-folder:not(.active)[data-unread="0"],
+.aside_flux.state_unread .tree-folder .item:not(.active)[data-unread="0"] {
 	display: none;
 }
-.category {
-	display: block;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-.category .btn:not([data-unread="0"]):after {
+.aside_flux .tree-folder-title > a:not([data-unread="0"]):after {
 	content: attr(data-unread);
 }
 
 /*=== Aside main page (feeds) */
-.categories .feeds {
-	width: 100%;
-	list-style: none;
-}
-.categories .feeds:not(.active) {
+.aside_flux .tree-folder-items:not(.active) {
 	display: none;
 }
-.categories .feeds .feed {
-	display: inline-block;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	vertical-align: middle;
-}
-.categories .feeds .feed:not([data-unread="0"]):before {
+.aside_flux .tree-folder-items .item > a:not([data-unread="0"]):before {
 	content: "(" attr(data-unread) ") ";
 }
-.categories .feeds .dropdown-menu {
+.aside_flux .tree-folder-items .dropdown-menu {
 	left: 0;
 }
-.categories .feeds .item .dropdown-toggle > .icon {
+.aside_flux .tree-folder-items .item .dropdown-toggle > .icon {
 	visibility: hidden;
 	cursor: pointer;
-	vertical-align: top;
 }
-.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.categories .feeds .item:hover .dropdown-toggle > .icon,
-.categories .feeds .item.active .dropdown-toggle > .icon {
+.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 {
 	visibility: visible;
 }
 
-- 
cgit v1.2.3


From 8769931a68d0dddb134674c86a43dec75b39bf83 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 09:32:02 +0200
Subject: Rename aside_flux in aside_feed.

---
 app/layout/aside_feed.phtml      | 95 ++++++++++++++++++++++++++++++++++++++++
 app/layout/aside_flux.phtml      | 95 ----------------------------------------
 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 +++++-----
 8 files changed, 129 insertions(+), 129 deletions(-)
 create mode 100644 app/layout/aside_feed.phtml
 delete mode 100644 app/layout/aside_flux.phtml

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
new file mode 100644
index 000000000..66b7b51af
--- /dev/null
+++ b/app/layout/aside_feed.phtml
@@ -0,0 +1,95 @@
+<?php
+	$class = '';
+	if (FreshRSS_Context::$conf->hide_read_feeds &&
+			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
+			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
+		$class = ' state_unread';
+	}
+?>
+
+<div class="aside aside_feed<?php echo $class; ?>" id="aside_feed">
+	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
+
+	<?php if (FreshRSS_Auth::hasAccess()) { ?>
+	<div class="stick configure-feeds">
+		<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
+		<a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
+	</div>
+	<?php } elseif (Minz_Configuration::needsLogin()) { ?>
+	<a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a>
+	<?php } ?>
+
+	<form id="mark-read-aside" method="post" style="display: none"></form>
+
+	<ul class="tree">
+		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
+			<div class="tree-folder-title">
+				<?php echo _i('all'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('main_stream'); ?></a>
+			</div>
+		</li>
+
+		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
+			<div class="tree-folder-title">
+				<?php echo _i('bookmark'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
+			</div>
+		</li>
+
+		<?php
+			foreach ($this->categories as $cat) {
+				$feeds = $cat->feeds();
+				if (!empty($feeds)) {
+					$c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id());
+					$c_show = $c_active && (!FreshRSS_Context::$conf->display_categories ||
+					                        FreshRSS_Context::$current_get['feed']);
+		?>
+		<li class="tree-folder<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
+			<div class="tree-folder-title">
+				<?php echo _i('category'); ?> <a data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
+			</div>
+
+			<ul class="tree-folder-items<?php echo $c_show ? ' active' : ''; ?>">
+				<?php
+					foreach ($feeds as $feed) {
+						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
+				?>
+				<li class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>">
+					<div class="dropdown">
+						<div class="dropdown-target"></div>
+						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
+						<?php /* feed_config_template */ ?>
+					</div>
+					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
+					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
+				</li>
+				<?php } ?>
+			</ul>
+		</li>
+		<?php
+				}
+			}
+		?>
+	</ul>
+</div>
+
+<script id="feed_config_template" type="text/html">
+	<ul class="dropdown-menu">
+		<li class="dropdown-close"><a href="#close">❌</a></li>
+		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('filter'); ?></a></li>
+		<?php if (FreshRSS_Auth::hasAccess()) { ?>
+		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('stats'); ?></a></li>
+		<?php } ?>
+		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('see_website'); ?></a></li>
+		<?php if (FreshRSS_Auth::hasAccess()) { ?>
+		<li class="separator"></li>
+		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('actualize'); ?></a></li>
+		<li class="item">
+			<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
+			<button class="read_all as-link <?php echo $confirm; ?>"
+			        form="mark-read-aside"
+			        formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"
+			        type="submit"><?php echo _t('mark_read'); ?></button>
+		</li>
+		<?php } ?>
+	</ul>
+</script>
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
deleted file mode 100644
index 30f362348..000000000
--- a/app/layout/aside_flux.phtml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-	$class = '';
-	if (FreshRSS_Context::$conf->hide_read_feeds &&
-			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
-			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
-		$class = ' state_unread';
-	}
-?>
-
-<div class="aside aside_flux<?php echo $class; ?>" id="aside_flux">
-	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
-
-	<?php if (FreshRSS_Auth::hasAccess()) { ?>
-	<div class="stick configure-feeds">
-		<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
-		<a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
-	</div>
-	<?php } elseif (Minz_Configuration::needsLogin()) { ?>
-	<a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a>
-	<?php } ?>
-
-	<form id="mark-read-aside" method="post" style="display: none"></form>
-
-	<ul class="tree">
-		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
-			<div class="tree-folder-title">
-				<?php echo _i('all'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('main_stream'); ?></a>
-			</div>
-		</li>
-
-		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
-			<div class="tree-folder-title">
-				<?php echo _i('bookmark'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
-			</div>
-		</li>
-
-		<?php
-			foreach ($this->categories as $cat) {
-				$feeds = $cat->feeds();
-				if (!empty($feeds)) {
-					$c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id());
-					$c_show = $c_active && (!FreshRSS_Context::$conf->display_categories ||
-					                        FreshRSS_Context::$current_get['feed']);
-		?>
-		<li class="tree-folder<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
-			<div class="tree-folder-title">
-				<?php echo _i('category'); ?> <a data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
-			</div>
-
-			<ul class="tree-folder-items<?php echo $c_show ? ' active' : ''; ?>">
-				<?php
-					foreach ($feeds as $feed) {
-						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
-				?>
-				<li class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>">
-					<div class="dropdown">
-						<div class="dropdown-target"></div>
-						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
-						<?php /* feed_config_template */ ?>
-					</div>
-					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
-					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
-				</li>
-				<?php } ?>
-			</ul>
-		</li>
-		<?php
-				}
-			}
-		?>
-	</ul>
-</div>
-
-<script id="feed_config_template" type="text/html">
-	<ul class="dropdown-menu">
-		<li class="dropdown-close"><a href="#close">❌</a></li>
-		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('filter'); ?></a></li>
-		<?php if (FreshRSS_Auth::hasAccess()) { ?>
-		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('stats'); ?></a></li>
-		<?php } ?>
-		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('see_website'); ?></a></li>
-		<?php if (FreshRSS_Auth::hasAccess()) { ?>
-		<li class="separator"></li>
-		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
-		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('actualize'); ?></a></li>
-		<li class="item">
-			<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
-			<button class="read_all as-link <?php echo $confirm; ?>"
-			        form="mark-read-aside"
-			        formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"
-			        type="submit"><?php echo _t('mark_read'); ?></button>
-		</li>
-		<?php } ?>
-	</ul>
-</script>
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 @@
 
 <div class="nav_menu">
 	<?php if ($actual_view === 'normal') { ?>
-	<a class="btn toggle_aside" href="#aside_flux"><?php echo _i('category'); ?></a>
+	<a class="btn toggle_aside" href="#aside_feed"><?php echo _i('category'); ?></a>
 	<?php } ?>
 
 	<?php if (FreshRSS_Auth::hasAccess()) { ?>
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 @@
 <?php
 
-$this->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;
 }
 
-- 
cgit v1.2.3


From 4204336bd67f8692bfdd964b0fddb8babb03b6ac Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 10:44:45 +0200
Subject: Begin to fix JS for new aside

---
 app/layout/aside_feed.phtml      | 15 +++++-----
 p/scripts/main.js                | 63 ++++++++++++++++++++--------------------
 p/themes/Origine/origine.css     |  2 +-
 p/themes/base-theme/template.css |  2 +-
 4 files changed, 42 insertions(+), 40 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 66b7b51af..d7b12426b 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -22,15 +22,15 @@
 	<form id="mark-read-aside" method="post" style="display: none"></form>
 
 	<ul class="tree">
-		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
+		<li class="tree-folder all<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
 			<div class="tree-folder-title">
-				<?php echo _i('all'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('main_stream'); ?></a>
+				<?php echo _i('all'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('main_stream'); ?></a>
 			</div>
 		</li>
 
-		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
+		<li class="tree-folder favorites<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
 			<div class="tree-folder-title">
-				<?php echo _i('bookmark'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
+				<?php echo _i('bookmark'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
 			</div>
 		</li>
 
@@ -44,7 +44,8 @@
 		?>
 		<li class="tree-folder<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
 			<div class="tree-folder-title">
-				<?php echo _i('category'); ?> <a data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
+				<a class="dropdown-toggle" href="#"><?php echo _i($c_show ? 'up' : 'down'); ?></a>
+				<a class="title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
 			</div>
 
 			<ul class="tree-folder-items<?php echo $c_show ? ' active' : ''; ?>">
@@ -52,14 +53,14 @@
 					foreach ($feeds as $feed) {
 						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
 				?>
-				<li class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>">
+				<li id="f_<?php echo $feed->id(); ?>" class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
 					<div class="dropdown">
 						<div class="dropdown-target"></div>
 						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
 						<?php /* feed_config_template */ ?>
 					</div>
 					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
-					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
+					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
 				</li>
 				<?php } ?>
 			</ul>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index f4b3898db..24c0972fc 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -56,31 +56,31 @@ function incLabel(p, inc, spaceAfter) {
 
 function incUnreadsFeed(article, feed_id, nb) {
 	//Update unread: feed
-	var elem = $('#' + feed_id + '>.feed').get(0),
+	var elem = $('#' + feed_id).get(0),
 		feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0,
 		feed_priority = elem ? str2int(elem.getAttribute('data-priority')) : 0;
 	if (elem) {
-		elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
-		elem = $(elem).closest('li').get(0);
+		elem.setAttribute('data-unread', feed_unreads + nb);
+		elem = $(elem).children('a').get(0);
 		if (elem) {
-			elem.setAttribute('data-unread', feed_unreads + nb);
+			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
 		}
 	}
 
 	//Update unread: category
-	elem = $('#' + feed_id).parent().prevAll('.category').children(':first').get(0);
+	elem = $('#' + feed_id).parents('.tree-folder').get(0);
 	feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 	if (elem) {
-		elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
-		elem = $(elem).closest('li').get(0);
+		elem.setAttribute('data-unread', feed_unreads + nb);
+		elem = $(elem).find('.tree-folder-title .title').get(0);
 		if (elem) {
-			elem.setAttribute('data-unread', feed_unreads + nb);
+			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
 		}
 	}
 
 	//Update unread: all
 	if (feed_priority > 0) {
-		elem = $('#aside_feed .all').children(':first').get(0);
+		elem = $('#aside_feed .all .tree-folder-title .title').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_feed .favorites').children(':first').get(0);
+		elem = $('#aside_feed .favorites .tree-folder-title .title').get(0);
 		if (elem) {
 			feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
@@ -97,7 +97,7 @@ function incUnreadsFeed(article, feed_id, nb) {
 	}
 
 	var isCurrentView = false;
-	//Update unread: title
+	// Update unread: title
 	document.title = document.title.replace(/^((?:\([ 0-9]+\) )?)/, function (m, p1) {
 		var $feed = $('#' + feed_id);
 		if (article || ($feed.closest('.active').length > 0 && $feed.siblings('.active').length === 0)) {
@@ -194,7 +194,7 @@ function mark_favorite(active) {
 		}
 		$b.find('.icon').replaceWith(data.icon);
 
-		var favourites = $('.favorites>a').contents().last().get(0);
+		var favourites = $('#aside_feed .favorites .tree-folder-title .title').contents().last().get(0);
 		if (favourites && favourites.textContent) {
 			favourites.textContent = favourites.textContent.replace(/((?: \([ 0-9]+\))?\s*)$/, function (m, p1) {
 				return incLabel(p1, inc, false);
@@ -202,7 +202,7 @@ function mark_favorite(active) {
 		}
 
 		if (active.closest('div').hasClass('not_read')) {
-			var elem = $('#aside_feed .favorites').children(':first').get(0),
+			var elem = $('#aside_feed .favorites .tree-folder-title .title').get(0),
 				feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 			if (elem) {
 				elem.setAttribute('data-unread', numberFormat(feed_unreads + inc));
@@ -292,42 +292,42 @@ function next_entry() {
 }
 
 function prev_feed() {
-	var active_feed = $("#aside_feed .feeds li.active");
+	var active_feed = $("#aside_feed .tree-folder-items .item.active");
 	if (active_feed.length > 0) {
-		active_feed.prevAll(':visible:first').find('a.feed').each(function(){this.click();});
+		active_feed.prevAll(':visible:first').find('a').each(function(){this.click();});
 	} else {
 		last_feed();
 	}
 }
 
 function next_feed() {
-	var active_feed = $("#aside_feed .feeds li.active");
+	var active_feed = $("#aside_feed .tree-folder-items .item.active");
 	if (active_feed.length > 0) {
-		active_feed.nextAll(':visible:first').find('a.feed').each(function(){this.click();});
+		active_feed.nextAll(':visible:first').find('a').each(function(){this.click();});
 	} else {
 		first_feed();
 	}
 }
 
 function first_feed() {
-	var feed = $("#aside_feed .feeds.active li:visible:first");
+	var feed = $("#aside_feed .tree-folder-items.active .item:visible:first");
 	if (feed.length > 0) {
 		feed.find('a')[1].click();
 	}
 }
 
 function last_feed() {
-	var feed = $("#aside_feed .feeds.active li:visible:last");
+	var feed = $("#aside_feed .tree-folder-items.active .item:visible:last");
 	if (feed.length > 0) {
 		feed.find('a')[1].click();
 	}
 }
 
 function prev_category() {
-	var active_cat = $("#aside_feed .category.stick.active");
+	var active_cat = $("#aside_feed .tree-folder.active");
 
 	if (active_cat.length > 0) {
-		var prev_cat = active_cat.parent('li').prevAll(':visible:first').find('.category.stick a.btn');
+		var prev_cat = active_cat.prevAll(':visible:first').find('.tree-folder-title .title');
 		if (prev_cat.length > 0) {
 			prev_cat[0].click();
 		}
@@ -338,10 +338,10 @@ function prev_category() {
 }
 
 function next_category() {
-	var active_cat = $("#aside_feed .category.stick.active");
+	var active_cat = $("#aside_feed .tree-folder.active");
 
 	if (active_cat.length > 0) {
-		var next_cat = active_cat.parent('li').nextAll(':visible:first').find('.category.stick a.btn');
+		var next_cat = active_cat.nextAll(':visible:first').find('.tree-folder-title .title');
 		if (next_cat.length > 0) {
 			next_cat[0].click();
 		}
@@ -352,16 +352,16 @@ function next_category() {
 }
 
 function first_category() {
-	var cat = $("#aside_feed .category.stick:visible:first");
+	var cat = $("#aside_feed .tree-folder:visible:first");
 	if (cat.length > 0) {
-		cat.find('a.btn')[0].click();
+		cat.find('.tree-folder-title .title')[0].click();
 	}
 }
 
 function last_category() {
-	var cat = $("#aside_feed .category.stick:visible:last");
+	var cat = $("#aside_feed .tree-folder:visible:last");
 	if (cat.length > 0) {
-		cat.find('a.btn')[0].click();
+		cat.find('.tree-folder-title .title')[0].click();
 	}
 }
 
@@ -487,7 +487,8 @@ function init_column_categories() {
 	if (context['current_view'] !== 'normal') {
 		return;
 	}
-	$('#aside_feed').on('click', '.category>a.dropdown-toggle', function () {
+
+	$('#aside_feed').on('click', '.tree-folder>.tree-folder-title>a.dropdown-toggle', function () {
 		$(this).children().each(function() {
 			if (this.alt === '▽') {
 				this.src = this.src.replace('/icons/down.', '/icons/up.');
@@ -497,12 +498,12 @@ function init_column_categories() {
 				this.alt = '▽';
 			}
 		});
-		$(this).parent().next(".feeds").slideToggle();
+		$(this).parent().next(".tree-folder-items").slideToggle();
 		return false;
 	});
-	$('#aside_feed').on('click', '.feeds .dropdown-toggle', function () {
+	$('#aside_feed').on('click', '.tree-folder-items .item .dropdown-toggle', function () {
 		if ($(this).nextAll('.dropdown-menu').length === 0) {
-			var feed_id = $(this).closest('li').attr('id').substr(2),
+			var feed_id = $(this).closest('.item').attr('id').substr(2),
 				feed_web = $(this).data('fweb'),
 				template = $('#feed_config_template').html().replace(/!!!!!!/g, feed_id).replace('http://example.net/', feed_web);
 			$(this).attr('href', '#dropdown-' + feed_id).prev('.dropdown-target').attr('id', 'dropdown-' + feed_id).parent().append(template);
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index e6d50c2e9..64bec06a2 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -565,7 +565,7 @@ a.btn {
 	position: relative;
 	margin: 5px 0;
 }
-.aside_feed .tree-folder-title > a:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
 	top: 3px; right: 3px;
 	padding: 0 5px;
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 40ff8140a..fb02a5b53 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -395,7 +395,7 @@ a.btn {
 .aside_feed.state_unread .tree-folder .item:not(.active)[data-unread="0"] {
 	display: none;
 }
-.aside_feed .tree-folder-title > a:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	content: attr(data-unread);
 }
 
-- 
cgit v1.2.3


From 6dc1267b9832272abd466579053c2bcdedcb5ecb Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 12:33:22 +0200
Subject: Fix Origine theme

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/layout/aside_subscription.phtml |  2 +-
 p/themes/Origine/origine.css        |  8 ++++----
 p/themes/base-theme/template.css    | 24 ++++++++++++++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index 9a95763c3..cbf5df67d 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -1,4 +1,4 @@
-<ul class="nav nav-list aside aside_feed">
+<ul class="nav nav-list aside">
 	<li class="nav-header"><?php echo _t('subscription_management'); ?></li>
 
 	<li class="item<?php echo Minz_Request::controllerName() == 'subscription' ? ' active' : ''; ?>">
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 0a317695b..d01bed963 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -505,7 +505,7 @@ a.btn {
 .tree-folder-title {
 	padding: 0 10px;
 	line-height: 2.5rem;
-	font-size: 1.2rem;
+	font-size: 1rem;
 	font-weight: bold;
 }
 .tree-folder-items {
@@ -513,7 +513,7 @@ a.btn {
 	border-bottom: 1px solid #ccc;
 	background: #f6f6f6;
 }
-.tree-folder-items .item {
+.tree-folder-items > .item {
 	padding: 0 10px;
 	line-height: 2.5rem;
 	font-size: 0.8rem;
@@ -606,12 +606,12 @@ a.btn {
 .aside_feed .tree-folder-items .item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items .item > a {
+.aside_feed .tree-folder-items > .item > a {
 	line-height: 3em;
 	text-align: left;
 	text-decoration: none;
 }
-.aside_feed .tree-folder-items .item:not([data-unread="0"]) {
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
 	font-weight: bold;
 }
 .aside_feed .tree-folder-items .dropdown-menu:after {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index fb02a5b53..bcafd162c 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -331,19 +331,31 @@ a.btn {
 	padding: 0;
 	list-style: none;
 }
-.tree-folder-title {
-	display: block;
-}
 .tree-folder-items {
 	padding: 0;
 	list-style: none;
 }
-.tree-folder-items .item {
+.tree-folder-title {
 	display: block;
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 }
+.tree-folder-title .title {
+	vertical-align: middle;
+}
+.tree-folder-items > .item {
+	display: block;
+	white-space: nowrap;
+}
+.tree-folder-items > .item > a {
+	display: inline-block;
+	vertical-align: middle;
+	width: calc(100% - 32px);
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
 
 /*=== STRUCTURE */
 /*===============*/
@@ -392,7 +404,7 @@ a.btn {
 
 /*=== Aside main page (categories) */
 .aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],
-.aside_feed.state_unread .tree-folder .item:not(.active)[data-unread="0"] {
+.aside_feed.state_unread .tree-folder > .item:not(.active)[data-unread="0"] {
 	display: none;
 }
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
@@ -403,7 +415,7 @@ a.btn {
 .aside_feed .tree-folder-items:not(.active) {
 	display: none;
 }
-.aside_feed .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_feed .tree-folder-items .dropdown-menu {
-- 
cgit v1.2.3


From cb730c373480ba415997696f4c0cbda4cca9d97e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 13:33:48 +0200
Subject: Last fix for Origine (I hope!)

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/layout/aside_feed.phtml      |  5 ++-
 p/themes/Origine/origine.css     | 73 ++++++++++++++++++++--------------------
 p/themes/base-theme/template.css | 11 ++----
 3 files changed, 40 insertions(+), 49 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index d7b12426b..47b63f187 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -54,13 +54,12 @@
 						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
 				?>
 				<li id="f_<?php echo $feed->id(); ?>" class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
-					<div class="dropdown">
+					<div class="dropdown no-mobile">
 						<div class="dropdown-target"></div>
 						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
 						<?php /* feed_config_template */ ?>
 					</div>
-					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
-					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
+					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?></a>
 				</li>
 				<?php } ?>
 			</ul>
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 004d31f0f..7292379c0 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -503,11 +503,26 @@ a.btn {
 	margin: 10px 0;
 }
 .tree-folder-title {
+	position: relative;
 	padding: 0 10px;
+	background: #fff;
 	line-height: 2.5rem;
 	font-size: 1rem;
 	font-weight: bold;
 }
+.tree-folder-title .title {
+	background: inherit;
+	color: #444;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	background: #f0f0f0;
+}
+.tree-folder.active .tree-folder-title .title {
+	color: #0062BE;
+}
 .tree-folder-items {
 	border-top: 1px solid #ccc;
 	border-bottom: 1px solid #ccc;
@@ -518,6 +533,15 @@ a.btn {
 	line-height: 2.5rem;
 	font-size: 0.8rem;
 }
+.tree-folder-items > .item.active {
+	background: #0062be;
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+	color: #fff;
+}
 
 /*=== STRUCTURE */
 /*===============*/
@@ -561,22 +585,12 @@ a.btn {
 	padding: 10px 0 50px;
 	text-align: center;
 }
-
-/*=== Aside main page (categories) */
 .aside.aside_feed .tree {
-	text-align: left;
-}
-.aside_feed .tree-folder-title {
-	position: relative;
-	background: #fff;
-}
-.aside_feed .tree-folder-title .title {
-	background: inherit;
-	color: #444;
-}
-.aside_feed .tree-folder-title .title:hover {
-	text-decoration: none;
+	position: sticky;
+	top: 0;
 }
+
+/*=== Aside main page (categories) */
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
 	right: 0;
@@ -587,39 +601,24 @@ a.btn {
 	background: inherit;
 	border-left: 1px solid #aaa;
 }
-.aside_feed .tree-folder.active .tree-folder-title {
-	background: #f0f0f0;
-}
-.aside_feed .tree-folder.active .tree-folder-title .title {
-	color: #0062BE;
-}
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items .item.active {
-	background: #0062BE;
-}
-.aside_feed .tree-folder-items .item.empty.active {
+.aside_feed .tree-folder-items > .item.empty.active {
 	background: #e67e22;
 }
-.aside_feed .tree-folder-items .item.error.active {
-	background: #BD362F;
+.aside_feed .tree-folder-items > .item.error.active {
+	background: #bd362f;
 }
-.aside_feed .tree-folder-items .item.empty > a {
+.aside_feed .tree-folder-items > .item.empty > a {
 	color: #e67e22;
 }
-.aside_feed .tree-folder-items .item.error > a {
-	color: #BD362F;
+.aside_feed .tree-folder-items > .item.error > a {
+	color: #bd362f;
 }
-.aside_feed .tree-folder-items .item.active > a,
-.aside_feed .tree-folder-items .item.empty.active > a,
-.aside_feed .tree-folder-items .item.error.active > a {
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items > .item > a {
-	line-height: 3em;
-	text-align: left;
-	text-decoration: none;
-}
 .aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
 	font-weight: bold;
 }
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index bcafd162c..5a07426ea 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -330,6 +330,7 @@ a.btn {
 	margin: 0;
 	padding: 0;
 	list-style: none;
+	text-align: left;
 }
 .tree-folder-items {
 	padding: 0;
@@ -351,7 +352,7 @@ a.btn {
 .tree-folder-items > .item > a {
 	display: inline-block;
 	vertical-align: middle;
-	width: calc(100% - 32px);
+	width: calc(100% - 16px);
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
@@ -717,7 +718,6 @@ br + br + br {
 @media(max-width: 840px) {
 	.header,
 	.aside .btn-important,
-	.aside .feeds .dropdown,
 	.flux_header .item.website span,
 	.item.date, .day .date,
 	.dropdown-menu > .no-mobile,
@@ -746,9 +746,6 @@ br + br + br {
 		width: 90%;
 		overflow: auto;
 	}
-	.aside .categories {
-		margin: 10px 0 75px;
-	}
 
 	.flux_header .item.website {
 		width: 40px;
@@ -770,10 +767,6 @@ br + br + br {
 		width: 100%;
 	}
 
-	#stream.global .box-category {
-		margin: 10px 0;
-	}
-
 	#panel {
 		top: 0; bottom: 0;
 		left: 0; right: 0;
-- 
cgit v1.2.3


From 45dbe94890e507402d043dee8e176081b8a290e1 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 13:54:18 +0200
Subject: Fix aside on mobile (Origine)

---
 app/layout/aside_feed.phtml      |  2 +-
 p/themes/Origine/origine.css     | 19 +++++++++++--------
 p/themes/base-theme/template.css | 12 ++----------
 3 files changed, 14 insertions(+), 19 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 47b63f187..1480173b2 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -11,7 +11,7 @@
 	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
 
 	<?php if (FreshRSS_Auth::hasAccess()) { ?>
-	<div class="stick configure-feeds">
+	<div class="stick configure-feeds no-mobile">
 		<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
 		<a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
 	</div>
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 7292379c0..7f60a1ec5 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -582,7 +582,7 @@ a.btn {
 	background: #fff;
 }
 .aside.aside_feed {
-	padding: 10px 0 50px;
+	padding: 10px 0;
 	text-align: center;
 }
 .aside.aside_feed .tree {
@@ -1030,17 +1030,20 @@ a.btn {
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 30px;
-		height: 30px;
-		line-height: 30px;
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
 		text-align: center;
 		background: #f6f6f6;
-		border-left: 1px solid #ddd;
 		border-bottom: 1px solid #ddd;
-		border-radius: 0 0 0 5px;
+	}
+
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
 	}
 
 	.nav_menu .btn {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 5a07426ea..b4cfec952 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -699,19 +699,11 @@ br + br + br {
 /*===========*/
 .nav-login,
 .nav_menu .search,
+.aside .toggle_aside,
 .nav_menu .toggle_aside {
 	display: none;
 }
 
-.aside .toggle_aside {
-	position: absolute;
-	right: 0;
-	display: none;
-	width: 30px;
-	height: 30px;
-	line-height: 30px;
-	text-align: center;
-}
 
 /*=== MOBILE */
 /*===========*/
@@ -724,11 +716,11 @@ br + br + br {
 	.no-mobile {
 		display: none;
 	}
+	.aside .toggle_aside,
 	.nav-login {
 		display: block;
 	}
 	.nav_menu .toggle_aside,
-	.aside .toggle_aside,
 	.nav_menu .search,
 	#panel .close img {
 		display: inline-block;
-- 
cgit v1.2.3


From 0c8b55fc1317cff28de1f270ada0a75b4de074ac Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 10:07:53 +0200
Subject: First iteration to update all the themes

See See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/layout/aside_feed.phtml          |  2 +-
 p/themes/Dark/dark.css               | 97 ++++++++++++++++++++++++++++++++----
 p/themes/Flat/flat.css               | 95 +++++++++++++++++++++++++++++++----
 p/themes/Origine/origine.css         |  2 +
 p/themes/Pafat/pafat.css             | 95 +++++++++++++++++++++++++++++++----
 p/themes/Screwdriver/screwdriver.css | 94 +++++++++++++++++++++++++++++++---
 p/themes/base-theme/base.css         | 90 +++++++++++++++++++--------------
 p/themes/base-theme/template.css     |  5 +-
 8 files changed, 400 insertions(+), 80 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 1480173b2..12beba3a1 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -59,7 +59,7 @@
 						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
 						<?php /* feed_config_template */ ?>
 					</div>
-					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?></a>
+					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
 				</li>
 				<?php } ?>
 			</ul>
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index f3790614e..d00fdcbd3 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -464,6 +464,42 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	position: relative;
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	font-weight: bold;
+}
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -500,10 +536,46 @@ a.btn {
 	border-right: 1px solid #333;
 	background: #1c1c1c;
 }
-.aside.aside_flux {
-	padding: 10px 0 50px;
-	border-right: 1px solid #333;
-	background: #1c1c1c;
+.aside.aside_feed {
+	padding: 10px 0;
+	text-align: center;
+}
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
+}
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 3px; right: 3px;
+	padding: 1px 5px;
+}
+
+/*=== Aside main page (feeds) */
+.aside_feed .tree-folder-items > .item.empty.active {
+}
+.aside_feed .tree-folder-items > .item.error.active {
+}
+.aside_feed .tree-folder-items > .item.empty > a {
+}
+.aside_feed .tree-folder-items > .item.error > a {
+}
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
+}
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
+	font-weight: bold;
+}
+.aside_feed .tree-folder-items .dropdown-menu:after {
+	left: 2px;
+}
+.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 {
+	border-radius: 3px;
+	vertical-align: middle;
 }
 
 /*=== Aside main page (categories) */
@@ -963,17 +1035,20 @@ a.btn {
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 30px;
-		height: 30px;
-		line-height: 30px;
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
 		text-align: center;
 		background: #111;
-		border-left: 1px solid #333;
 		border-bottom: 1px solid #333;
-		border-radius: 0 0 0 5px;
+	}
+
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
 	}
 
 	.nav_menu .btn {
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index e2151b1f9..a1129771a 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -473,6 +473,42 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	position: relative;
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	font-weight: bold;
+}
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -508,9 +544,46 @@ a.btn {
 .aside {
 	background: #ecf0f1;
 }
-.aside.aside_flux {
-	padding: 10px 0 50px;
-	background: #ecf0f1;
+.aside.aside_feed {
+	padding: 10px 0;
+	text-align: center;
+}
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
+}
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 3px; right: 3px;
+	padding: 1px 5px;
+}
+
+/*=== Aside main page (feeds) */
+.aside_feed .tree-folder-items > .item.empty.active {
+}
+.aside_feed .tree-folder-items > .item.error.active {
+}
+.aside_feed .tree-folder-items > .item.empty > a {
+}
+.aside_feed .tree-folder-items > .item.error > a {
+}
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
+}
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
+	font-weight: bold;
+}
+.aside_feed .tree-folder-items .dropdown-menu:after {
+	left: 2px;
+}
+.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 {
+	border-radius: 3px;
+	vertical-align: middle;
 }
 
 /*=== Aside main page (categories) */
@@ -961,15 +1034,19 @@ a.btn {
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 32px;
-		height: 32px;
-		line-height: 30px;
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
 		text-align: center;
 		background: #34495e;
-		border-radius: 0 0 0 5px;
+	}
+
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
 	}
 
 	.nav_menu .btn {
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 7f60a1ec5..b4465a717 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -584,10 +584,12 @@ a.btn {
 .aside.aside_feed {
 	padding: 10px 0;
 	text-align: center;
+	background: #fff;
 }
 .aside.aside_feed .tree {
 	position: sticky;
 	top: 0;
+	margin: 10px 0 50px;
 }
 
 /*=== Aside main page (categories) */
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 28b17e15f..ed19aa5db 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -520,6 +520,42 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	position: relative;
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	font-weight: bold;
+}
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -572,8 +608,46 @@ a.btn {
 	border-right: 1px solid #aaa;
 	background: #fff;
 }
-.aside.aside_flux {
-	padding: 10px 0 50px;
+.aside.aside_feed {
+	padding: 10px 0;
+	text-align: center;
+}
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
+}
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 3px; right: 3px;
+	padding: 1px 5px;
+}
+
+/*=== Aside main page (feeds) */
+.aside_feed .tree-folder-items > .item.empty.active {
+}
+.aside_feed .tree-folder-items > .item.error.active {
+}
+.aside_feed .tree-folder-items > .item.empty > a {
+}
+.aside_feed .tree-folder-items > .item.error > a {
+}
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
+}
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
+	font-weight: bold;
+}
+.aside_feed .tree-folder-items .dropdown-menu:after {
+	left: 2px;
+}
+.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 {
+	border-radius: 3px;
+	vertical-align: middle;
 }
 
 /*=== Aside main page (categories) */
@@ -1056,17 +1130,20 @@ a.btn {
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 30px;
-		height: 30px;
-		line-height: 30px;
+		width: 100%;
+		height: 40px;
+		line-height: 40px;
 		text-align: center;
 		background: #f6f6f6;
-		border-left: 1px solid #ddd;
 		border-bottom: 1px solid #ddd;
-		border-radius: 0 0 0 5px;
+	}
+
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
 	}
 
 	.nav_menu .btn {
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 6206504d1..94a1bccdd 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -531,6 +531,42 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	position: relative;
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	font-weight: bold;
+}
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -578,9 +614,46 @@ a.btn {
 	background: #222;
 	width: 235px;
 }
-.aside.aside_flux {
-	padding: 10px 0 50px;
-	background: #222;
+.aside.aside_feed {
+	padding: 10px 0;
+	text-align: center;
+}
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
+}
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 3px; right: 3px;
+	padding: 1px 5px;
+}
+
+/*=== Aside main page (feeds) */
+.aside_feed .tree-folder-items > .item.empty.active {
+}
+.aside_feed .tree-folder-items > .item.error.active {
+}
+.aside_feed .tree-folder-items > .item.empty > a {
+}
+.aside_feed .tree-folder-items > .item.error > a {
+}
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
+}
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
+	font-weight: bold;
+}
+.aside_feed .tree-folder-items .dropdown-menu:after {
+	left: 2px;
+}
+.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 {
+	border-radius: 3px;
+	vertical-align: middle;
 }
 
 /*=== Aside main page (categories) */
@@ -1135,12 +1208,10 @@ opacity: 1;
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 30px;
-		height: 30px;
-		line-height: 30px;
+		width: 100%;
+		height: 40px;
+		line-height: 40px;
 		text-align: center;
 		background: #171717;
 		box-shadow: 0 1px rgba(255,255,255,0.08);
@@ -1151,6 +1222,13 @@ opacity: 1;
 		margin: 20px 0 0;
 	}
 
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
+	}
+
 	.nav_menu .btn {
 		margin: 5px 10px;
 	}
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 0b0a04c9a..968716073 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -358,16 +358,36 @@ a.btn {
 	margin: 10px 0;
 }
 .tree-folder-title {
+	position: relative;
 	padding: 0 10px;
 	line-height: 2.5rem;
-	font-size: 1.2rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
 	font-weight: bold;
 }
-.tree-folder-items .item {
-	padding: 0 5px 0 20px;
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
 	line-height: 2.5rem;
 	font-size: 0.8rem;
 }
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
 
 /*=== STRUCTURE */
 /*===============*/
@@ -403,55 +423,44 @@ a.btn {
 .aside {
 }
 .aside.aside_feed {
-	padding: 10px 0 50px;
+	padding: 10px 0;
 	text-align: center;
 }
-
-/*=== Aside main page (categories) */
 .aside.aside_feed .tree {
-	text-align: left;
-}
-.aside_feed .tree-folder-title {
-	position: relative;
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
 }
-.aside_feed .tree-folder-title > a:not([data-unread="0"]):after {
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
 	top: 3px; right: 3px;
 	padding: 1px 5px;
 }
 
 /*=== Aside main page (feeds) */
-.categories .feeds .item.active {
-}
-.categories .feeds .item.empty.active {
+.aside_feed .tree-folder-items > .item.empty.active {
 }
-.categories .feeds .item.error.active {
+.aside_feed .tree-folder-items > .item.error.active {
 }
-.categories .feeds .item.empty .feed {
+.aside_feed .tree-folder-items > .item.empty > a {
 }
-.categories .feeds .item.error .feed {
+.aside_feed .tree-folder-items > .item.error > a {
 }
-.categories .feeds .item.active .feed,
-.categories .feeds .item.empty.active .feed,
-.categories .feeds .item.error.active .feed {
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
 }
-.categories .feeds .item .feed {
-	margin: 0;
-	width: 165px;
-	line-height: 3em;
-	font-size: 0.8em;
-	text-align: left;
-	text-decoration: none;
-}
-.categories .feeds .feed:not([data-unread="0"]) {
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
 	font-weight: bold;
 }
-.categories .feeds .dropdown-menu:after {
+.aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
-.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.categories .feeds .item:hover .dropdown-toggle > .icon,
-.categories .feeds .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 {
+	border-radius: 3px;
 	vertical-align: middle;
 }
 
@@ -758,15 +767,20 @@ a.btn {
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 30px;
-		height: 30px;
-		line-height: 30px;
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
 		text-align: center;
 	}
 
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
+	}
+
 	.nav_menu .btn {
 		margin: 5px 10px;
 	}
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index b4cfec952..86e06f5ea 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -352,7 +352,7 @@ a.btn {
 .tree-folder-items > .item > a {
 	display: inline-block;
 	vertical-align: middle;
-	width: calc(100% - 16px);
+	width: calc(100% - 32px);
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
@@ -399,9 +399,6 @@ a.btn {
 	width: 250px;
 	vertical-align: top;
 }
-.aside.aside_feed {
-	background: #fff;
-}
 
 /*=== Aside main page (categories) */
 .aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],
-- 
cgit v1.2.3


From 9fc536c28763260dd996f64e2cd451605faa64d3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 12:43:05 +0200
Subject: Fix .state_unread .items with data-unread="0"

---
 p/themes/base-theme/template.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 86e06f5ea..b07b579d0 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -402,7 +402,7 @@ a.btn {
 
 /*=== Aside main page (categories) */
 .aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],
-.aside_feed.state_unread .tree-folder > .item:not(.active)[data-unread="0"] {
+.aside_feed.state_unread .tree-folder-items > .item:not(.active)[data-unread="0"] {
 	display: none;
 }
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
-- 
cgit v1.2.3


From fa0c7d75e6b9d01130f1c9518eef5f37d8e6d4ff Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 13:50:08 +0200
Subject: Begin to fix global view

---
 app/layout/aside_feed.phtml          |  6 ++--
 app/views/index/global.phtml         | 27 ++++++++++++------
 p/scripts/global_view.js             |  2 +-
 p/themes/Dark/dark.css               |  3 --
 p/themes/Origine/origine.css         | 11 +++-----
 p/themes/Pafat/pafat.css             |  4 ---
 p/themes/Screwdriver/screwdriver.css |  3 --
 p/themes/base-theme/base.css         |  3 --
 p/themes/base-theme/template.css     | 54 ++++++++++++------------------------
 9 files changed, 44 insertions(+), 69 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 12beba3a1..06e12a5cf 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -42,7 +42,7 @@
 					$c_show = $c_active && (!FreshRSS_Context::$conf->display_categories ||
 					                        FreshRSS_Context::$current_get['feed']);
 		?>
-		<li class="tree-folder<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
+		<li class="tree-folder category<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
 			<div class="tree-folder-title">
 				<a class="dropdown-toggle" href="#"><?php echo _i($c_show ? 'up' : 'down'); ?></a>
 				<a class="title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
@@ -53,13 +53,13 @@
 					foreach ($feeds as $feed) {
 						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
 				?>
-				<li id="f_<?php echo $feed->id(); ?>" class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
+				<li id="f_<?php echo $feed->id(); ?>" class="item feed<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
 					<div class="dropdown no-mobile">
 						<div class="dropdown-target"></div>
 						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
 						<?php /* feed_config_template */ ?>
 					</div>
-					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
+					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <a class="item-title" data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
 				</li>
 				<?php } ?>
 			</ul>
diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index ab63c409a..5159882ba 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -1,11 +1,20 @@
-<?php //$this->partial('nav_menu'); ?>
+<?php
+	$this->partial('nav_menu');
+
+	$class = '';
+	if (FreshRSS_Context::$conf->hide_read_feeds &&
+			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
+			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
+		$class = ' state_unread';
+	}
+?>
 
-<div id="stream" class="global categories">
+<div id="stream" class="global<?php echo $class; ?>">
 <?php
 	$url_base = array(
 		'c' => 'index',
 		'a' => 'index',
-		'params' => array()
+		'params' => Minz_Request::params()
 	);
 
 	foreach ($this->categories as $cat) {
@@ -14,20 +23,20 @@
 
 		if (!empty($feeds)) {
 ?>
-	<div class="box">
-		<div class="box-title"><a data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $cat->name(); ?></a></div>
+	<div class="box category" data-unread="<?php echo $cat->nbNotRead(); ?>">
+		<div class="box-title"><a class="title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $cat->name(); ?></a></div>
 
 		<ul class="box-content">
 			<?php
 				foreach ($feeds as $feed) {
 					$nb_not_read = $feed->nbNotRead();
-					$error = $feed->inError() ? 'error ' : '';
-					$empty = $feed->nbEntries() === 0 ? 'empty ' : '';
+					$error = $feed->inError() ? ' error' : '';
+					$empty = $feed->nbEntries() === 0 ? ' empty' : '';
 					$url_base['params']['get'] = 'f_' . $feed->id();
 			?>
-			<li class="item feed<?php echo $error, $empty; ?>">
+			<li class="item feed<?php echo $error, $empty; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>">
 				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
-				<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $feed->name(); ?></a>
+				<a class="item-title" data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $feed->name(); ?></a>
 			</li>
 			<?php } ?>
 		</ul>
diff --git a/p/scripts/global_view.js b/p/scripts/global_view.js
index 8c2e6c1a2..14909f44e 100644
--- a/p/scripts/global_view.js
+++ b/p/scripts/global_view.js
@@ -9,7 +9,7 @@ function load_panel(link) {
 	panel_loading = true;
 
 	$.get(link, function (data) {
-		$("#panel").append($(".nav_menu, #stream .day, #stream .flux, #stream .pagination", data));
+		$("#panel").append($(".nav_menu, #stream .day, #stream .flux, #stream .pagination, #stream.prompt", data));
 
 		$("#panel .nav_menu").children().not("#nav_menu_read_all").remove();
 
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 2b853a45c..25a3e66f6 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -852,9 +852,6 @@ a.btn {
 	border-radius: 5px;
 	text-align: left;
 }
-#stream.global .category {
-	margin: 0;
-}
 #stream.global .btn {
 	width: auto;
 	height: 2em;
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index b4465a717..7230aa128 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -593,7 +593,7 @@ a.btn {
 }
 
 /*=== Aside main page (categories) */
-.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+.aside_feed .category .title:not([data-unread="0"]):after {
 	position: absolute;
 	right: 0;
 	margin: 10px 0;
@@ -603,6 +603,9 @@ a.btn {
 	background: inherit;
 	border-left: 1px solid #aaa;
 }
+.feed .item-title:not([data-unread="0"]) {
+	font-weight: bold;
+}
 
 /*=== Aside main page (feeds) */
 .aside_feed .tree-folder-items > .item.empty.active {
@@ -621,9 +624,6 @@ a.btn {
 .aside_feed .tree-folder-items > .item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
-	font-weight: bold;
-}
 .aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
@@ -903,9 +903,6 @@ a.btn {
 	text-align: left;
 	box-shadow: 0 0 3px #bbb;
 }
-#stream.global .category {
-	margin: 0;
-}
 #stream.global .btn {
 	width: auto;
 	height: 2em;
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index cdbedbf22..84a485e13 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -914,10 +914,6 @@ a.btn {
 	text-align: left;
 }
 
-#stream.global .category {
-	margin: 0;
-}
-
 #stream.global .category:first-child {
 	margin: 0;
 }
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index aa5758a90..5771bb68f 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -969,9 +969,6 @@ opacity: 1;
 	box-shadow: 0 0 4px #171717;
 	overflow:hidden;
 }
-#stream.global .category {
-	margin: 0;
-}
 #stream.global .btn {
 	width: auto;
 	height: 2em;
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 4de5fa98a..53f59bbe5 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -668,9 +668,6 @@ a.btn {
 #stream.global .box-category {
 	text-align: left;
 }
-#stream.global .category {
-	margin: 0;
-}
 #stream.global .btn {
 	width: auto;
 	height: 2em;
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index b07b579d0..1af7a73d6 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -289,6 +289,7 @@ a.btn {
 	vertical-align: top;
 }
 .box .box-title {
+	position: relative;
 	font-size: 1.2rem;
 	font-weight: bold;
 	text-align: center;
@@ -400,22 +401,10 @@ a.btn {
 	vertical-align: top;
 }
 
-/*=== Aside main page (categories) */
-.aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],
-.aside_feed.state_unread .tree-folder-items > .item:not(.active)[data-unread="0"] {
-	display: none;
-}
-.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
-	content: attr(data-unread);
-}
-
 /*=== Aside main page (feeds) */
 .aside_feed .tree-folder-items:not(.active) {
 	display: none;
 }
-.aside_feed .tree-folder-items > .item > a:not([data-unread="0"]):before {
-	content: "(" attr(data-unread) ") ";
-}
 .aside_feed .tree-folder-items .dropdown-menu {
 	left: 0;
 }
@@ -612,32 +601,13 @@ br + br + br {
 
 /*=== GLOBAL VIEW */
 /*================*/
-/*=== Category boxes */
-
-/* TODO <delete> */
-#stream.global .box-category {
-	display: inline-block;
-	width: 19em;
-	max-width: 95%;
-	margin: 20px 10px;
-	border: 1px solid #ccc;
-	vertical-align: top;
-}
-#stream.global .category {
-	width: 100%;
-}
-#stream.global .btn {
-	display: block;
-}
-#stream.global .box-category .feeds {
-	display: block;
-	overflow: auto;
+#stream.global {
+	text-align: center;
 }
-#stream.global .box-category .feed {
-	width: 19em;
-	max-width: 90%;
+
+#stream.global .box {
+	text-align: left;
 }
-/* TODO </delete */
 
 /*=== Panel */
 #overlay {
@@ -694,6 +664,18 @@ br + br + br {
 
 /*=== DIVERS */
 /*===========*/
+.category .title:not([data-unread="0"]):after {
+	content: attr(data-unread);
+}
+.feed .item-title:not([data-unread="0"]):before {
+	content: "(" attr(data-unread) ") ";
+}
+
+.state_unread .category:not(.active)[data-unread="0"],
+.state_unread .feed:not(.active)[data-unread="0"] {
+	display: none;
+}
+
 .nav-login,
 .nav_menu .search,
 .aside .toggle_aside,
-- 
cgit v1.2.3


From 62727b1d4f101fa328b57eda716803c2f7147d7b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 14:10:45 +0200
Subject: Fix Origine and base-theme themes for global view

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 p/themes/Origine/origine.css     | 39 ++++++++++++++-------------------------
 p/themes/base-theme/base.css     | 32 ++++++++++++++++----------------
 p/themes/base-theme/template.css |  3 +++
 3 files changed, 33 insertions(+), 41 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 7230aa128..918d4f653 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -897,32 +897,24 @@ a.btn {
 
 /*=== GLOBAL VIEW */
 /*================*/
-#stream.global .box-category {
-	background: #fff;
-	border-radius: 5px;
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
 	text-align: left;
-	box-shadow: 0 0 3px #bbb;
-}
-#stream.global .btn {
-	width: auto;
-	height: 2em;
-	margin: 0;
-	padding: 0 10px;
-	background: #f6f6f6;
-	border: none;
-	border-bottom: 1px solid #ddd;
-	border-radius: 5px 5px 0 0;
-	line-height: 2em;
-	font-size: 1.2rem;
 }
-#stream.global .btn:not([data-unread="0"]) {
+.box.category:not([data-unread="0"]) .box-title {
 	background: #0084CC;
+}
+.box.category:not([data-unread="0"]) .box-title:active {
+	background: #3498db;
+}
+.box.category:not([data-unread="0"]) .box-title .title {
 	color: #fff;
 	font-weight: bold;
-	text-shadow: none;
 }
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0; right: 5px;
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
 	border: 0;
 	background: none;
 	color: #fff;
@@ -930,12 +922,9 @@ a.btn {
 	box-shadow: none;
 	text-shadow: none;
 }
-#stream.global .box-category .feeds {
-	max-height: 250px;
-}
-#stream.global .box-category .feeds .item {
+.box.category .item.feed {
 	padding: 2px 10px;
-	font-size: 0.9rem;
+	font-size: 0.8rem;
 }
 
 /*=== DIVERS */
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 53f59bbe5..029c2d254 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -665,30 +665,30 @@ a.btn {
 
 /*=== GLOBAL VIEW */
 /*================*/
-#stream.global .box-category {
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
 	text-align: left;
 }
-#stream.global .btn {
-	width: auto;
-	height: 2em;
-	margin: 0;
-	padding: 0 10px;
-	line-height: 2em;
-	font-size: 1.2rem;
+.box.category:not([data-unread="0"]) .box-title {
 }
-#stream.global .btn:not([data-unread="0"]) {
-	font-weight: bold;
+.box.category:not([data-unread="0"]) .box-title:active {
 }
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0; right: 5px;
+.box.category:not([data-unread="0"]) .box-title .title {
 	font-weight: bold;
 }
-#stream.global .box-category .feeds {
-	max-height: 250px;
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
+	border: 0;
+	background: none;
+	font-weight: bold;
+	box-shadow: none;
+	text-shadow: none;
 }
-#stream.global .box-category .feeds .item {
+.box.category .item.feed {
 	padding: 2px 10px;
-	font-size: 0.9rem;
+	font-size: 0.8rem;
 }
 
 /*=== DIVERS */
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 1af7a73d6..f4f19ee71 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -294,6 +294,9 @@ a.btn {
 	font-weight: bold;
 	text-align: center;
 }
+.box .box-title a {
+	display: block;
+}
 .box .box-title form {
 	margin: 0;
 }
-- 
cgit v1.2.3


From 98fbc736ec3b4a5260da72eb8c9f66b798b74725 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 14:34:08 +0200
Subject: Fix all the themes for global view

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 p/themes/Dark/dark.css               | 45 ++++++++++++-----------------
 p/themes/Flat/flat.css               | 45 +++++++++++------------------
 p/themes/Origine/origine.css         |  3 --
 p/themes/Pafat/pafat.css             | 55 +++++++++--------------------------
 p/themes/Screwdriver/screwdriver.css | 56 +++++++++++++++---------------------
 p/themes/base-theme/template.css     |  3 ++
 6 files changed, 75 insertions(+), 132 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 25a3e66f6..f48f42b68 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -845,43 +845,34 @@ a.btn {
 
 /*=== GLOBAL VIEW */
 /*================*/
-#stream.global .box-category {
-	text-align: left;
-	background: #1a1a1a;
-	border: 1px solid #000;
-	border-radius: 5px;
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
 	text-align: left;
+	color: #888;
 }
-#stream.global .btn {
-	width: auto;
-	height: 2em;
-	margin: 0;
-	padding: 0 10px;
-	line-height: 2em;
-	font-size: 1.2rem;
+.box.category:not([data-unread="0"]) .box-title {
+	background: #34495E;
+}
+.box.category:not([data-unread="0"]) .box-title:active {
 	background: #26303F;
-	border: none;
-	border-bottom: 1px solid #000;
-	border-radius: 5px 5px 0 0;
 }
-#stream.global .btn:not([data-unread="0"]) {
-	font-weight: bold;
-	background: #34495e;
+.box.category:not([data-unread="0"]) .box-title .title {
 	color: #fff;
-}
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0; right: 5px;
 	font-weight: bold;
+}
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
 	border: 0;
 	background: none;
-	color: #fff;
-}
-#stream.global .box-category .feeds {
-	max-height: 250px;
+	font-weight: bold;
+	box-shadow: none;
+	text-shadow: none;
 }
-#stream.global .box-category .feeds .item {
+.box.category .item.feed {
 	padding: 2px 10px;
-	font-size: 0.9rem;
+	font-size: 0.8rem;
 }
 
 /*=== Panel */
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index c594811f2..432a9a0fb 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -851,44 +851,33 @@ a.btn {
 
 /*=== GLOBAL VIEW */
 /*================*/
-#stream.global .box-category {
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
 	text-align: left;
-	border: 1px solid #ddd;
-	border-radius: 5px;
 }
-#stream.global .category {
-	margin: 0;
+.box.category:not([data-unread="0"]) .box-title {
+	background: #3498db;
 }
-#stream.global .btn {
-	width: auto;
-	height: 2em;
-	margin: 0;
-	padding: 0 10px;
-	line-height: 2em;
-	font-size: 1.2rem;
-	background: #ecf0f1;
-	color: #333;
-	border-bottom: 1px solid #ddd;
-	border-radius: 5px 5px 0 0;
+.box.category:not([data-unread="0"]) .box-title:active {
+	background: #2980b9;
 }
-#stream.global .btn:not([data-unread="0"]) {
+.box.category:not([data-unread="0"]) .box-title .title {
 	font-weight: bold;
-	background: #3498db;
 	color: #fff;
 }
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0; right: 5px;
-	font-weight: bold;
-	background: none;
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
 	border: 0;
-	color: #fff;
-}
-#stream.global .box-category .feeds {
-	max-height: 250px;
+	background: none;
+	font-weight: bold;
+	box-shadow: none;
+	text-shadow: none;
 }
-#stream.global .box-category .feeds .item {
+.box.category .item.feed {
 	padding: 2px 10px;
-	font-size: 0.9rem;
+	font-size: 0.8rem;
 }
 
 /*=== DIVERS */
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 918d4f653..7231abd01 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -603,9 +603,6 @@ a.btn {
 	background: inherit;
 	border-left: 1px solid #aaa;
 }
-.feed .item-title:not([data-unread="0"]) {
-	font-weight: bold;
-}
 
 /*=== Aside main page (feeds) */
 .aside_feed .tree-folder-items > .item.empty.active {
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 84a485e13..f10b66086 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -908,59 +908,32 @@ a.btn {
 
 /*=== GLOBAL VIEW */
 /*================*/
-#stream.global .box-category {
-	background: #fff;
-	border:none;
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
 	text-align: left;
 }
-
-#stream.global .category:first-child {
-	margin: 0;
+.box.category:not([data-unread="0"]) .box-title {
+	background: #5BC0DE;
 }
-
-
-#stream.global .btn {
-	width: auto;
-	height: 2em;
-	margin: 0;
-	padding: 0 10px;
-	background: #f6f6f6;
-	border-bottom: 1px solid #aaa;
-	border-radius: 5px 5px 0 0;
-	line-height: 2em;
-	font-size: 1.2rem;
-}
-
-#stream.global .btn:not([data-unread="0"]) {
-	background: #5bc0de;
-	border-color : #5bc0de;
-	color: #fff;
+.box.category:not([data-unread="0"]) .box-title .title {
 	font-weight: bold;
-	text-shadow: none;
-
+	color: #fff;
 }
-
-
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0; right: 5px;
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
 	border: 0;
 	background: none;
-	color: #fff;
 	font-weight: bold;
 	box-shadow: none;
 	text-shadow: none;
+	font-size: 0.8rem;
+	line-height: 1.6rem;
 }
-
-#stream.global .box-category .feeds {
-	max-height: 250px;
-	width: 302px;
-	border : solid #aaa 1px;
-	border-top : none;
-}
-
-#stream.global .box-category .feeds .item {
+.box.category .item.feed {
 	padding: 2px 10px;
-	font-size: 0.9rem;
+	font-size: 0.8rem;
 }
 
 /*=== DIVERS */
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 5771bb68f..c38cb617e 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -957,60 +957,50 @@ opacity: 1;
 
 /*=== GLOBAL VIEW */
 /*================*/
-#stream.global{
-	background:#222;
+#stream.global {
+	background: #222;
 	padding: 24px 0;
 	box-shadow: 0 1px #fff, 0 -2px 2px #171717 inset, 0 2px 2px #171717 inset;
 }
-#stream.global .box-category {
-	background: #fff;
-	border-radius: 4px 4px 0 0;
-	text-align: left;
-	box-shadow: 0 0 4px #171717;
-	overflow:hidden;
-}
-#stream.global .btn {
-	width: auto;
-	height: 2em;
-	margin: 0;
-	padding: 0 10px;
+
+.box.category .box-title {
 	background: linear-gradient(0deg, #EDE7DE 0%, #fff 100%) #171717;
 	background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #fff 100%);
-	border: none;
 	box-shadow: 0px -1px #fff inset,0 -2px #ccc inset;
 	border-radius: none;
 	line-height: 2em;
 	font-size: 1.2rem;
-	color:#888;
 	text-shadow:0 1px #ccc;
 }
-#stream.global .btn:not([data-unread="0"]) {
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
+	text-align: left;
+	color: #888;
+}
+.box.category:not([data-unread="0"]) .box-title {
+}
+.box.category:not([data-unread="0"]) .box-title:active {
+}
+.box.category:not([data-unread="0"]) .box-title .title {
 	color: #222;
 	font-weight: bold;
 }
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0;
-	right: 5px;
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
 	border: 0;
 	background: none;
-	color: #222;
 	font-weight: bold;
-	box-shadow: none;
-	text-shadow: none;
-}
-#stream.global .box-category .feeds {
-	max-height: 250px;
-	color:#222;
-	background:#EDE7DE;
 }
-#stream.global .box-category .feeds .item {
+.box.category .item.feed {
 	padding: 2px 10px;
-	font-size: 0.9rem;
-	overflow:hidden;
+	font-size: 0.8rem;
 }
-#stream.global .box-category .feed {
-	color:#222;
+.box.category .item.feed .item-title {
+	color: #222;
 }
+
 /*=== PANEL */
 /*===========*/
 #panel {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index f4f19ee71..fd95cb697 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -673,6 +673,9 @@ br + br + br {
 .feed .item-title:not([data-unread="0"]):before {
 	content: "(" attr(data-unread) ") ";
 }
+.feed .item-title:not([data-unread="0"]) {
+	font-weight: bold;
+}
 
 .state_unread .category:not(.active)[data-unread="0"],
 .state_unread .feed:not(.active)[data-unread="0"] {
-- 
cgit v1.2.3


From cdad09ae2c363ee74ef7feba58e00e3500a35317 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 14:53:38 +0200
Subject: Fix feed colors on subscription page (all themes)

---
 p/themes/Dark/dark.css               | 4 ++++
 p/themes/Flat/flat.css               | 4 ++++
 p/themes/Origine/origine.css         | 4 ++++
 p/themes/Pafat/pafat.css             | 4 ++++
 p/themes/Screwdriver/screwdriver.css | 2 ++
 p/themes/base-theme/base.css         | 4 ++++
 p/themes/base-theme/template.css     | 1 +
 7 files changed, 23 insertions(+)

(limited to 'p/themes/base-theme/template.css')

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 1f26224e4..e551aa9c0 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -571,15 +571,19 @@ a.btn {
 .feed.item.error.active {
 	background: #a44;
 }
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #c95;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #a44;
 }
+.feed.item.empty.active,
 .feed.item.empty.active > a {
 	color: #111;
 }
+.feed.item.error.active,
 .feed.item.error.active > a {
 	color: #fff;
 }
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 46c874311..eb7737c5d 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -576,12 +576,16 @@ a.btn {
 .feed.item.error.active {
 	background: #bd362f;
 }
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #e67e22;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #bd362f;
 }
+.feed.item.empty.active,
+.feed.item.error.active,
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
 	color: #fff;
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 1b54e9bfe..464422a0b 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -611,12 +611,16 @@ a.btn {
 .feed.item.error.active {
 	background: #bd362f;
 }
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #e67e22;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #bd362f;
 }
+.feed.item.empty.active,
+.feed.item.error.active,
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
 	color: #fff;
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 15fdb3a1a..49cb3bc17 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -621,12 +621,16 @@ a.btn {
 .feed.item.error.active {
 	background: #bd362f;
 }
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #e67e22;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #bd362f;
 }
+.feed.item.empty.active,
+.feed.item.error.active,
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
 	color: #fff;
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index ae6ceb00f..4f55d752e 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -649,9 +649,11 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #e67e22;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #BD362F;
 }
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 0d53c50d1..871a632d8 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -447,10 +447,14 @@ a.btn {
 }
 .feed.item.error.active {
 }
+.feed.item.empty,
 .feed.item.empty > a {
 }
+.feed.item.error,
 .feed.item.error > a {
 }
+.feed.item.empty.active,
+.feed.item.error.active,
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
 }
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index fd95cb697..a79d539d8 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -179,6 +179,7 @@ a.btn {
 .dropdown {
 	position: relative;
 	display: inline-block;
+	vertical-align: middle;
 }
 .dropdown-target {
 	display: none;
-- 
cgit v1.2.3


From 659515862566744fc90511bc4182fc32ccf2e6b3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 26 Oct 2014 14:13:05 +0100
Subject: Fix themes (aside_feed)

---
 p/themes/Dark/dark.css               |  3 +--
 p/themes/Flat/flat.css               |  3 +--
 p/themes/Origine/origine.css         |  4 +---
 p/themes/Pafat/pafat.css             |  1 -
 p/themes/Screwdriver/screwdriver.css |  1 -
 p/themes/base-theme/base.css         |  1 -
 p/themes/base-theme/template.css     | 14 ++++++++++++--
 7 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index e551aa9c0..03bf3c985 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -474,7 +474,6 @@ a.btn {
 	line-height: 2.5rem;
 	font-size: 1rem;
 	background: #1c1c1c;
-	font-weight: bold;
 }
 .tree-folder-title .title {
 	background: inherit;
@@ -485,6 +484,7 @@ a.btn {
 }
 .tree-folder.active .tree-folder-title {
 	background: #2c2c2c;
+	font-weight: bold;
 }
 .tree-folder-items {
 	border-top: 1px solid #222;
@@ -594,7 +594,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 	background-color: #111;
 }
 
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index eb7737c5d..313bee0ee 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -483,7 +483,6 @@ a.btn {
 	background: #34495e;
 	line-height: 2.5rem;
 	font-size: 1rem;
-	font-weight: bold;
 }
 .tree-folder-title .title {
 	background: inherit;
@@ -494,6 +493,7 @@ a.btn {
 }
 .tree-folder.active .tree-folder-title {
 	background: #2980b9;
+	font-weight: bold;
 }
 .tree-folder-items {
 	background: #2c3e50;
@@ -597,7 +597,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 464422a0b..afd6ec04f 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -508,7 +508,6 @@ a.btn {
 	background: #fff;
 	line-height: 2.5rem;
 	font-size: 1rem;
-	font-weight: bold;
 }
 .tree-folder-title .title {
 	background: inherit;
@@ -519,6 +518,7 @@ a.btn {
 }
 .tree-folder.active .tree-folder-title {
 	background: #f0f0f0;
+	font-weight: bold;
 }
 .tree-folder.active .tree-folder-title .title {
 	color: #0062BE;
@@ -629,11 +629,9 @@ a.btn {
 	left: 2px;
 }
 .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 {
 	background-color: #fff;
 	border-radius: 3px;
-	vertical-align: middle;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 49cb3bc17..8b1e7866c 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -642,7 +642,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 	background-color: #fff;
 }
 
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 4f55d752e..b6c2e670e 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -664,7 +664,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 871a632d8..ac30dbfea 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -465,7 +465,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index a79d539d8..ffb104af2 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -401,14 +401,23 @@ a.btn {
 .aside {
 	display: table-cell;
 	height: 100%;
-	width: 250px;
+	width: 300px;
 	vertical-align: top;
 }
 
-/*=== Aside main page (feeds) */
+/*=== Aside main page */
+.aside_feed .tree-folder-title .icon {
+	padding: 5px;
+}
+.aside_feed .tree-folder-items .item.feed {
+	padding: 0px 15px;
+}
 .aside_feed .tree-folder-items:not(.active) {
 	display: none;
 }
+.aside_feed .tree-folder-items .dropdown {
+	vertical-align: top;
+}
 .aside_feed .tree-folder-items .dropdown-menu {
 	left: 0;
 }
@@ -472,6 +481,7 @@ a.btn {
 .flux .item.date {
 	width: 145px;
 	text-align: right;
+	overflow: hidden;
 }
 .flux .item > a {
 	display: block;
-- 
cgit v1.2.3


From 01ef0ef2b8b5f8eda53b2dff19f460dd9d1b8276 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 26 Oct 2014 18:58:43 +0100
Subject: Fix nav_entries menu width

See https://github.com/marienfressinaud/FreshRSS/issues/678
---
 p/themes/base-theme/template.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index ffb104af2..6640284f9 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -569,7 +569,7 @@ br + br + br {
 	position: fixed;
 	bottom: 0; left: 0;
 	display: table;
-	width: 250px;
+	width: 300px;
 	background: #fff;
 	table-layout: fixed;
 }
-- 
cgit v1.2.3


From 482f995d61f4b172f7b79becc25d0d7157098daf Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 26 Oct 2014 21:21:07 +0100
Subject: All the category area is clickable

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 p/themes/base-theme/template.css | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'p/themes/base-theme/template.css')

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 6640284f9..79fe506f2 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -348,6 +348,8 @@ a.btn {
 	text-overflow: ellipsis;
 }
 .tree-folder-title .title {
+	display: inline-block;
+	width: 100%;
 	vertical-align: middle;
 }
 .tree-folder-items > .item {
@@ -406,6 +408,10 @@ a.btn {
 }
 
 /*=== Aside main page */
+.aside_feed .category .title {
+	width: calc(100% - 35px);
+}
+
 .aside_feed .tree-folder-title .icon {
 	padding: 5px;
 }
-- 
cgit v1.2.3


From 724e13f0a6419b046b33da71e66058e279551edd Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 31 Oct 2014 16:43:05 +0100
Subject: Fix global view mark as read

---
 app/views/index/global.phtml     |  5 +++--
 p/scripts/global_view.js         | 12 ++++++------
 p/themes/base-theme/template.css |  6 +++---
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index 0975a5a00..ae7f5ffbc 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -47,7 +47,8 @@
 ?>
 </div>
 
-<div id="overlay"></div>
-<div id="panel"<?php echo FreshRSS_Context::$conf->display_posts ? '' : ' class="hide_posts"'; ?>>
+<div id="overlay">
 	<a class="close" href="#"><?php echo _i('close'); ?></a>
 </div>
+<div id="panel"<?php echo FreshRSS_Context::$conf->display_posts ? '' : ' class="hide_posts"'; ?>>
+</div>
diff --git a/p/scripts/global_view.js b/p/scripts/global_view.js
index 14909f44e..7d7ba22b5 100644
--- a/p/scripts/global_view.js
+++ b/p/scripts/global_view.js
@@ -24,12 +24,13 @@ function load_panel(link) {
 		// en en ouvrant une autre ensuite, on se retrouve au même point de scroll
 		$("#panel").scrollTop(0);
 
-		$('#panel').on('click', '#nav_menu_read_all > a, #nav_menu_read_all .item > a, #bigMarkAsRead', function () {
+		$('#panel').on('click', '#nav_menu_read_all button, #bigMarkAsRead', function () {
+			console.log($(this).attr("formaction"));
 			$.ajax({
-				url: $(this).attr("href"),
+				type: "POST",
+				url: $(this).attr("formaction"),
 				async: false
 			});
-			//$("#panel .close").first().click();
 			window.location.reload(false);
 			return false;
 		});
@@ -39,9 +40,8 @@ function load_panel(link) {
 }
 
 function init_close_panel() {
-	$("#panel .close").click(function () {
-		$("#panel").html('<a class="close" href="#">' + icons['close'] + '</a>');
-		init_close_panel();
+	$("#overlay .close").click(function () {
+		$("#panel").html('');
 		$("#panel").slideToggle();
 		$("#overlay").fadeOut();
 
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 79fe506f2..5ba621415 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -645,13 +645,13 @@ br + br + br {
 	overflow: auto;
 	background: #fff;
 }
-#panel .close {
+#overlay .close {
 	position: fixed;
 	top: 0; bottom: 0;
 	left: 0; right: 0;
 	display: block;
 }
-#panel .close img {
+#overlay .close img {
 	display: none;
 }
 
@@ -762,7 +762,7 @@ br + br + br {
 	}
 
 	#panel {
-		top: 0; bottom: 0;
+		top: 25px; bottom: 30px;
 		left: 0; right: 0;
 	}
 	#panel .close {
-- 
cgit v1.2.3


From afe51884d9258e26a3aecfe422e69ede9f86fa7e Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 1 Nov 2014 09:58:06 -0400
Subject: Add CSS numbering on user query list

---
 p/themes/base-theme/template.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 5ba621415..f696ac237 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -499,7 +499,8 @@ a.btn {
 	text-overflow: ellipsis;
 	overflow: hidden;
 }
-.flux .item.share > a {
+.flux .item.share > a,
+.item.query > a {
 	display: list-item;
 	list-style-position: inside;
 	list-style-type: decimal;
-- 
cgit v1.2.3


From ec55aa94bfb30cdb0cd701785189215dfaf2094a Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 15 Nov 2014 18:02:22 -0500
Subject: Theme selection redesign

I made a CSS3 gallery to select the theme. Now you can see the theme before applying it.
Comments are welcome.

See #571
---
 app/views/configure/display.phtml        |  34 ++++++++----
 p/themes/Dark/thumbs/original.png        | Bin 0 -> 123928 bytes
 p/themes/Flat/thumbs/original.png        | Bin 0 -> 133420 bytes
 p/themes/Origine/thumbs/original.png     | Bin 0 -> 135886 bytes
 p/themes/Pafat/thumbs/original.png       | Bin 0 -> 129220 bytes
 p/themes/Screwdriver/thumbs/original.png | Bin 0 -> 133107 bytes
 p/themes/base-theme/template.css         |  92 +++++++++++++++++++++++++++++++
 7 files changed, 115 insertions(+), 11 deletions(-)
 create mode 100644 p/themes/Dark/thumbs/original.png
 create mode 100644 p/themes/Flat/thumbs/original.png
 create mode 100644 p/themes/Origine/thumbs/original.png
 create mode 100644 p/themes/Pafat/thumbs/original.png
 create mode 100644 p/themes/Screwdriver/thumbs/original.png

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 69205fa93..39582249e 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -21,17 +21,29 @@
 		<div class="form-group">
 			<label class="group-name" for="theme"><?php echo _t('theme'); ?></label>
 			<div class="group-controls">
-				<select name="theme" id="theme" required=""><?php
-					$found = false;
-					foreach ($this->themes as $theme) {
-						?><option value="<?php echo $theme['id']; ?>"<?php if (FreshRSS_Context::$conf->theme === $theme['id']) { echo ' selected="selected"'; $found = true; } ?>><?php
-							echo $theme['name'] . ' — ' . _t('by') . ' ' . $theme['author'];
-						?></option><?php
-					}
-					if (!$found) {
-						?><option selected="selected"></option><?php
-					}
-				?></select>
+				<ul class="slides">
+					<?php $slides = count($this->themes); $i = 1; ?>
+					<?php foreach($this->themes as $theme) { ?>
+						<input type="radio" name="theme" id="img-<?php echo $i ?>" <?php if (FreshRSS_Context::$conf->theme === $theme['id']) {echo "checked";}?> value="<?php echo $theme['id'] ?>"/>
+						<li class="slide-container">
+							<div class="slide">
+								<img src="<?php echo Minz_Url::display('/themes/' . $theme['id'] . '/thumbs/original.png')?>"/>
+							</div>
+							<div class="nav">
+								<?php if ($i !== 1) {?>
+									<label for="img-<?php echo $i - 1 ?>" class="prev">&#x2039;</label>
+								<?php } ?>
+								<?php if ($i !== $slides) {?>
+									<label for="img-<?php echo $i + 1 ?>" class="next">&#x203a;</label>
+								<?php } ?>
+							</div>
+							<div class="properties">
+								<?php echo $theme['name'] . ' — ' . _t('by') . ' ' . $theme['author']?>
+							</div>
+						</li>
+						<?php $i++ ?>
+					<?php } ?>
+				</ul>
 			</div>
 		</div>
 
diff --git a/p/themes/Dark/thumbs/original.png b/p/themes/Dark/thumbs/original.png
new file mode 100644
index 000000000..fd574319f
Binary files /dev/null and b/p/themes/Dark/thumbs/original.png differ
diff --git a/p/themes/Flat/thumbs/original.png b/p/themes/Flat/thumbs/original.png
new file mode 100644
index 000000000..b9cafa9c8
Binary files /dev/null and b/p/themes/Flat/thumbs/original.png differ
diff --git a/p/themes/Origine/thumbs/original.png b/p/themes/Origine/thumbs/original.png
new file mode 100644
index 000000000..d26d4fbed
Binary files /dev/null and b/p/themes/Origine/thumbs/original.png differ
diff --git a/p/themes/Pafat/thumbs/original.png b/p/themes/Pafat/thumbs/original.png
new file mode 100644
index 000000000..fe05f7260
Binary files /dev/null and b/p/themes/Pafat/thumbs/original.png differ
diff --git a/p/themes/Screwdriver/thumbs/original.png b/p/themes/Screwdriver/thumbs/original.png
new file mode 100644
index 000000000..ba9bacf90
Binary files /dev/null and b/p/themes/Screwdriver/thumbs/original.png differ
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index f696ac237..aab511fb9 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -683,6 +683,98 @@ br + br + br {
 	left: 0;
 }
 
+/*=== SLIDESHOW */
+/*==============*/
+.slides {
+	padding: 0;
+	height: 320px;
+	display: block;
+	position: relative;
+	min-width: 260px;
+	max-width: 640px;
+}
+.slides * {
+	user-select: none;
+	-ms-user-select: none;
+	-moz-user-select: none;
+	-khtml-user-select: none;
+	-webkit-user-select: none;
+	-webkit-touch-callout: none;
+}
+.slides input {
+	display: none;
+}
+.slide-container {
+	display: block;
+}
+.slide {
+	top: 0;
+	opacity: 0;
+	width: 100%;
+	height: 100%;
+	display: block;
+	position: absolute;
+	transform: scale(0);
+	transition: all .7s ease-in-out;
+}
+.slide img {
+	width: 100%;
+	height: 100%;
+}
+.nav label {
+	width: 10%;
+	height: 100%;
+	display: none;
+	position: absolute;
+	opacity: 0;
+	z-index: 9;
+	cursor: pointer;
+	transition: opacity .2s;
+	color: #FFF;
+	font-size: 1000%;
+	text-align: center;
+	line-height: 225%;
+	font-family: "Varela Round", sans-serif;
+	background-color: rgba(255, 255, 255, .3);
+	text-shadow: 0px 0px 15px rgb(119, 119, 119);
+	padding: 0;
+}
+.properties {
+	bottom: 15px;
+	display: none;
+	left: 15%;
+	padding: 5px;
+	position: absolute;
+	text-align: center;
+	width: 70%;
+	font-size: 15pt;
+	text-shadow: 0px 0px 15px rgb(119, 119, 119);
+	border-radius: 5px;
+	box-shadow: 5px 5px 10px;
+	border: 1px solid;
+	background-color: #fff;
+}
+.slide:hover + .nav label {
+	opacity: 0.5;
+}
+.slide:hover ~ .properties {
+	display: block;
+}
+.nav label:hover {
+	opacity: 1;
+}
+.nav .next {
+	right: 0;
+}
+input:checked + .slide-container .slide {
+	opacity: 1;
+	transform: scale(1);
+	transition: opacity 1s ease-in-out;
+}
+input:checked + .slide-container .nav label {
+	display: block;
+}
+
 /*=== DIVERS */
 /*===========*/
 .category .title:not([data-unread="0"]):after {
-- 
cgit v1.2.3


From 91388c5b7602af44894e8283c18ca76b5b06ed43 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 16 Nov 2014 08:55:19 -0500
Subject: Theme properties are more visible

---
 app/views/configure/display.phtml |  4 +++-
 p/themes/base-theme/template.css  | 25 +++++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 39582249e..1c925a5ca 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -38,7 +38,9 @@
 								<?php } ?>
 							</div>
 							<div class="properties">
-								<?php echo $theme['name'] . ' — ' . _t('by') . ' ' . $theme['author']?>
+								<div><?php echo sprintf('%s - %s %s', $theme['name'], _t('by'), $theme['author']) ?></div>
+								<div><?php echo $theme['description'] ?></div>
+								<div class="page-number"><?php echo sprintf('%d/%d', $i, $slides) ?></div>
 							</div>
 						</li>
 						<?php $i++ ?>
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index aab511fb9..80f76e80b 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -692,6 +692,7 @@ br + br + br {
 	position: relative;
 	min-width: 260px;
 	max-width: 640px;
+	margin-bottom: 30px;
 }
 .slides * {
 	user-select: none;
@@ -740,26 +741,19 @@ br + br + br {
 	padding: 0;
 }
 .properties {
-	bottom: 15px;
+	bottom: -35px;
+	position: absolute;
+	width: 100%;
 	display: none;
-	left: 15%;
-	padding: 5px;
+}
+.properties .page-number {
+	right: 0;
+	top: 0;
 	position: absolute;
-	text-align: center;
-	width: 70%;
-	font-size: 15pt;
-	text-shadow: 0px 0px 15px rgb(119, 119, 119);
-	border-radius: 5px;
-	box-shadow: 5px 5px 10px;
-	border: 1px solid;
-	background-color: #fff;
 }
 .slide:hover + .nav label {
 	opacity: 0.5;
 }
-.slide:hover ~ .properties {
-	display: block;
-}
 .nav label:hover {
 	opacity: 1;
 }
@@ -774,6 +768,9 @@ input:checked + .slide-container .slide {
 input:checked + .slide-container .nav label {
 	display: block;
 }
+input:checked + .slide-container .properties {
+	display: block;
+}
 
 /*=== DIVERS */
 /*===========*/
-- 
cgit v1.2.3


From c1c0011d04bdef525c85cfd67e34058080d5f5ce Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 12 Dec 2014 12:40:11 +0100
Subject: Quick fix for theme slider

Bluelagoon description was overflowed by its screenshot
---
 p/themes/base-theme/template.css | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 80f76e80b..535a80a22 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -741,10 +741,15 @@ br + br + br {
 	padding: 0;
 }
 .properties {
-	bottom: -35px;
+	display: none;
+	bottom: 0;
 	position: absolute;
 	width: 100%;
-	display: none;
+	padding: 5px;
+	background: rgba(255, 255, 255, 0.7);
+	color: #000;
+	border-top: 1px solid #aaa;
+	z-index: 10;
 }
 .properties .page-number {
 	right: 0;
-- 
cgit v1.2.3


From bf87db31d90ef18871045f1c815443e162e06e46 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 12 Dec 2014 12:43:34 +0100
Subject: Second fix for theme slider

---
 p/themes/base-theme/template.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 535a80a22..280b9b332 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -693,6 +693,7 @@ br + br + br {
 	min-width: 260px;
 	max-width: 640px;
 	margin-bottom: 30px;
+	border: 1px solid #aaa;
 }
 .slides * {
 	user-select: none;
@@ -743,8 +744,8 @@ br + br + br {
 .properties {
 	display: none;
 	bottom: 0;
+	left: 0; right: 0;
 	position: absolute;
-	width: 100%;
 	padding: 5px;
 	background: rgba(255, 255, 255, 0.7);
 	color: #000;
@@ -752,7 +753,7 @@ br + br + br {
 	z-index: 10;
 }
 .properties .page-number {
-	right: 0;
+	right: 5px;
 	top: 0;
 	position: absolute;
 }
-- 
cgit v1.2.3


From 6078888de631ea105410079888838503fd7acb3d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 12 Dec 2014 14:27:50 +0100
Subject: Remove user-select: none in theme selector

See https://github.com/FreshRSS/FreshRSS/issues/571
---
 p/themes/base-theme/template.css | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 280b9b332..25f206106 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -695,14 +695,6 @@ br + br + br {
 	margin-bottom: 30px;
 	border: 1px solid #aaa;
 }
-.slides * {
-	user-select: none;
-	-ms-user-select: none;
-	-moz-user-select: none;
-	-khtml-user-select: none;
-	-webkit-user-select: none;
-	-webkit-touch-callout: none;
-}
 .slides input {
 	display: none;
 }
-- 
cgit v1.2.3


From 9e406394950b6df386918fa5f21ff110d726cd08 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 18 Jan 2015 12:33:55 +0100
Subject: Enlarge the .item.date to contain larger date

I know it's not the best solution, a dynamic width would be the best but there
are some CSS constraints. I don't want to spend my time on this problem ;)

Fix https://github.com/FreshRSS/FreshRSS/issues/756
---
 p/themes/base-theme/template.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 25f206106..c6ea40f66 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -485,7 +485,7 @@ a.btn {
 	text-decoration: none;
 }
 .flux .item.date {
-	width: 145px;
+	width: 155px;
 	text-align: right;
 	overflow: hidden;
 }
-- 
cgit v1.2.3


From b355a45c35b366fe2ad56b461dd28b11956ef6d9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 29 Jan 2015 09:52:43 +0100
Subject: Change behaviour of #add_rss input.extend

UI was frustrating when input had the focus: we needed to click elsewhere to
be able to open the next dropdown.

See https://github.com/FreshRSS/FreshRSS/issues/777
---
 app/views/subscription/index.phtml | 2 +-
 p/themes/base-theme/template.css   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'p/themes/base-theme/template.css')

diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index b9e40988c..331e8244e 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -7,7 +7,7 @@
 
 	<form id="add_rss" method="post" action="<?php echo _url('feed', 'add'); ?>" autocomplete="off">
 		<div class="stick">
-			<input type="url" name="url_rss" class="extend" placeholder="<?php echo _t('sub.feed.add'); ?>" />
+			<input type="url" name="url_rss" class="long" placeholder="<?php echo _t('sub.feed.add'); ?>" />
 			<div class="dropdown">
 				<div id="dropdown-cat" class="dropdown-target"></div>
 
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index c6ea40f66..a299a5ddf 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -75,6 +75,7 @@ input {
 }
 textarea,
 input[type="file"],
+input.long,
 input.extend:focus {
 	width: 300px;
 }
-- 
cgit v1.2.3