From 3083af6288f23ba6986232798fde67b91517f287 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 9 Mar 2014 21:45:25 -0400
Subject: Enhance feed adding popup

I added a new option in the category select. It allows the user to add dynamically
a new category and add the feed to the newly created category.

See #356
---
 app/layout/aside_feed.phtml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/layout')

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index e324b15bd..6f3cdafb2 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -20,9 +20,14 @@
 							<?php echo $cat->name (); ?>
 						</option>
 						<?php } ?>
+						<option value="nc"><?php echo Minz_Translate::t ('new_category'); ?></option>
 						</select>
 					</li>
 
+					<li class="input" style="display:none">
+						<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo Minz_Translate::t ('new_category'); ?>" />
+					</li>
+
 					<li class="separator"></li>
 
 					<li class="dropdown-header"><?php echo Minz_Translate::t ('http_authentication'); ?></li>
-- 
cgit v1.2.3


From f31747ee7bdaebf02e7e58d51c27102e0c7c9ef1 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Fri, 14 Mar 2014 06:15:52 -0400
Subject: Refresh page after getting new articles.

Change the URL to the refresh link. Before it was redirecting to the home page.
Now it is redirecting to the same page, which make more sense.

See #457
---
 app/Controllers/indexController.php      |  4 +---
 app/layout/nav_menu.phtml                | 20 +++++---------------
 app/views/helpers/view/normal_view.phtml |  2 +-
 3 files changed, 7 insertions(+), 19 deletions(-)

(limited to 'app/layout')

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 73f454715..9da1e5022 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -25,16 +25,14 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			}
 		}
 
-		// construction of RSS url of this feed
 		$params = Minz_Request::params ();
-		$params['output'] = 'rss';
 		if (isset ($params['search'])) {
 			$params['search'] = urlencode ($params['search']);
 		}
 		if (!Minz_Configuration::allowAnonymous()) {
 			$params['token'] = $token;
 		}
