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:
fram
2013-11-21 10:16:47 +01:00
parent 64e84ff296 89f400d3fc
commit 5a9bb5106f
258 changed files with 7028 additions and 4678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCmsContentController.php
+19 -1
View File
@@ -116,6 +116,7 @@ class AdminCmsContentControllerCore extends AdminController
public function renderPageHeaderToolbar()
{
$id_cms_category = (int)Tools::getValue('id_cms_category');
$id_cms_page = Tools::getValue('id_cms');
if (!$id_cms_category)
$id_cms_category = 1;
@@ -124,7 +125,24 @@ class AdminCmsContentControllerCore extends AdminController
$this->toolbar_title[] = 'CMS';
if ($this->display == 'edit_category')
$this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_category->name[$this->context->employee->id_lang]);
{
if (Tools::getValue('addcms_category') !== false)
$this->toolbar_title[] =$this->l('Add new');
else
$this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_category->name[$this->context->employee->id_lang]);
}
elseif ($this->display == 'edit_page')
{
$this->toolbar_title[] = $cms_category->name[$this->context->employee->id_lang];
if (Tools::getValue('addcms') !== false)
$this->toolbar_title[] = $this->l('Add new');
elseif ($id_cms_page)
{
$cms_page = new CMS($id_cms_page);
$this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_page->meta_title[$this->context->employee->id_lang]);
}
}
else
$this->toolbar_title[] = $cms_category->name[$this->context->employee->id_lang];
controllers/admin/AdminCurrenciesController.php
+1 -1
View File
@@ -64,7 +64,7 @@ class AdminCurrenciesControllerCore extends AdminController
'title' => $this->l('Automatically update currency rates'),
'image' => '../img/admin/tab-tools.gif',
'info' => '<div class="alert alert-block"><p>'.$this->l('Use PrestaShop\'s webservice to update your currency exchange rates. Please use caution, rates are provided as-is. You can place this URL in the crontab,or access it manually.').':</p>
<p><strong>'.Tools::getShopDomain(true, true).__PS_BASE_URI__.basename(_PS_ADMIN_DIR_).'/cron_currency_rates.php?secure_key='.md5(_COOKIE_KEY_.Configuration::get('PS_SHOP_NAME')).'</strong></p></div>',
<p><strong><a href="'.Tools::getShopDomain(true, true).__PS_BASE_URI__.basename(_PS_ADMIN_DIR_).'/cron_currency_rates.php?secure_key='.md5(_COOKIE_KEY_.Configuration::get('PS_SHOP_NAME')).'" onclick="return !window.open($(this).attr(\'href\'));">'.Tools::getShopDomain(true, true).__PS_BASE_URI__.basename(_PS_ADMIN_DIR_).'/cron_currency_rates.php?secure_key='.md5(_COOKIE_KEY_.Configuration::get('PS_SHOP_NAME')).'</a></strong></p></div>',
)
);
controllers/admin/AdminDashboardController.php
+1 -1
View File
@@ -78,7 +78,7 @@ class AdminDashboardControllerCore extends AdminController
{
$form['icon'] = 'tab-preferences';
$form['fields'] = array();
$form['submit'] = array('title' => $this->l('Save'), 'class' => 'button');
$form['submit'] = array('title' => $this->l('Save'), 'class' => 'btn btn-default');
}
foreach ($modules as $module)
controllers/admin/AdminGendersController.php
+1 -1
View File
@@ -90,7 +90,7 @@ class AdminGendersControllerCore extends AdminController
if(empty($this->display))
$this->page_header_toolbar_btn['new_gender'] = array(
'href' => self::$currentIndex.'&amp;addgender&amp;token='.$this->token,
'desc' => $this->l('Add new gender'),
'desc' => $this->l('Add new title'),
'icon' => 'process-icon-new'
);
controllers/admin/AdminLanguagesController.php
+15 -15
View File
@@ -43,7 +43,7 @@ class AdminLanguagesControllerCore extends AdminController
'dir' => 'l'
),
array(
'name' => 'no-picture',
'name' => 'no_picture',
'dir' => 'p'
)
);
@@ -165,7 +165,7 @@ class AdminLanguagesControllerCore extends AdminController
'label' => $this->l('Date format:'),
'name' => 'date_format_lite',
'required' => true,
'hint' => $this->l('Short date format (e.g., %s)')
'hint' => sprintf($this->l('Short date format (e.g., %s)'), 'Y-m-d')
/* TO DO - ajouter les liens dans le hint ? */
/*'desc' => sprintf($this->l('Short date format (e.g., %s)'), '<a href="http://php.net/date" target="_blank">Y-m-d</a>')*/
),
@@ -174,7 +174,7 @@ class AdminLanguagesControllerCore extends AdminController
'label' => $this->l('Date format (full):'),
'name' => 'date_format_full',
'required' => true,
'hint' => $this->l('Full date format (e.g., %s)')
'hint' => sprintf($this->l('Full date format (e.g., %s)'), 'Y-m-d H:i:s')
/* TO DO - ajouter les liens dans le hint ? */
/*'desc' => sprintf($this->l('Full date format (e.g., %s)'), '<a href="http://php.net/date" target="_blank">Y-m-d H:i:s</a>')*/
),
@@ -188,7 +188,7 @@ class AdminLanguagesControllerCore extends AdminController
array(
'type' => 'file',
'label' => $this->l('"No-picture" image:'),
'name' => 'no-picture',
'name' => 'no_picture',
'hint' => $this->l('Image is displayed when "no picture is found"')
),
array(
@@ -385,11 +385,11 @@ class AdminLanguagesControllerCore extends AdminController
{
if (isset($_POST['iso_code']) && !empty($_POST['iso_code']) && Validate::isLanguageIsoCode(Tools::getValue('iso_code')) && Language::getIdByIso($_POST['iso_code']))
$this->errors[] = Tools::displayError('This ISO code is already linked to another language.');
if ((!empty($_FILES['no-picture']['tmp_name']) || !empty($_FILES['flag']['tmp_name'])) && Validate::isLanguageIsoCode(Tools::getValue('iso_code')))
if ((!empty($_FILES['no_picture']['tmp_name']) || !empty($_FILES['flag']['tmp_name'])) && Validate::isLanguageIsoCode(Tools::getValue('iso_code')))
{
if ($_FILES['no-picture']['error'] == UPLOAD_ERR_OK)
if ($_FILES['no_picture']['error'] == UPLOAD_ERR_OK)
$this->copyNoPictureImage(strtolower(Tools::getValue('iso_code')));
unset($_FILES['no-picture']);
unset($_FILES['no_picture']);
}
else
$this->errors[] = Tools::displayError('Flag and "No picture" image fields are required.');
@@ -399,13 +399,13 @@ class AdminLanguagesControllerCore extends AdminController
public function processUpdate()
{
if (( isset($_FILES['no-picture']) && !$_FILES['no-picture']['error'] || isset($_FILES['flag']) && !$_FILES['flag']['error'])
if (( isset($_FILES['no_picture']) && !$_FILES['no_picture']['error'] || isset($_FILES['flag']) && !$_FILES['flag']['error'])
&& Validate::isLanguageIsoCode(Tools::getValue('iso_code')))
{
if ($_FILES['no-picture']['error'] == UPLOAD_ERR_OK)
if ($_FILES['no_picture']['error'] == UPLOAD_ERR_OK)
$this->copyNoPictureImage(strtolower(Tools::getValue('iso_code')));
// class AdminTab deal with every $_FILES content, don't do that for no-picture
unset($_FILES['no-picture']);
// class AdminTab deal with every $_FILES content, don't do that for no_picture
unset($_FILES['no_picture']);
}
$object = $this->loadObject();
if (Tools::getValue('active') != (int)$object->active)
@@ -419,16 +419,16 @@ class AdminLanguagesControllerCore extends AdminController
/**
* Copy a no-product image
*
* @param string $language Language iso_code for no-picture image filename
* @param string $language Language iso_code for no_picture image filename
*/
public function copyNoPictureImage($language)
{
if (isset($_FILES['no-picture']) && $_FILES['no-picture']['error'] === 0)
if ($error = ImageManager::validateUpload($_FILES['no-picture'], Tools::getMaxUploadSize()))
if (isset($_FILES['no_picture']) && $_FILES['no_picture']['error'] === 0)
if ($error = ImageManager::validateUpload($_FILES['no_picture'], Tools::getMaxUploadSize()))
$this->errors[] = $error;
else
{
if (!($tmp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS')) || !move_uploaded_file($_FILES['no-picture']['tmp_name'], $tmp_name))
if (!($tmp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS')) || !move_uploaded_file($_FILES['no_picture']['tmp_name'], $tmp_name))
return false;
if (!ImageManager::resize($tmp_name, _PS_IMG_DIR_.'p/'.$language.'.jpg'))
$this->errors[] = Tools::displayError('An error occurred while copying "No Picture" image to your product folder.');
controllers/admin/AdminLocalizationController.php
-5
View File
@@ -131,12 +131,7 @@ class AdminLocalizationControllerCore extends AdminController
);
}
public function initPageHeaderToolbar()
{
parent::initPageHeaderToolbar();
$this->page_header_toolbar_title = $this->l('Localization');
}
public function postProcess()
{
controllers/admin/AdminShippingController.php
+1 -2
View File
@@ -112,8 +112,7 @@ class AdminShippingControllerCore extends AdminController
'identifier' => 'value',
'list' => $carrier_default_order
),
),
'submit' => array()
)
)
);
}