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

// fix small bugs

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10813 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-11-30 16:32:51 +00:00
parent 577aa781bc
commit 003ac6e01b
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/attributes/form.tpl
+19 -1
View File
@@ -23,9 +23,27 @@
* @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"}
{block name=script}
{block name="label"}
{if $input.type == 'color'}
<div id="colorAttributeProperties" style="display:{if $colorAttributeProperties}block{else}none{/if}";>
{/if}
{if isset($input.label)}
<label>{$input.label} </label>
{/if}
{/block}
{block name="end_field_block"}
{if $input.type == 'text' && $input.name == 'texture'}
</div>
{/if}
</div>
{/block}
{block name="script"}
var attributesGroups = {ldelim}{$strAttributesGroups}{rdelim};
$('#id_attribute_group').change(function() {
var val = $(this).val();
admin-dev/themes/template/logs/list_header.tpl
+1 -1
View File
@@ -31,7 +31,7 @@
<fieldset>
<legend>{l s='Severity levels'}</legend>
<p>{l s='Meaning of severity levels:'}</p>
<ol>
<ol style="margin-left: 30px; list-style-type: decimal;">
<li style="color: green;">{l s='Informative only'}</li>
<li style="color: orange;">{l s='Warning'}</li>
<li style="color: orange;">{l s='Error'}</li>
classes/AdminController.php
+4 -4
View File
@@ -1555,13 +1555,13 @@ class AdminControllerCore extends Controller
// retrocomp :
// if value is not set, try with "AdminTab" as prefix.
// @todo : change AdminTab to Helper
if ( isset($_LANGADM[$class.$key]))
if (isset($_LANGADM[$class.$key]))
$str = $_LANGADM[$class.$key];
else if ( isset($_LANGADM['admincontroller'.$key]))
else if (isset($_LANGADM['admincontroller'.$key]))
$str = $_LANGADM['admincontroller'.$key];
else if ( isset($_LANGADM['helper'.$key]))
else if (isset($_LANGADM['helper'.$key]))
$str = $_LANGADM['helper'.$key];
else if ( isset($_LANGADM['admintab'.$key]))
else if (isset($_LANGADM['admintab'.$key]))
$str = $_LANGADM['admintab'.$key];
else
// note in 1.5, some translations has moved from AdminXX to helper/*.tpl