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:
Jerome Nadaud
2013-10-17 18:27:14 +02:00
parent 088d23f8f9 d933466d04
commit fa22cff995
7 changed files with 108 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+38 -10
View File
@@ -8177,39 +8177,43 @@ a.link-social:hover {
.row-margin-bottom { .row-margin-bottom {
margin-bottom: 15px; } margin-bottom: 15px; }
/* line 17, admin-theme/_admin-commons.sass */ /* line 16, admin-theme/_admin-commons.sass */
.row-padding-top {
padding-top: 15px; }
/* line 19, admin-theme/_admin-commons.sass */
.thumbnail { .thumbnail {
background-color: white; background-color: white;
border-color: #cccccc !important; } border-color: #cccccc !important; }
/* line 21, admin-theme/_admin-commons.sass */ /* line 23, admin-theme/_admin-commons.sass */
.badge, #header_notifs_icon_wrapper .notifs_badge, .badge.badge-success, .badge.badge-error { .badge, #header_notifs_icon_wrapper .notifs_badge, .badge.badge-success, .badge.badge-error {
background-color: #8fc04d; } background-color: #8fc04d; }
/* line 23, admin-theme/_admin-commons.sass */ /* line 25, admin-theme/_admin-commons.sass */
#header_notifs_icon_wrapper .badge-success.notifs_badge, .badge-success.badge { #header_notifs_icon_wrapper .badge-success.notifs_badge, .badge-success.badge {
background-color: #5cb85c; } background-color: #5cb85c; }
/* line 26, admin-theme/_admin-commons.sass */ /* line 28, admin-theme/_admin-commons.sass */
#header_notifs_icon_wrapper .badge-error.notifs_badge, .badge-error.badge { #header_notifs_icon_wrapper .badge-error.notifs_badge, .badge-error.badge {
background-color: #d9534f; } background-color: #d9534f; }
/* line 31, admin-theme/_admin-commons.sass */ /* line 33, admin-theme/_admin-commons.sass */
.nav-tabs { .nav-tabs {
border-bottom: none; } border-bottom: none; }
/* line 33, admin-theme/_admin-commons.sass */ /* line 35, admin-theme/_admin-commons.sass */
.nav-tabs li a { .nav-tabs li a {
font-size: 1.1em; font-size: 1.1em;
font-family: "Ubuntu", sans-serif; font-family: "Ubuntu", sans-serif;
text-transform: uppercase; text-transform: uppercase;
font-weight: 300; } font-weight: 300; }
/* line 39, admin-theme/_admin-commons.sass */ /* line 41, admin-theme/_admin-commons.sass */
.nav-tabs li.active a, .nav-tabs li.active a:hover { .nav-tabs li.active a, .nav-tabs li.active a:hover {
background-color: white; } background-color: white; }
/* line 42, admin-theme/_admin-commons.sass */ /* line 44, admin-theme/_admin-commons.sass */
.alert.alert-danger, #carrier_wizard .wizard_error { .alert.alert-danger, #carrier_wizard .wizard_error {
padding-left: 60px; padding-left: 60px;
position: relative; } position: relative; }
/* line 45, admin-theme/_admin-commons.sass */ /* line 47, admin-theme/_admin-commons.sass */
.alert.alert-danger:before, #carrier_wizard .wizard_error:before { .alert.alert-danger:before, #carrier_wizard .wizard_error:before {
position: absolute; position: absolute;
top: 0; top: 0;
@@ -8225,7 +8229,31 @@ a.link-social:hover {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
content: "\f00d"; } content: "\f00d"; }
/* line 61, admin-theme/_admin-commons.sass */ /* line 62, admin-theme/_admin-commons.sass */
.alert.alert-success, #carrier_wizard .alert-success.wizard_error {
padding-left: 60px;
position: relative; }
/* line 65, admin-theme/_admin-commons.sass */
.alert.alert-success:before, #carrier_wizard .alert-success.wizard_error:before {
position: absolute;
top: 0;
left: 10px;
display: block;
min-height: 25px;
min-width: 25px;
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
font-size: 35px;
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
content: "\f00c"; }
/* line 81, admin-theme/_admin-commons.sass */
.panel .panel-footer, #header_notifs_icon_wrapper .notifs_panel .panel-footer, #dash_version .panel-footer, #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer {
margin: 0 -20px -20px; }
/* line 86, admin-theme/_admin-commons.sass */
.overflow-y { .overflow-y {
height: 200px; height: 200px;
overflow-y: auto; } overflow-y: auto; }
admin-dev/themes/default/css/admin-theme/_admin-commons.sass
+25
View File
@@ -13,6 +13,8 @@
.row-margin-bottom .row-margin-bottom
margin-bottom: 15px margin-bottom: 15px
.row-padding-top
padding-top: 15px
.thumbnail .thumbnail
background-color: white background-color: white
@@ -57,6 +59,29 @@
-webkit-font-smoothing: antialiased -webkit-font-smoothing: antialiased
content: "\f00d" content: "\f00d"
.alert.alert-success
padding-left: 60px
position: relative
&:before
position: absolute
top: 0
left: 10px
display: block
min-height: 25px
min-width: 25px
font-family: FontAwesome
font-weight: normal
font-style: normal
font-size: 35px
text-decoration: inherit
-webkit-font-smoothing: antialiased
content: "\f00c"
.panel
.panel-footer
margin: 0 -20px -20px
.overflow-y .overflow-y
height: 200px height: 200px
admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
+6 -1
View File
@@ -32,7 +32,12 @@
{/if} {/if}
{$smarty.block.parent} {$smarty.block.parent}
{if in_array($input.type, array('radio', 'switch')) && $input.name == 'smarty_cache'} {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} {/if}
{/block} {/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 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"> <div class="form-group">
<label class="control-label col-lg-3" for="simple_product">{$bullet_common_field} {l s='Type:'}</label> <label class="control-label col-lg-3" for="simple_product">
{$bullet_common_field} {l s='Type:'}
</label>
<div class="col-lg-9"> <div class="col-lg-9">
<div class="radio"> <div class="radio">
<label for="simple_product"> <label for="simple_product">
@@ -120,7 +122,7 @@
<hr/> <hr/>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3 required" for="name_{$id_lang}"> <label class="control-label col-lg-3 required" for="name_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip" <span class="label-tooltip" data-toggle="tooltip"
title="{l s='Invalid characters:'} &lt;&gt;;=#{}"> title="{l s='Invalid characters:'} &lt;&gt;;=#{}">
@@ -128,18 +130,16 @@
</span> </span>
</label> </label>
<div class="col-lg-5"> <div class="col-lg-5">
<div class="row"> {include file="controllers/products/input_text_lang.tpl"
{include file="controllers/products/input_text_lang.tpl" languages=$languages
languages=$languages input_class="{$class_input_ajax}{if !$product->id}copy2friendlyUrl{/if} updateCurrentText"
input_class="{$class_input_ajax}{if !$product->id}copy2friendlyUrl{/if} updateCurrentText" input_value=$product->name
input_value=$product->name input_name="name"
input_name="name" }
}
</div>
</div> </div>
</div> </div>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="reference"> <label class="control-label col-lg-3" for="reference">
<span class="label-tooltip" data-toggle="tooltip" <span class="label-tooltip" data-toggle="tooltip"
title="{l s='Special characters allowed:'} .-_#\"> title="{l s='Special characters allowed:'} .-_#\">
@@ -151,7 +151,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="ean13"> <label class="control-label col-lg-3" for="ean13">
<span class="label-tooltip" data-toggle="tooltip" <span class="label-tooltip" data-toggle="tooltip"
title="{l s='(Europe, Japan)'}"> title="{l s='(Europe, Japan)'}">
@@ -163,7 +163,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="upc"> <label class="control-label col-lg-3" for="upc">
<span class="label-tooltip" data-toggle="tooltip" <span class="label-tooltip" data-toggle="tooltip"
title="{l s='(US, Canada)'}"> title="{l s='(US, Canada)'}">
@@ -178,7 +178,7 @@
<hr/> <hr/>
{* status informations *} {* status informations *}
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3"> <label class="control-label col-lg-3">
{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""} {include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
{l s='Status:'} {l s='Status:'}
@@ -187,18 +187,20 @@
<span class="switch prestashop-switch"> <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} /> <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"> <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> </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} /> <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"> <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> </label>
<span class="slide-button btn btn-default"></span> <span class="slide-button btn btn-default"></span>
</span> </span>
</div> </div>
</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"> <label class="control-label col-lg-3" for="redirect_type">
{include file="controllers/products/multishop/checkbox.tpl" field="redirect_type" type="radio" onclick=""} {include file="controllers/products/multishop/checkbox.tpl" field="redirect_type" type="radio" onclick=""}
{l s='Redirect when disabled'} {l s='Redirect when disabled'}
@@ -211,7 +213,7 @@
</select> </select>
</div> </div>
</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="col-lg-9 col-lg-offset-3">
<div class="alert alert-info"> <div class="alert alert-info">
{l s='404 Not Found = Do not redirect and display a 404 page'}<br/> {l s='404 Not Found = Do not redirect and display a 404 page'}<br/>
@@ -221,7 +223,7 @@
</div> </div>
</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"> <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=""} {include file="controllers/products/multishop/checkbox.tpl" field="id_product_redirected" type="radio" onclick=""}
{l s='Related product:'} {l s='Related product:'}
@@ -248,7 +250,7 @@
</script> </script>
</div> </div>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="visibility"> <label class="control-label col-lg-3" for="visibility">
{include file="controllers/products/multishop/checkbox.tpl" field="visibility" type="default"} {include file="controllers/products/multishop/checkbox.tpl" field="visibility" type="default"}
{l s='Visibility:'} {l s='Visibility:'}
@@ -263,7 +265,7 @@
</div> </div>
</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="col-lg-12">
<div class="form-group"> <div class="form-group">
<label class="control-label col-lg-3" for="available_for_order"> <label class="control-label col-lg-3" for="available_for_order">
@@ -347,7 +349,7 @@
</div> </div>
{if $images} {if $images}
<div class="row"> <div class="form-group">
<div class="col-lg-9 col-lg-offset-3"> <div class="col-lg-9 col-lg-offset-3">
<div class="alert alert-info"> <div class="alert alert-info">
{l s='Would you like to add an image in your description?'} {l s='Would you like to add an image in your description?'}
@@ -357,7 +359,7 @@
</div> </div>
<div id="createImageDescription" class="panel" style="display:none"> <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> <label class="control-label col-lg-3" for="smallImage_0">{l s='Select your image:'}</label>
<div class="col-lg-9"> <div class="col-lg-9">
<ul class="list-inline"> <ul class="list-inline">
@@ -372,7 +374,7 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="leftRight_1">{l s='Position:'}</label> <label class="control-label col-lg-3" for="leftRight_1">{l s='Position:'}</label>
<div class="col-lg-5"> <div class="col-lg-5">
<p class="checkbox"> <p class="checkbox">
@@ -385,7 +387,7 @@
</p> </p>
</div> </div>
</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> <label class="control-label col-lg-3" for="imageTypes_0">{l s='Select the type of picture:'}</label>
<div class="col-lg-5"> <div class="col-lg-5">
{foreach from=$imagesTypes key=key item=type} {foreach from=$imagesTypes key=key item=type}
@@ -398,7 +400,7 @@
{/foreach} {/foreach}
</div> </div>
</div> </div>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="resultImage"> <label class="control-label col-lg-3" for="resultImage">
<span class="label-tooltip" data-toggle="tooltip" <span class="label-tooltip" data-toggle="tooltip"
title="{l s='The tag to copy/paste into the description.'}"> 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} {foreach from=$languages item=language}
{if $languages|count > 1} {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"> <div class="col-lg-9">
{/if} {/if}
{if isset($maxchar)} {if isset($maxchar)}
<div class="input-group"> <div class="input-group">
<span id="{$input_name}_{$language.id_lang}_counter" class="input-group-addon"><span class="text-count-down">{$maxchar}</span></span> <span id="{$input_name}_{$language.id_lang}_counter" class="input-group-addon">
<span class="text-count-down">{$maxchar}</span>
</span>
{/if} {/if}
<input type="text" <input type="text"
id="{$input_name}_{$language.id_lang}" id="{$input_name}_{$language.id_lang}"
@@ -42,8 +44,8 @@
{if isset($maxchar)} data-maxchar="{$maxchar}"{/if} {if isset($maxchar)} data-maxchar="{$maxchar}"{/if}
{if isset($maxlength)} maxlength="{$maxlength}"{/if} /> {if isset($maxlength)} maxlength="{$maxlength}"{/if} />
{if isset($maxchar)} {if isset($maxchar)}
</div> </div>
{/if} {/if}
{if $languages|count > 1} {if $languages|count > 1}
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">
admin-dev/themes/default/template/helpers/list/list_header.tpl
+1 -1
View File
@@ -256,7 +256,7 @@
-- --
{else} {else}
{if $params.type == 'bool'} {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="">--</option>
<option value="1" {if $params.value == 1} selected="selected" {/if}>{l s='Yes'}</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> <option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl
+1 -1
View File
@@ -42,7 +42,7 @@
<ul class="data_list_large"> <ul class="data_list_large">
<li> <li>
<span class="data_label size_l"> <span class="data_label size_l">
{l s='Online Visitor' mod='dashactivity'} {l s='Online Visitors' mod='dashactivity'}
<small class="text-muted"><br/> <small class="text-muted"><br/>
{l s='In the last 30 minutes' mod='dashactivity'} {l s='In the last 30 minutes' mod='dashactivity'}
</small> </small>