From 627700648ba3f144afa9294afe1f9c51b0018ad7 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 13 Apr 2013 13:15:55 +0200
Subject: Déplacement du bouton pour voir les flux RSS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/layout/aside_flux.phtml | 24 +++++++++++++++++++++++-
 app/layout/nav_menu.phtml   | 19 -------------------
 public/theme/freshrss.css   |  2 +-
 public/theme/global.css     |  3 +++
 public/theme/icons/rss.svg  |  4 ++--
 5 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index 198103428..b12edfbc7 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -2,8 +2,30 @@
 	<a class="toggle_aside" href="#close"><i class="icon i_close"></i></a>
 
 	<ul class="categories">
+		<?php
+			$get = Request::param ('get', '');
+			$search = Request::param ('search', '');
+			$url = array (
+				'c' => 'index',
+				'a' => 'index',
+				'params' => array (
+					'output' => 'rss'
+				)
+			);
+			if ($get != '') {
+				$url['params']['get'] = $get;
+			}
+			if ($search != '') {
+				$url['params']['search'] = $search;
+			}
+		?>
 		<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
-		<li><a class="btn btn-important" href="<?php echo _url ('configure', 'feed'); ?>">Gestion des abonnements</a></li>
+		<li>
+			<div class="stick">
+				<a class="btn btn-important" href="<?php echo _url ('configure', 'feed'); ?>">Gestion des abonnements</a>
+				<a class="btn btn-important" href="<?php echo Url::display ($url); ?>"><i class="icon i_rss"></i></a>
+			</div>
+		</li>
 		<?php } ?>
 
 		<li>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 71a5bd11e..90fe4aea1 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -62,23 +62,4 @@
 			</li>
 		</ul>
 	</div>
-
-	<?php
-		$get = Request::param ('get', '');
-		$search = Request::param ('search', '');
-		$url = array (
-			'c' => 'index',
-			'a' => 'index',
-			'params' => array (
-				'output' => 'rss'
-			)
-		);
-		if ($get != '') {
-			$url['params']['get'] = $get;
-		}
-		if ($search != '') {
-			$url['params']['search'] = $search;
-		}
-	?>
-	<a class="btn" href="<?php echo Url::display ($url); ?>"><i class="icon i_rss"></i></a>
 </div>
diff --git a/public/theme/freshrss.css b/public/theme/freshrss.css
index e60310354..6db467a76 100644
--- a/public/theme/freshrss.css
+++ b/public/theme/freshrss.css
@@ -150,7 +150,7 @@
 	}
 
 .day {
-	height: 50px;
+	min-height: 50px;
 	padding: 0 10px;
 	font-size: 130%;
 	font-weight: bold;
diff --git a/public/theme/global.css b/public/theme/global.css
index e44cda059..e4c503dfc 100644
--- a/public/theme/global.css
+++ b/public/theme/global.css
@@ -143,6 +143,9 @@ input, select, textarea {
 	.stick input:first-child {
 		border-radius: 3px 0 0 3px;
 	}
+		.stick .btn.btn-important:first-child {
+			border-right: 1px solid #06f;
+		}
 	.stick .btn:last-child,
 	.stick input:last-child {
 		border-radius: 0 3px 3px 0;
diff --git a/public/theme/icons/rss.svg b/public/theme/icons/rss.svg
index fe588c2cf..ceaddceee 100644
--- a/public/theme/icons/rss.svg
+++ b/public/theme/icons/rss.svg
@@ -22,8 +22,8 @@
   <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' transform='translate(-561,-301.00012)'/>
   <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-561,-301.00012)'>
     
-    <path sodipodi:cx='323.0625' sodipodi:cy='97.1875' d='m 325.0625,97.1875 a 2,3.236068 0 1 1 -4,0 2,3.236068 0 1 1 4,0 z' id='path4983' sodipodi:rx='2' sodipodi:ry='3.236068' style='color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.69602728;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' transform='matrix(1.0000007,0,0,0.61803426,241.93747,252.93479)' sodipodi:type='arc'/>
-    <path inkscape:connector-curvature='0' d='m 563.0002,303 0,1 c 0,0.55016 0.45347,1 1,1 4.97056,0 9,4.02944 9,9 0,0.55016 0.45347,1 1,1 l 1,0 0,-1 c 0,-6.07513 -4.92487,-11 -11,-11 l -1,0 z m 0,4 0,1 c 0,0.55016 0.45347,1 1,1 2.76143,0 5,2.23857 5,5 0,0.55016 0.45347,1 1,1 l 1,0 0,-1 c 0,-3.866 -3.134,-7 -7,-7 l -1,0 z' id='path5814' style='color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.33333492;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new'/>
+    <path sodipodi:cx='323.0625' sodipodi:cy='97.1875' d='m 325.0625,97.1875 a 2,3.236068 0 1 1 -4,0 2,3.236068 0 1 1 4,0 z' id='path4983' sodipodi:rx='2' sodipodi:ry='3.236068' style='color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.69602728;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' transform='matrix(1.0000007,0,0,0.61803426,241.93747,252.93479)' sodipodi:type='arc'/>
+    <path inkscape:connector-curvature='0' d='m 563.0002,303 0,1 c 0,0.55016 0.45347,1 1,1 4.97056,0 9,4.02944 9,9 0,0.55016 0.45347,1 1,1 l 1,0 0,-1 c 0,-6.07513 -4.92487,-11 -11,-11 l -1,0 z m 0,4 0,1 c 0,0.55016 0.45347,1 1,1 2.76143,0 5,2.23857 5,5 0,0.55016 0.45347,1 1,1 l 1,0 0,-1 c 0,-3.866 -3.134,-7 -7,-7 l -1,0 z' id='path5814' style='color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.33333492;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new'/>
   </g>
   <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-561,-301.00012)'/>
   <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-561,-301.00012)'/>
-- 
cgit v1.2.3