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
2013-11-05 17:15:51 +01:00
parent 332101614a 657c8f415a
commit b68d8c5d4a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
+1 -1
View File
@@ -50,7 +50,7 @@
<span class="fees_all" {if $ranges|count == 0}style="display:none" {/if}>All</span> <span class="fees_all" {if $ranges|count == 0}style="display:none" {/if}>All</span>
</td> </td>
<td> <td>
<input type="checkbox" onclick="checkAllZones(this);" > <input type="checkbox" onclick="checkAllZones(this);" class="form-control">
</td> </td>
{foreach from=$ranges key=r item=range} {foreach from=$ranges key=r item=range}
<td class="border_top border_bottom {if $range.id_range != 0} validated {/if}" > <td class="border_top border_bottom {if $range.id_range != 0} validated {/if}" >
controllers/admin/AdminCarrierWizardController.php
+1 -1
View File
@@ -152,7 +152,7 @@ class AdminCarrierWizardControllerCore extends AdminController
public function initPageHeaderToolbar() public function initPageHeaderToolbar()
{ {
parent::initPageHeaderToolbar(); parent::initPageHeaderToolbar();
$this->page_header_toolbar_btn = array(); $this->page_header_toolbar_btn['back']['href'] = $this->context->link->getAdminLink('AdminCarriers');
} }
public function renderStepOne($carrier) public function renderStepOne($carrier)