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

// fix col-offset and btn-primary

Browse Source
This commit is contained in:
Kevin Granger
2013-08-29 17:04:10 +02:00
parent 36815be192
commit 7d4c0ad36e
10 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
View File

@@ -5,11 +5,6 @@
</div>
<div id="dashboard">
<!--
<select class="form-control pull-right" name="" id="">
<option value="">Jan 29, 2012 - Feb 4, 2012</option>
</select>
-->
<div class="row">
<div class="col-lg-3">
<div id="dash_activity" class="panel">

4
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
View File

@@ -127,7 +127,7 @@
</div>
</div>
<div class="row">
<p class="alert alert-info col-offset-3">
<p class="alert alert-info col-lg-offset-3">
<a href="#" onclick="$('#sample_files_import').slideToggle(); return false;">
{l s='Click to view our sample import csv files.'}
</a>
@@ -223,7 +223,7 @@
</div>
</div>
<div class="row">
<div class="col-offset-3">
<div class="col-lg-offset-3">
<input type="submit" name="submitImportFile" value="{l s='Next step'}" class="btn btn-primary" {if empty($files_to_import)}disabled{/if}/>
</div>
{if empty($files_to_import)}

2
admin-dev/themes/default/template/controllers/products/attachments.tpl
View File

@@ -103,7 +103,7 @@
<hr/>
<div class="row">
<div class="col-lg-9 col-offset-3">
<div class="col-lg-9 col-lg-offset-3">
<div class="row">
<div class="col-lg-6">
<p>{l s='Available attachments:'}</p>

4
admin-dev/themes/default/template/controllers/products/informations.tpl
View File

@@ -208,7 +208,7 @@
</div>
</div>
<div class="row redirect_product_options" style="display:none">
<div class="col-lg-9 col-offset-3">
<div class="col-lg-9 col-lg-offset-3">
<div class="alert alert-info">
{l s='404 : Not Found = Product does not exist and no redirect'}<br/>
{l s='301 : Moved Permanently = Product Moved Permanently'}<br/>
@@ -333,7 +333,7 @@
{if $images}
<div class="row">
<div class="col-lg-9 col-offset-3">
<div class="col-lg-9 col-lg-offset-3">
<div class="alert">
{l s='Do you want an image associated with the product in your description?'}
<a class="addImageDescription" href="javascript:void(0);">{l s='Click here'}</a>.

2
admin-dev/themes/default/template/controllers/products/pack.tpl
View File

@@ -62,7 +62,7 @@
</div>
<div class="row">
<div class="col-lg-9 col-offset-3">
<div class="col-lg-9 col-lg-offset-3">
<button type="button" id="add_pack_item" class="btn btn-default">
<i class="icon-plus-sign-alt"></i> {l s='Add this product to the pack'}
</button>

8
admin-dev/themes/default/template/controllers/products/prices.tpl
View File

@@ -182,7 +182,7 @@ $(document).ready(function () {
{if $tax_exclude_taxe_option}
<div class="row">
<div class="col-lg-9 col-offset-3">
<div class="col-lg-9 col-lg-offset-3">
<div class="alert">
{l s='Taxes are currently disabled'} :
<a href="{$link->getAdminLink('AdminTaxes')|escape:'htmlall':'UTF-8'}">{l s='Tax options'}</a>
@@ -233,7 +233,7 @@ $(document).ready(function () {
{if $ps_tax && $country_display_tax_label}
<div class="row">
<div class="col-lg-9 col-offset-3">
<div class="col-lg-9 col-lg-offset-3">
<div class="alert">
<span>{l s='or'}
{$currency->prefix}<span id="unit_price_with_tax">0.00</span>{$currency->suffix}
@@ -246,7 +246,7 @@ $(document).ready(function () {
<div class="row">
{include file="controllers/products/multishop/checkbox.tpl" field="on_sale" type="default"}
<div class="col-lg-9 col-offset-3">
<div class="col-lg-9 col-lg-offset-3">
<div class="checkbox">
<label class="control-label" for="on_sale" >
<input type="checkbox" name="on_sale" id="on_sale" {if $product->on_sale}checked="checked"{/if} value="1" />
@@ -257,7 +257,7 @@ $(document).ready(function () {
</div>
<div class="row">
<div class="col-lg-9 col-offset-3">
<div class="col-lg-9 col-lg-offset-3">
<div class="alert">
<strong>{l s='Final retail price:'}</strong>
<span {if !$country_display_tax_label}style="display:none"{/if} >

2
admin-dev/themes/default/template/controllers/products/seo.tpl
View File

@@ -109,7 +109,7 @@
</div>
<div class="row">
<div class="col-lg-9 col-offset-3">
<div class="col-lg-9 col-lg-offset-3">
{foreach from=$languages item=language}
<div class="alert alert-warning translatable-field lang-{$language.id_lang}">
<i class="icon-link"></i> {l s='The product link will look like this:'}

4
admin-dev/themes/default/template/helpers/form/form.tpl
View File

@@ -31,7 +31,7 @@
{if isset($fields.title)}<h3>{$fields.title}</h3>{/if}
{block name="defaultForm"}
<form id="{if isset($fields.form.form.id_form)}{$fields.form.form.id_form|escape:'htmlall':'UTF-8'}{else}{$table}_form{/if}" class="defaultForm {$name_controller}" action="{$current}&{if !empty($submit_action)}{$submit_action}=1{/if}&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
<form id="{if isset($fields.form.form.id_form)}{$fields.form.form.id_form|escape:'htmlall':'UTF-8'}{else}{$table}_form{/if}" class="defaultForm {$name_controller} form-horizontal" action="{$current}&{if !empty($submit_action)}{$submit_action}=1{/if}&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
{if $form_id}
<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
{/if}
@@ -482,7 +482,7 @@
{/if}
{elseif $key == 'submit'}
<div class="row">
<div class="col-lg-9 col-offset-3">
<div class="col-lg-9 col-lg-offset-3">
<button
type="submit"
id="{if isset($field.id)}{$field.id}{else}{$table}_form_submit_btn{/if}"

4
admin-dev/themes/default/template/helpers/options/options.tpl
View File

@@ -285,12 +285,12 @@
{/foreach}
{if isset($categoryData['submit'])}
<div class="row">
<div class="col-lg-9 col-offset-3">
<div class="col-lg-9 col-lg-offset-3">
<button
type="submit"
id="{$table}_form_submit_btn"
name="{if isset($categoryData['submit']['name'])}{$categoryData['submit']['name']}{else}submitOptions{$table}{/if}"
class="{if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-primary{/if}"
class="{if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-default{/if}"
>
<i class="{if isset($categoryData['submit']['icon'])}{$categoryData['submit']['icon']}{else}icon-save{/if}"></i>
{if isset($categoryData['submit']['title'])}{$categoryData['submit']['title']}{else}{l s='Save'}{/if}

4
controllers/admin/AdminInvoicesController.php
View File

@@ -111,7 +111,7 @@ class AdminInvoicesControllerCore extends AdminController
),
'submit' => array(
'title' => $this->l('Generate PDF file by date'),
'class' => 'btn btn-primary',
'class' => 'btn btn-default',
'id' => 'submitPrint',
'icon' => 'icon-download-alt'
)
@@ -149,7 +149,7 @@ class AdminInvoicesControllerCore extends AdminController
),
'submit' => array(
'title' => $this->l('Generate PDF file by status.'),
'class' => 'btn btn-primary',
'class' => 'btn btn-default',
'id' => 'submitPrint2',
'icon' => 'icon-download-alt'
)