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-08-28 10:07:02 +02:00
parent ecb4d65347 0019426e81
commit 97e342984d
16 changed files with 165 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
View File
admin-dev/themes/default/template/helpers/form/form.tpl
+1 -1
View File
@@ -430,7 +430,7 @@
<div class="row">
<div class="input-group col-lg-4">
<input
id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
type="text"
data-hex="true"
{if isset($input.class)}class="{$input.class}"
controllers/admin/AdminAddressesController.php
+14
View File
@@ -83,6 +83,18 @@ class AdminAddressesControllerCore extends AdminController
);
}
public function initPageHeaderToolbar()
{
$this->page_header_toolbar_title = $this->l('Addresses');
$this->page_header_toolbar_btn['new_address'] = array(
'href' => self::$currentIndex.'&amp;addaddress&amp;token='.$this->token,
'desc' => $this->l('Add new address'),
'icon' => 'process-icon-new'
);
parent::initPageHeaderToolbar();
}
public function renderForm()
{
$this->fields_form = array(
@@ -130,6 +142,8 @@ class AdminAddressesControllerCore extends AdminController
'label' => $this->l('Other'),
'name' => 'other',
'required' => false,
'cols' => 15,
'rows' => 3,
'hint' => $this->l('Forbidden characters:').' &lt;&gt;;=#{}'
),
),
controllers/admin/AdminCartsController.php
+12
View File
@@ -93,6 +93,18 @@ class AdminCartsControllerCore extends AdminController
parent::__construct();
}
public function initPageHeaderToolbar()
{
$this->page_header_toolbar_title = $this->l('Carts');
$this->page_header_toolbar_btn['export_cart'] = array(
'href' => self::$currentIndex.'&amp;exportcart&amp;token='.$this->token,
'desc' => $this->l('Export carts'),
'icon' => 'process-icon-export'
);
parent::initPageHeaderToolbar();
}
public function renderView()
{
if (!($cart = $this->loadObject(true)))
controllers/admin/AdminContactsController.php
+11
View File
@@ -117,6 +117,17 @@ class AdminContactsControllerCore extends AdminController
return parent::renderForm();
}
public function initPageHeaderToolbar()
{
$this->page_header_toolbar_title = $this->l('Contacts');
$this->page_header_toolbar_btn['new_contact'] = array(
'href' => self::$currentIndex.'&amp;addcontact&amp;token='.$this->token,
'desc' => $this->l('Add new contact'),
'icon' => 'process-icon-new'
);
parent::initPageHeaderToolbar();
}
}
controllers/admin/AdminCustomersController.php
+12
View File
@@ -185,6 +185,18 @@ class AdminCustomersControllerCore extends AdminController
}
}
public function initPageHeaderToolbar()
{
$this->page_header_toolbar_title = $this->l('Customers');
$this->page_header_toolbar_btn['new_customer'] = array(
'href' => self::$currentIndex.'&amp;addcustomer&amp;token='.$this->token,
'desc' => $this->l('Add new customer'),
'icon' => 'process-icon-new'
);
parent::initPageHeaderToolbar();
}
public function initProcess()
{
parent::initProcess();
controllers/admin/AdminDashboardController.php
+34
View File
@@ -0,0 +1,34 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
class AdminDashboardControllerCore extends AdminController
{
public function __construct()
{
$this->display = 'view';
parent::__construct();
}
}
controllers/admin/AdminGendersController.php
+12
View File
@@ -84,6 +84,18 @@ class AdminGendersControllerCore extends AdminController
parent::__construct();
}
public function initPageHeaderToolbar()
{
$this->page_header_toolbar_title = $this->l('Genders');
$this->page_header_toolbar_btn['new_gender'] = array(
'href' => self::$currentIndex.'&amp;addgender&amp;token='.$this->token,
'desc' => $this->l('Add new gender'),
'icon' => 'process-icon-new'
);
parent::initPageHeaderToolbar();
}
public function renderForm()
{
$this->fields_form = array(
controllers/admin/AdminGroupsController.php
+12
View File
@@ -142,6 +142,18 @@ class AdminGroupsControllerCore extends AdminController
parent::initToolbar();
}
public function initPageHeaderToolbar()
{
$this->page_header_toolbar_title = $this->l('Groups');
$this->page_header_toolbar_btn['new_group'] = array(
'href' => self::$currentIndex.'&amp;addgroup&amp;token='.$this->token,
'desc' => $this->l('Add new group'),
'icon' => 'process-icon-new'
);
parent::initPageHeaderToolbar();
}
public function initProcess()
{
$this->id_object = Tools::getValue('id_'.$this->table);
controllers/admin/AdminOrderMessageController.php
+11
View File
@@ -88,6 +88,17 @@ class AdminOrderMessageControllerCore extends AdminController
parent::__construct();
}
public function initPageHeaderToolbar()
{
$this->page_header_toolbar_title = $this->l('Order messages');
$this->page_header_toolbar_btn['new_order_message'] = array(
'href' => self::$currentIndex.'&amp;addorder_message&amp;token='.$this->token,
'desc' => $this->l('Add new order message'),
'icon' => 'process-icon-new'
);
parent::initPageHeaderToolbar();
}
}
controllers/admin/AdminOrdersController.php
+12
View File
@@ -138,6 +138,18 @@ class AdminOrdersControllerCore extends AdminController
parent::__construct();
}
public function initPageHeaderToolbar()
{
$this->page_header_toolbar_title = $this->l('Orders');
$this->page_header_toolbar_btn['new_order'] = array(
'href' => self::$currentIndex.'&amp;addorder&amp;token='.$this->token,
'desc' => $this->l('Add new order'),
'icon' => 'process-icon-new'
);
parent::initPageHeaderToolbar();
}
public function renderForm()
{
if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP && Shop::isFeatureActive())
controllers/admin/AdminSlipController.php
+12
View File
@@ -75,6 +75,18 @@ class AdminSlipControllerCore extends AdminController
parent::__construct();
}
public function initPageHeaderToolbar()
{
$this->page_header_toolbar_title = $this->l('Slips');
$this->page_header_toolbar_btn['generate_pdf'] = array(
'href' => self::$currentIndex.'&amp;token='.$this->token,
'desc' => $this->l('Generate PDF'),
'icon' => 'process-icon-save-date'
);
parent::initPageHeaderToolbar();
}
public function renderForm()
{
$this->fields_form = array(
controllers/admin/AdminStatusesController.php
+17
View File
@@ -185,6 +185,23 @@ class AdminStatusesControllerCore extends AdminController
$helper->title = $this->l('Edit Order Status');
return $helper;
}
public function initPageHeaderToolbar()
{
$this->page_header_toolbar_title = $this->l('States');
$this->page_header_toolbar_btn['new_order_state'] = array(
'href' => self::$currentIndex.'&amp;addorder_state&amp;token='.$this->token,
'desc' => $this->l('Add new order state'),
'icon' => 'process-icon-new'
);
$this->page_header_toolbar_btn['new_order_return_state'] = array(
'href' => self::$currentIndex.'&amp;addorder_return_state&amp;token='.$this->token,
'desc' => $this->l('Add new order return state'),
'icon' => 'process-icon-new'
);
parent::initPageHeaderToolbar();
}
/**
* Function used to render the list to display for this controller
install-dev/data/xml/access.xml
+1
View File
@@ -98,5 +98,6 @@
<access id="access_1_99" id_profile="SuperAdmin" id_tab="Stock_cover" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_100" id_profile="SuperAdmin" id_tab="Supply_orders" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_101" id_profile="SuperAdmin" id_tab="Configuration" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_102" id_profile="SuperAdmin" id_tab="Dashboard" view="1" add="1" edit="1" delete="1"/>
</entities>
</entity_access>
install-dev/data/xml/tab.xml
+3
View File
@@ -9,6 +9,9 @@
<tab id="Home" id_parent="-1" active="1">
<class_name>AdminHome</class_name>
</tab>
<tab id="Dashboard" id_parent="-1" active="1">
<class_name>AdminDashboard</class_name>
</tab>
<tab id="CMS_Pages" id_parent="-1" active="1">
<class_name>AdminCms</class_name>
</tab>
install-dev/langs/fr/data/tab.xml
+1
View File
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<entity_tab>
<tab id="Addresses" name="Adresses"/>
<tab id="Dashboard" name="Dasboard"/>
<tab id="Administration" name="Administration"/>
<tab id="Advanced_Parameters" name="Param&#xE8;tres avanc&#xE9;s"/>
<tab id="Attachments" name="Documents joints"/>