-		$this->view->rss_url = array (
+		$this->view->url = array (
 			'c' => 'index',
 			'a' => 'index',
 			'params' => $params
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 097809e08..ffdc95b24 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -99,17 +99,6 @@
 	</div>
 	<?php } ?>
 
-	<?php
-		$params = Minz_Request::params ();
-		if (isset ($params['search'])) {
-			$params['search'] = urlencode ($params['search']);
-		}
-		$url = array (
-			'c' => 'index',
-			'a' => 'index',
-			'params' => $params
-		);
-	?>
 	<div class="dropdown" id="nav_menu_views">
 		<div id="dropdown-views" class="dropdown-target"></div>
 		<a class="dropdown-toggle btn" href="#dropdown-views"><?php echo Minz_Translate::t ('display'); ?> <?php echo FreshRSS_Themes::icon('down'); ?></a>
@@ -117,7 +106,7 @@
 			<li class="dropdown-close"><a href="#close">❌</a></li>
 
 			<?php
-				$url_output = $url;
+				$url_output = $this->url;
 				if ($actual_view !== 'normal') { ?>
 			<li class="item">
 				<?php $url_output['params']['output'] = 'normal'; ?>
@@ -144,7 +133,7 @@
 			<li class="separator"></li>
 
 			<?php
-				$url_state = $url;
+				$url_state = $this->url;
 				$url_state['params']['state'] = 'all';
 			?>
 			<li class="item" role="checkbox" aria-checked="<?php echo ($this->state === 'all') ? 'true' :'false'; ?>">
@@ -181,7 +170,7 @@
 
 			<li class="item">
 				<?php
-					$url_order = $url;
+					$url_order = $this->url;
 					if ($this->order === 'DESC') {
 						$url_order['params']['order'] = 'ASC';
 				?>
@@ -201,7 +190,8 @@
 			<li class="separator"></li>
 
 			<li class="item">
-				<a class="view_rss" target="_blank" href="<?php echo Minz_Url::display ($this->rss_url); ?>">
+				<?php $url_output['params']['output'] = 'rss'; ?>
+				<a class="view_rss" target="_blank" href="<?php echo Minz_Url::display ($url_output); ?>">
 					<?php echo Minz_Translate::t ('rss_view'); ?>
 				</a>
 			</li>
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index 9fd06ebae..b0f90b4c9 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -28,7 +28,7 @@ if (!empty($this->entries)) {
 
 <div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>"><?php
 	?><div id="new-article">
-		<a href="<?php echo _url('index', 'index'); ?>"><?php echo Minz_Translate::t ('new_article'); ?></a>
+		<a href="<?php echo Minz_Url::display ($this->url); ?>"><?php echo Minz_Translate::t ('new_article'); ?></a>
 	</div><?php
 	foreach ($this->entries as $item) {
 		if ($display_today && $item->isDay (FreshRSS_Days::TODAY, $this->today)) {
-- 
cgit v1.2.3


From 19fb901cb417c13be0ac3019d1bb1e7b09d08b37 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Mar 2014 15:08:44 +0100
Subject: Small corrections previous pull requests

https://github.com/marienfressinaud/FreshRSS/issues/457
https://github.com/marienfressinaud/FreshRSS/pull/459

https://github.com/marienfressinaud/FreshRSS/issues/422
https://github.com/marienfressinaud/FreshRSS/pull/461
---
 app/layout/layout.phtml               |  8 ++++++--
 app/views/helpers/view/rss_view.phtml |  2 +-
 p/scripts/main.js                     | 22 +++++++++++-----------
 3 files changed, 18 insertions(+), 14 deletions(-)

(limited to 'app/layout')

diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 1501df3c3..63255b54f 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -18,8 +18,12 @@
 <?php } ?>
 		<link rel="shortcut icon" type="image/x-icon" sizes="16x16 64x64" href="<?php echo Minz_Url::display('/favicon.ico'); ?>" />
 		<link rel="icon msapplication-TileImage apple-touch-icon" type="image/png" sizes="256x256" href="<?php echo Minz_Url::display('/themes/icons/favicon-256.png'); ?>" />
-<?php if (isset ($this->rss_url)) { ?>
-		<link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display ($this->rss_url); ?>" />
+<?php
+	if (isset($this->url)) {
+		$rss_url = $this->url;
+		$rss_url['params']['output'] = 'rss';
+?>
+		<link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display ($rss_url); ?>" />
 <?php } ?>
 		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('starred', true); ?>">
 		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('non-starred', true); ?>">
diff --git a/app/views/helpers/view/rss_view.phtml b/app/views/helpers/view/rss_view.phtml
index 620bf1388..2c6ca610b 100755
--- a/app/views/helpers/view/rss_view.phtml
+++ b/app/views/helpers/view/rss_view.phtml
@@ -6,7 +6,7 @@
 		<description><?php echo Minz_Translate::t ('rss_feeds_of', $this->rss_title); ?></description>
 		<pubDate><?php echo date('D, d M Y H:i:s O'); ?></pubDate>
 		<lastBuildDate><?php echo gmdate('D, d M Y H:i:s'); ?> GMT</lastBuildDate>
-		<atom:link href="<?php echo Minz_Url::display ($this->rss_url, 'html', true); ?>" rel="self" type="application/rss+xml" />
+		<atom:link href="<?php echo Minz_Url::display ($this->url, 'html', true); ?>" rel="self" type="application/rss+xml" />
 <?php
 foreach ($this->entries as $item) {
 ?>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index bee56d1b3..a03be85eb 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -968,12 +968,12 @@ function init_print_action() {
 function init_share_observers() {
 	shares = $('.form-group:not(".form-actions")').length;
 
-	$('.post').on('click', '.share.remove', function(e){
+	$('.post').on('click', '.share.remove', function(e) {
 		e.preventDefault();
 		$(this).parents('.form-group').remove();
 	});
 
-	$('.share.add').on('click',function(e){
+	$('.share.add').on('click', function(e) {
 		e.preventDefault();
 		var opt = $(this).siblings('select').find(':selected');
 		var row = $(this).parents('form').data(opt.data('form'));
@@ -984,10 +984,10 @@ function init_share_observers() {
 		$(this).parents('.form-actions').before(row);
 		shares++;
 	});
-};
+}
 
 function init_feed_observers() {
-	$('select[id="category"]').on('change', function(){
+	$('select[id="category"]').on('change', function() {
 		var detail = $(this).parent('li').next('li');
 		if ($(this).val() === 'nc') {
 			detail.show();
@@ -996,18 +996,18 @@ function init_feed_observers() {
 			detail.hide();
 		}
 	});
-};
+}
 
 function init_password_observers() {
-	$('input[type="password"] + a.btn.toggle-password').on('click', function(e){
+	$('input[type="password"] + a.btn.toggle-password').on('click', function(e) {
 		e.preventDefault();
 		var passwordField = $(this).siblings('input[type="password"]');
-		passwordField.attr('type','text');
-		setTimeout(function(){
-			passwordField.attr('type','password');
-		},2000);
+		passwordField.attr('type', 'text');
+		setTimeout(function() {
+			passwordField.attr('type', 'password');
+		}, 2000);
 	});
-};
+}
 
 function init_all() {
 	if (!(window.$ && window.url_freshrss && ((!full_lazyload) || $.fn.lazyload))) {
-- 
cgit v1.2.3