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 
Conflicts:
	controllers/admin/AdminCategoriesController.php
This commit is contained in:
Jerome Nadaud
2013-10-25 14:29:02 +02:00
parent bff1ad8833 3997543e7f
commit 8d1765f2df
97 changed files with 3010 additions and 1960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+1 -1
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/css/admin-theme.sass
+7
View File
@@ -110,6 +110,13 @@ body.display-modal
input[type="text"],input[type="search"],input[type="password"], textarea, select
@extend .form-control
//panels
#content
.panel
.panel-footer
margin: 15px -20px -20px
height: 73px
//todo: fix focus firefox
*:focus
outline: none!important
admin-dev/themes/default/css/admin-theme/_admin-commons.sass
-3
View File
@@ -95,9 +95,6 @@
-webkit-font-smoothing: antialiased
content: "\F05A"
.panel
.panel-footer
margin: 15px -20px -20px
.overflow-y
height: 200px
admin-dev/themes/default/css/admin-theme/_admin-toolbar.sass
+11 -16
View File
@@ -64,14 +64,16 @@
-webkit-font-smoothing: antialiased
*margin-right: .3em
.process-icon-new
@extend .icon-plus-sign-alt
.process-icon-save
.page-header-toolbar-back
border: none!important
display: inline-block
.process-icon-save, .process-icon-save-and-stay, .process-icon-save-and-preview
@extend .icon-save
.process-icon-cancel
@extend .icon-remove
.process-icon-back
@extend .icon-arrow-left
.process-icon-save-and-stay
@extend .icon-save
@extend .icon-circle-arrow-left
.process-icon-help
@extend .icon-question-sign
.process-icon-export
@@ -82,7 +84,7 @@
@extend .icon-question-sign
.process-icon-edit
@extend .icon-edit
.process-icon-newAttributes
.process-icon-newAttributes, .process-icon-new, .process-icon-new-url
@extend .icon-plus-sign-alt
.process-icon-modules-list
@extend .icon-puzzle-piece
@@ -96,9 +98,7 @@
@extend .icon-trash
.process-icon-update
@extend icon-refresh
.process-icon-preview
@extend .icon-eye-open
.process-icon-previewURL
.process-icon-preview, .process-icon-previewURL
@extend .icon-eye-open
.process-icon-stats
@extend .icon-bar-chart
@@ -110,15 +110,10 @@
@extend .icon-minus-sign
.process-icon-partial_refund
@extend .icon-exchange
.process-icon-cancel
@extend .icon-remove
.process-icon-new-url
@extend .icon-plus-sign-alt
.process-icon-anchor
@extend .icon-anchor
.process-icon-refresh
@extend .icon-refresh
.process-icon-configure
@extend .icon-cog
.process-icon-save-and-preview
@extend .icon-save
admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
+1 -1
View File
@@ -85,7 +85,7 @@
});
</script>
<div class="col-lg-9">
<div class="col-lg-4">
<input type="text" id="email" name="email" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}"/>
</div>
{/if}
admin-dev/themes/default/template/controllers/products/customization.tpl
+2 -2
View File
@@ -60,7 +60,7 @@
<label class="control-label col-lg-3">
{l s='Define the label of the file fields:'}
</label>
<div class="col-lg-9">
<div class="col-lg-6">
{$display_file_labels}
</div>
</div>
@@ -71,7 +71,7 @@
<label class="control-label col-lg-3">
{l s='Define the label of the text fields:'}
</label>
<div class="col-lg-9">
<div class="col-lg-6">
{$display_text_labels}
</div>
</div>
admin-dev/themes/default/template/controllers/products/prices.tpl
+10 -10
View File
@@ -312,7 +312,7 @@ $(document).ready(function () {
<div id="add_specific_price" class="well" style="display: none;">
<div class="col-lg-12">
<div class="form-group">
<label class="control-label col-lg-3" for="{if !$multi_shop}spm_currency_0{else}sp_id_shop{/if}">{l s='For'}</label>
<label class="control-label col-lg-2" for="{if !$multi_shop}spm_currency_0{else}sp_id_shop{/if}">{l s='For'}</label>
<div class="col-lg-9">
<div class="row">
{if !$multi_shop}
@@ -356,8 +356,8 @@ $(document).ready(function () {
</div>
<div class="form-group">
<label class="control-label col-lg-3" for="customer">{l s='Customer'}</label>
<div class="col-lg-9">
<label class="control-label col-lg-2" for="customer">{l s='Customer'}</label>
<div class="col-lg-4">
<input type="hidden" name="sp_id_customer" id="id_customer" value="0" />
<div class="input-group">
<input type="text" name="customer" value="{l s='All customers'}" id="customer" autocomplete="off" />
@@ -371,7 +371,7 @@ $(document).ready(function () {
{if $combinations|@count != 0}
<div class="form-group">
<label class="control-label col-lg-3" for="sp_id_product_attribute">{l s='Combination:'}</label>
<label class="control-label col-lg-2" for="sp_id_product_attribute">{l s='Combination:'}</label>
<div class="col-lg-4">
<select id="sp_id_product_attribute" name="sp_id_product_attribute">
<option value="0">{l s='Apply to all combinations'}</option>
@@ -384,17 +384,17 @@ $(document).ready(function () {
{/if}
<div class="form-group">
<label class="control-label col-lg-3" for="sp_from">{l s='Available'}</label>
<label class="control-label col-lg-2" for="sp_from">{l s='Available'}</label>
<div class="col-lg-9">
<div class="row">
<div class="col-lg-6">
<div class="col-lg-4">
<div class="input-group">
<span class="input-group-addon">{l s='from'}</span>
<input class="datepicker" type="text" name="sp_from" value="" style="text-align: center" id="sp_from" />
<span class="input-group-addon"><i class="icon-calendar-empty"></i></span>
</div>
</div>
<div class="col-lg-6">
<div class="col-lg-4">
<div class="input-group">
<span class="input-group-addon">{l s='to'}</span>
<input class="datepicker" type="text" name="sp_to" value="" style="text-align: center" id="sp_to" />
@@ -406,7 +406,7 @@ $(document).ready(function () {
</div>
<div class="form-group">
<label class="control-label col-lg-3" for="sp_from_quantity">{l s='Starting at'}</label>
<label class="control-label col-lg-2" for="sp_from_quantity">{l s='Starting at'}</label>
<div class="input-group col-lg-4">
<span class="input-group-addon">{l s='unit'}</span>
<input type="text" name="sp_from_quantity" id="sp_from_quantity" value="1" />
@@ -414,7 +414,7 @@ $(document).ready(function () {
</div>
<div class="form-group">
<label class="control-label col-lg-3" for="sp_price">{l s='Product price'}
<label class="control-label col-lg-2" for="sp_price">{l s='Product price'}
{if $country_display_tax_label}
{l s='(tax excl.):'}
{/if}
@@ -436,7 +436,7 @@ $(document).ready(function () {
</div>
<div class="form-group">
<label class="control-label col-lg-3" for="sp_reduction">{l s='Apply a discount of:'}</label>
<label class="control-label col-lg-2" for="sp_reduction">{l s='Apply a discount of:'}</label>
<div class="col-lg-4">
<div class="row">
<div class="col-lg-6">
admin-dev/themes/default/template/helpers/form/form.tpl
+2 -2
View File
@@ -76,7 +76,7 @@
{/block}
{block name="field"}
<div class="col-lg-9{if !isset($input.label)} col-lg-offset-3{/if}">
<div class="col-lg-{if isset($input.col)}{$input.col|intval}{else}9{/if} {if !isset($input.label)}col-lg-offset-3{/if}">
{block name="input"}
{if $input.type == 'text' || $input.type == 'tags'}
{if isset($input.lang) AND $input.lang}
@@ -466,7 +466,7 @@
{elseif $input.type == 'birthday'}
<div class="form-group">
{foreach $input.options as $key => $select}
<div class="col-lg-4">
<div class="col-lg-2">
<select name="{$key}" class="{if isset($input.class)}{$input.class}{/if}">
<option value="">-</option>
{if $key == 'months'}
admin-dev/themes/default/template/page_header_toolbar.tpl
+4 -5
View File
@@ -27,11 +27,10 @@
{block name=pageTitle}
<h2 class="page-title">
{if isset($toolbar_btn['back'])}
<a id="page-header-desc-{$table}-{if isset($toolbar_btn['back'].imgclass)}{$toolbar_btn['back'].imgclass}{else}{$k}{/if}" class="toolbar_btn" {if isset($toolbar_btn['back'].href)}href="{$toolbar_btn['back'].href}"{/if} title="{$toolbar_btn['back'].desc}" {if isset($toolbar_btn['back'].target) && $toolbar_btn['back'].target}target="_blank"{/if}{if isset($toolbar_btn['back'].js) && $toolbar_btn['back'].js}onclick="{$toolbar_btn['back'].js}"{/if}>
<i class="{if isset($toolbar_btn['back'].icon)}{$toolbar_btn['back'].icon}{else}process-icon-{if isset($toolbar_btn['back'].imgclass)}{$toolbar_btn['back'].imgclass}{else}{$k}{/if}{/if} {if isset($toolbar_btn['back'].class)}{$toolbar_btn['back'].class}{/if}" ></i>
<span {if isset($toolbar_btn['back'].force_desc) && $toolbar_btn['back'].force_desc == true } class="locked" {/if}>{$toolbar_btn['back'].desc}</span>
</a>
<a id="page-header-desc-{$table}-{if isset($toolbar_btn['back'].imgclass)}{$toolbar_btn['back'].imgclass}{else}{$k}{/if}" class="page-header-toolbar-back" {if isset($toolbar_btn['back'].href)}href="{$toolbar_btn['back'].href}"{/if} title="{$toolbar_btn['back'].desc}" {if isset($toolbar_btn['back'].target) && $toolbar_btn['back'].target}target="_blank"{/if}{if isset($toolbar_btn['back'].js) && $toolbar_btn['back'].js}onclick="{$toolbar_btn['back'].js}"{/if}>
<i class="process-icon-back"></i>
<!-- <span {if isset($toolbar_btn['back'].force_desc) && $toolbar_btn['back'].force_desc == true } class="locked" {/if}>{$toolbar_btn['back'].desc}</span> -->
</a>
{/if}
{if is_array($title)}{$title|end}{else}{$title}{/if}
</h2>