dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// UI fixs

Browse Source
This commit is contained in:
Kevin Granger
2013-10-31 15:49:57 +01:00
parent 549fa9003c
commit ba28c5f527
3 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
+31 -32
View File
@@ -33,7 +33,7 @@
{$smarty.block.parent}
{if in_array($input.type, array('radio', 'switch')) && $input.name == 'smarty_cache'}
<div class="clearfix row-padding-top">
<a href="{$current}&token={$token}&empty_smarty_cache=1" class="btn btn-default" href="">
<a href="{$current}&token={$token}&empty_smarty_cache=1" class="btn btn-default">
<i class="icon-eraser"></i>
{l s='Clear Smarty cache & Autoload cache'}
</a>
@@ -97,33 +97,31 @@
</form>
</div>
{if $servers}
<div class="row">
<div class="form-group">
<table class="table">
<thead>
<tr>
<th class="fixed-width-xs"><span class="title_box">{l s='ID'}</span></th>
<th><span class="title_box">{l s='IP address'}</span></th>
<th class="fixed-width-xs"><span class="title_box">{l s='Port'}</span></th>
<th class="fixed-width-xs"><span class="title_box">{l s='Weight'}</span></th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
{foreach $servers AS $server}
<div class="form-group">
<table class="table">
<thead>
<tr>
<td>{$server.id_memcached_server}</td>
<td>{$server.ip}</td>
<td>{$server.port}</td>
<td>{$server.weight}</td>
<td align="right">
<a class="btn btn-default" href="{$current}&token={$token}&deleteMemcachedServer={$server.id_memcached_server}" onclick="if (!confirm('{l s='Do you really want to remove the server %s:%s' sprintf=[$server.ip, $server.port] js=1}')) return false;"><i class="icon-minus-sign-alt"></i> {l s='Remove'}</a>
</td>
<th class="fixed-width-xs"><span class="title_box">{l s='ID'}</span></th>
<th><span class="title_box">{l s='IP address'}</span></th>
<th class="fixed-width-xs"><span class="title_box">{l s='Port'}</span></th>
<th class="fixed-width-xs"><span class="title_box">{l s='Weight'}</span></th>
<th>&nbsp;</th>
</tr>
{/foreach}
</tbody>
</table>
</div>
</thead>
<tbody>
{foreach $servers AS $server}
<tr>
<td>{$server.id_memcached_server}</td>
<td>{$server.ip}</td>
<td>{$server.port}</td>
<td>{$server.weight}</td>
<td>
<a class="btn btn-default" href="{$current}&token={$token}&deleteMemcachedServer={$server.id_memcached_server}" onclick="if (!confirm('{l s='Do you really want to remove the server %s:%s' sprintf=[$server.ip, $server.port] js=1}')) return false;"><i class="icon-minus-sign-alt"></i> {l s='Remove'}</a>
</td>
</tr>
{/foreach}
</tbody>
</table>
</div>
{/if}
</div>
@@ -132,18 +130,19 @@
{block name="script"}
function showMemcached()
{
if ($('input[name="caching_system"]:radio:checked').val() == 'CacheMemcache')
{
function showMemcached() {
if ($('input[name="caching_system"]:radio:checked').val() == 'CacheMemcache') {
$('#memcachedServers').show();
$('#ps_cache_fs_directory_depth').parent().parent().hide();
}
else
{
else if ($('input[name="caching_system"]:radio:checked').val() == 'CacheFs') {
$('#memcachedServers').hide();
$('#ps_cache_fs_directory_depth').parent().parent().show();
}
else {
$('#memcachedServers').hide();
$('#ps_cache_fs_directory_depth').parent().parent().hide();
}
}
$(document).ready(function() {
admin-dev/themes/default/template/helpers/form/assoshop.tpl
+6 -4
View File
@@ -74,13 +74,15 @@ function check_all_shop() {
</script>
<div class="assoShop">
<table class="table" cellpadding="0" cellspacing="0" width="100%">
<table class="table">
<tr>
<th>{l s='Shop'}</th>
</tr>
<tr>
<td>
<label class="t"><input class="input_all_shop" type="checkbox" /> <b>{l s='All shops'}</b></label>
<label>
<input class="input_all_shop" type="checkbox" />{l s='All shops'}
</label>
</td>
</tr>
{foreach $input.values as $groupID => $groupData}
@@ -88,13 +90,13 @@ function check_all_shop() {
<tr {if $input.type == 'shop'}class="alt_row"{/if}>
<td>
<img style="vertical-align:middle;" alt="" src="../img/admin/lv2_b.gif" />
<label class="t">
<label>
<input class="input_shop_group"
type="checkbox"
name="checkBoxShopGroupAsso_{$table}[{$groupID}]"
value="{$groupID}"
{if $groupChecked} checked="checked"{/if} />
<b>{l s='Group:'} {$groupData['name']}</b>
{l s='Group:'} {$groupData['name']}
</label>
</td>
</tr>