TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Language menu in the B.O to switch UI language on the fly. (see issue #183)

Browse Source
This commit is contained in:
Franck Allimant
2014-01-26 22:03:11 +01:00
parent 6b78a33f97
commit 3c36a3e1b2
2 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/lib/Thelia/Tools/URL.php
View File

@@ -154,7 +154,8 @@ class URL
$sepChar = strstr($base, '?') === false ? '?' : '&';
if ('' !== $queryString = rtrim($queryString, "&")) $queryString = $sepChar . $queryString;
return $base . $queryString;
return rtrim($base, '&') . $queryString;
}
/**

40
templates/backOffice/default/admin-layout.tpl
View File

@@ -67,16 +67,36 @@
<div class="version-info pull-left">{intl l='Version %ver' ver="{$THELIA_VERSION}"}</div>
<div class="clearfix pull-right hidden-xs">
<div class="btn-group pull-right">
<a href="{navigate to="index"}" title="{intl l='View site'}" target="_blank" class="btn btn-default"><span class="glyphicon glyphicon-eye-open"></span> {intl l="View shop"}</a>
<button class="btn btn-default btn-primary"><span class="glyphicon glyphicon-user"></span> {admin attr="firstname"} {admin attr="lastname"}</button>
<button class="btn btn-default btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a class="profile" href="{url path='admin/configuration/administrators'}"><span class="glyphicon glyphicon-edit"></span> {intl l="Profil"}</a></li>
<li><a class="logout" href="{url path='admin/logout'}" title="{intl l='Close administation session'}"><span class="glyphicon glyphicon-off"></span> {intl l="Logout"}</a></li>
</ul>
<div class="button-toolbar pull-righ" role="toolbar">
<div class="btn-group">
<a href="{navigate to="index"}" title="{intl l='View site'}" target="_blank" class="btn btn-default"><span class="glyphicon glyphicon-eye-open"></span> {intl l="View shop"}</a>
<button class="btn btn-default btn-primary"><span class="glyphicon glyphicon-user"></span> {admin attr="firstname"} {admin attr="lastname"}</button>
<button class="btn btn-default btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a class="profile" href="{url path='admin/configuration/administrators'}"><span class="glyphicon glyphicon-edit"></span> {intl l="Profil"}</a></li>
<li><a class="logout" href="{url path='admin/logout'}" title="{intl l='Close administation session'}"><span class="glyphicon glyphicon-off"></span> {intl l="Logout"}</a></li>
</ul>
</div>
<div class="btn-group">
{loop type="lang" name="ui-lang" id="{lang attr='id'}"}
<button class="btn btn-default">
<img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="$TITLE" /> {$CODE|ucfirst}</a>
</button>
{/loop}
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{loop type="lang" name="ui-lang"}
<li><a href="{url path="{navigate to="current"}" lang={$CODE}}"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="$TITLE" /> {$CODE|ucfirst}</a></li>
{/loop}
</ul>
</div>
</div>
</div>