dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Multistore bootstrap design

Browse Source
This commit is contained in:
Jerome Nadaud
2013-09-20 15:04:43 +02:00
parent 2f3d736f13
commit f312a055b1
8 changed files with 147 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/shop/content.tpl
+9 -12
View File
@@ -27,15 +27,12 @@
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
{/if}
<div class="multishop-left">
<div class="multishop-title">{l s='Multistore tree'}</div>
{include file="controllers/shop/tree.tpl" selected_tree_id=$selected_tree_id}
</div>
<div class="multishop-right">{$content}</div>
<script type="text/javascript">
$().ready(function(){
if (parseInt($('.multishop-right').css('height')) > 200)
$('.multishop-left').css('height', $('.multishop-right').css('height'));
})
</script>
<div class="row">
<div class="col-lg-4">
<fieldset>
<h3><i class="icon-sitemap"></i> {l s='Multistore tree'}</h3>
{include file="controllers/shop/tree.tpl" selected_tree_id=$selected_tree_id}
</fieldset>
</div>
<div class="col-lg-8">{$content}</div>
</div>
admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl
+57 -47
View File
@@ -27,10 +27,15 @@
{block name="input"}
{if $input.type == 'theme'}
{foreach $input.values as $theme}
<div class="select_theme {if $theme->id == $fields_value.id_theme_checked}select_theme_choice{/if}" onclick="$(this).find('input').attr('checked', true); $('.select_theme').removeClass('select_theme_choice'); $(this).toggleClass('select_theme_choice');">
{$theme->name}<br />
<img src="../themes/{$theme->directory}/preview.jpg" alt="{$theme->directory}" /><br />
<input type="radio" name="id_theme" value="{$theme->id}" {if $theme->id == $fields_value.id_theme_checked}checked="checked"{/if} />
<div class="col-lg-3 select_theme {if $theme->id == $fields_value.id_theme_checked}select_theme_choice{/if}" onclick="$(this).find('input').attr('checked', true); $('.select_theme').removeClass('select_theme_choice'); $(this).toggleClass('select_theme_choice');">
<div class="radio">
<label>
<input type="radio" name="id_theme" value="{$theme->id}"{if $theme->id == $fields_value.id_theme_checked} checked="checked"{/if}> {$theme->name}
</label>
</div>
<div class="theme_container">
<img class="thumbnail" src="../themes/{$theme->directory}/preview.jpg" alt="{$theme->directory}">
</div>
</div>
{/foreach}
<div class="clear">&nbsp;</div>
@@ -65,50 +70,55 @@
{block name="other_fieldsets"}
{if isset($form_import)}
<br /><br />
<fieldset><legend>{l s='Import data from another shop'}</legend>
{foreach $form_import as $key => $field}
{if $key == 'radio'}
<label>{$field.label} :</label>
<div class="margin-form">
<label class="t" for="{$field.name}_on"><img src="../img/admin/enabled.gif" alt="{l s='Yes'}" title="{l s='Yes'}" /></label>
<input type="radio" name="{$field.name}" id="{$field.name}_on" value="1" {if $field.value } checked="checked" {/if} />
<label class="t" for="{$field.name}_on"> {l s='Yes'}</label>
<label class="t" for="{$field.name}_off"><img src="../img/admin/disabled.gif" alt="{l s='No'}" title="{l s='No'}" style="margin-left: 10px;" /></label>
<input type="radio" name="{$field.name}" id="{$field.name}_off" value="0" {if !$field.value } checked="checked" {/if}/>
<label class="t" for="{$field.name}_off"> {l s='No'}</label>
</div>
{elseif $key == 'select'}
<div id="shop_list" {if !$checked}display:none{/if}>
<label>{$field.label} :</label>
<div class="margin-form">
<select name="{$field.name}" id="{$field.name}" >
{foreach $field.options.query AS $key => $option}
<option value="{$key}" {if $key == $defaultShop}selected="selected"{/if}>
{$option.name}
</option>
{/foreach}
</select>
</div>
</div>
{elseif $key == 'allcheckbox'}
<div id="data_list" {if !$checked}display:none{/if}>
<label>{$field.label} :</label>
<div class="margin-form">
<ul>
{foreach $field.values as $key => $label}
<li><input type="checkbox" name="importData[{$key}]" checked="checked" /> {$label}</li>
{/foreach}
</ul>
</div>
<fieldset>
<h3><i class="icon-cloud-download"></i> {l s='Import data from another shop'}</h3>
{foreach $form_import as $key => $field}
<div class="row">
{if $key == 'radio'}
<label class="control-label col-lg-3">{$field.label} :</label>
<div class="col-lg-2">
<span class="switch prestashop-switch">
<input type="radio" name="{$field.name}" id="{$field.name}_on" value="1" {if $field.value } checked="checked" {/if}>
<label class="radio" for="{$field.name}_on">
<i class="icon-check-sign color_success"></i> {l s='Yes'}
</label>
<input type="radio" name="{$field.name}" id="{$field.name}_off" value="0" {if !$field.value } checked="checked" {/if}>
<label class="radio" for="{$field.name}_off">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
</span>
</div>
{elseif $key == 'select'}
<div id="shop_list" {if !$checked}display:none{/if}>
<label class="control-label col-lg-3">{$field.label} :</label>
<div class="col-lg-9">
<select name="{$field.name}" id="{$field.name}" >
{foreach $field.options.query AS $key => $option}
<option value="{$key}" {if $key == $defaultShop}selected="selected"{/if}>
{$option.name}
</option>
{/foreach}
</select>
</div>
{elseif $key == 'submit'}
<div class="margin-form">
<input type="submit" value="{$field.title}" name="submitAdd{$table}" {if isset($field.class)}class="{$field.class}"{/if} />
</div>
{/if}
{/foreach}
</fieldset>
</div>
{elseif $key == 'allcheckbox'}
<div id="data_list" {if !$checked}display:none{/if}>
<label class="control-label col-lg-3">{$field.label} :</label>
<div class="col-lg-9">
{foreach $field.values as $key => $label}
<p class="checkbox"><input type="checkbox" name="importData[{$key}]" checked="checked" /> {$label}</p>
{/foreach}
</div>
</div>
{elseif $key == 'submit'}
<div class="col-lg-9">
<input type="submit" value="{$field.title}" name="submitAdd{$table}" class="btn btn-default{if isset($field.class)} {$field.class}{/if}" />
</div>
{/if}
</div>
{/foreach}
</fieldset>
{/if}
{/block}
admin-dev/themes/default/template/controllers/shop/helpers/list/list_action_delete.tpl
+1 -1
View File
@@ -28,5 +28,5 @@
{elseif isset($confirm)}
onclick="if (confirm('{$confirm}')){ return true; } else { event.stopPropagation(); event.preventDefault();};"
{/if} title="{$action}">
<img src="../img/admin/delete.gif" alt="{$action}" />
<i class="icon-trash"></i> {$action}
</a>
admin-dev/themes/default/template/helpers/options/options.tpl
+2 -2
View File
@@ -75,7 +75,7 @@
{/if}
{block name="label"}
{if isset($field['title']) && isset($field['hint'])}
<label class="control-label col-lg-3 {if isset($field['required']) && $field['required'] && $field['type'] != 'radio'}required{/if}">
<label class="control-label col-lg-3 {if isset($field['required']) && $field['required'] && $field['type'] != 'radio'}required{/if}" for="{$key}">
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="
{if is_array($field['hint'])}
{foreach $field['hint'] as $hint}
@@ -93,7 +93,7 @@
</span>
</label>
{elseif isset($field['title'])}
<label class="control-label col-lg-3">{$field['title']}</label>
<label class="control-label col-lg-3" for="{$key}">{$field['title']}</label>
{/if}
{/block}
{block name="field"}
classes/helper/HelperForm.php
+1 -1
View File
@@ -105,7 +105,7 @@ class HelperFormCore extends Helper
$tree->setUseSearch($params['tree']['use_search']);
if (isset($params['tree']['use_checkbox']))
$tree->setuseCheckBox($params['tree']['use_checkbox']);
$tree->setUseCheckBox($params['tree']['use_checkbox']);
$this->context->smarty->assign('categories_tree', $tree->render());
$categories = false;
controllers/admin/AdminShopController.php
+43 -16
View File
@@ -29,6 +29,7 @@ class AdminShopControllerCore extends AdminController
{
public function __construct()
{
$this->bootstrap = true;
$this->context = Context::getContext();
$this->table = 'shop';
$this->className = 'Shop';
@@ -39,7 +40,7 @@ class AdminShopControllerCore extends AdminController
'id_shop' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
'class' => 'fixed-width-xs'
),
'name' => array(
'title' => $this->l('Shop'),
@@ -145,7 +146,6 @@ class AdminShopControllerCore extends AdminController
public function initContent()
{
$this->list_simple_header = true;
parent::initContent();
$this->addJqueryPlugin('cookie-plugin');
@@ -313,14 +313,15 @@ class AdminShopControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Shop')
'title' => $this->l('Shop'),
'icon' => 'icon-shopping-cart'
),
'input' => array(
array(
'type' => 'text',
'label' => $this->l('Shop name:'),
'desc' => $this->l('This field does not refer to the shop name visible in the front office.').' '.
sprintf($this->l('Follow %sthis link%s to edit the shop name used on the Front Office.'), '<a href="'.$this->context->link->getAdminLink('AdminStores').'">', '</a>'),
'desc' => array($this->l('This field does not refer to the shop name visible in the front office.'),
sprintf($this->l('Follow %sthis link%s to edit the shop name used on the Front Office.'), '<a href="'.$this->context->link->getAdminLink('AdminStores').'">', '</a>')),
'name' => 'name',
'required' => true,
)
@@ -398,34 +399,60 @@ class AdminShopControllerCore extends AdminController
if (Tools::isSubmit('id_shop'))
{
$shop = new Shop((int)Tools::getValue('id_shop'));
$parent = $shop->id_category;
$id_root = $shop->id_category;
}
else
$parent = $categories[0]['id_category'];
$id_root = $categories[0]['id_category'];
$id_shop = (int)Tools::getValue('id_shop');
$shop = new Shop($id_shop);
$selected_cat = Shop::getCategories($id_shop);
if (empty($selected_cat))
{
// get first category root and preselect all these children
$root_categories = Category::getRootCategories();
$root_category = new Category($root_categories[0]['id_category']);
$children = $root_category->getAllChildren($this->context->language->id);
$selected_cat[] = $root_categories[0]['id_category'];
foreach ($children as $child)
$selected_cat[] = $child->id;
}
if (Shop::getContext() == Shop::CONTEXT_SHOP && Tools::isSubmit('id_shop'))
$root_category = new Category($shop->id_category);
else
$root_category = new Category($id_root);
$this->fields_form['input'][] = array(
'type' => 'categories_select',
'type' => 'categories',
'name' => 'categoryBox',
'label' => $this->l('Associated categories:'),
'category_tree' => $this->initCategoriesAssociation($parent),
'tree' => array(
'id' => 'categories-tree',
'selected_categories' => $selected_cat,
'root_category' => $root_category->id,
'use_search' => true,
'use_checkbox' => true
),
'desc' => $this->l('By selecting associated categories, you are choosing to share the categories between shops. Once associated between shops, any alteration of this category will impact every shop.')
);
/*$this->fields_form['input'][] = array(
'type' => 'radio',
'label' => $this->l('Status:'),
'type' => 'switch',
'label' => $this->l('Enabled:'),
'name' => 'active',
'required' => true,
'class' => 't',
'is_bool' => true,
'values' => array(
array(
'id' => 'active_on',
'value' => 1,
'label' => $this->l('Enabled')
'value' => 1
),
array(
'id' => 'active_off',
'value' => 0,
'label' => $this->l('Disabled')
'value' => 0
)
),
'desc' => $this->l('Enable or disable your store?')
controllers/admin/AdminShopGroupController.php
+17 -27
View File
@@ -28,6 +28,7 @@ class AdminShopGroupControllerCore extends AdminController
{
public function __construct()
{
$this->bootstrap = true;
$this->table = 'shop_group';
$this->className = 'ShopGroup';
$this->lang = false;
@@ -47,7 +48,7 @@ class AdminShopGroupControllerCore extends AdminController
'id_shop_group' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25,
'class' => 'fixed-width-xs',
),
'name' => array(
'title' => $this->l('Group shop'),
@@ -92,7 +93,6 @@ class AdminShopGroupControllerCore extends AdminController
public function initContent()
{
$this->list_simple_header = true;
parent::initContent();
if ($this->display == 'options')
@@ -128,7 +128,8 @@ class AdminShopGroupControllerCore extends AdminController
{
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Shop group:')
'title' => $this->l('Shop group'),
'icon' => 'icon-shopping-cart'
),
'description' => $this->l('Warning: Enabling the "share customers" and "share orders" options is not recommended. Once activated and orders are created, you will not be able to disable these options. If you need these options, we recommend using several categories rather than several shops.'),
'input' => array(
@@ -139,7 +140,7 @@ class AdminShopGroupControllerCore extends AdminController
'required' => true
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Share customers:'),
'name' => 'share_customer',
'required' => true,
@@ -149,19 +150,17 @@ class AdminShopGroupControllerCore extends AdminController
'values' => array(
array(
'id' => 'share_customer_on',
'value' => 1,
'label' => $this->l('Enabled')
'value' => 1
),
array(
'id' => 'share_customer_off',
'value' => 0,
'label' => $this->l('Disabled')
'value' => 0
)
),
'desc' => $this->l('Once this option is enabled, the shops in this group will share customers. If a customer registers in any one of these shops, the account will automatically be available in the others shops of this goup. rnrnWarning: you will not be able to disable this option once you have registered customers.'),
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Share available quantities to sell:'),
'name' => 'share_stock',
'required' => true,
@@ -170,19 +169,17 @@ class AdminShopGroupControllerCore extends AdminController
'values' => array(
array(
'id' => 'share_stock_on',
'value' => 1,
'label' => $this->l('Enabled')
'value' => 1
),
array(
'id' => 'share_stock_off',
'value' => 0,
'label' => $this->l('Disabled')
'value' => 0
)
),
'desc' => $this->l('Share available quantities between shops of this group. When changing this option, all available products quantities will be reset to 0.'),
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Share orders:'),
'name' => 'share_order',
'required' => true,
@@ -192,19 +189,17 @@ class AdminShopGroupControllerCore extends AdminController
'values' => array(
array(
'id' => 'share_order_on',
'value' => 1,
'label' => $this->l('Enabled')
'value' => 1
),
array(
'id' => 'share_order_off',
'value' => 0,
'label' => $this->l('Disabled')
'value' => 0
)
),
'desc' => $this->l('Once this option is enabled (which is only possible if customers and available quantities are shared among shops), the customer\'s cart will be shared by all shops in this group. This way, any purchase started in one shop will be able to be completed in another shop from the same group. rnrnWarning: You will not be able to disable this option once you\'ve started to accept orders.')
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Status:'),
'name' => 'active',
'required' => true,
@@ -213,13 +208,11 @@ class AdminShopGroupControllerCore extends AdminController
'values' => array(
array(
'id' => 'active_on',
'value' => 1,
'label' => $this->l('Enabled')
'value' => 1
),
array(
'id' => 'active_off',
'value' => 0,
'label' => $this->l('Disabled')
'value' => 0
)
),
'desc' => $this->l('Enable or disable group shops?')
@@ -305,10 +298,7 @@ class AdminShopGroupControllerCore extends AdminController
if ($this->fields_options && is_array($this->fields_options))
{
$this->display = 'options';
$this->show_toolbar = true;
unset($this->toolbar_btn);
$this->initToolbar();
$this->show_toolbar = false;
$helper = new HelperOptions($this);
$this->setHelperDisplay($helper);
$helper->id = $this->id;
controllers/admin/AdminShopUrlController.php
+17 -21
View File
@@ -28,6 +28,7 @@ class AdminShopUrlControllerCore extends AdminController
{
public function __construct()
{
$this->bootstrap = true;
$this->table = 'shop_url';
$this->className = 'ShopUrl';
$this->lang = false;
@@ -44,11 +45,10 @@ class AdminShopUrlControllerCore extends AdminController
'id_shop_url' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
'class' => 'fixed-width-xs'
),
'shop_name' => array(
'title' => $this->l('Shop name'),
'width' => 150,
'filter_key' => 's!name'
),
'url' => array(
@@ -63,7 +63,7 @@ class AdminShopUrlControllerCore extends AdminController
'type' => 'bool',
'orderby' => false,
'filter_key' => 'main',
'width' => 100,
'class' => 'fixed-width-md'
),
'active' => array(
'title' => $this->l('Enabled'),
@@ -72,7 +72,7 @@ class AdminShopUrlControllerCore extends AdminController
'type' => 'bool',
'orderby' => false,
'filter_key' => 'active',
'width' => 50,
'class' => 'fixed-width-md'
),
);
@@ -118,7 +118,8 @@ class AdminShopUrlControllerCore extends AdminController
array(
'form' => array(
'legend' => array(
'title' => $this->l('URL options')
'title' => $this->l('URL options'),
'icon' => 'icon-cogs'
),
'input' => array(
array(
@@ -139,20 +140,18 @@ class AdminShopUrlControllerCore extends AdminController
)
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Main URL:'),
'name' => 'main',
'class' => 't',
'values' => array(
array(
'id' => 'main_on',
'value' => 1,
'label' => '<img src="../img/admin/enabled.gif" alt="'.$this->l('Enabled').'" title="'.$this->l('Enabled').'" />'
'value' => 1
),
array(
'id' => 'main_off',
'value' => 0,
'label' => '<img src="../img/admin/disabled.gif" alt="'.$this->l('Disabled').'" title="'.$this->l('Disabled').'" />'
'value' => 0
)
),
'desc' => array(
@@ -168,24 +167,21 @@ class AdminShopUrlControllerCore extends AdminController
)
),
array(
'type' => 'radio',
'label' => $this->l('Status:'),
'type' => 'switch',
'label' => $this->l('Enabled:'),
'name' => 'active',
'required' => false,
'class' => 't',
'values' => array(
array(
'id' => 'active_on',
'value' => 1,
'label' => '<img src="../img/admin/enabled.gif" alt="'.$this->l('Enabled').'" title="'.$this->l('Enabled').'" />'
'value' => 1
),
array(
'id' => 'active_off',
'value' => 0,
'label' => '<img src="../img/admin/disabled.gif" alt="'.$this->l('Disabled').'" title="'.$this->l('Disabled').'" />'
'value' => 0
)
),
'desc' => $this->l('Enabled or disabled')
)
)
),
'submit' => array(
@@ -197,7 +193,8 @@ class AdminShopUrlControllerCore extends AdminController
array(
'form' => array(
'legend' => array(
'title' => $this->l('Shop URL')
'title' => $this->l('Shop URL'),
'icon' => 'icon-shopping-cart'
),
'input' => array(
array(
@@ -225,7 +222,7 @@ class AdminShopUrlControllerCore extends AdminController
'name' => 'virtual_uri',
'desc' => $desc_virtual_uri,
'size' => 50,
'hint' => (!$update_htaccess) ? $this->l('Warning: URL rewriting (e.g. mod_rewrite for Apache) seems to be disabled. If your URL doesn\'t work, please check with your host provider on how to activate URL rewriting.') : '',
'hint' => (!$update_htaccess) ? $this->l('Warning: URL rewriting (e.g. mod_rewrite for Apache) seems to be disabled. If your URL doesn\'t work, please check with your host provider on how to activate URL rewriting.') : null,
),
array(
'type' => 'text',
@@ -290,7 +287,6 @@ class AdminShopUrlControllerCore extends AdminController
public function initContent()
{
$this->list_simple_header = true;
parent::initContent();
$this->addJqueryPlugin('cookie-plugin');