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
---
 p/scripts/main.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'p/scripts')

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) {
-- 
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/scripts')

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 fe655e0d9d2fb1173099d77c478bbb2f7ac8b1e1 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 1 Oct 2014 13:58:09 +0200
Subject: Fix close slider when a feed is selected

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/views/subscription/index.phtml | 5 +++--
 p/scripts/main.js                  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'p/scripts')

diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 10578bdd3..577ddd972 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -134,8 +134,9 @@
 	<?php } ?>
 </div>
 
-<a id="close-slider"></a>
-<div id="slider"<?php echo isset($this->feed) ? ' class="active"' : ''; ?>>
+<?php $class = isset($this->feed) ? ' class="active"' : ''; ?>
+<a href="#" id="close-slider"<?php echo $class; ?>></a>
+<div id="slider"<?php echo $class; ?>>
 <?php
 	if (isset($this->feed)) {
 		$this->renderHelper('feed/update');
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 925a93650..005dc961b 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1272,6 +1272,7 @@ function init_slider_observers() {
 	closer.on('click', function() {
 		closer.removeClass('active');
 		slider.removeClass('active');
+		return false;
 	});
 }
 
-- 
cgit v1.2.3