Merge pull request #345 from roadster31/various-fixes

Various fixes
This commit is contained in:
Manuel Raynaud
2014-04-28 21:56:01 +02:00
20 changed files with 466 additions and 269 deletions

View File

@@ -51,6 +51,7 @@ return array(
'Administration profiles' => 'Profils d\'administration',
'Administrators' => 'Administrateurs',
'Advanced configuration' => 'Configuration avancée',
'Advanced configuration and tools' => 'Outils et configuration avancés',
'Afficher ce profil' => 'Afficher ce profil',
'All countries are assigned to a shipping zone.' => 'Tous les pays sont assignés à une zone de livraison.',
'All orders' => 'Toutes les commandes',
@@ -82,7 +83,6 @@ return array(
'Browse files' => 'Parcourir les fichiers',
'Browse this category' => 'Parcourir cette catégorie',
'Browse this folder' => 'Parcourir ce dossier',
'Cache' => 'Cache',
'Can\'t be cumulative' => 'Ne peut pas se cumuler',
'Can\'t load documents, please refresh this page.' => 'Impossible de charger les documents. Rechargez la page',
'Can\'t load images, please refresh this page.' => 'Impossible de charger l\'image. Rechargez la page',
@@ -477,7 +477,8 @@ return array(
'FirstName' => 'Prénom',
'Firstname' => 'Prénom',
'Flush the Thelia internal cache' => 'Vider le cache interne de Thelia',
'Flush the cache now' => 'Vider le cache maintenant',
'Flush the assets cache directory' => 'Vider le cache des assets web',
'Flush the images and documents cache' => 'Vider le caches des images et documents',
'Folder created on %date_create. Last modification: %date_change' => 'Dossier créé le %date_create. Dernière modification le %date_change',
'Folder title' => 'Titre du dossier',
'Folders' => 'Dossiers',
@@ -833,6 +834,7 @@ return array(
'Thelia Shipping configuration' => 'Configuration des livraisons Thelia',
'Thelia Shipping zones' => 'Zone de livraison de Thelia',
'Thelia System Variables' => 'Variables Thelia',
'Thelia caches flushing' => 'Vidage des caches Thelia',
'Thelia configuration' => 'Configuration thelia',
'Thelia contributions' => 'Contributions de Thelia',
'Thelia core' => 'Coeur de Thelia',
@@ -866,6 +868,7 @@ return array(
'This is the message purpose, such as \'Order confirmation\'.' => 'Titre du message (ex : confirmation de commande)',
'This is the subject of the e-mail, such as \'Your order is confirmed\'.' => 'Sujet du message (ex : votre commande est validée)',
'This mailing template could not be changed.' => 'Le template de mailing ne peut pas être changé',
'This module cannot be started, some files are probably missing.' => 'Ce module ne peut pas être démarré, il manque sans doute des fichiers.',
'This month' => 'Ce mois',
'This product contains no accessories' => 'Ce produit n\'a aucun accessoire',
'This product contains no contents' => 'Ce produit n\'a aucun contenu associé',

View File

@@ -1,6 +1,6 @@
{extends file="admin-layout.tpl"}
{block name="page-title"}{intl l='Cache'}{/block}
{block name="page-title"}{intl l='Advanced configuration'}{/block}
{block name="check-resource"}admin.cache{/block}
{block name="check-access"}view{/block}
@@ -13,31 +13,56 @@
<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>{intl l="Advanced configuration"}</li>
<li>{intl l="Advanced configuration and tools"}</li>
</ul>
<div class="row">
<div class="col-md-12 general-block-decorator">
<div class="row">
<div class="col-md-12 general-block-decorator">
<div class="row vertical-row-space">
<div class="col-md-12 title title-without-tabs">
{intl l='Advanced configuration'}
{intl l='Thelia caches flushing'}
</div>
</div>
<div class="row">
<div class="col-md-4">
{form name="thelia.cache.flush"}
<form method="post" action="{url path="/admin/configuration/advanced/flush-cache"}">
{form_hidden_fields form=$form}
<div class="form-group">
<button type="submit" class="btn btn-warning btn-sm btn-block">{intl l="Flush the Thelia internal cache"}</button>
</div>
</form>
{/form}
</div>
<div class="form-container">
<div class="col-md-6">
<div class="col-md-4">
{form name="thelia.cache.flush"}
<form method="post" action="{url path="/admin/configuration/advanced/flush-cache"}">
{form_hidden_fields form=$form}
{form name="thelia.assets.flush"}
<form method="post" action="{url path="/admin/configuration/advanced/flush-assets"}">
{form_hidden_fields form=$form}
<div class="form-group">
<label class="control-label">{intl l="Flush the Thelia internal cache"} : </label>
<button type="submit" class="btn btn-warning btn-sm">{intl l="Flush the cache now"}</button>
</div>
</form>
{/form}
</div>
<div class="form-group">
<button type="submit" class="btn btn-warning btn-sm btn-block">{intl l="Flush the assets cache directory"}</button>
</div>
</form>
{/form}
</div>
<div class="col-md-4">
{form name="thelia.images-and-documents-cache.flush"}
<form method="post" action="{url path="/admin/configuration/advanced/flush-images-and-documents"}">
{form_hidden_fields form=$form}
<div class="form-group">
<button type="submit" class="btn btn-warning btn-sm btn-block">{intl l="Flush the images and documents cache"}</button>
</div>
</form>
{/form}
</div>
</div>
</div>

File diff suppressed because one or more lines are too long

View File

@@ -452,4 +452,9 @@ ul.document-list {
left: 0; top: 0;
width: 100%;height: 100%;
z-index: 100;
}
// A vertical spacer between rows
.vertical-row-space {
margin-bottom: 1em;
}

View File

@@ -65,7 +65,7 @@
{form_field form=$form field='file'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{$label} : </label>
<input type="file" id="{$label_attr.for}" name="{$name}" class="form-control" value="" title="{$label}" placeholder="{intl l='File'}">
<input type="file" id="{$label_attr.for}" name="{$name}" value="" title="{$label}" placeholder="{intl l='File'}">
</div>
{/form_field}

View File

@@ -68,7 +68,7 @@
{form_field form=$form field='file'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{$label} : </label>
<input type="file" id="{$label_attr.for}" name="{$name}" class="form-control" value="" title="{$label}" placeholder="{intl l='File'}">
<input type="file" id="{$label_attr.for}" name="{$name}" value="" title="{$label}" placeholder="{intl l='File'}">
</div>
{/form_field}

View File

@@ -79,55 +79,64 @@
<tbody>
{loop type="module" name="module.{$module_type}" module_type={$module_type|default:1} order=$module_order backend_context=1}
<tr>
<tr {if ! $EXISTS}class="warning"{/if}>
<td>{$ID}</td>
<td>{$TITLE}</td>
<td>{$CODE}</td>
<td>{$CHAPO}</td>
<td class="text-center">
<div class="make-switch switch-small module-activation" data-id="{$ID}" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
<input type="checkbox" {if $ACTIVE}checked{/if}>
</div>
<noscript>
{if $ACTIVE}
<a title="{intl l="Deactivate %title module" title={$TITLE}}" href="{url path="/admin/module/toggle-activation/{$ID}"}">{intl l="deactivation"}</a>
{else}
<a title="{intl l="activate %title module" title={$TITLE}}" href="{url path="/admin/module/toggle-activation/{$ID}"}">{intl l="activation"}</a>
{/if}
</noscript>
</td>
{if $EXISTS}
<td class="text-center">
<div class="make-switch switch-small module-activation" data-id="{$ID}" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
<input type="checkbox" {if $ACTIVE}checked{/if}>
</div>
<noscript>
{if $ACTIVE}
<a title="{intl l="Deactivate %title module" title={$TITLE}}" href="{url path="/admin/module/toggle-activation/{$ID}"}">{intl l="deactivation"}</a>
{else}
<a title="{intl l="activate %title module" title={$TITLE}}" href="{url path="/admin/module/toggle-activation/{$ID}"}">{intl l="activation"}</a>
{/if}
</noscript>
</td>
<td class="text-center">
{admin_position_block
resource="admin.modules"
access="UPDATE"
path={url path="admin/module/update-position"}
url_parameter="module_id"
in_place_edit_class="modulePositionChange"
position=$POSITION
id=$ID
}
</td>
<td class="text-center">
{admin_position_block
resource="admin.modules"
access="UPDATE"
path={url path="admin/module/update-position"}
url_parameter="module_id"
in_place_edit_class="modulePositionChange"
position=$POSITION
id=$ID
}
</td>
{else}
<td colspan="2" class="text-left">
<span class="label label-warning">Warning</span>
{intl l="This module cannot be started, some files are probably missing."}
</td>
{/if}
{module_include location='modules_table_row'}
<td class="text-right">
<div class="btn-group">
{if $CONFIGURABLE == 1}
{loop type="auth" name="can_change" role="ADMIN" module=$CODE access="VIEW"}
<a class="{if ! $ACTIVE}disabled {/if} btn btn-primary btn-xs" id="config-btn-{$ID}" title="{intl l='Configure this module'}" href="{url path="/admin/module/$CODE"}">{intl l="Configure"}</a>
{if $EXISTS}
{if $CONFIGURABLE == 1}
{loop type="auth" name="can_change" role="ADMIN" module=$CODE access="VIEW"}
<a class="{if ! $ACTIVE}disabled {/if} btn btn-primary btn-xs" id="config-btn-{$ID}" title="{intl l='Configure this module'}" href="{url path="/admin/module/$CODE"}">{intl l="Configure"}</a>
{/loop}
{/if}
{*loop type="auth" name="can_change" role="ADMIN" resource="admin.modules" access="VIEW"}
<a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
{/loop*}
{loop type="auth" name="can_change" role="ADMIN" resource="admin.module" access="UPDATE"}
<a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
{/loop}
{/if}
{*loop type="auth" name="can_change" role="ADMIN" resource="admin.modules" access="VIEW"}
<a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
{/loop*}
{loop type="auth" name="can_change" role="ADMIN" resource="admin.module" access="UPDATE"}
<a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
{/loop}
{loop type="auth" name="can_delete" role="ADMIN" resource="admin.module" access="DELETE"}
<a class="btn btn-default btn-xs module-delete-action" title="{intl l='Delete this module'}" href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
{/loop}