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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
djfm
2013-10-18 08:20:32 +00:00
parent 37656c2df9 e17c5f7c91
commit 901f5aeb08
16 changed files with 269 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
+1 -1
View File
@@ -60,7 +60,7 @@
html.append($('<li>').html(file))
});
$('#changedFiles')
.append($('<h3>').html(lang+' ('+json[key].length+')'))
.append($('<h4>').html(lang+' ('+json[key].length+')'))
.append(html);
}
});
admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
+6 -1
View File
@@ -32,7 +32,12 @@
{/if}
{$smarty.block.parent}
{if in_array($input.type, array('radio', 'switch')) && $input.name == 'smarty_cache'}
<a href="{$current}&token={$token}&empty_smarty_cache=1" class="clear button" href="">{l s='Clear Smarty cache & Autoload cache'}</a>
<div class="clearfix row-padding-top">
<a href="{$current}&token={$token}&empty_smarty_cache=1" class="btn btn-default" href="">
<i class="icon-eraser"></i>
{l s='Clear Smarty cache & Autoload cache'}
</a>
</div>
{/if}
{/block}
admin-dev/themes/default/template/controllers/products/informations.tpl
+29 -27
View File
@@ -94,8 +94,10 @@
<div id="warn_virtual_combinations" class="alert alert-warning" style="display:none">{l s='You cannot use combinations with a virtual product.'}</div>
<div class="row">
<label class="control-label col-lg-3" for="simple_product">{$bullet_common_field} {l s='Type:'}</label>
<div class="form-group">
<label class="control-label col-lg-3" for="simple_product">
{$bullet_common_field} {l s='Type:'}
</label>
<div class="col-lg-9">
<div class="radio">
<label for="simple_product">
@@ -120,7 +122,7 @@
<hr/>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3 required" for="name_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Invalid characters:'} &lt;&gt;;=#{}">
@@ -128,18 +130,16 @@
</span>
</label>
<div class="col-lg-5">
<div class="row">
{include file="controllers/products/input_text_lang.tpl"
languages=$languages
input_class="{$class_input_ajax}{if !$product->id}copy2friendlyUrl{/if} updateCurrentText"
input_value=$product->name
input_name="name"
}
</div>
{include file="controllers/products/input_text_lang.tpl"
languages=$languages
input_class="{$class_input_ajax}{if !$product->id}copy2friendlyUrl{/if} updateCurrentText"
input_value=$product->name
input_name="name"
}
</div>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3" for="reference">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Special characters allowed:'} .-_#\">
@@ -151,7 +151,7 @@
</div>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3" for="ean13">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='(Europe, Japan)'}">
@@ -163,7 +163,7 @@
</div>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3" for="upc">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='(US, Canada)'}">
@@ -178,7 +178,7 @@
<hr/>
{* status informations *}
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3">
{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
{l s='Status:'}
@@ -187,18 +187,20 @@
<span class="switch prestashop-switch">
<input onclick="toggleDraftWarning(false);showOptions(true);showRedirectProductOptions(false);" type="radio" name="active" id="active_on" value="1" {if $product->active || !$product->isAssociatedToShop()}checked="checked" {/if} />
<label for="active_on" class="radioCheck">
<i class="icon-check-sign"></i> {l s='Enabled'}
<i class="icon-check-sign text-success"></i>
{l s='Enabled'}
</label>
<input onclick="toggleDraftWarning(true);showOptions(false);showRedirectProductOptions(true);" type="radio" name="active" id="active_off" value="0" {if !$product->active && $product->isAssociatedToShop()}checked="checked"{/if} />
<label for="active_off" class="radioCheck">
<i class="icon-ban-circle"></i> {l s='Disabled'}
<i class="icon-ban-circle text-danger"></i>
{l s='Disabled'}
</label>
<span class="slide-button btn btn-default"></span>
</span>
</div>
</div>
<div class="row redirect_product_options" style="display:none">
<div class="form-group redirect_product_options" style="display:none">
<label class="control-label col-lg-3" for="redirect_type">
{include file="controllers/products/multishop/checkbox.tpl" field="redirect_type" type="radio" onclick=""}
{l s='Redirect when disabled'}
@@ -211,7 +213,7 @@
</select>
</div>
</div>
<div class="row redirect_product_options" style="display:none">
<div class="form-group redirect_product_options" style="display:none">
<div class="col-lg-9 col-lg-offset-3">
<div class="alert alert-info">
{l s='404 Not Found = Do not redirect and display a 404 page'}<br/>
@@ -221,7 +223,7 @@
</div>
</div>
<div class="row redirect_product_options redirect_product_options_product_choise" style="display:none">
<div class="form-group redirect_product_options redirect_product_options_product_choise" style="display:none">
<label class="control-label col-lg-3" for="related_product_autocomplete_input">
{include file="controllers/products/multishop/checkbox.tpl" field="id_product_redirected" type="radio" onclick=""}
{l s='Related product:'}
@@ -248,7 +250,7 @@
</script>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3" for="visibility">
{include file="controllers/products/multishop/checkbox.tpl" field="visibility" type="default"}
{l s='Visibility:'}
@@ -263,7 +265,7 @@
</div>
</div>
<div id="product_options" class="row" {if !$product->active}style="display:none"{/if} >
<div id="product_options" class="form-group" {if !$product->active}style="display:none"{/if} >
<div class="col-lg-12">
<div class="form-group">
<label class="control-label col-lg-3" for="available_for_order">
@@ -347,7 +349,7 @@
</div>
{if $images}
<div class="row">
<div class="form-group">
<div class="col-lg-9 col-lg-offset-3">
<div class="alert alert-info">
{l s='Would you like to add an image in your description?'}
@@ -357,7 +359,7 @@
</div>
<div id="createImageDescription" class="panel" style="display:none">
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3" for="smallImage_0">{l s='Select your image:'}</label>
<div class="col-lg-9">
<ul class="list-inline">
@@ -372,7 +374,7 @@
</ul>
</div>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3" for="leftRight_1">{l s='Position:'}</label>
<div class="col-lg-5">
<p class="checkbox">
@@ -385,7 +387,7 @@
</p>
</div>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3" for="imageTypes_0">{l s='Select the type of picture:'}</label>
<div class="col-lg-5">
{foreach from=$imagesTypes key=key item=type}
@@ -398,7 +400,7 @@
{/foreach}
</div>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3" for="resultImage">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='The tag to copy/paste into the description.'}">
admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
+8 -6
View File
@@ -25,12 +25,14 @@
{foreach from=$languages item=language}
{if $languages|count > 1}
<div class="translatable-field lang-{$language.id_lang}">
<div class="translatable-field row lang-{$language.id_lang}">
<div class="col-lg-9">
{/if}
{if isset($maxchar)}
<div class="input-group">
<span id="{$input_name}_{$language.id_lang}_counter" class="input-group-addon"><span class="text-count-down">{$maxchar}</span></span>
{if isset($maxchar)}
<div class="input-group">
<span id="{$input_name}_{$language.id_lang}_counter" class="input-group-addon">
<span class="text-count-down">{$maxchar}</span>
</span>
{/if}
<input type="text"
id="{$input_name}_{$language.id_lang}"
@@ -42,8 +44,8 @@
{if isset($maxchar)} data-maxchar="{$maxchar}"{/if}
{if isset($maxlength)} maxlength="{$maxlength}"{/if} />
{if isset($maxchar)}
</div>
{/if}
</div>
{/if}
{if $languages|count > 1}
</div>
<div class="col-lg-2">
admin-dev/themes/default/template/helpers/calendar/calendar.tpl
+21 -10
View File
@@ -191,7 +191,15 @@
datepickerEnd.setValue(ev.date.setMonth(ev.date.getMonth()+1));
}
}).data('daterangepicker');
{/literal}
startDate = parseDate($("#date-start").val(), parseFormat('{$date_format}'));
endDate = parseDate($("#date-end").val(), parseFormat('{$date_format}'));
if (startDate.getFullYear() == endDate.getFullYear() && startDate.getMonth() == endDate.getMonth())
datepickerStart.setValue(startDate.setMonth(startDate.getMonth()-1));
{literal}
var datepickerEnd = $('.datepicker2').daterangepicker({
"dates": translated_dates,
"weekStart": 1,
@@ -220,6 +228,7 @@
$("#date-start-compare").focus(function() {
datepickerStart.setCompare(true);
datepickerEnd.setCompare(true);
$('#compare-options').val(3);
$(".date-input").removeClass("input-selected");
$(this).addClass("input-selected");
});
@@ -227,6 +236,7 @@
$("#date-end-compare").focus(function() {
datepickerStart.setCompare(true);
datepickerEnd.setCompare(true);
$('#compare-options').val(3);
$(".date-input").removeClass("input-selected");
$(this).addClass("input-selected");
});
@@ -241,16 +251,9 @@
$('#datepicker-compare').click(function() {
if ($(this).attr("checked")) {
if ($("#date-start-compare").val().replace(/^\s+|\s+$/g, '').length == 0)
$('#compare-options').trigger('change');
datepickerStart.setStartCompare($("#date-start-compare").val());
datepickerStart.setEndCompare($("#date-end-compare").val());
datepickerEnd.setStartCompare($("#date-start-compare").val());
datepickerEnd.setEndCompare($("#date-end-compare").val());
$('#compare-options').trigger('change');
$('#form-date-body-compare').show();
$('#compare-options').prop('disabled', false);
$('#date-start-compare').focus();
} else {
datepickerStart.setStartCompare(null);
datepickerStart.setEndCompare(null);
@@ -268,8 +271,16 @@
if (this.value == 2)
setPreviousYear();
$('#date-start-compare').focus();
datepickerStart.setStartCompare($("#date-start-compare").val());
datepickerStart.setEndCompare($("#date-end-compare").val());
datepickerEnd.setStartCompare($("#date-start-compare").val());
datepickerEnd.setEndCompare($("#date-end-compare").val());
datepickerStart.setCompare(true);
datepickerEnd.setCompare(true);
if (this.value == 3)
$('#date-start-compare').focus();
});
if ($('#datepicker-compare').attr("checked"))
admin-dev/themes/default/template/helpers/list/list_header.tpl
+1 -1
View File
@@ -256,7 +256,7 @@
--
{else}
{if $params.type == 'bool'}
<select class="filter" onchange="$('#submitFilterButton{$list_id}').focus();$('#submitFilterButton{$list_id}').click();" name="{$list_id}Filter_{$key}">
<select class="filter fixed-width-sm" onchange="$('#submitFilterButton{$list_id}').focus();$('#submitFilterButton{$list_id}').click();" name="{$list_id}Filter_{$key}">
<option value="">--</option>
<option value="1" {if $params.value == 1} selected="selected" {/if}>{l s='Yes'}</option>
<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
admin-dev/themes/default/template/nav.tpl
+1 -2
View File
@@ -1,4 +1,4 @@
<nav id="nav-sidebar" data-spy="affix" data-offset-top="0" role="navigation">
<nav id="nav-sidebar" role="navigation">
{if !$tab}
<div class="mainsubtablist" style="display:none"></div>
{/if}
@@ -31,5 +31,4 @@
{/if}
{/foreach}
</ul>
</nav>