// Move controller templates to subfolder controllers/
This commit is contained in:
+1
-1
@@ -28,7 +28,7 @@
|
||||
<fieldset>
|
||||
<legend>{$title}</legend>
|
||||
<form id="reconfiliation_form" action="{$smarty.server.REQUEST_URI}" method="POST">
|
||||
{include file="$pathAccountExportTpl/common_form.tpl"}
|
||||
{include file="controllers/accounting_export/common_form.tpl"}
|
||||
<label for="clientPrefix">{l s='Journal:'}</label>
|
||||
<div class="margin-form">
|
||||
<input type="text" name="journal" value="{$journal}"/>
|
||||
+1
-1
@@ -28,7 +28,7 @@
|
||||
<fieldset>
|
||||
<legend>{$title}</legend>
|
||||
<form id="reconfiliation_form" action="{$smarty.server.REQUEST_URI}" method="POST">
|
||||
{include file="$pathAccountExportTpl/common_form.tpl"}
|
||||
{include file="controllers/accounting_export/common_form.tpl"}
|
||||
|
||||
<div class="margin-form">
|
||||
<input id="submitReconciliationExport" type="submit" class="button" name="submitAccountingExportType" />
|
||||
+1
-1
@@ -24,7 +24,7 @@
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
{extends file="../helper/form/form.tpl"}
|
||||
{extends file="helper/form/form.tpl"}
|
||||
|
||||
{block name="label"}
|
||||
{/block}
|
||||
+3
-3
@@ -60,17 +60,17 @@
|
||||
<div id="cart_rule_informations" class="cart_rule_tab">
|
||||
<h4>{l s='Cart rule informations'}</h4>
|
||||
<div class="separation"></div>
|
||||
{include file='cart_rules/informations.tpl'}
|
||||
{include file='controllers/cart_rules/informations.tpl'}
|
||||
</div>
|
||||
<div id="cart_rule_conditions" class="cart_rule_tab">
|
||||
<h4>{l s='Cart rule conditions'}</h4>
|
||||
<div class="separation"></div>
|
||||
{include file='cart_rules/conditions.tpl'}
|
||||
{include file='controllers/cart_rules/conditions.tpl'}
|
||||
</div>
|
||||
<div id="cart_rule_actions" class="cart_rule_tab">
|
||||
<h4>{l s='Cart rule actions'}</h4>
|
||||
<div class="separation"></div>
|
||||
{include file='cart_rules/actions.tpl'}
|
||||
{include file='controllers/cart_rules/actions.tpl'}
|
||||
</div>
|
||||
<div class="separation"></div>
|
||||
<div style="text-align:center">
|
||||
+12
-2
@@ -19,9 +19,19 @@
|
||||
*
|
||||
* @author PrestaShop SA <contact@prestashop.com>
|
||||
* @copyright 2007-2011 PrestaShop SA
|
||||
* @version Release: $Revision: 9856 $
|
||||
* @version Release: $Revision: 8971 $
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
{extends file="helper/form/form.tpl"}
|
||||
|
||||
{$content}
|
||||
{block name="end_field_block"}
|
||||
{if ($input.name == 'groupBox')}
|
||||
<p class="hint" style="display:block">
|
||||
<span>{$input.info_introduction}</span><br />
|
||||
<span>{$input.unidentified}</span><br />
|
||||
<span>{$input.guest}</span><br />
|
||||
<span>{$input.customer}</span><br />
|
||||
</p><br /><br /><br /><br />
|
||||
{/if}</div>
|
||||
{/block}
|
||||
@@ -0,0 +1,53 @@
|
||||
{*
|
||||
* 2007-2011 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 <contact@prestashop.com>
|
||||
* @copyright 2007-2011 PrestaShop SA
|
||||
* @version Release: $Revision$
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
{extends file="helper/list/list_header.tpl"}
|
||||
|
||||
{block name=leadin}
|
||||
<div class="cat_bar2">
|
||||
{if count($categories_tree) == 0}
|
||||
{if $category_root->id_category == 0}
|
||||
<img src="../img/admin/home.gif" alt="" /> {$category_root->name}
|
||||
{else}
|
||||
<img src="../img/admin/home.gif" alt="" /> {$categories_name}
|
||||
{/if}
|
||||
{else}
|
||||
{if $category_root->id_category == 0}
|
||||
<a href="{$currentIndex}&token={$token}"><img src="../img/admin/home.gif" alt="" /> {$category_root->name}</a> >
|
||||
{else}
|
||||
<a href="{$currentIndex}&id_category={$category_root->id_category}&token={$token}"><img src="../img/admin/home.gif" alt="" /> {$category_root->name}</a> >
|
||||
{/if}
|
||||
|
||||
{foreach $categories_tree key=key item=category}
|
||||
{if $key == 0}
|
||||
{$category.name}
|
||||
{else}
|
||||
<a href="{$currentIndex}&token={$token}&id_category={$category.id_category}&viewcategory">{$category.name}</a> >
|
||||
{/if}
|
||||
{/foreach}
|
||||
{/if}
|
||||
</div>
|
||||
{/block}
|
||||
+1
-1
@@ -24,7 +24,7 @@
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
{extends file="../helper/form/form.tpl"}
|
||||
{extends file="helper/form/form.tpl"}
|
||||
|
||||
{block name="script"}
|
||||
$(document).ready(function() {
|
||||
+1
-1
@@ -24,7 +24,7 @@
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
{extends file="../helper/form/form.tpl"}
|
||||
{extends file="helper/form/form.tpl"}
|
||||
|
||||
{block name="start_field_block"}
|
||||
<div class="margin-form">
|
||||
+2
-2
@@ -28,6 +28,6 @@
|
||||
{if isset($module_content)}
|
||||
{$module_content}
|
||||
{else}
|
||||
{include file='modules/js.tpl'}
|
||||
{include file='modules/page.tpl'}
|
||||
{include file='controllers/modules/js.tpl'}
|
||||
{include file='controllers/modules/page.tpl'}
|
||||
{/if}
|
||||
+3
-3
@@ -26,8 +26,8 @@
|
||||
|
||||
<div id="productBox">
|
||||
|
||||
{include file='modules/header.tpl'}
|
||||
{include file='modules/filters.tpl'}
|
||||
{include file='controllers/modules/header.tpl'}
|
||||
{include file='controllers/modules/filters.tpl'}
|
||||
|
||||
<div id="container">
|
||||
<!--start sidebar module-->
|
||||
@@ -47,7 +47,7 @@
|
||||
</div>
|
||||
|
||||
<div id="moduleContainer">
|
||||
{include file='modules/list.tpl'}
|
||||
{include file='controllers/modules/list.tpl'}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
+6
-6
@@ -195,7 +195,7 @@
|
||||
<legend><img src="../img/admin/details.gif" /> {l s='Documents'}</legend>
|
||||
|
||||
{* Include document template *}
|
||||
{include file='orders/_documents.tpl'}
|
||||
{include file='controllers/orders/_documents.tpl'}
|
||||
</fieldset>
|
||||
<br />
|
||||
|
||||
@@ -372,7 +372,7 @@
|
||||
</div>
|
||||
<div class="clear" style="margin-bottom: 10px;"></div>
|
||||
|
||||
{include file='orders/_shipping.tpl'}
|
||||
{include file='controllers/orders/_shipping.tpl'}
|
||||
|
||||
{if $carrierModuleCall}
|
||||
{$carrierModuleCall}
|
||||
@@ -544,13 +544,13 @@
|
||||
|
||||
{foreach from=$products item=product key=k}
|
||||
{* Include customized datas partial *}
|
||||
{include file='orders/_customized_data.tpl'}
|
||||
{include file='controllers/orders/_customized_data.tpl'}
|
||||
|
||||
{* Include product line partial *}
|
||||
{include file='orders/_product_line.tpl'}
|
||||
{include file='controllers/orders/_product_line.tpl'}
|
||||
{/foreach}
|
||||
{if $can_edit}
|
||||
{include file='orders/_new_product.tpl'}
|
||||
{include file='controllers/orders/_new_product.tpl'}
|
||||
{/if}
|
||||
</table>
|
||||
|
||||
@@ -632,7 +632,7 @@
|
||||
</tr>
|
||||
<tr style="display: none" >
|
||||
<td colspan="3" class="current-edit" id="voucher_form">
|
||||
{include file='orders/_discount_form.tpl'}
|
||||
{include file='controllers/orders/_discount_form.tpl'}
|
||||
</td>
|
||||
</tr>
|
||||
{/if}
|
||||
+1
-1
@@ -39,7 +39,7 @@
|
||||
{if $display_restrictions}
|
||||
<br /><h2 class="space">{l s='Payment module restrictions'}</h2>
|
||||
{foreach $lists as $list}
|
||||
{include file='payment/restrictions.tpl'}
|
||||
{include file='controllers/payment/restrictions.tpl'}
|
||||
<br />
|
||||
{/foreach}
|
||||
{else}
|
||||
+1
-1
@@ -23,7 +23,7 @@
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
{extends file="../helper/form/form.tpl"}
|
||||
{extends file="helper/form/form.tpl"}
|
||||
|
||||
{block name="label"}
|
||||
|
||||
+2
-2
@@ -193,7 +193,7 @@
|
||||
<tr>
|
||||
<td class="col-left"><label>{l s='Short description:'}<br /></label><p class="product_description">({l s='appears in the product lists and on the top of the product page'})</p></td>
|
||||
<td style="padding-bottom:5px;">
|
||||
{include file="products/textarea_lang.tpl"
|
||||
{include file="controllers/products/textarea_lang.tpl"
|
||||
languages=$languages
|
||||
input_name='description_short'
|
||||
input_value=$product->description_short
|
||||
@@ -205,7 +205,7 @@
|
||||
<tr>
|
||||
<td class="col-left"><label>{l s='Description:'}<br /></label><p class="product_description">({l s='appears in the body of the product page'})</p></td>
|
||||
<td style="padding-bottom:5px;">
|
||||
{include file="products/textarea_lang.tpl" languages=$languages
|
||||
{include file="controllers/products/textarea_lang.tpl" languages=$languages
|
||||
input_name='description'
|
||||
input_value=$product->description
|
||||
}
|
||||
+2
-2
@@ -177,7 +177,7 @@
|
||||
<tr>
|
||||
<td class="col-left"><label>{l s='Displayed text when in-stock:'}</label></td>
|
||||
<td style="padding-bottom:5px;">
|
||||
{include file="products/input_text_lang.tpl"
|
||||
{include file="controllers/products/input_text_lang.tpl"
|
||||
languages=$languages
|
||||
input_value=$product->available_now
|
||||
input_name='available_now'}
|
||||
@@ -187,7 +187,7 @@
|
||||
<tr>
|
||||
<td class="col-left"><label>{l s='Displayed text when allowed to be back-ordered:'}</label></td>
|
||||
<td style="padding-bottom:5px;">
|
||||
{include file="products/input_text_lang.tpl"
|
||||
{include file="controllers/products/input_text_lang.tpl"
|
||||
languages=$languages
|
||||
input_value=$product->available_later
|
||||
input_name='available_later'}
|
||||
+4
-4
@@ -48,7 +48,7 @@
|
||||
<label>{l s='Meta title:'}</label>
|
||||
</td>
|
||||
<td>
|
||||
{include file="products/input_text_lang.tpl"
|
||||
{include file="controllers/products/input_text_lang.tpl"
|
||||
languages=$languages
|
||||
input_name='meta_title'
|
||||
input_value=$product->meta_title}
|
||||
@@ -60,7 +60,7 @@
|
||||
<label>{l s='Meta description:'}</label>
|
||||
</td>
|
||||
<td>
|
||||
{include file="products/input_text_lang.tpl"
|
||||
{include file="controllers/products/input_text_lang.tpl"
|
||||
languages=$languages
|
||||
input_name='meta_description'
|
||||
input_value=$product->meta_description
|
||||
@@ -73,7 +73,7 @@
|
||||
<label>{l s='Meta keywords:'}</label>
|
||||
</td>
|
||||
<td>
|
||||
{include file="products/input_text_lang.tpl" languages=$languages
|
||||
{include file="controllers/products/input_text_lang.tpl" languages=$languages
|
||||
input_value=$product->meta_keywords
|
||||
input_name='meta_keywords'}
|
||||
<p class="preference_description">{l s='Keywords for HTML header, separated by a comma'}</p>
|
||||
@@ -84,7 +84,7 @@
|
||||
<label>{l s='Friendly URL:'}</label>
|
||||
</td>
|
||||
<td>
|
||||
{include file="products/input_text_lang.tpl"
|
||||
{include file="controllers/products/input_text_lang.tpl"
|
||||
languages=$languages
|
||||
input_value=$product->link_rewrite
|
||||
input_name='link_rewrite'}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user