From 4855c85006192ba52a65e1a03fadd069f07a0667 Mon Sep 17 00:00:00 2001
From: botanic <Botanic@localhost>
Date: Wed, 3 Sep 2014 04:03:01 -0700
Subject: [PATCH] fixed language when logged in

---
 code/web/public_php/ams/css/custom.css        | 20 +++++++++++++++++++
 .../public_php/ams/templates/dashboard.tpl    |  8 ++++----
 code/web/public_php/ams/templates/layout.tpl  | 11 ++++------
 code/web/public_php/ams/templates/login.tpl   |  2 +-
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/code/web/public_php/ams/css/custom.css b/code/web/public_php/ams/css/custom.css
index 11234d182..ba7a0f596 100644
--- a/code/web/public_php/ams/css/custom.css
+++ b/code/web/public_php/ams/css/custom.css
@@ -8,6 +8,7 @@
 	
 .top-block {
     background-color: white;
+	border-radius: 5px;
 }	
 	
 .row-fluid [class*="span"] {
@@ -102,4 +103,23 @@ margin-top: 10px;
 .gender-list {
 	margin-left: 22px;
 	margin-bottom: -20px;
+}
+
+.lg-icon {
+    font-size: 20px;
+	margin: 5px;
+}
+
+.sidebar-nav {
+    padding-top: 5px;
+}
+
+.sidebar-nav .nav-header{
+	color:#666;
+}
+
+.flags_logged_in{
+  display: inline;
+  position:absolute;
+  margin:7px;
 }
\ No newline at end of file
diff --git a/code/web/public_php/ams/templates/dashboard.tpl b/code/web/public_php/ams/templates/dashboard.tpl
index 84ca701a3..e67391f82 100644
--- a/code/web/public_php/ams/templates/dashboard.tpl
+++ b/code/web/public_php/ams/templates/dashboard.tpl
@@ -4,25 +4,25 @@
 	<div class="sortable row-fluid ui-sortable">
 		<a data-original-title="{$nrAssignedWaiting} Assigned to you and waiting for support!" data-rel="tooltip" class="well span3 top-block"
 		   href="index.php?page=show_queue&get=create&userid={$user_id}&groupid=1&what=waiting_for_support&how=assigned&who=user">
-			<span class="icon32 icon-blue icon-alert"></span>
+			<span class="glyphicon glyphicon-exclamation-sign lg-icon red"></span>
 			<div>Tickets Waiting for Direct Action</div>
 			<span class="notification red">{$nrAssignedWaiting}</span>
 		</a>
 
 		<a data-original-title="{$nrToDo} Tickets Todo." data-rel="tooltip" class="well span3 top-block" href="index.php?page=show_queue&get=todo">
-			<span class="icon32 icon-blue icon-tag"></span>
+			<span class="glyphicon glyphicon-edit lg-icon yellow"></span>
 			<div>Tickets Todo</div>
 			<span class="notification red">{$nrToDo}</span>
 		</a>
 
 		<a data-original-title="By {$newestTicketAuthor}" data-rel="tooltip" class="well span3 top-block" href="index.php?page=show_ticket&id={$newestTicketId}">
-			<span class="icon32 icon-blue icon-flag"></span>
+			<span class="glyphicon glyphicon-flag lg-icon green"></span>
 			<div>Newest Ticket</div>
 			<span class="notification blue">{$newestTicketTitle}</span>
 		</a>
 
 		<a data-original-title="{$nrTotalTickets} tickets in total" data-rel="tooltip" class="well span3 top-block" href="index.php?page=show_queue&get=all">
-			<span class="icon32 icon-blue icon-archive"></span>
+			<span class="glyphicon glyphicon-briefcase lg-icon blue"></span>
 			<div>Total amount of Tickets</div>
 			<span class="notification blue">{$nrTotalTickets}</span>
 		</a>
diff --git a/code/web/public_php/ams/templates/layout.tpl b/code/web/public_php/ams/templates/layout.tpl
index 030e4ed58..767d581ba 100644
--- a/code/web/public_php/ams/templates/layout.tpl
+++ b/code/web/public_php/ams/templates/layout.tpl
@@ -60,6 +60,10 @@
 					<span class="icon-bar"></span>
 				</a>
 				<a class="brand" href="index.php"> <img alt="Ryzom Core Logo" src="img/ryzomcore_166_62.png"></a>
+				<div class="flags_logged_in">
+				      <img onclick="reloadPageWithLanguage('en');" src="img/en.png">
+				      <img onclick="reloadPageWithLanguage('fr');" src="img/fr.png">
+				</div>
 
 				<!-- theme selector starts -->
 				<!--<div class="btn-group pull-right theme-container">
@@ -93,12 +97,6 @@
 					</ul>
 				</div>
 				{/if}
-				<div class="btn-group pull-right">
-				    <div class="flags">
-				      <img src="img/en.png" onclick="reloadPageWithLanguage('en');"/>
-				      <img src="img/fr.png" onclick="reloadPageWithLanguage('fr');"/>
-				    </div>
-				</div>
 				<!-- user dropdown ends -->
 			</div>
 		</div>
@@ -113,7 +111,6 @@
 					<ul class="nav nav-tabs nav-stacked main-menu">
 						{block name=menu}{/block}
 					</ul>
-					<label id="for-is-ajax" class="hidden-tablet" for="is-ajax"><input id="is-ajax" type="checkbox"> Ajax on menu</label>
 					<!--<label id="for-is-ajax" class="hidden-tablet" for="is-ajax" style="visibility:hidden;"><div id="uniform-is-ajax" class="checker"><span class="checked"><input style="opacity: 0;" id="is-ajax" type="checkbox"></span></div> Ajax on menu</label>--!>
 				</div><!--/.well -->
 			</div><!--/span-->
diff --git a/code/web/public_php/ams/templates/login.tpl b/code/web/public_php/ams/templates/login.tpl
index 54a87bbcb..b10701582 100644
--- a/code/web/public_php/ams/templates/login.tpl
+++ b/code/web/public_php/ams/templates/login.tpl
@@ -25,7 +25,7 @@
 				<div class="clearfix"></div>
 
 				<div class="input-prepend">
-				<label for="remember" class="remember"><div class="checker" id="uniform-remember"><span><input type="checkbox" id="remember" style="opacity: 0;"></span></div>Remember me</label>
+				<label for="remember" class="remember "><div class="checkbox" id="uniform-remember"><span><input type="checkbox" id="remember" ></span></div>Remember me</label>
 				</div>
 				<div class="clearfix"></div>