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

//Interface optimisations for form display and menu display

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9388 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dSevere
2011-10-17 12:48:54 +00:00
parent 154c7a9ed9
commit 232c21bd0a
3 changed files with 57 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/admin.css
+1 -1
View File
@@ -31,7 +31,7 @@ fieldset{background:#FFFFF0;border:1px solid #DFD5C3;font-size:1.1em;margin:0;pa
legend{background:#FFF6D3;border:1px solid #DFD5C3;font-weight:700;margin:0;padding:.2em .5em;text-align:left} legend{background:#FFF6D3;border:1px solid #DFD5C3;font-weight:700;margin:0;padding:.2em .5em;text-align:left}
#menu{float:left;height:30px;line-height:normal;margin:10px 0 0;*margin:7px 0 0;padding:0;width:100%;padding:0 1px} #menu{float:left;height:30px;line-height:normal;margin:10px 0 0;*margin:7px 0 0;padding:0;width:100%;padding:0 1px}
#menu li{background:url(bg-tab.png) repeat-x 0 -2px;float:left;height:29px;list-style:none;margin:0 1px 0 0;list-style:none;display:block;border:1px solid #999999;-moz-border-radius-topright:6px;-moz-border-radius-topleft:6px;-webkit-border-top-right-radius:6px;-webkit-border-top-left-radius:6px} #menu li{background:url(bg-tab.png) repeat-x 0 -2px;float:left;height:29px;list-style:none;margin:0 1px 0 0;list-style:none;display:block;border:1px solid #999999;-moz-border-radius-topright:6px;-moz-border-radius-topleft:6px;-webkit-border-top-right-radius:6px;-webkit-border-top-left-radius:6px}
#menu li a{color:#000;display:block;height:20px;padding:8px 8px 4px 0;font-weight:bold;font-size:0.95em;} #menu li a{color:#000;display:block;height:20px;padding:8px 6px 4px 0;font-weight:bold;font-size:0.95em;}
#menu img{display:inline;padding:0 3px 0 6px;vertical-align:top;width:16px;height:16px} #menu img{display:inline;padding:0 3px 0 6px;vertical-align:top;width:16px;height:16px}
#menu li.active,#menu li:hover{background-position:0 -38px;white-space:nowrap;} #menu li.active,#menu li:hover{background-position:0 -38px;white-space:nowrap;}
#menu li.active a{color:#000} #menu li.active a{color:#000}
admin-dev/themes/oldschool/admin.css
+1 -1
View File
@@ -32,7 +32,7 @@ fieldset{background:#FFFFF0;border:1px solid #DFD5C3;font-size:1.1em;margin:0;pa
legend{background:#FFF6D3;border:1px solid #DFD5C3;font-weight:700;margin:0;padding:.2em .5em;text-align:left} legend{background:#FFF6D3;border:1px solid #DFD5C3;font-weight:700;margin:0;padding:.2em .5em;text-align:left}
#menu{float:left;height:30px;line-height:normal;margin:10px 0 0;*margin:7px 0 0;padding:0;width:100%;padding:0 1px} #menu{float:left;height:30px;line-height:normal;margin:10px 0 0;*margin:7px 0 0;padding:0;width:100%;padding:0 1px}
#menu li{background:url(bg-tab.png) repeat-x 0 -2px;float:left;height:29px;list-style:none;margin:0 1px 0 0;list-style:none;display:block;border:1px solid #999999;-moz-border-radius-topright:6px;-moz-border-radius-topleft:6px;-webkit-border-top-right-radius:6px;-webkit-border-top-left-radius:6px} #menu li{background:url(bg-tab.png) repeat-x 0 -2px;float:left;height:29px;list-style:none;margin:0 1px 0 0;list-style:none;display:block;border:1px solid #999999;-moz-border-radius-topright:6px;-moz-border-radius-topleft:6px;-webkit-border-top-right-radius:6px;-webkit-border-top-left-radius:6px}
#menu li a{color:#000;display:block;height:20px;padding:8px 7px 4px 0;font-weight:bold;font-size:0.95em;} #menu li a{color:#000;display:block;height:20px;padding:8px 6px 4px 0;font-weight:bold;font-size:0.95em;}
#menu img{display:inline;padding:0 3px 0 6px;vertical-align:top;width:16px;height:16px} #menu img{display:inline;padding:0 3px 0 6px;vertical-align:top;width:16px;height:16px}
#menu li.active,#menu li:hover{background-position:0 -38px;white-space:nowrap;} #menu li.active,#menu li:hover{background-position:0 -38px;white-space:nowrap;}
#menu li.active a{color:#000} #menu li.active a{color:#000}
admin-dev/themes/template/form.tpl
+55 -36
View File
@@ -1,5 +1,5 @@
{* {*
* 2007-2011 PrestaShop * 2007-2011 PrestaShop
* *
* NOTICE OF LICENSE * NOTICE OF LICENSE
* *
@@ -71,74 +71,93 @@
{if $input.name == 'id_state'} {if $input.name == 'id_state'}
<div id="contains_states" {if $contains_states}style="display:none;"{/if}> <div id="contains_states" {if $contains_states}style="display:none;"{/if}>
{/if} {/if}
{if isset($input.label)}
<label>{$input.label} </label> <label>{$input.label} </label>
{/if}
<div class="margin-form"> <div class="margin-form">
{if $input.type == 'text'} {if $input.type == 'text'}
{if isset($input.lang) && isset($input.attributeLang)} {if isset($input.lang) && isset($input.attributeLang)}
{foreach $languages as $language} {foreach $languages as $language}
<div id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;"> <div id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
<input type="text" <input type="text"
name="{$input.name}_{$language.id_lang}" name="{$input.name}_{$language.id_lang}"
value="{$fields_value[$input.name][$language.id_lang]}" value="{$fields_value[$input.name][$language.id_lang]}"
{if isset($input.size)}size="{$input.size}"{/if} {if isset($input.size)}size="{$input.size}"{/if}
{if isset($input.class)}class="{$input.class}"{/if} {if isset($input.class)}class="{$input.class}"{/if}
{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if} /> {if isset($input.readonly) && $input.readonly}readonly="readonly"{/if} />
{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if} {if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
</div> </div>
{/foreach} {/foreach}
{if count($languages) > 1} {if count($languages) > 1}
<div class="displayed_flag"> <div class="displayed_flag">
<img src="../img/l/{$defaultFormLanguage}.jpg" <img src="../img/l/{$defaultFormLanguage}.jpg"
class="pointer" class="pointer"
id="language_current_{$input.name}" id="language_current_{$input.name}"
onclick="toggleLanguageFlags(this);" /> onclick="toggleLanguageFlags(this);" />
</div> </div>
<div id="languages_{$input.name}" class="language_flags"> <div id="languages_{$input.name}" class="language_flags">
{l s='Choose language:'}<br /><br /> {l s='Choose language:'}<br /><br />
{foreach $languages as $language} {foreach $languages as $language}
<img src="../img/l/{$language.id_lang}.jpg" <img src="../img/l/{$language.id_lang}.jpg"
class="pointer" class="pointer"
alt="{$language.name}" alt="{$language.name}"
title="{$language.name}" title="{$language.name}"
onclick="changeLanguage('{$input.name}', '{$input.attributeLang}', {$language.id_lang}, '{$language.iso_code}');" /> onclick="changeLanguage('{$input.name}', '{$input.attributeLang}', {$language.id_lang}, '{$language.iso_code}');" />
{/foreach} {/foreach}
</div> </div>
{/if} {/if}
{else} {else}
<input type="text" <input type="text"
name="{$input.name}" name="{$input.name}"
id="{$input.name}" id="{$input.name}"
value="{$fields_value[$input.name]}" value="{$fields_value[$input.name]}"
{if isset($input.size)}size="{$input.size}"{/if} {if isset($input.size)}size="{$input.size}"{/if}
{if isset($input.class)}class="{$input.class}"{/if} {if isset($input.class)}class="{$input.class}"{/if}
{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if} /> {if isset($input.readonly) && $input.readonly}readonly="readonly"{/if} />
{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if} {if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
{/if} {/if}
{elseif $input.type == 'hidden'}
<input type="hidden" name="{$input.name}" value="{$fields_value[$input.name]}" />
{elseif $input.type == 'select'} {elseif $input.type == 'select'}
<select name="{$input.name}" id="{$input.name}" {if isset($input.onchange)}onchange="{$input.onchange}"{/if}> <select name="{$input.name}" id="{$input.name}" {if isset($input.multiple)}multiple="multiple" {/if}{if isset($input.onchange)}onchange="{$input.onchange}"{/if}>
{if isset($input.options.optiongroup)} {if isset($input.options.optiongroup)}
{foreach $input.options.optiongroup.query AS $optiongroup} {foreach $input.options.optiongroup.query AS $optiongroup}
<optgroup label="{$optiongroup[$input.options.optiongroup.label]}"> <optgroup label="{$optiongroup[$input.options.optiongroup.label]}">
{foreach $optiongroup[$input.options.options.query] as $option} {foreach $optiongroup[$input.options.options.query] as $option}
<option value="{$option[$input.options.options.id]}" <option value="{$option[$input.options.options.id]}"
{if $fields_value[$input.name] == $option[$input.options.options.id]}selected="selected"{/if}>{$option[$input.options.options.name]|escape:'htmlall':'UTF-8'}</option> {if isset($input.multiple)}
{foreach $fields_value[$input.name] as $field_value}
{if $field_value == $option[$input.options.options.id]}selected="selected"{/if}
{/foreach}
{else}
{if $fields_value[$input.name] == $option[$input.options.options.id]}selected="selected"{/if}
{/if}
>{$option[$input.options.options.name]|escape:'htmlall':'UTF-8'}</option>
{/foreach} {/foreach}
</optgroup> </optgroup>
{/foreach} {/foreach}
{else} {else}
{foreach $input.options.query AS $option} {foreach $input.options.query AS $option}
{$fields_value[$input.name]|@p} <option value="{$option[$input.options.id]}"
<option value="{$option[$input.options.id]}" {if isset($input.multiple)}
{if $fields_value[$input.name] == $option[$input.options.id]}selected="selected"{/if}>{$option[$input.options.name]|escape:'htmlall':'UTF-8'}</option> {foreach $fields_value[$input.name] as $field_value}
{$field_value}
{if $field_value == $option[$input.options.id]}selected="selected"{/if}
{/foreach}
{else}
{if $fields_value[$input.name] == $option[$input.options.id]}selected="selected"{/if}
{/if}
>{$option[$input.options.name]|escape:'htmlall':'UTF-8'}</option>
{/foreach} {/foreach}
{/if} {/if}
</select> </select>
{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
{elseif $input.type == 'radio'} {elseif $input.type == 'radio'}
{foreach $input.values as $value} {foreach $input.values as $value}
<input type="radio" <input type="radio"
name="{$input.name}" name="{$input.name}"
id="{$value.id}" id="{$value.id}"
value="{$value.value|escape:'htmlall':'UTF-8'}" value="{$value.value|escape:'htmlall':'UTF-8'}"
{if $fields_value[$input.name] == $value.value}checked="checked"{/if} /> {if $fields_value[$input.name] == $value.value}checked="checked"{/if} />
<label {if isset($input.class)}class="{$input.class}"{/if} for="{$value.id}"> <label {if isset($input.class)}class="{$input.class}"{/if} for="{$value.id}">
{if isset($input.is_bool) && $input.is_bool == true} {if isset($input.is_bool) && $input.is_bool == true}
@@ -161,18 +180,18 @@
{/foreach} {/foreach}
{if count($languages) > 1} {if count($languages) > 1}
<div class="displayed_flag"> <div class="displayed_flag">
<img src="../img/l/{$defaultFormLanguage}.jpg" <img src="../img/l/{$defaultFormLanguage}.jpg"
class="pointer" class="pointer"
id="language_current_{$input.name}" id="language_current_{$input.name}"
onclick="toggleLanguageFlags(this);" /> onclick="toggleLanguageFlags(this);" />
</div> </div>
<div id="languages_{$input.name}" class="language_flags"> <div id="languages_{$input.name}" class="language_flags">
{l s='Choose language:'}<br /><br /> {l s='Choose language:'}<br /><br />
{foreach $languages as $language} {foreach $languages as $language}
<img src="../img/l/{$language.id_lang}.jpg" <img src="../img/l/{$language.id_lang}.jpg"
class="pointer" class="pointer"
alt="{$language.name}" alt="{$language.name}"
title="{$language.name}" title="{$language.name}"
onclick="changeLanguage('{$input.name}', '{$input.attributeLang}', {$language.id_lang}, '{$language.iso_code}');" /> onclick="changeLanguage('{$input.name}', '{$input.attributeLang}', {$language.id_lang}, '{$language.iso_code}');" />
{/foreach} {/foreach}
</div> </div>
@@ -181,7 +200,7 @@
<textarea name="{$input.name}" id="{$input.name}" cols="{$input.cols}" rows="{$input.rows}">{$fields_value[$input.name]}</textarea> <textarea name="{$input.name}" id="{$input.name}" cols="{$input.cols}" rows="{$input.rows}">{$fields_value[$input.name]}</textarea>
{/if} {/if}
{elseif $input.type == 'checkbox'} {elseif $input.type == 'checkbox'}
{elseif $input.type == 'file'} {elseif $input.type == 'file'}
<input type="file" name="{$input.name}" /> <input type="file" name="{$input.name}" />
<img src="{$fields_value[$input.name]}" /> <img src="{$fields_value[$input.name]}" />
@@ -228,4 +247,4 @@
<a href="{$current}&token={$token}"><img src="../img/admin/arrow2.gif" />{l s='Back to list'}</a> <a href="{$current}&token={$token}"><img src="../img/admin/arrow2.gif" />{l s='Back to list'}</a>
{/if} {/if}
<br /> <br />
{/if} {/if}