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

// Helper now can uses toolbar

Browse Source 
// bugfix in category listing and editing
// display fix in adminHome

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9695 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-10-27 18:20:13 +00:00
parent d7ac4fb94e
commit 5f79d9f879
9 changed files with 107 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/admin.css
+1 -2
View File
@@ -145,5 +145,4 @@ form.defaultForm{ background-color:#ebedf4; border:1px solid #ccced7; min-heig
ul.cc_button {float:right;margin:0;padding:6px 0;}
ul.cc_button li {float:left;text-decoration: none;list-style: none;font-size:12px;padding:5px 0;}
.toolbar_btn {border:2px outset black;display:block;height:50px;margin:2px;padding:3px 2px 1px 2px;width:60px;}
.toolbar_btn span{font-size:small;margin-top:5px;text-align:center}
.table_grid{width:100%}
admin-dev/themes/template/categories/list_header.tpl
+26 -18
View File
@@ -63,10 +63,10 @@
<a href="{$currentIndex}&id_category=1&viewcategory&token={$token}">
&nbsp;<img src="../img/admin/home.gif" alt="" /> {l s='Home'}&nbsp;>&nbsp;
</a>
{foreach $categories_tree as $key => $category}
{foreach $categories_tree key=key item=category}
<a href="{$currentIndex}&id_category={$category.id_category}&{if $category.id_category == 1}viewcategory{else}addcategory{/if}&token={$token}">
{if $key != 0}
<a href="{$currentIndex}&id_category={$category.id_category}&viewcategory&token={$token}">
<img src="../img/admin/edit.gif" alt="" /> {$category.name}&nbsp;>&nbsp;
<img src="../img/admin/edit.gif" alt="{l s='edit'}" /> {$category.name}&nbsp;&gt;&nbsp;
</a>
{else}
<img src="../img/admin/edit.gif" alt="" /> {$category.name}
@@ -75,24 +75,32 @@
{/if}
</div>
<h2>{l s='Categories'}</h2>
<h3>
{if $list_total == 0}
{l s='There are no subcategories in '} "{$categories_name}"
{else}
{$list_total}&nbsp;
{if $list_total < 1}
{l s='subcategories'}
<div class="toolbarBox">
<ul class="cc_button">
{foreach from=$toolbar_btn item=btn key=k}
<li>
<a class="toolbar_btn" href="{$btn.href}" title="{$btn.desc}">
<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:'' }" ></span>{$btn.desc}
</a>
</li>
{/foreach}
</ul>
<div class="pageTitle">
<h3>{l s='Categories'}<span id="current_obj" style="font-weight:normal">&nbsp;{$categories_name}</span></h3>
{if $list_total == 0}
{l s='There are no subcategories in '} "{$categories_name}"
{else}
{l s='subcategory'} {l s='in category'} "{$categories_name}"
{$list_total}&nbsp;
{if $list_total < 1}
{l s='subcategories'}
{else}
{l s='subcategory'} {l s='in category'} "{$categories_name}"
{/if}
{/if}
{/if}
</h3>
{if $add_button}
<br /><a href="{$currentIndex}&add{$table}&token={$token}"><img src="../img/admin/add.gif" border="0" /> {l s='Add new'}</a><br /><br />
{/if}
</div>
</div>
<a name="{$table}">&nbsp;</a>
<form method="post" action="{$action}" class="form">
admin-dev/themes/template/customers/form.tpl
+15 -1
View File
@@ -54,8 +54,22 @@
</script>
<script type="text/javascript" src="../js/form.js"></script>
{/if}
<div class="toolbarBox">
<ul class="cc_button">
{foreach from=$toolbar_btn item=btn key=k}
<li>
<a class="toolbar_btn" href="{$btn.href}" title="{$btn.desc}">
<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:'' }" ></span>{$btn.desc}
</a>
</li>
{/foreach}
</ul>
<div class="pageTitle">{* todo : what to display as title for each items (table_lang.name ? *}
<h3><span id="current_obj" style="font-weight: normal;">{$current_obj_name|default:'&nbsp;'}</span></h3>
</div>
</div>
{if isset($fields.title)}<h2>{$fields.title}</h2>{/if}
<form action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
<form class="defaultForm" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
{if $form_id}
<input type="hidden" name="id_{$table}" value="{$form_id}" />
{/if}
admin-dev/themes/template/helper/form/form.tpl
+17 -3
View File
@@ -54,8 +54,22 @@
</script>
<script type="text/javascript" src="../js/form.js"></script>
{/if}
<div class="toolbarBox">
<ul class="cc_button">
{foreach from=$toolbar_btn item=btn key=k}
<li>
<a class="toolbar_btn" href="{$btn.href}" title="{$btn.desc}">
<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:'' }" ></span>{$btn.desc}
</a>
</li>
{/foreach}
</ul>
<div class="pageTitle">{* todo : what to display as title for each items (table_lang.name ? *}
<h3><span id="current_obj" style="font-weight: normal;">{$current_obj_name|default:'&nbsp;'}</span></h3>
</div>
</div>
{if isset($fields.title)}<h2>{$fields.title}</h2>{/if}
<form action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
<form class="defaultForm" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
{if $form_id}
<input type="hidden" name="id_{$table}" value="{$form_id}" />
{/if}
@@ -235,9 +249,9 @@
value="" />
{elseif $input.type == 'group'}
{assign var=groups value=$input.values}
{include file='form_group.tpl'}
{include file='helper/form/form_group.tpl'}
{elseif $input.type == 'shop' OR $input.type == 'group_shop'}
{include file='form_shop.tpl'}
{include file='helper/form/form_shop.tpl'}
{elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop}
<label>{l s='Shop association:'}</label>
<div class="margin-form">
admin-dev/themes/template/helper/list/list_header.tpl
+15 -4
View File
@@ -56,15 +56,26 @@
});
</script>
{if $add_button}
<br /><a href="{$currentIndex}&add{$table}&token={$token}"><img src="../img/admin/add.gif" border="0" /> {l s='Add new'}</a><br /><br />
{/if}
<div class="toolbarBox">
<ul class="cc_button">
{foreach from=$toolbar_btn item=btn key=k}
<li>
<a class="toolbar_btn" href="{$btn.href}" title="{$btn.desc}">
<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:'' }" ></span>{$btn.desc}
</a>
</li>
{/foreach}
</ul>
<div class="pageTitle">{* todo : what to display as title for each items (table_lang.name ? *}
<h3><span id="current_obj" style="font-weight: normal;">{$current_obj_name|default:'&nbsp;'}</span></h3>
</div>
</div>
<a name="{$table}">&nbsp;</a>
<form method="post" action="{$action}" class="form">
{/if}{* End if simple_header *}
<input type="hidden" id="submitFilter{$table}" name="submitFilter{$table}" value="0"/>
<table>
<table class="table_grid">
{if !$simple_header}
<tr>
<td style="vertical-align: bottom;">
admin-dev/themes/template/home/content.tpl
+1
View File
@@ -62,6 +62,7 @@ $(document).ready(function() {
});
});
</script>
<div class="clear"></div>
{/if}
<div id="column_left">
<ul class="F_list clearfix">
classes/AdminController.php
+14
View File
@@ -718,6 +718,19 @@ class AdminControllerCore extends Controller
*/
public function initToolbar()
{
switch ($this->display)
{
// @todo defining default buttons
case 'add':
case 'edit':
case 'options':
break;
default: // list
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;token='.$this->token,
'desc' => $this->l('Add new')
);
}
$this->context->smarty->assign('toolbar_btn', $this->toolbar_btn);
}
@@ -1119,6 +1132,7 @@ class AdminControllerCore extends Controller
}
$helper->actions = $this->actions;
$helper->toolbar_btn = $this->toolbar_btn;
$helper->bulk_actions = $this->bulk_actions;
$helper->currentIndex = self::$currentIndex;
$helper->className = $this->className;
classes/HelperList.php
+1 -2
View File
@@ -286,7 +286,6 @@ class HelperListCore extends Helper
'fields_display' => $this->fieldsDisplay,
'list' => $this->_list,
'actions' => $this->actions,
'toolbar_btn' => $this->toolbar_btn,
'no_link' => $this->no_link,
'current_index' => $this->currentIndex,
'view' => in_array('view', $this->actions),
@@ -528,7 +527,7 @@ class HelperListCore extends Helper
'id_cat' => $id_cat,
'shop_link_type' => $this->shopLinkType,
'has_actions' => (boolean)count($this->actions),
'add_button' => in_array('edit', $this->actions) && (!isset($this->noAdd) || !$this->noAdd),
'toolbar_btn' => $this->toolbar_btn,
'table_id' => isset($table_id) ? $table_id : null,
'table_dnd' => isset($table_dnd) ? $table_dnd : null,
'name' => isset($name) ? $name : null,
controllers/admin/AdminCategoriesController.php
+17
View File
@@ -123,11 +123,28 @@ class AdminCategoriesControllerCore extends AdminController
public function initView()
{
$this->initToolbar();
$this->content .= $this->initList();
}
public function initToolbar()
{
if (empty($this->display))
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;token='.$this->token,
'desc' => $this->l('Add new')
);
if ($this->display == 'view')
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;id_parent='.Tools::getValue('id_category').'&amp;token='.$this->token,
'desc' => $this->l('Add new')
);
}
public function initForm()
{
$obj = $this->loadObject(true);
$selected_cat = array(isset($obj->id_parent) ? $obj->id_parent : Tools::getValue('id_parent', 1));
if (sizeof($selected_cat) > 0)
{