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-08 18:42:19 +02:00
parent d88857610d f2c6887497
commit b9cfc24922
23 changed files with 756 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+4 -4
View File
@@ -1510,7 +1510,7 @@ input[type="number"]::-webkit-outer-spin-button, input[type="number"]::-webkit-i
display: block;
width: 100%;
height: 27px;
padding: 4px 12px;
padding: 4px 8px;
font-size: 12px;
line-height: 1.42857;
color: #555555;
@@ -1732,7 +1732,7 @@ textarea.input-lg, .input-group-lg > textarea, .input-group-lg > textarea.input-
/* line 10, ../bower_components/sass-bootstrap/lib/_buttons.scss */
.btn {
display: inline-block;
padding: 4px 12px;
padding: 4px 8px;
margin-bottom: 0;
font-size: 12px;
font-weight: normal;
@@ -3170,7 +3170,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
/* line 59, ../bower_components/sass-bootstrap/lib/_input-groups.scss */
.input-group-addon {
padding: 4px 12px;
padding: 4px 8px;
font-size: 12px;
font-weight: normal;
line-height: 1;
@@ -3842,7 +3842,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
.pagination > li > a, .pagination > li > span {
position: relative;
float: left;
padding: 4px 12px;
padding: 4px 8px;
line-height: 1.42857;
text-decoration: none;
background-color: white;
admin-dev/themes/default/css/bootstrap/_variables.scss
+1 -1
View File
@@ -64,7 +64,7 @@ $headings-font-weight: 300 ;
// Based on 14px font-size and 1.428 line-height (~20px to start)
$padding-base-vertical: 4px ;
// $padding-base-horizontal: 12px ;
$padding-base-horizontal: 8px ;
// $padding-large-vertical: 14px ;
// $padding-large-horizontal: 16px ;
admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+6 -6
View File
@@ -63,25 +63,25 @@
</section>
<section class="dash_links panel">
<h4><i class="icon-link"></i>{l s="Useful PrestaShop Links"}</h4>
<h4><i class="icon-link"></i> {l s="Useful PrestaShop Links"}</h4>
<dl>
<dt>{l s="Discover the latest official documentation :"}</dt>
<dt>{l s="Discover the official documentation"}</dt>
<dd><a href="http://doc.prestashop.com/display/PS16?utm_source=backoffice_dashboard" target="_blank">{l s="Go to doc.prestashop.com"}</a></dd>
</dl>
<dl>
<dt>{l s="Use the PrestaShop forum & discover a great community :"}</dt>
<dt>{l s="Use the forum & discover a great community"}</dt>
<dd><a href="http://www.prestashop.com/forums?utm_source=backoffice_dashboard" target="_blank">{l s="Go to forums.prestashop.com"}</a></dd>
</dl>
<dl>
<dt>{l s="Enhance your Shop with new templates & modules :"}</dt>
<dt>{l s="Enhance your Shop with new templates & modules"}</dt>
<dd><a href="http://addons.prestashop.com?utm_source=backoffice_dashboard" target="_blank">{l s="Go to addons.prestashop.com"}</a></dd>
</dl>
<dl>
<dt>{l s="PrestaShop BugTracker :"}</dt>
<dt>{l s="Report issues in the Bug Tracker"}</dt>
<dd><a href="http://forge.prestashop.com?utm_source=backoffice_dashboard" target="_blank">{l s="Go to forge.prestashop.com"}</a></dd>
</dl>
<dl>
<dt>{l s="Contact US :"}</dt>
<dt>{l s="Contact Us"}</dt>
<dd><a href="http://www.prestashop.com/en/contact-us?utm_source=backoffice_dashboard" target="_blank">{l s="Go to prestashop.com"}</a></dd>
</dl>
</section>
admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
+2 -2
View File
@@ -23,7 +23,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="form-horizontal">
<div class="form-horizontal well">
<div class="form-group">
<label class="control-label col-lg-3">
{l s='Name'}
@@ -95,7 +95,7 @@
</div>
{/if}
<div class="form-group">
<div class="row">
<div class="col-lg-9 col-lg-offset-3">
<button class="btn btn-default" type="button" id="cancel_add_voucher">
<i class="icon-remove text-danger"></i>
admin-dev/themes/default/template/controllers/orders/_new_product.tpl
+2 -2
View File
@@ -48,7 +48,7 @@
</td>
<td style="display:none;">
<div class="form-group">
<div class="row">
<div class="input-group fixed-width-xl">
<div class="input-group-addon">
{$currency->sign}
@@ -57,7 +57,7 @@
<input type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" disabled="disabled" />
</div>
</div>
<div class="form-group">
<div class="row">
<div class="input-group fixed-width-xl">
<div class="input-group-addon">
{$currency->sign}
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+595 -571
View File
File diff suppressed because it is too large Load Diff
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+1 -1
View File
@@ -242,7 +242,7 @@
<p>
<span >
{l s='Your product will be saved as a draft.'}</span>
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >{l s='Save and preview.'}</a></span>
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >{l s='Save and preview'}</a></span>
<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
</p>
</div>
admin-dev/themes/default/template/helpers/list/list_header.tpl
+15 -8
View File
@@ -152,10 +152,8 @@
if (submited)
return false;
submited = true;
//add hidden input to emulate submit button click when posting the form -> field name posted
btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'" value="1" />');
$('#{$table}_form').submit();
return false;
});
@@ -165,7 +163,6 @@
btn_save_and_stay.click(function() {
//add hidden input to emulate submit button click when posting the form -> field name posted
btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'AndStay" value="1" />');
$('#{$table}_form').submit();
return false;
});
@@ -265,11 +262,21 @@
<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
</select>
{elseif $params.type == 'date' || $params.type == 'datetime'}
<div class="date_range form-group">
<label>{l s='From'}</label>
<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($params.value.0)}{$params.value.0}{/if}"{if isset($params.width)} style="width:70px"{/if}/>
<label>{l s='To'}</label>
<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($params.value.1)}{$params.value.1}{/if}"{if isset($params.width)} style="width:70px"{/if}/>
<div class="date_range row">
<div class="input-group fixed-width-xl">
<span class="input-group-addon">{l s='From'}</span>
<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($params.value.0)}{$params.value.0}{/if}"/>
<span class="input-group-addon">
<i class="icon-calendar"></i>
</span>
</div>
<div class="input-group fixed-width-xl">
<span class="input-group-addon">{l s='To'}</span>
<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($params.value.1)}{$params.value.1}{/if}"/>
<span class="input-group-addon">
<i class="icon-calendar"></i>
</span>
</div>
</div>
{elseif $params.type == 'select'}
{if isset($params.filter_key)}