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:
Kevin Granger committed 2013-10-21 19:00:18 +02:00
2 parents c89f6c1adb f336cc599b
commit fadbc4c250
32 files changed
+87 -77
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/css/admin-theme.css
+30 -23
View File
@@ -10286,34 +10286,41 @@ li.sortable-placeholder {
height: 350px; } height: 350px; }
/* line 162, admin-theme/_admin-dashboard.sass */ /* line 162, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons { #dashboard #dashaddons {
padding: 20px 20px 0 20px; } background-color: white;
/* line 163, admin-theme/_admin-dashboard.sass */ border: 1px dashed #dfdfdf;
#dashboard #dashaddons header a { -webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
padding: 10px 20px; }
/* line 166, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons a {
display: block; } display: block; }
/* line 165, admin-theme/_admin-dashboard.sass */ /* line 168, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons header a:hover { #dashboard #dashaddons a:hover {
text-decoration: none; } text-decoration: none; }
/* line 170, admin-theme/_admin-dashboard.sass */ /* line 173, admin-theme/_admin-dashboard.sass */
#dashboard #dashactivity svg { #dashboard #dashactivity svg {
height: 150px; } height: 150px; }
/* line 177, admin-theme/_admin-dashboard.sass */ /* line 180, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value { #dashboard .loading .data_value {
min-width: 30px; min-width: 30px;
text-align: center; } text-align: center; }
/* line 180, admin-theme/_admin-dashboard.sass */ /* line 183, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value:before { #dashboard .loading .data_value:before {
font-size: 0.7em; font-size: 0.7em;
font-family: FontAwesome; font-family: FontAwesome;
content: "\f021"; content: "\f021";
color: #cccccc; } color: #cccccc; }
/* line 186, admin-theme/_admin-dashboard.sass */ /* line 189, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value span, #dashboard .loading .data_value small { #dashboard .loading .data_value span, #dashboard .loading .data_value small {
display: none; } display: none; }
/* line 188, admin-theme/_admin-dashboard.sass */ /* line 191, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_trend { #dashboard .loading .data_trend {
display: none; } display: none; }
/* line 213, admin-theme/_admin-dashboard.sass */ /* line 216, admin-theme/_admin-dashboard.sass */
.data_loading, #dashboard .data_value span, #dashboard .data_value .dash_trend { .data_loading, #dashboard .data_value span, #dashboard .data_value .dash_trend {
opacity: 1; opacity: 1;
-webkit-animation-name: bounceG; -webkit-animation-name: bounceG;
@@ -10327,7 +10334,7 @@ li.sortable-placeholder {
transform: scale(0.7); } transform: scale(0.7); }
@-webkit-keyframes bounceG { @-webkit-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */ /* line 224, admin-theme/_admin-dashboard.sass */
0% { 0% {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@@ -10335,7 +10342,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1); -ms-transform: scale(0.1);
transform: scale(0.1); } transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */ /* line 227, admin-theme/_admin-dashboard.sass */
100% { 100% {
opacity: 1; opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
@@ -10344,7 +10351,7 @@ li.sortable-placeholder {
transform: scale(1); } } transform: scale(1); } }
@-moz-keyframes bounceG { @-moz-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */ /* line 224, admin-theme/_admin-dashboard.sass */
0% { 0% {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@@ -10352,7 +10359,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1); -ms-transform: scale(0.1);
transform: scale(0.1); } transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */ /* line 227, admin-theme/_admin-dashboard.sass */
100% { 100% {
opacity: 1; opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
@@ -10361,7 +10368,7 @@ li.sortable-placeholder {
transform: scale(1); } } transform: scale(1); } }
@-ms-keyframes bounceG { @-ms-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */ /* line 224, admin-theme/_admin-dashboard.sass */
0% { 0% {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@@ -10369,7 +10376,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1); -ms-transform: scale(0.1);
transform: scale(0.1); } transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */ /* line 227, admin-theme/_admin-dashboard.sass */
100% { 100% {
opacity: 1; opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
@@ -10378,7 +10385,7 @@ li.sortable-placeholder {
transform: scale(1); } } transform: scale(1); } }
@-o-keyframes bounceG { @-o-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */ /* line 224, admin-theme/_admin-dashboard.sass */
0% { 0% {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@@ -10386,7 +10393,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1); -ms-transform: scale(0.1);
transform: scale(0.1); } transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */ /* line 227, admin-theme/_admin-dashboard.sass */
100% { 100% {
opacity: 1; opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
@@ -10395,7 +10402,7 @@ li.sortable-placeholder {
transform: scale(1); } } transform: scale(1); } }
@keyframes bounceG { @keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */ /* line 224, admin-theme/_admin-dashboard.sass */
0% { 0% {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@@ -10403,7 +10410,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1); -ms-transform: scale(0.1);
transform: scale(0.1); } transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */ /* line 227, admin-theme/_admin-dashboard.sass */
100% { 100% {
opacity: 1; opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
@@ -10411,11 +10418,11 @@ li.sortable-placeholder {
-ms-transform: scale(1); -ms-transform: scale(1);
transform: scale(1); } } transform: scale(1); } }
/* line 228, admin-theme/_admin-dashboard.sass */ /* line 231, admin-theme/_admin-dashboard.sass */
#dash_version { #dash_version {
padding: 0 !important; padding: 0 !important;
overflow: hidden; } overflow: hidden; }
/* line 232, admin-theme/_admin-dashboard.sass */ /* line 235, admin-theme/_admin-dashboard.sass */
#dash_version iframe { #dash_version iframe {
height: 80px; height: 80px;
width: 100%; } width: 100%; }
admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass
+5 -2
View File
@@ -160,11 +160,14 @@
#dashproducts #dashproducts
#dashaddons #dashaddons
header a background-color: white
border: 1px dashed #DFDFDF
@include border-radius(3px)
a
display: block display: block
&:hover &:hover
text-decoration: none text-decoration: none
padding: 20px 20px 0 20px padding: 10px 20px
#dashactivity #dashactivity
svg svg
admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+1 -3
View File
@@ -29,9 +29,7 @@
{include file='controllers/cart_rules/actions.tpl'} {include file='controllers/cart_rules/actions.tpl'}
{include file="footer_toolbar.tpl"} {include file="footer_toolbar.tpl"}
</div> </div>
<button type="submit" class="btn btn-primary btn-large pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn"> <button type="submit" class="btn btn-default pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn">{l s='Save'}
<i class="icon-save"></i>
{l s='Save'}
</button> </button>
<!--<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" id="" />--> <!--<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" id="" />-->
</form> </form>
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
+1 -1
View File
@@ -361,7 +361,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<button type="submit" id="submitCustomerNote" class="btn btn-primary pull-right" disabled="disabled" /><i class="icon-save"></i> {l s='Save'}</button> <button type="submit" id="submitCustomerNote" class="btn btn-default pull-right" disabled="disabled" /><i class="icon-save"></i> {l s='Save'}</button>
</div> </div>
</div> </div>
<span id="note_feedback"></span> <span id="note_feedback"></span>
admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+7 -9
View File
@@ -26,9 +26,9 @@
<script> <script>
var dashboard_ajax_url = '{$link->getAdminLink('AdminDashboard')}'; var dashboard_ajax_url = '{$link->getAdminLink('AdminDashboard')}';
var adminstats_ajax_url = '{$link->getAdminLink('AdminStats')}'; var adminstats_ajax_url = '{$link->getAdminLink('AdminStats')}';
var no_results_translation = '{l s='No result'}'; var no_results_translation = '{l s='No result' js='1'}';
var dashboard_use_push = '{$dashboard_use_push|intval}'; var dashboard_use_push = '{$dashboard_use_push|intval}';
var read_more = '{l s='Read more'}' var read_more = '{l s='Read more' js='1'}';
</script> </script>
<div id="dashboard"> <div id="dashboard">
@@ -46,13 +46,11 @@
</div> </div>
<div class="col-lg-7" id="hookDashboardZoneTwo"> <div class="col-lg-7" id="hookDashboardZoneTwo">
{$hookDashboardZoneTwo} {$hookDashboardZoneTwo}
<section id="dashaddons" class="panel widget"> <div id="dashaddons" class="widget">
<header class="panel-heading"> <a href="http://addons.prestashop.com/208-dashboards?utm_source=backoffice_dashboard" target="_blank">
<a href="http://addons.prestashop.com/208-dashboards?utm_source=backoffice_dashboard" target="_blank"> <i class="icon-plus"></i> {l s='Add more graph and data'}
<i class="icon-plus"></i> {l s='Add more graph and data'} </a>
</a> </div>
</header>
</section>
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">
admin-dev/themes/default/template/controllers/images/content.tpl
+2 -2
View File
@@ -123,7 +123,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-9 col-lg-push-3"> <div class="col-lg-9 col-lg-push-3">
<input type="Submit" name="submitRegenerate{$table}" value="{l s='Regenerate thumbnails'}" class="btn btn-primary" onclick="return confirm('{l s='Are you sure?'}');" /> <input type="Submit" name="submitRegenerate{$table}" value="{l s='Regenerate thumbnails'}" class="btn btn-default" onclick="return confirm('{l s='Are you sure?'}');" />
</div> </div>
</div> </div>
</div> </div>
@@ -151,7 +151,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12 pull-right"> <div class="col-lg-12 pull-right">
<input type="Submit" name="submitMoveImages{$table}" value="{l s='Move images'}" class="btn btn-primary" onclick="return confirm('{l s='Are you sure?'}');" /> <input type="Submit" name="submitMoveImages{$table}" value="{l s='Move images'}" class="btn btn-default" onclick="return confirm('{l s='Are you sure?'}');" />
</div> </div>
</div> </div>
</div> </div>
admin-dev/themes/default/template/controllers/modules_positions/form.tpl
+1 -1
View File
@@ -80,7 +80,7 @@
<input type="hidden" name="id_module" value="{$id_module}" /> <input type="hidden" name="id_module" value="{$id_module}" />
<input type="hidden" name="id_hook" value="{$id_hook}" /> <input type="hidden" name="id_hook" value="{$id_hook}" />
{/if} {/if}
<input type="submit" value="{l s='Save'}" name="{if $edit_graft}submitEditGraft{else}submitAddToHook{/if}" id="{$table}_form_submit_btn" class="btn btn-primary" /> <input type="submit" value="{l s='Save'}" name="{if $edit_graft}submitEditGraft{else}submitAddToHook{/if}" id="{$table}_form_submit_btn" class="btn btn-default" />
</div> </div>
</div> </div>
</div> </div>
admin-dev/themes/default/template/controllers/payment/restrictions.tpl
+1 -1
View File
@@ -119,7 +119,7 @@
</table> </table>
</div> </div>
<div class="row pull-right"> <div class="row pull-right">
<button type="submit" class="btn btn-primary" name="submitModule{$list['name_id']}"> <button type="submit" class="btn btn-default" name="submitModule{$list['name_id']}">
<i class="icon-save"></i> <i class="icon-save"></i>
{l s='Save restrictions'} {l s='Save restrictions'}
</button> </button>
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+1 -1
View File
@@ -258,7 +258,7 @@
<input type="hidden" name="id_product_attribute" id="id_product_attribute" value="0" /> <input type="hidden" name="id_product_attribute" id="id_product_attribute" value="0" />
<input type="hidden" name="key_tab" id="key_tab" value="Informations" /> <input type="hidden" name="key_tab" id="key_tab" value="Informations" />
<button id="product_form_submit_btn" type="submit" name="submitAddproduct" class="btn btn-primary">{l s='Save'}</button> <button id="product_form_submit_btn" type="submit" name="submitAddproduct" class="btn btn-default">{l s='Save'}</button>
{include file="footer_toolbar.tpl"} {include file="footer_toolbar.tpl"}
</form> </form>
</div> </div>
admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl
+2 -2
View File
@@ -37,7 +37,7 @@
</select> </select>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<input type="submit" class="btn btn-primary" name="submitBulk" id="submitBulk" value="{l s='Apply'}" /> <input type="submit" class="btn btn-default" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
</div> </div>
</div> </div>
{else} {else}
@@ -53,7 +53,7 @@
{/if} {/if}
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<input type="submit" class="btn btn-primary" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} /> <input type="submit" class="btn btn-default" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
</div> </div>
</div> </div>
{/foreach} {/foreach}
admin-dev/themes/default/template/helpers/options/options.tpl
+1 -2
View File
@@ -350,10 +350,9 @@
</p> </p>
</div> </div>
{/if} {/if}
{/block}{* end block field *}
</div> </div>
</div> </div>
{/block}{* end block field *}
{/if} {/if}
{/foreach} {/foreach}
{if isset($categoryData['submit'])} {if isset($categoryData['submit'])}
admin-dev/themes/default/template/helpers/required_fields.tpl
+1 -1
View File
@@ -57,6 +57,6 @@
{/foreach} {/foreach}
</tbody> </tbody>
</table> </table>
<button class="btn btn-primary pull-right" type="submit" name="submitFields"><i class="icon-save"></i> {l s='Save'}</button> <button class="btn btn-default pull-right" type="submit" name="submitFields"><i class="icon-save"></i> {l s='Save'}</button>
</form> </form>
</div> </div>
classes/Tab.php
+3 -2
View File
@@ -339,12 +339,13 @@ class TabCore extends ObjectModel
* Get Instance from tab class name * Get Instance from tab class name
* *
* @param $class_name string Name of tab class * @param $class_name string Name of tab class
* @param $id_lang integer id_lang
* @return Tab Tab object (empty if bad id or class name) * @return Tab Tab object (empty if bad id or class name)
*/ */
public static function getInstanceFromClassName($class_name) public static function getInstanceFromClassName($class_name, $id_lang = null)
{ {
$id_tab = (int)Tab::getIdFromClassName($class_name); $id_tab = (int)Tab::getIdFromClassName($class_name);
return new Tab($id_tab); return new Tab($id_tab, $id_lang);
} }
public static function getNbTabs($id_parent = null) public static function getNbTabs($id_parent = null)
controllers/admin/AdminAddressesController.php
+1 -1
View File
@@ -149,7 +149,7 @@ class AdminAddressesControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save '), 'title' => $this->l('Save '),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
) )
); );
$id_customer = (int)Tools::getValue('id_customer'); $id_customer = (int)Tools::getValue('id_customer');
controllers/admin/AdminCategoriesController.php
+1 -1
View File
@@ -491,7 +491,7 @@ class AdminCategoriesControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save'), 'title' => $this->l('Save'),
'class' => 'btn-primary' 'class' => 'btn-default'
) )
); );
controllers/admin/AdminCmsCategoriesController.php
+1 -1
View File
@@ -293,7 +293,7 @@ class AdminCmsCategoriesControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save'), 'title' => $this->l('Save'),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
) )
); );
$this->tpl_form_vars['PS_ALLOW_ACCENTED_CHARS_URL'] = (int)Configuration::get('PS_ALLOW_ACCENTED_CHARS_URL'); $this->tpl_form_vars['PS_ALLOW_ACCENTED_CHARS_URL'] = (int)Configuration::get('PS_ALLOW_ACCENTED_CHARS_URL');
controllers/admin/AdminCmsController.php
+1 -1
View File
@@ -177,7 +177,7 @@ class AdminCmsControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save'), 'title' => $this->l('Save'),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
) )
); );
controllers/admin/AdminContactsController.php
+1 -1
View File
@@ -101,7 +101,7 @@ class AdminContactsControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save '), 'title' => $this->l('Save '),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
) )
); );
controllers/admin/AdminCurrenciesController.php
+1 -1
View File
@@ -226,7 +226,7 @@ class AdminCurrenciesControllerCore extends AdminController
$this->fields_form['submit'] = array( $this->fields_form['submit'] = array(
'title' => $this->l('Save'), 'title' => $this->l('Save'),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
); );
return parent::renderForm(); return parent::renderForm();
controllers/admin/AdminDeliverySlipController.php
+1 -1
View File
@@ -83,7 +83,7 @@ class AdminDeliverySlipControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Generate PDF file'), 'title' => $this->l('Generate PDF file'),
'class' => 'btn btn-primary', 'class' => 'btn btn-default',
'icon' => 'icon-download-alt' 'icon' => 'icon-download-alt'
) )
); );
controllers/admin/AdminEmployeesController.php
+7 -3
View File
@@ -113,11 +113,15 @@ class AdminEmployeesControllerCore extends AdminController
if ($theme[0] != '.' && is_dir($path.$theme) && (file_exists($path.$theme.'/css/admin.css') || file_exists($path.$theme.'/css/admin-theme.css'))) if ($theme[0] != '.' && is_dir($path.$theme) && (file_exists($path.$theme.'/css/admin.css') || file_exists($path.$theme.'/css/admin-theme.css')))
$this->themes[] = $theme; $this->themes[] = $theme;
$home_tab = Tab::getInstanceFromClassName('AdminDashboard'); $home_tab = Tab::getInstanceFromClassName('AdminDashboard', $this->context->language->id);
$this->tabs_list[$home_tab->id] = array( $this->tabs_list[$home_tab->id] = array(
'name' => $home_tab->name[$this->context->language->id], 'name' => $home_tab->name,
'id_tab' => $home_tab->id,
'children' => array(array(
'id_tab' => $home_tab->id, 'id_tab' => $home_tab->id,
'children' => array(array('id_tab' =>$home_tab->id, 'name' => $home_tab->name[$this->context->language->id]))); 'name' => $home_tab->name
))
);
foreach (Tab::getTabs($this->context->language->id, 0) as $tab) foreach (Tab::getTabs($this->context->language->id, 0) as $tab)
{ {
if (Tab::checkTabRights($tab['id_tab'])) if (Tab::checkTabRights($tab['id_tab']))
controllers/admin/AdminGendersController.php
+1 -1
View File
@@ -158,7 +158,7 @@ class AdminGendersControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save'), 'title' => $this->l('Save'),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
) )
); );
controllers/admin/AdminGroupsController.php
+1 -1
View File
@@ -239,7 +239,7 @@ class AdminGroupsControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save '), 'title' => $this->l('Save '),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
), ),
'input' => array( 'input' => array(
array( array(
controllers/admin/AdminImagesController.php
+2 -2
View File
@@ -157,7 +157,7 @@ class AdminImagesControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL 'visibility' => Shop::CONTEXT_ALL
) )
), ),
'submit' => array('title' => $this->l('Save '), 'class' => 'btn btn-primary'), 'submit' => array('title' => $this->l('Save '), 'class' => 'btn btn-default'),
), ),
); );
@@ -326,7 +326,7 @@ class AdminImagesControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save'), 'title' => $this->l('Save'),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
) )
); );
controllers/admin/AdminMetaController.php
+1 -1
View File
@@ -320,7 +320,7 @@ class AdminMetaControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save'), 'title' => $this->l('Save'),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
) )
); );
return parent::renderForm(); return parent::renderForm();
controllers/admin/AdminSlipController.php
+1 -1
View File
@@ -115,7 +115,7 @@ class AdminSlipControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Generate PDF file'), 'title' => $this->l('Generate PDF file'),
'class' => 'btn btn-primary', 'class' => 'btn btn-default',
'id' => 'submitPrint', 'id' => 'submitPrint',
'icon' => 'icon-download-alt' 'icon' => 'icon-download-alt'
) )
controllers/admin/AdminSpecificPriceRuleController.php
+1 -1
View File
@@ -265,7 +265,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save'), 'title' => $this->l('Save'),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
), ),
); );
if (($value = $this->getFieldValue($this->object, 'price')) != -1) if (($value = $this->getFieldValue($this->object, 'price')) != -1)
controllers/admin/AdminStockConfigurationController.php
+3 -3
View File
@@ -190,7 +190,7 @@ class AdminStockConfigurationControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save'), 'title' => $this->l('Save'),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
) )
); );
} }
@@ -302,7 +302,7 @@ class AdminStockConfigurationControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save'), 'title' => $this->l('Save'),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
) )
); );
@@ -339,7 +339,7 @@ class AdminStockConfigurationControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save'), 'title' => $this->l('Save'),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
) )
); );
} }
controllers/admin/AdminStockManagementController.php
+3 -3
View File
@@ -305,7 +305,7 @@ class AdminStockManagementControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Add to stock'), 'title' => $this->l('Add to stock'),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
) )
); );
$this->fields_value['usable'] = 1; $this->fields_value['usable'] = 1;
@@ -409,7 +409,7 @@ class AdminStockManagementControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Remove from stock'), 'title' => $this->l('Remove from stock'),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
) )
); );
break; break;
@@ -531,7 +531,7 @@ class AdminStockManagementControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Transfer'), 'title' => $this->l('Transfer'),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
) )
); );
break; break;
controllers/admin/AdminTaxRulesGroupController.php
+2 -2
View File
@@ -187,7 +187,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save and stay'), 'title' => $this->l('Save and stay'),
'class' => 'btn btn-primary', 'class' => 'btn btn-default',
'stay' => true 'stay' => true
) )
); );
@@ -337,7 +337,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save and stay'), 'title' => $this->l('Save and stay'),
'class' => 'btn btn-primary', 'class' => 'btn btn-default',
'stay' => true 'stay' => true
) )
); );
controllers/admin/AdminTaxesController.php
+1 -1
View File
@@ -215,7 +215,7 @@ class AdminTaxesControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save'), 'title' => $this->l('Save'),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
) )
); );
controllers/admin/AdminWebserviceController.php
+1 -1
View File
@@ -179,7 +179,7 @@ class AdminWebserviceControllerCore extends AdminController
$this->fields_form['submit'] = array( $this->fields_form['submit'] = array(
'title' => $this->l('Save '), 'title' => $this->l('Save '),
'class' => 'btn btn-primary' 'class' => 'btn btn-default'
); );
if (!($obj = $this->loadObject(true))) if (!($obj = $this->loadObject(true)))