diff --git a/modules/blocktopmenu/blocktopmenu.php b/modules/blocktopmenu/blocktopmenu.php index d857362dd..682fe6457 100644 --- a/modules/blocktopmenu/blocktopmenu.php +++ b/modules/blocktopmenu/blocktopmenu.php @@ -141,7 +141,8 @@ class Blocktopmenu extends Module if (Tools::isSubmit('submitBlocktopmenu')) { - if (Configuration::updateValue('MOD_BLOCKTOPMENU_ITEMS', Tools::getValue('items'))) + $items = Tools::getValue('items'); + if (is_array($items) && count($items) && Configuration::updateValue('MOD_BLOCKTOPMENU_ITEMS', implode(',', $items))) $this->_html .= $this->displayConfirmation($this->l('The settings have been updated.')); else $this->_html .= $this->displayError($this->l('Unable to update settings.')); @@ -150,7 +151,6 @@ class Blocktopmenu extends Module } else if (Tools::isSubmit('submitBlocktopmenuLinks')) { - if ((!count($links_label)) && (!count($labels))) ; else if (!count($links_label)) @@ -166,7 +166,7 @@ class Blocktopmenu extends Module } $update_cache = true; } - else if (Tools::isSubmit('submitBlocktopmenuRemove')) + else if (Tools::isSubmit('deletelinksmenutop')) { $id_linksmenutop = Tools::getValue('id_linksmenutop', 0); MenuTopLinks::remove($id_linksmenutop, (int)Shop::getContextShopID()); @@ -174,21 +174,24 @@ class Blocktopmenu extends Module $this->_html .= $this->displayConfirmation($this->l('The link has been removed')); $update_cache = true; } - else if (Tools::isSubmit('submitBlocktopmenuEdit')) + else if (Tools::isSubmit('updatelinksmenutop')) { $id_linksmenutop = (int)Tools::getValue('id_linksmenutop', 0); $id_shop = (int)Shop::getContextShopID(); - if (!Tools::isSubmit('link')) + if (Tools::isSubmit('updatelink')) { - $tmp = MenuTopLinks::getLinkLang($id_linksmenutop, $id_shop); - $links_label_edit = $tmp['link']; - $labels_edit = $tmp['label']; - $new_window_edit = $tmp['new_window']; - } - else - { - MenuTopLinks::update(Tools::getValue('link'), Tools::getValue('label'), Tools::getValue('new_window', 0), (int)$id_shop, (int)$id_linksmenutop, (int)$id_linksmenutop); + $link = array(); + $label = array(); + $new_window = (int)Tools::getValue('new_window', 0); + + foreach (Language::getLanguages(false) as $lang) + { + $link[$lang['id_lang']] = Tools::getValue('link_'.(int)$lang['id_lang']); + $label[$lang['id_lang']] = Tools::getValue('label_'.(int)$lang['id_lang']); + } + + MenuTopLinks::update($link, $label, $new_window, (int)$id_shop, (int)$id_linksmenutop, (int)$id_linksmenutop); $this->_html .= $this->displayConfirmation($this->l('The link has been edited')); } $update_cache = true; @@ -197,255 +200,41 @@ class Blocktopmenu extends Module if ($update_cache) $this->clearMenuCache(); - $this->_html .= ' -
-
- '.$this->l('The modifications will be applied to').' '.(Shop::getContext() == Shop::CONTEXT_SHOP ? $this->l('shop').' '.$this->context->shop->name : $this->l('all shops')).'. -
- '.$this->l('Settings').' -
-
- -
- -
-
- -
 
- - - - - - - -
-
-
- '.$this->l('Add').' >> - 		-
-
- << '.$this->l('Remove').' -
-
 
- - -
- -
-

- -

-
-

'; - - $this->_html .= ' -
- '.$this->l('Add Menu Top Link').' -
- - '; - foreach ($languages as $language) - { - $this->_html .= ' - '; - } - - $this->_html .= ' -
'.$this->displayFlags($languages, (int)$id_lang, $divLangName, 'link_label', true).'

'; - - $this->_html .= ' -
- -
-
'; - - if (Tools::isSubmit('id_linksmenutop')) - $this->_html .= ''; - - if (Tools::isSubmit('submitBlocktopmenuEdit')) - $this->_html .= ''; - - $this->_html .= ' - -
- -
-

'; + $this->_html .= $this->renderForm(); + $this->_html .= $this->renderAddForm(); $links = MenuTopLinks::gets((int)$id_lang, null, (int)Shop::getContextShopID()); if (!count($links)) return $this->_html; - $this->_html .= ' -
- '.$this->l('List Menu Top Link').' - - - - - - - - - - - '; - foreach ($links as $link) - { - $this->_html .= ' - - - - - - - '; - } - $this->_html .= ' -
'.$this->l('Id Link').''.$this->l('Label').''.$this->l('Link').''.$this->l('New Window').''.$this->l('Action').'
'.(int)$link['id_linksmenutop'].''.Tools::safeOutput($link['label']).''.Tools::safeOutput($link['link']).''.(($link['new_window']) ? $this->l('Yes') : $this->l('No')).' -
- - - -
-
-
'; + $this->_html .= $this->renderList(); + return $this->_html; } private function getMenuItems() { - return explode(',', Configuration::get('MOD_BLOCKTOPMENU_ITEMS')); + $items = Tools::getValue('items'); + if (is_array($items) && count($items)) + return $items; + else + { + $conf = Configuration::get('MOD_BLOCKTOPMENU_ITEMS'); + if (strlen($conf) && strpos($conf, ',')) + return explode(',', Configuration::get('MOD_BLOCKTOPMENU_ITEMS')); + else + return array(); + } } private function makeMenuOption() { $menu_item = $this->getMenuItems(); + $id_lang = (int)$this->context->language->id; $id_shop = (int)Shop::getContextShopID(); + $html = ''; } private function makeMenu() @@ -951,7 +741,290 @@ class Blocktopmenu extends Module INSERT IGNORE INTO '._DB_PREFIX_.'linksmenutop_lang (id_linksmenutop, id_lang, id_shop, label, link) VALUES ('.(int)$link['new_id_linksmenutop'].', '.(int)$l['id_lang'].', '.(int)$params['new_id_shop'].', '.(int)$l['label'].', '.(int)$l['link'].' )'); } - - } -} + + public function renderForm() + { + $fields_form = array( + 'form' => array( + 'legend' => array( + 'title' => $this->l('Menu Top Link'), + 'icon' => 'icon-link' + ), + 'input' => array( + array( + 'type' => 'link_choice', + 'label' => '', + 'name' => 'link', + 'lang' => true, + ), + array( + 'type' => 'switch', + 'label' => $this->l('Search Bar'), + 'name' => 'search', + 'is_bool' => true, + 'values' => array( + array( + 'id' => 'active_on', + 'value' => 1, + 'label' => $this->l('Enabled') + ), + array( + 'id' => 'active_off', + 'value' => 0, + 'label' => $this->l('Disabled') + ) + ), + ) + ), + 'submit' => array( + 'title' => $this->l('Save'), + 'class' => 'btn btn-primary', + ) + ), + ); + + if (Shop::isFeatureActive()) + $fields_form['form']['description'] = $this->l('The modifications will be applied to').' '.(Shop::getContext() == Shop::CONTEXT_SHOP ? $this->l('shop').' '.$this->context->shop->name : $this->l('all shops')); + + $helper = new HelperForm(); + $helper->show_toolbar = false; + $helper->table = $this->table; + $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT')); + $helper->default_form_language = $lang->id; + $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0; + $this->fields_form = array(); + $helper->module = $this; + $helper->identifier = $this->identifier; + $helper->submit_action = 'submitBlocktopmenu'; + $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name; + $helper->token = Tools::getAdminTokenLite('AdminModules'); + $helper->tpl_vars = array( + 'fields_value' => $this->getConfigFieldsValues(), + 'languages' => $this->context->controller->getLanguages(), + 'id_language' => $this->context->language->id, + 'choices' => $this->renderChoicesSelect(), + 'selected_links' => $this->makeMenuOption(), + ); + return $helper->generateForm(array($fields_form)); + } + + public function renderAddForm() + { + $fields_form = array( + 'form' => array( + 'legend' => array( + 'title' => $this->l('Menu Top Link'), + 'icon' => 'icon-link' + ), + 'input' => array( + array( + 'type' => 'text', + 'label' => $this->l('Label:'), + 'name' => 'label', + 'lang' => true, + ), + array( + 'type' => 'text', + 'label' => $this->l('Link:'), + 'name' => 'link', + 'lang' => true, + ), + array( + 'type' => 'switch', + 'label' => $this->l('New window'), + 'name' => 'new_window', + 'is_bool' => true, + 'values' => array( + array( + 'id' => 'active_on', + 'value' => 1, + 'label' => $this->l('Enabled') + ), + array( + 'id' => 'active_off', + 'value' => 0, + 'label' => $this->l('Disabled') + ) + ), + ) + ), + 'submit' => array( + 'title' => $this->l('Save'), + 'class' => 'btn btn-primary', + ) + ), + ); + + $helper = new HelperForm(); + $helper->show_toolbar = false; + $helper->table = $this->table; + $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT')); + $helper->default_form_language = $lang->id; + $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0; + $this->fields_form = array(); + + $helper->identifier = $this->identifier; + + + if (Tools::isSubmit('updatelinksmenutop')) + { + $helper->submit_action = 'updatelinksmenutop'; + $fields_form['form']['input'][] = array('type' => 'hidden', 'name' => 'updatelink'); + $fields_form['form']['input'][] = array('type' => 'hidden', 'name' => 'id_linksmenutop'); + } + else + $helper->submit_action = 'submitBlocktopmenuLinks'; + + $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name; + $helper->token = Tools::getAdminTokenLite('AdminModules'); + $helper->tpl_vars = array( + 'fields_value' => $this->getAddLinkFieldsValues(), + 'languages' => $this->context->controller->getLanguages(), + 'id_language' => $this->context->language->id + ); + return $helper->generateForm(array($fields_form)); + } + + public function renderChoicesSelect() + { + $spacer = str_repeat(' ', $this->spacer_size); + + $html = ''; + return $html; + } + + public function getConfigFieldsValues() + { + return array( + 'search' => Tools::getValue('search', Configuration::get('MOD_BLOCKTOPMENU_SEARCH')) + ); + } + + public function getAddLinkFieldsValues() + { + $links_label_edit = ''; + $labels_edit = ''; + $new_window_edit = ''; + if (Tools::isSubmit('updatelinksmenutop')) + { + $link = MenuTopLinks::getLinkLang(Tools::getValue('id_linksmenutop'), (int)Shop::getContextShopID()); + $links_label_edit = $link['link']; + $labels_edit = $link['label']; + $new_window_edit = $link['new_window']; + } + + $fields_values = array( + 'new_window' => Tools::getValue('new_window', $new_window_edit), + 'id_linksmenutop' => Tools::getValue('id_linksmenutop'), + ); + + foreach (Language::getLanguages(false) as $lang) + { + $fields_values['label'][$lang['id_lang']] = Tools::getValue('label_'.(int)$lang['id_lang'], isset($labels_edit[$lang['id_lang']]) ? $labels_edit[$lang['id_lang']] : ''); + $fields_values['link'][$lang['id_lang']] = Tools::getValue('link_'.(int)$lang['id_lang'], isset($links_label_edit[$lang['id_lang']]) ? $links_label_edit[$lang['id_lang']] : ''); + } + + return $fields_values; + } + + public function renderList() + { + $links = MenuTopLinks::gets((int)$this->context->language->id, null, (int)Shop::getContextShopID()); + $fields_list = array( + 'id_linksmenutop' => array( + 'title' => $this->l('Id Link'), + 'type' => 'text', + ), + 'label' => array( + 'title' => $this->l('Label'), + 'type' => 'text', + ), + 'link' => array( + 'title' => $this->l('Link'), + 'type' => 'link', + ), + 'new_window' => array( + 'title' => $this->l('New Window'), + 'type' => 'bool', + 'align' => 'center', + 'active' => 'status', + ) + ); + + $helper = new HelperList(); + $helper->shopLinkType = ''; + $helper->simple_header = true; + $helper->identifier = 'id_linksmenutop'; + $helper->table = 'linksmenutop'; + $helper->actions = array('edit', 'delete'); + $helper->show_toolbar = false; + $helper->module = $this; + $helper->title = $this->l('Link list'); + $helper->token = Tools::getAdminTokenLite('AdminModules'); + $helper->currentIndex = AdminController::$currentIndex.'&configure='.$this->name; + + return $helper->generateList($links, $fields_list); + } +} \ No newline at end of file diff --git a/modules/blocktopmenu/views/index.php b/modules/blocktopmenu/views/index.php new file mode 100644 index 000000000..3f6561f72 --- /dev/null +++ b/modules/blocktopmenu/views/index.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blocktopmenu/views/templates/admin/_configure/helpers/form/form.tpl b/modules/blocktopmenu/views/templates/admin/_configure/helpers/form/form.tpl new file mode 100644 index 000000000..2a01368a9 --- /dev/null +++ b/modules/blocktopmenu/views/templates/admin/_configure/helpers/form/form.tpl @@ -0,0 +1,85 @@ +{* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 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/afl-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 +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{extends file="helpers/form/form.tpl"} + +{block name="script"} +$(document).ready(function(){ +$("#addItem").click(add); +$("#availableItems").dblclick(add); +$("#removeItem").click(remove); +$("#items").dblclick(remove); +function add() +{ + $("#availableItems option:selected").each(function(i){ + var val = $(this).val(); + var text = $(this).text(); + text = text.replace(/(^\s*)|(\s*$)/gi,""); + if (val == "PRODUCT") + { + val = prompt('{l s="Set ID product" js=1}'); + if (val == null || val == "" || isNaN(val)) + return; + text = '{l s="Product ID" js=1}'+val; + val = "PRD"+val; + } + $("#items").append(''); + }); + serialize(); + return false; +} +function remove() +{ + $("#items option:selected").each(function(i){ + $(this).remove(); + }); + serialize(); + return false; +} +function serialize() +{ + var options = ""; + $("#items option").each(function(i){ + options += $(this).val()+","; + }); + $("#itemsInput").val(options.substr(0, options.length - 1)); +} +}); +{/block} + +{block name="input"} + {if $input.type == 'link_choice'} +
+
{$selected_links}
+
{$choices}
+
+
+
{l s='Remove'}
+
{l s='Add'}
+
+ {else} + {$smarty.block.parent} + {/if} +{/block} diff --git a/modules/blocktopmenu/views/templates/admin/_configure/helpers/form/index.php b/modules/blocktopmenu/views/templates/admin/_configure/helpers/form/index.php new file mode 100644 index 000000000..3f6561f72 --- /dev/null +++ b/modules/blocktopmenu/views/templates/admin/_configure/helpers/form/index.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blocktopmenu/views/templates/admin/_configure/helpers/index.php b/modules/blocktopmenu/views/templates/admin/_configure/helpers/index.php new file mode 100644 index 000000000..3f6561f72 --- /dev/null +++ b/modules/blocktopmenu/views/templates/admin/_configure/helpers/index.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blocktopmenu/views/templates/admin/_configure/helpers/list/index.php b/modules/blocktopmenu/views/templates/admin/_configure/helpers/list/index.php new file mode 100644 index 000000000..3f6561f72 --- /dev/null +++ b/modules/blocktopmenu/views/templates/admin/_configure/helpers/list/index.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blocktopmenu/views/templates/admin/_configure/helpers/list/list_content.tpl b/modules/blocktopmenu/views/templates/admin/_configure/helpers/list/list_content.tpl new file mode 100644 index 000000000..4b3dd7749 --- /dev/null +++ b/modules/blocktopmenu/views/templates/admin/_configure/helpers/list/list_content.tpl @@ -0,0 +1,34 @@ +{* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 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/afl-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 +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{extends file="helpers/list/list_content.tpl"} + +{block name="td_content"} + {if isset($params.type) && $params.type == 'link'} + {$tr.$key|escape:'htmlall':'UTF-8'} + {else} + {$smarty.block.parent} + {/if} +{/block} diff --git a/modules/blocktopmenu/views/templates/admin/_configure/index.php b/modules/blocktopmenu/views/templates/admin/_configure/index.php new file mode 100644 index 000000000..3f6561f72 --- /dev/null +++ b/modules/blocktopmenu/views/templates/admin/_configure/index.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blocktopmenu/views/templates/admin/index.php b/modules/blocktopmenu/views/templates/admin/index.php new file mode 100644 index 000000000..3f6561f72 --- /dev/null +++ b/modules/blocktopmenu/views/templates/admin/index.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blocktopmenu/views/templates/index.php b/modules/blocktopmenu/views/templates/index.php new file mode 100644 index 000000000..3f6561f72 --- /dev/null +++ b/modules/blocktopmenu/views/templates/index.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file