fixed language when logged in

This commit is contained in:
botanic 2014-09-03 04:03:01 -07:00
parent ef2477fa23
commit fb18ee6f54
4 changed files with 29 additions and 12 deletions

View file

@ -8,6 +8,7 @@
.top-block { .top-block {
background-color: white; background-color: white;
border-radius: 5px;
} }
.row-fluid [class*="span"] { .row-fluid [class*="span"] {
@ -103,3 +104,22 @@ margin-top: 10px;
margin-left: 22px; margin-left: 22px;
margin-bottom: -20px; 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;
}

View file

@ -4,25 +4,25 @@
<div class="sortable row-fluid ui-sortable"> <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" <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"> 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> <div>Tickets Waiting for Direct Action</div>
<span class="notification red">{$nrAssignedWaiting}</span> <span class="notification red">{$nrAssignedWaiting}</span>
</a> </a>
<a data-original-title="{$nrToDo} Tickets Todo." data-rel="tooltip" class="well span3 top-block" href="index.php?page=show_queue&get=todo"> <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> <div>Tickets Todo</div>
<span class="notification red">{$nrToDo}</span> <span class="notification red">{$nrToDo}</span>
</a> </a>
<a data-original-title="By {$newestTicketAuthor}" data-rel="tooltip" class="well span3 top-block" href="index.php?page=show_ticket&id={$newestTicketId}"> <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> <div>Newest Ticket</div>
<span class="notification blue">{$newestTicketTitle}</span> <span class="notification blue">{$newestTicketTitle}</span>
</a> </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"> <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> <div>Total amount of Tickets</div>
<span class="notification blue">{$nrTotalTickets}</span> <span class="notification blue">{$nrTotalTickets}</span>
</a> </a>

View file

@ -60,6 +60,10 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="index.php"> <img alt="Ryzom Core Logo" src="img/ryzomcore_166_62.png"></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 --> <!-- theme selector starts -->
<!--<div class="btn-group pull-right theme-container"> <!--<div class="btn-group pull-right theme-container">
@ -93,12 +97,6 @@
</ul> </ul>
</div> </div>
{/if} {/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 --> <!-- user dropdown ends -->
</div> </div>
</div> </div>
@ -113,7 +111,6 @@
<ul class="nav nav-tabs nav-stacked main-menu"> <ul class="nav nav-tabs nav-stacked main-menu">
{block name=menu}{/block} {block name=menu}{/block}
</ul> </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>--!> <!--<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><!--/.well -->
</div><!--/span--> </div><!--/span-->

View file

@ -25,7 +25,7 @@
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="input-prepend"> <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>
<div class="clearfix"></div> <div class="clearfix"></div>