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

// field translatable + tpl products + fixs

Browse Source
This commit is contained in:
Kevin Granger
2013-07-10 19:39:35 +02:00
parent f847c821ed
commit f042d704d2
15 changed files with 232 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/js/admin-theme.js
-1
View File
@@ -43,7 +43,6 @@ function adminNav(navId)
}
}
$( document ).ready(function() {
$('.label-tooltip').tooltip();
});
admin-dev/themes/default/template/controllers/modules/filters.tpl
+26 -33
View File
@@ -44,39 +44,34 @@
</div>
{else}
<!--start addons login-->
<div id="addons_login_div">
<div class="row">
<div class="col-12 col-lg-12">
<p>{l s='Do you have a %s account?' sprintf='<a href="http://addons.prestashop.com/">PrestaShop Addons</a>'}</p>
<form id="addons_login_form" method="post" class="form-horizontal">
<div class="row">
<div class="col-lg-10 col-offset-2">
<div id="addons_loading">
<div class="alert"></div>
</div>
</div>
<div id="addons_login_div" class="row">
<div class="col-lg-12">
<form id="addons_login_form" method="post" class="form-horizontal">
<legend>{l s='Do you have a %s account?' sprintf='<a href="http://addons.prestashop.com/">PrestaShop Addons</a>'}</legend>
<div class="row">
<label class="control-label col-lg-3">{l s='Addons Login'} :</label>
<div class="input-group col-lg-4">
<span class="input-group-addon"><i class="icon-user"></i></span>
<input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
</div>
<div class="row">
<label class="col-lg-2 control-label">{l s='Addons Login'} :</label>
<div class="col-lg-5">
<input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s= 'Password Addons'} :</label>
<div class="input-group col-lg-4">
<span class="input-group-addon"><i class="icon-key"></i></span>
<input type="password" value="" id="password_addons" autocomplete="off" class="ac_input">
</div>
<div class="row">
<label class="col-lg-2 control-label">{l s= 'Password Addons'} :</label>
<div class="col-lg-5">
<input type="password" value="" id="password_addons" autocomplete="off" class="ac_input">
</div>
</div>
<div class="row">
<div class="col-lg-10 col-offset-3">
<button class="btn btn-default" id="addons_login_button" type="submit">
<i class="icon-unlock"></i> {l s='Log in'}
</button>
<div id="addons_loading" class="help-block"></div>
</div>
<div class="row">
<div class="col-lg-10 col-offset-2">
<button class="btn btn-default btn-small" id="addons_login_button" type="submit">
{l s='Log in'}
</button>
</div>
</div>
</form>
</div>
</div>
</form>
</div>
</div>
<!--end addons login-->
@@ -86,8 +81,6 @@
{/if}
<!--start filter module-->
<div class="well">
<form id="filternameForm" method="post" class="form-horizontal">
<div class="row">
@@ -150,4 +143,4 @@
</span>
</form>
</div>
<!--end filter module-->
<!--end filter module-->
admin-dev/themes/default/template/controllers/modules/header.tpl
+16 -14
View File
@@ -23,20 +23,22 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="toolbar-placeholder">
<div class="toolbarBox toolbarHead">
<ul class="cc_button">
{if $add_permission eq '1'}
<li>
<a id="desc-module-new" class="toolbar_btn" href="#top_container" onclick="$('#module_install').slideToggle();" title="{l s='Add a new module'}">
<span class="process-icon-new-module" ></span>
<div>{l s='Add a new module'}</div>
</a>
</li>
{/if}
</ul>
<div class="pageTitle">
<h3><span id="current_obj" style="font-weight: normal;"><span class="breadcrumb item-0">Module</span> : <span class="breadcrumb item-1">{l s='List of modules'}</span></span></h3>
<div class="row-fluid page-head">
<h2 class="page-title">
{l s='List of modules'}
</h2>
<div class="page-bar toolbarBox">
<div class="btn-toolbar">
<ul class="cc_button nav nav-pills pull-right">
{if $add_permission eq '1'}
<li>
<a id="desc-module-new" class="toolbar_btn" href="#top_container" onclick="$('#module_install').slideToggle();" title="{l s='Add a new module'}">
<i class="process-icon-new-module" ></i>
<div>{l s='Add a new module'}</div>
</a>
</li>
{/if}
</ul>
</div>
</div>
</div>
admin-dev/themes/default/template/controllers/products/associations.tpl
+65 -62
View File
@@ -30,76 +30,79 @@
{include file="controllers/products/multishop/check_fields.tpl" product_tab="Associations"}
<div id="no_default_category" class="alert alert-info">
{l s='Please select a default category.'}
{l s='Please select a default category.'}
</div>
<div class="row">
{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}
<label class="control-label col-lg-3" for="category_block">{l s='Associated categories:'}</label>
<div class="col-lg-4">
<div id="category_block">
{$category_tree}
<div class="row">
{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}
<label class="control-label col-lg-3" for="category_block">{l s='Associated categories:'}</label>
<div class="col-lg-9">
<div id="category_block">
{$category_tree}
</div>
<a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')|escape:'htmlall':'UTF-8'}&addcategory">
<i class="icon-plus-sign"></i> {l s='Create new category'} <i class="icon-external-link-sign"></i>
</a>
</div>
<a class="btn btn-default bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')|escape:'htmlall':'UTF-8'}&addcategory">
<i class="icon-plus-sign"></i> {l s='Create new category'}
</a>
</div>
</div>
<div class="row">
{include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"}
<label class="control-label col-lg-3" for="id_category_default">{l s='Default category:'}</label>
<div class="col-lg-5">
<select id="id_category_default" name="id_category_default">
{foreach from=$selected_cat item=cat}
<option value="{$cat.id_category}" {if $id_category_default == $cat.id_category}selected="selected"{/if} >{$cat.name}</option>
<div class="row">
{include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"}
<label class="control-label col-lg-3" for="id_category_default">{l s='Default category:'}</label>
<div class="col-lg-5">
<select id="id_category_default" name="id_category_default">
{foreach from=$selected_cat item=cat}
<option value="{$cat.id_category}" {if $id_category_default == $cat.id_category}selected="selected"{/if} >{$cat.name}</option>
{/foreach}
</select>
<div class="help-block">{l s='The default category is the category displayed by default.'}</div>
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Accessories:'}</label>
<div class="col-lg-5">
<input type="hidden" name="inputAccessories" id="inputAccessories" value="{foreach from=$accessories item=accessory}{$accessory.id_product}-{/foreach}" />
<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|escape:'htmlall':'UTF-8'}¤{/foreach}" />
<div id="ajax_choose_product">
<input type="text" value="" id="product_autocomplete_input" />
<div class="help-block">
{l s='Begin typing the first letters of the product name, then select the product from the drop-down list.'}
{l s='(Do not forget to save the product afterward)'}
</div>
</div>
<div id="divAccessories">
{* @todo : donot use 3 foreach, but assign var *}
{foreach from=$accessories item=accessory}
{$accessory.name|escape:'htmlall':'UTF-8'}{if !empty($accessory.reference)}{$accessory.reference}{/if}
<span class="delAccessory" name="{$accessory.id_product}" style="cursor: pointer;">
<img src="../img/admin/delete.gif" class="middle" alt="" />
</span>
{/foreach}
</select>
<div class="alert alert-info" style="display:block;">{l s='The default category is the category displayed by default.'}</div>
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Accessories:'}</label>
<div class="col-lg-5">
<input type="hidden" name="inputAccessories" id="inputAccessories" value="{foreach from=$accessories item=accessory}{$accessory.id_product}-{/foreach}" />
<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|escape:'htmlall':'UTF-8'}¤{/foreach}" />
<div id="ajax_choose_product">
<p style="clear:both;margin-top:0;">
<input type="text" value="" id="product_autocomplete_input" />
{l s='Begin typing the first letters of the product name, then select the product from the drop-down list.'}
</p>
<p class="preference_description">{l s='(Do not forget to save the product afterward)'}</p>
<!--<img onclick="$(this).prev().search();" style="cursor: pointer;" src="../img/admin/add.gif" alt="{l s='Add an accessory'}" title="{l s='Add an accessory'}" />-->
</div>
<div id="divAccessories">
{* @todo : donot use 3 foreach, but assign var *}
{foreach from=$accessories item=accessory}
{$accessory.name|escape:'htmlall':'UTF-8'}{if !empty($accessory.reference)}{$accessory.reference}{/if}
<span class="delAccessory" name="{$accessory.id_product}" style="cursor: pointer;">
<img src="../img/admin/delete.gif" class="middle" alt="" />
</span><br />
{/foreach}
</div>
</div>
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Manufacturer:'}</label>
<div class="col-lg-5">
<select name="id_manufacturer" id="id_manufacturer">
<option value="0">-- {l s='Choose (optional)'} --</option>
{if $product->id_manufacturer}
<option value="{$product->id_manufacturer}" selected="selected">{$product->manufacturer_name}</option>
{/if}
<option disabled="disabled">----------</option>
</select>
<a class="btn btn-default bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'htmlall':'UTF-8'}&addmanufacturer">
<i class="icon-plus-sign"></i> {l s='Create new manufacturer'}
</a>
<div class="row">
<label class="control-label col-lg-3">{l s='Manufacturer:'}</label>
<div class="col-lg-9">
<div class="row">
<div class="col-lg-7">
<select name="id_manufacturer" id="id_manufacturer">
<option value="0">-- {l s='Choose (optional)'} --</option>
{if $product->id_manufacturer}
<option value="{$product->id_manufacturer}" selected="selected">{$product->manufacturer_name}</option>
{/if}
<option disabled="disabled">----------</option>
</select>
</div>
<div class="col-lg-5">
<a class="btn btn-link bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'htmlall':'UTF-8'}&addmanufacturer">
<i class="icon-plus-sign"></i> {l s='Create new manufacturer'} <i class="icon-external-link-sign"></i>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
admin-dev/themes/default/template/controllers/products/combinations.tpl
+66 -76
View File
@@ -65,88 +65,81 @@
<div id="add_new_combination" style="display: none;">
<table cellpadding="5" style="width:100%">
<tr>
<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" valign="top">
<label>{l s='Attribute:'}</label>
</td>
<td style="padding-bottom:5px;">
<select name="attribute_group" id="attribute_group" style="width: 200px;" onchange="populate_attrs();">
{if isset($attributes_groups)}
{foreach from=$attributes_groups key=k item=attribute_group}
<option value="{$attribute_group.id_attribute_group}">{$attribute_group.name|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
{/foreach}
{/if}
</select>
</td>
</tr>
<tr>
<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" valign="top">
<label>{l s='Value:'}</label>
</td>
<td style="padding-bottom:5px;">
<select name="attribute" id="attribute" style="width: 200px;">
<option value="0">---</option>
</select>
<script type="text/javascript">
$(document).ready(function(){
populate_attrs();
});
</script>
</td>
</tr>
<tr>
<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" valign="top">
<input style="width: 140px; margin-bottom: 10px;" type="button" value="{l s='Add'}" class="button" onclick="add_attr();"/><br />
<input style="width: 140px;" type="button" value="{l s='Delete'}" class="button" onclick="del_attr()"/></td>
<td align="left">
<select id="product_att_list" name="attribute_combination_list[]" multiple="multiple" size="4" style="width: 320px;"></select>
</td>
</tr>
<tr>
<td colspan="2">
<div class="separation"></div>
</td>
</tr>
<tr>
<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;"><label>{l s='Reference:'}</label></td>
<td style="padding-bottom:5px;">
<input size="55" type="text" id="attribute_reference" name="attribute_reference" value="" style="width: 130px; margin-right: 44px;" />
{l s='EAN13:'}<input size="55" maxlength="13" type="text" id="attribute_ean13" name="attribute_ean13" value="" style="width: 110px; margin-left: 10px; margin-right: 44px;" />
{l s='UPC:'}<input size="55" maxlength="12" type="text" id="attribute_upc" name="attribute_upc" value="" style="width: 110px; margin-left: 10px; margin-right: 44px;" />
<span class="alert alert-info" name="help_box">{l s='Special characters allowed:'} .-_#<span class="hint-pointer">&nbsp;</span></span>
</td>
</tr>
<tr>
<td colspan="2">
<div class="separation"></div>
</td>
</tr>
</table>
<table>
<tr>
<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">
<div class="row">
<label class="control-label col-lg-3">{l s='Attribute:'}</label>
<div class="col-lg-5">
<select name="attribute_group" id="attribute_group" onchange="populate_attrs();">
{if isset($attributes_groups)}
{foreach from=$attributes_groups key=k item=attribute_group}
<option value="{$attribute_group.id_attribute_group}">{$attribute_group.name|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
{/foreach}
{/if}
</select>
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Value:'}</label>
<div class="col-lg-5">
<select name="attribute" id="attribute">
<option value="0">---</option>
</select>
</div>
</div>
<script type="text/javascript">
$(document).ready(function(){
populate_attrs();
});
</script>
<div class="row">
<label class="control-label col-lg-3"></label>
<div class="col-lg-5">
<input type="button" value="{l s='Add'}" class="button" onclick="add_attr();"/>
<input type="button" value="{l s='Delete'}" class="button" onclick="del_attr()"/>
<select id="product_att_list" name="attribute_combination_list[]" multiple="multiple" ></select>
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Reference:'}</label>
<div class="col-lg-5">
<input type="text" id="attribute_reference" name="attribute_reference" value="" />
{l s='EAN13:'}
<input maxlength="13" type="text" id="attribute_ean13" name="attribute_ean13" value="" />
{l s='UPC:'}
<input maxlength="12" type="text" id="attribute_upc" name="attribute_upc" value="" />
</div>
<p class="help-block" name="help_box">{l s='Special characters allowed:'} .-_#</p>
</div>
{include file="controllers/products/multishop/checkbox.tpl" field="attribute_wholesale_price" type="default"}
<label>{l s='Wholesale price:'}</label>
</td>
<td style="padding-bottom:5px;">
{if $currency->format % 2 != 0}{$currency->sign}{/if}
<input type="text" size="6" name="attribute_wholesale_price" id="attribute_wholesale_price" value="" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
{if $currency->format % 2 == 0} {$currency->sign} {/if}<span id="attribute_wholesale_price_blank">({l s='Leave blank if the price does not change'})</span>
<span style="display:none" id="attribute_wholesale_price_full">({l s='Overrides wholesale price on "Information" tab'})</span>
</td>
</tr>
<tr>
<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">
{include file="controllers/products/multishop/checkbox.tpl" field="attribute_price_impact" type="attribute_price_impact"}
<label>{l s='Impact on price:'}</label>
</td>
<td colspan="2" style="padding-bottom:5px;">
<select name="attribute_price_impact" id="attribute_price_impact" style="width: 140px;" onchange="check_impact(); calcImpactPriceTI();">
<select name="attribute_price_impact" id="attribute_price_impact" onchange="check_impact(); calcImpactPriceTI();">
<option value="0">{l s='None'}</option>
<option value="1">{l s='Increase'}</option>
<option value="-1">{l s='Reduction'}</option>
</select>
<span id="span_impact">&nbsp;&nbsp;{l s='of'}&nbsp;&nbsp;{if $currency->format % 2 != 0}{$currency->sign} {/if}
<input type="hidden" id="attribute_priceTEReal" name="attribute_price" value="0.00" />
<input type="text" size="6" id="attribute_price" value="0.00" onkeyup="$('#attribute_priceTEReal').val(this.value.replace(/,/g, '.')); if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.'); calcImpactPriceTI();"/>{if $currency->format % 2 == 0} {$currency->sign}{/if}
@@ -162,14 +155,11 @@
{if $currency->format % 2 == 0}{$currency->sign} {/if}
{/if}
</span>
</td>
</tr>
<tr>
<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">
{include file="controllers/products/multishop/checkbox.tpl" field="attribute_weight_impact" type="attribute_weight_impact"}
<label>{l s='Impact on weight:'}</label>
</td>
<td colspan="2" style="padding-bottom:5px;">
<select name="attribute_weight_impact" id="attribute_weight_impact" style="width: 140px;" onchange="check_weight_impact();">
<option value="0">{l s='None'}</option>
<option value="1">{l s='Increase'}</option>
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+4 -1
View File
@@ -105,6 +105,8 @@
$(document).ready(function()
{
hideOtherLanguage(default_language);
$('#product-tab-content-wait').show();
if (product_type == product_type_pack)
@@ -130,7 +132,7 @@
// currentId is the current product tab id
currentId = $(".productTabs .tab-row.active a").attr('id').substr(5);
console.log(currentId);
//console.log(currentId);
// id is the wanted producttab id
id = $(this).attr('id').substr(5);
@@ -174,6 +176,7 @@
// if pack is enabled, save button are visible only if pack is valid
handleSaveButtons();
}
hideOtherLanguage(default_language);
});
$(".productTabs .tab-row.active").click();
admin-dev/themes/default/template/controllers/products/informations.tpl
+9 -10
View File
@@ -94,7 +94,7 @@
<div class="row">
<label class="control-label col-lg-3">{$bullet_common_field} {l s='Type:'}</label>
<div class="col-lg-5">
<div class="col-lg-9">
<div class="radio">
<label for="simple_product">
<input type="radio" name="type_product" id="simple_product" value="{Product::PTYPE_SIMPLE}" {if $product_type == Product::PTYPE_SIMPLE}checked="checked"{/if} />
@@ -116,18 +116,17 @@
</div>
</div>
<div class="row">
<label class="control-label col-lg-3 required">{l s='Name:'}</label>
<div class="col-lg-5 translatable">
{foreach from=$languages item=language}
<div class="lang_{$language.id_lang}">
<input class="{$class_input_ajax}{if !$product->id}copy2friendlyUrl{/if} updateCurrentText" type="text" {if !$product->id}disabled="disabled"{/if}
id="name_{$language.id_lang}" name="name_{$language.id_lang}"
value="{$product->name[$language.id_lang]|htmlentitiesUTF8|default:''}"
/>
<div class="col-lg-5">
<div class="row">
{include file="controllers/products/input_text_lang.tpl"
languages=$languages
input_class="{$class_input_ajax}{if !$product->id}copy2friendlyUrl{/if} updateCurrentText"
input_value=$product->name
input_name="name"
}
</div>
{/foreach}
<span class="help-block" name="help_box">{l s='Invalid characters:'} &lt;&gt;;=#{}</span>
</div>
</div>
admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
+3 -1
View File
@@ -25,7 +25,9 @@
{foreach from=$languages item=language}
<div class="input-group col-lg-12 translatable-field lang-{$language.id_lang}">
<input id="{$input_name}_{$language.id_lang}" type="text"
<input type="text"
id="{$input_name}_{$language.id_lang}"
class="{$input_class}"
name="{$input_name}_{$language.id_lang}"
value="{$input_value[$language.id_lang]|htmlentitiesUTF8|default:''}"
onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();">
admin-dev/themes/default/template/controllers/products/seo.tpl
+8 -10
View File
@@ -40,6 +40,7 @@
<p class="help-block">{l s='Product page title: Leave blank to use the product name'}</p>
</div>
</div>
<div class="row">
{include file="controllers/products/multishop/checkbox.tpl" field="meta_description" type="default" multilang="true"}
<label class="control-label col-lg-3">{l s='Meta description:'}</label>
@@ -51,10 +52,10 @@
input_value=$product->meta_description
}
</div>
<p class="help-block">{l s='A single sentence for the HTML header is needed. '}</p>
<div class="help-block">{l s='A single sentence for the HTML header is needed. '}</div>
</div>
</div>
<div class="row">
{include file="controllers/products/multishop/checkbox.tpl" field="meta_keywords" type="default" multilang="true"}
<label class="control-label col-lg-3">{l s='Meta keywords:'}</label>
@@ -67,6 +68,7 @@
<p class="help-block">{l s='Keywords for HTML header, separated by commas.'}</p>
</div>
</div>
<div class="row">
{include file="controllers/products/multishop/checkbox.tpl" field="link_rewrite" type="default" multilang="true"}
<label class="control-label col-lg-3">{l s='Friendly URL:'}</label>
@@ -85,19 +87,15 @@
<a class="btn btn-default" onmousedown="updateFriendlyURLByName();"><i class="icon-random"></i> {l s='Generate'}</a>
</div>
</div>
<p class="help-block">{l s='friendly URL from the product name.'}</p>
<div class="help-block">{l s='friendly URL from the product name.'}</div>
</div>
</div>
<div class="row">
<div class="col-lg-9 col-offset-3">
<div class="alert">
<div class="alert alert-block">
<i class="icon-link"></i> {l s='The product link will look like this:'}
{$curent_shop_url|escape:'htmlall':'UTF-8'}lang/{if isset($product->id)}{$product->id}{else}<b>id_product</b>{/if}-<span id="friendly-url">{$product->link_rewrite[$default_language]}</span>.html</p>
{$curent_shop_url|escape:'htmlall':'UTF-8'}lang/{if isset($product->id)}{$product->id}{else}<b>id_product</b>{/if}-<span id="friendly-url">{$product->link_rewrite[$default_language]}</span>.html
</div>
</div>
</div>
<script type="text/javascript">
hideOtherLanguage('{{$default_language}}');
</script>
</div>
admin-dev/themes/default/template/header.tpl
+1
View File
@@ -74,6 +74,7 @@
var token_admin_customers = '{getAdminToken tab='AdminCustomers' slashes=1}';
var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads' slashes=1}';
var currentIndex = '{$currentIndex}';
var default_language = '{$default_language|intval}';
</script>
{/if}
classes/controller/AdminController.php
+1
View File
@@ -1402,6 +1402,7 @@ class AdminControllerCore extends Controller
'controller_name' => htmlentities(Tools::getValue('controller')),
'currentIndex' => self::$currentIndex,
'bootstrap' => $this->bootstrap,
'default_language' => (int)Configuration::get('PS_LANG_DEFAULT')
));
}
classes/helper/Helper.php
+30 -20
View File
@@ -239,13 +239,18 @@ class HelperCore
$html .= '
<div class="category-filter">
<span><a href="#" id="collapse_all">'.$translations['Collapse All'].'</a>|&nbsp;</span>
<span><a href="#" id="expand_all">'.$translations['Expand All'].'</a>|&nbsp;</span>
<a class="btn btn-link" href="#" id="collapse_all"><i class="icon-collapse"></i> '.$translations['Collapse All'].'</a>
<a class="btn btn-link" href="#" id="expand_all"><i class="icon-expand"></i> '.$translations['Expand All'].'</a>
'.(!$use_radio ? '
<span><a href="#" id="check_all">'.$translations['Check All'].'</a>|&nbsp;</span>
<span><a href="#" id="uncheck_all">'.$translations['Uncheck All'].'</a>|&nbsp;</span>' : '')
<a class="btn btn-link" href="#" id="check_all"><i class="icon-check"></i> '.$translations['Check All'].'</a>
<a class="btn btn-link" href="#" id="uncheck_all"><i class="icon-check-empty"></i> '.$translations['Uncheck All'].'</a>' : '')
.($use_search ? '
<span>'.$translations['search'].': <input type="text" name="search_cat" id="search_cat"/></span>' : '')
<div class="row">
<label class="control-label col-lg-6">'.$translations['search'].' :</label>
<div class="col-lg-6">
<input type="text" name="search_cat" id="search_cat"/>
</div>
</div>' : '')
.'</div>';
$home_is_selected = false;
@@ -269,23 +274,28 @@ class HelperCore
}
}
$root_input = '&nbsp;';
$root_input = '';
if ($root['id_category'] != $top_category->id || (Tools::isSubmit('ajax') && Tools::getValue('action') == 'getCategoriesFromRootCategory'))
$root_input = '<input type="'.(!$use_radio ? 'checkbox' : 'radio').'" name="'
.$input_name.'" value="'.$root['id_category'].'" '
.($home_is_selected ? 'checked' : '').' onclick="clickOnCategoryBox($(this));" />
<span class="category_label">'
.$root['name'].
'</span>';
$root_input = '
<p class="checkbox"><i class="icon-folder-open"></i><label>
<input type="'.(!$use_radio ? 'checkbox' : 'radio').'" name="'
.$input_name.'" value="'.$root['id_category'].'" '
.($home_is_selected ? 'checked' : '').' onclick="clickOnCategoryBox($(this));" />'
.$root['name'].
'</label></p>';
$html .= '
<ul id="categories-treeview" class="filetree">
<li id="'.$root['id_category'].'" class="hasChildren">
<span class="folder">'.$root_input.' </span>
<ul>
<li><span class="placeholder">&nbsp;</span></li>
</ul>
</li>
</ul>';
<div class="container">
<div class="well">
<ul id="categories-treeview">
<li id="'.$root['id_category'].'" class="hasChildren">
<span class="folder">'.$root_input.' </span>
<ul>
<li><span class="placeholder">&nbsp;</span></li>
</ul>
</li>
</ul>
</div>
</div>';
if ($use_search)
$html .= '<script type="text/javascript">searchCategory();</script>';
controllers/admin/AdminModulesController.php
+1 -1
View File
@@ -960,7 +960,7 @@ class AdminModulesControllerCore extends AdminController
public function initContent()
{
// Adding Css
$this->addCSS(__PS_BASE_URI__.str_replace(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR, '', _PS_ADMIN_DIR_).'/themes/'.$this->bo_theme.'/css/modules.css', 'all');
//$this->addCSS(__PS_BASE_URI__.str_replace(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR, '', _PS_ADMIN_DIR_).'/themes/'.$this->bo_theme.'/css/modules.css', 'all');
// If we are on a module configuration, no need to load all modules
if (Tools::getValue('configure') != '')
controllers/admin/AdminProductsController.php
-1
View File
@@ -2989,7 +2989,6 @@ class AdminProductsControllerCore extends AdminController
$data->assign(array(
'product' => $product,
'languages' => $this->_languages,
'default_language' => (int)Configuration::get('PS_LANG_DEFAULT'),
'ps_ssl_enabled' => Configuration::get('PS_SSL_ENABLED'),
'curent_shop_url' => $this->context->shop->getBaseURL()
));
js/admin.js
+2 -2
View File
@@ -1007,9 +1007,9 @@ function quickSelect(elt)
//bootstrap BO New fonctions
function hideOtherLanguage(id){
$('.translatable-field').hide();
$('.lang-'+id).show();
$('.lang-' + id).show();
}