From 31a6a13268023a2db5eba2445ee6c7db4a6d9623 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 22 Aug 2013 11:30:13 +0200
Subject: Fix issue #134 : modif barre connexion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

La barre contenant le lien connexion/déconnexion est supprimée (sauf en
vue mobile)
Le lien connexion se trouve à la place de la roue des paramètres
Le lien déconnexion se trouve dans la liste des actions en cliquant sur
la roue des paramètres
---
 app/layout/header.phtml                    |  12 +++++++++++-
 public/themes/default/freshrss.css         |   8 ++++++++
 public/themes/flat-design/freshrss.css     |   8 ++++++++
 public/themes/flat-design/icons/login.png  | Bin 213 -> 333 bytes
 public/themes/flat-design/icons/login.svg  |   6 +++---
 public/themes/flat-design/icons/logout.png | Bin 220 -> 339 bytes
 public/themes/flat-design/icons/logout.svg |   6 +++---
 7 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index eefa6af30..d8ab81959 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -1,5 +1,5 @@
 <?php if (login_is_conf ($this->conf)) { ?>
-<ul class="nav nav-head">
+<ul class="nav nav-head nav-login">
 	<?php if (!is_logged ()) { ?>
 	<li class="item"><i class="icon i_login"></i> <a class="signin" href="#"><?php echo Translate::t ('login'); ?></a></li>
 	<?php } else { ?>
@@ -59,8 +59,18 @@
 				<li class="separator"></li>
 				<li class="item"><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Translate::t ('about'); ?></a></li>
 				<li class="item"><a href="<?php echo _url ('index', 'logs'); ?>"><?php echo Translate::t ('logs'); ?></a></li>
+				<?php if (login_is_conf ($this->conf) && is_logged ()) { ?>
+				<li class="separator"></li>
+				<li class="item"><a class="signout" href="#"><i class="icon i_logout"></i> <?php echo Translate::t ('logout'); ?></a></li>
+				<?php } ?>
 			</ul>
 		</div>
 	</div>
+	<?php }
+
+	if (login_is_conf ($this->conf) && !is_logged ()) { ?>
+	<div class="item configure">
+		<i class="icon i_login"></i> <a class="signin" href="#"><?php echo Translate::t ('login'); ?></a>
+	</div>
 	<?php } ?>
 </div>
diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css
index 89212ab1e..3f0b3c23c 100644
--- a/public/themes/default/freshrss.css
+++ b/public/themes/default/freshrss.css
@@ -70,6 +70,10 @@
 			right: -20px;
 		}
 
+	.nav-login {
+		display: none;
+	}
+
 	.nav_menu {
 		width: 100%;
 		background: #fafafa;
@@ -588,6 +592,10 @@
 			padding: 12px;
 		}
 
+	.nav-login {
+		display: block;
+	}
+
 	.content {
 		font-size: 120%;
 	}
diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css
index a9fd22230..653de0420 100644
--- a/public/themes/flat-design/freshrss.css
+++ b/public/themes/flat-design/freshrss.css
@@ -69,6 +69,10 @@ body {
 			right: -20px;
 		}
 
