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

Merge branch 'master' of github.com:thelia/thelia

Browse Source
This commit is contained in:
Etienne Roudeix
2013-11-08 11:26:22 +01:00
parent 422a80fcce 85ea937570
commit 99ad2d6820
40 changed files with 1168 additions and 1071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/admin/default/I18n/fr_FR.php
View File

@@ -79,7 +79,7 @@ return array (
'Address Line 2' => 'Adresse suite',
'Additional address' => 'Adresse complémentaire',
'Address Line 3' => 'Adresse suite',
'Zip code' => 'Code posta',
'Zip code' => 'Code postal',
'City' => 'Ville',
'Country' => 'Pays',
'Email Address' => 'Adresse e-mail',

12
templates/admin/default/administrators.html
View File

@@ -1,6 +1,6 @@
{extends file="admin-layout.tpl"}
{block name="page-title"}{intl l='Taxes rules'}{/block}
{block name="page-title"}{intl l='Back-office users'}{/block}
{block name="check-resource"}admin.configuration.administrator{/block}
{block name="check-access"}view{/block}
@@ -9,12 +9,12 @@
<div>
<div id="wrapper" class="container">
<div class="clearfix">
<ul class="breadcrumb">
<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
<li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
<li><a href="{url path='/admin/configuration/administrators'}">{intl l="Administrators"}</a></li>
<li><a href="{url path='/admin/configuration/administrators'}">{intl l="Back-office users"}</a></li>
</ul>
</div>
@@ -37,8 +37,8 @@
<thead>
<tr>
<th>{intl l="Login"}</th>
<th>{intl l="FirstName"}</th>
<th>{intl l="LastName"}</th>
<th>{intl l="First Name"}</th>
<th>{intl l="Last Name"}</th>
<th>{intl l="Profile"}</th>
<th class="col-md-1">{intl l="Actions"}</th>
</tr>
@@ -82,7 +82,7 @@
{/loop}
</tbody>
</tbody>
</table>
</div>
</div>

10
templates/admin/default/languages.html
View File

@@ -21,9 +21,9 @@
<div class="row">
<div class="col-md-12">
<div class="general-block-decorator">
<form action="" method="">
<table class="table table-striped table-condensed table-left-aligned">
<caption>
{intl l="Languages management"}
@@ -98,13 +98,13 @@
<div class="form-group {if $error}has-error{/if}" >
<label for="{$label_attr.for}" class="label-control">{intl l="If a translation is missing or incomplete :"}</label>
<div class="input-group">
<select name="{$name}" id="{$label_attr.for}" data-toggle="selectpicker">
<select name="{$name}" id="{$label_attr.for}" data-toggle="selectpicker" class="form-control">
{foreach $choices as $choice}
<option value="{$choice->value}" {if $lang_without_translation == $choice->value}selected="selected"{/if}>{$choice->label}</option>
{/foreach}
</select>
<div class="input-group-btn">
<button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span></button>
<button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span> {intl l='Save'}</button>
</div>
</div>
</div>
@@ -115,7 +115,7 @@
</div>
<div class="col-md-6">
<div class="general-block-decorator clearfix">
<div class="title title-without-tabs">{intl l="Using a domain or subdomain for each language"}</div>
{form name="thelia.lang.url"}
<form action="{url path="/admin/configuration/languages/updateUrl"}" method="post">