+	.nav-login {
+		display: none;
+	}
+
 	.nav_menu {
 		width: 100%;
 		text-align: center;
@@ -597,6 +601,10 @@ body {
 			padding: 12px;
 		}
 
+	.nav-login {
+		display: block;
+	}
+
 	.content {
 		font-size: 120%;
 	}
diff --git a/public/themes/flat-design/icons/login.png b/public/themes/flat-design/icons/login.png
index 9d436b8d0..cebe0cf7d 100644
Binary files a/public/themes/flat-design/icons/login.png and b/public/themes/flat-design/icons/login.png differ
diff --git a/public/themes/flat-design/icons/login.svg b/public/themes/flat-design/icons/login.svg
index 0ac148a06..0a8af162f 100644
--- a/public/themes/flat-design/icons/login.svg
+++ b/public/themes/flat-design/icons/login.svg
@@ -17,11 +17,11 @@
   <title id='title9167'>Gnome Symbolic Icon Theme</title>
   <defs id='defs7386'/>
   <g inkscape:label='status' transform='translate(-181.0002,-237)' inkscape:groupmode='layer' id='layer9' style='display:inline'>
-    <g inkscape:label='lock' transform='translate(161.0002,-39)' id='g4053' style='fill:#FFFFFF;fill-opacity:1'>
+    <g inkscape:label='lock' transform='translate(161.0002,-39)' id='g4053' style='fill:#bebebe;fill-opacity:1'>
       
     </g>
-    <path inkscape:connector-curvature='0' d='m 184,244 c -0.554,0 -1,0.446 -1,1 l 0,0.53125 0,5.46875 12,0 0,-5.46875 L 195,245 c 0,-0.554 -0.446,-1 -1,-1 l -10,0 z' id='rect4063' sodipodi:nodetypes='csccccscc' style='color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible'/>
-    <path inkscape:connector-curvature='0' d='m 188,238 c -1.6447,0 -3,1.3553 -3,3 l 0,7 c 0,1.6447 1.3553,3 3,3 l 2,0 c 1.6447,0 3,-1.3553 3,-3 l 0,-7 c 0,-1.6447 -1.3553,-3 -3,-3 l -2,0 z m 0,2 2,0 c 0.5713,0 1,0.4287 1,1 l 0,7 c 0,0.5713 -0.4287,1 -1,1 l -2,0 c -0.5713,0 -1,-0.4287 -1,-1 l 0,-7 c 0,-0.5713 0.4287,-1 1,-1 z' id='rect4291' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans'/>
+    <path inkscape:connector-curvature='0' d='m 184,244 c -0.554,0 -1,0.446 -1,1 l 0,0.53125 0,5.46875 12,0 0,-5.46875 L 195,245 c 0,-0.554 -0.446,-1 -1,-1 l -10,0 z' id='rect4063' sodipodi:nodetypes='csccccscc' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible'/>
+    <path inkscape:connector-curvature='0' d='m 188,238 c -1.6447,0 -3,1.3553 -3,3 l 0,7 c 0,1.6447 1.3553,3 3,3 l 2,0 c 1.6447,0 3,-1.3553 3,-3 l 0,-7 c 0,-1.6447 -1.3553,-3 -3,-3 l -2,0 z m 0,2 2,0 c 0.5713,0 1,0.4287 1,1 l 0,7 c 0,0.5713 -0.4287,1 -1,1 l -2,0 c -0.5713,0 -1,-0.4287 -1,-1 l 0,-7 c 0,-0.5713 0.4287,-1 1,-1 z' id='rect4291' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans'/>
   </g>
   <g inkscape:label='devices' transform='translate(-181.0002,-237)' inkscape:groupmode='layer' id='layer10'/>
   <g inkscape:label='apps' transform='translate(-181.0002,-237)' inkscape:groupmode='layer' id='layer11'/>
diff --git a/public/themes/flat-design/icons/logout.png b/public/themes/flat-design/icons/logout.png
index 84917499d..49255fccd 100644
Binary files a/public/themes/flat-design/icons/logout.png and b/public/themes/flat-design/icons/logout.png differ
diff --git a/public/themes/flat-design/icons/logout.svg b/public/themes/flat-design/icons/logout.svg
index c573700bf..284a67578 100644
--- a/public/themes/flat-design/icons/logout.svg
+++ b/public/themes/flat-design/icons/logout.svg
@@ -17,11 +17,11 @@
   <title id='title9167'>Gnome Symbolic Icon Theme</title>
   <defs id='defs7386'/>
   <g inkscape:label='status' transform='translate(-201.0002,-237)' inkscape:groupmode='layer' id='layer9' style='display:inline'>
-    <g inkscape:label='lock' transform='translate(181.0002,-39)' id='g4053-3' style='fill:#FFFFFF;fill-opacity:1'>
+    <g inkscape:label='lock' transform='translate(181.0002,-39)' id='g4053-3' style='fill:#bebebe;fill-opacity:1'>
       
     </g>
-    <path inkscape:connector-curvature='0' d='m 204,246 c -0.554,0 -1,0.446 -1,1 l 0,0.53125 0,5.46875 12,0 0,-5.46875 L 215,247 c 0,-0.554 -0.446,-1 -1,-1 l -10,0 z' id='rect4063-6' sodipodi:nodetypes='csccccscc' style='color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible'/>
-    <path inkscape:connector-curvature='0' d='m 208.0002,237 c -1.64469,0 -3,1.35529 -3,3 l 0,3 2,0 0,-3 c 0,-0.57129 0.42873,-1 1,-1 l 2,0 c 0.57127,0 1,0.42871 1,1 l 0,7 2,0 0,-7 c 0,-1.64471 -1.35531,-3 -3,-3 l -2,0 z' id='rect4291-4' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans'/>
+    <path inkscape:connector-curvature='0' d='m 204,246 c -0.554,0 -1,0.446 -1,1 l 0,0.53125 0,5.46875 12,0 0,-5.46875 L 215,247 c 0,-0.554 -0.446,-1 -1,-1 l -10,0 z' id='rect4063-6' sodipodi:nodetypes='csccccscc' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible'/>
+    <path inkscape:connector-curvature='0' d='m 208.0002,237 c -1.64469,0 -3,1.35529 -3,3 l 0,3 2,0 0,-3 c 0,-0.57129 0.42873,-1 1,-1 l 2,0 c 0.57127,0 1,0.42871 1,1 l 0,7 2,0 0,-7 c 0,-1.64471 -1.35531,-3 -3,-3 l -2,0 z' id='rect4291-4' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans'/>
   </g>
   <g inkscape:label='devices' transform='translate(-201.0002,-237)' inkscape:groupmode='layer' id='layer10'/>
   <g inkscape:label='apps' transform='translate(-201.0002,-237)' inkscape:groupmode='layer' id='layer11'/>
-- 
cgit v1.2.3