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

// change layout module position consistency with listing module, new admin stylesheets

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11023 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vKham
2011-12-07 10:50:11 +00:00
parent f6cf5ff6ed
commit a2209b5d84
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/admin.css
+5 -3
View File
@@ -336,8 +336,8 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
#moduleContainer .moduleDesc .metadata dl dt, .moduleDesc .metadata dl dd { float:left; margin:0; padding:0;} #moduleContainer .moduleDesc .metadata dl dt, .moduleDesc .metadata dl dd { float:left; margin:0; padding:0;}
#moduleContainer .moduleDesc .metadata dl dd { padding-right:10px;} #moduleContainer .moduleDesc .metadata dl dd { padding-right:10px;}
#moduleContainer .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;} #moduleContainer .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
#moduleContainer .moduleDesc p.desc { color:#666; font-size:12px; display:block; clear:both;} #moduleContainer .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic; font-size:12px; display:block; clear:both;}
#moduleContainer .setup {background-color:#6db300; font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;} #moduleContainer .setup {background-color:#6db300;font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;}
#moduleContainer .setup.non-install { background-color:#ec7000;} #moduleContainer .setup.non-install { background-color:#ec7000;}
#moduleContainer .setup.off{ background-color:#ccc;} #moduleContainer .setup.off{ background-color:#ccc;}
#moduleContainer .row-actions-module span { padding-right:5px;} #moduleContainer .row-actions-module span { padding-right:5px;}
@@ -352,7 +352,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
/*MODULE POSITION*/ /*MODULE POSITION*/
.blocLiveEdit { float:right; clear:right; background-color: #EBEDF4; border: 1px solid #C2C4D9;display: block; width:250px;} .blocLiveEdit { float:right; clear:right; background-color: #EBEDF4; border: 1px solid #C2C4D9;display: block; width:250px;}
.blocLiveEdit h2 { margin:0; padding: 0 10px;} .blocLiveEdit h2 { background: transparent url(live_edit.png) no-repeat scroll 10px 10px; height: 40px; line-height: 50px;margin: 0; padding: 0 10px; text-indent: 40px;}
.blocLiveEdit p { padding: 0 10px;} .blocLiveEdit p { padding: 0 10px;}
.blocLiveEdit a.button {�float: left; margin:10px; display: inline-block;} .blocLiveEdit a.button {�float: left; margin:10px; display: inline-block;}
@@ -364,6 +364,8 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
#modulePosition .lab_modules_positions p { font-family:Georgia; font-style: italic; font-size:12px; padding-left:40px;} #modulePosition .lab_modules_positions p { font-family:Georgia; font-style: italic; font-size:12px; padding-left:40px;}
#modulePosition .lab_modules_positions span { font-size:12px; padding-left:5px;} #modulePosition .lab_modules_positions span { font-size:12px; padding-left:5px;}
select#show_modules { font-size:12px;}
/*FOOTER*/ /*FOOTER*/
#footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666} #footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666}
#footer .footer_link, #footer .footer_link:hover {color:#D41958;} #footer .footer_link, #footer .footer_link:hover {color:#D41958;}
admin-dev/themes/default/live_edit.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

admin-dev/themes/template/modules_positions/list_modules.tpl
+22 -13
View File
@@ -44,6 +44,7 @@
</div> </div>
{/if} {/if}
<div class="filter-module">
<form> <form>
{l s='Show'} : {l s='Show'} :
<select id="show_modules" onChange="autoUrl('show_modules', '{$url_show_modules}')"> <select id="show_modules" onChange="autoUrl('show_modules', '{$url_show_modules}')">
@@ -58,7 +59,8 @@
<input type="checkbox" id="hook_position" onclick="autoUrlNoList('hook_position', '{$url_show_invisible}')" {if $hook_position}checked="checked"{/if} />&nbsp; <input type="checkbox" id="hook_position" onclick="autoUrlNoList('hook_position', '{$url_show_invisible}')" {if $hook_position}checked="checked"{/if} />&nbsp;
<label class="t" for="hook_position">{l s='Display non-positionable hook'}</label> <label class="t" for="hook_position">{l s='Display non-positionable hook'}</label>
</form> </form>
</div>
<br/>
<div> <div>
<div id="modulePosition"> <div id="modulePosition">
@@ -80,20 +82,28 @@
{foreach $hooks as $hook} {foreach $hooks as $hook}
<a name="{$hook['name']}"/> <a name="{$hook['name']}"/>
<table cellpadding="0" cellspacing="0" class="table widthfull space {if $hook['module_count'] >= 2} tableDnD{/if}" id="{$hook['id_hook']}"> <table cellpadding="0" cellspacing="0" class="table widthfull space {if $hook['module_count'] >= 2} tableDnD{/if}" id="{$hook['id_hook']}">
<tr class="nodrag nodrop"><th colspan="4">{$hook['title']} - <span style="color: red">{$hook['module_count']}</span> {if $hook['module_count'] > 1}{l s='modules'}{else}{l s='module'}{/if} <colgroup>
{if $hook['module_count'] && $can_move} <col width="10"></col>
<input type="checkbox" id="Ghook{$hook['id_hook']}" class="floatr" style="margin-right: 2px;" onclick="hookCheckboxes({$hook['id_hook']}, 0, this)"/> <col width="30"></col>
{/if} <col width="40"></col>
<col width=""></col>
<col width="50"></col>
</colgroup>
<tr class="nodrag nodrop"><th colspan="5"> {if $hook['module_count'] && $can_move}
<input type="checkbox" id="Ghook{$hook['id_hook']}" style="margin-right: 2px;" onclick="hookCheckboxes({$hook['id_hook']}, 0, this)"/>
{/if}{$hook['title']} - <span style="color: red">{$hook['module_count']}</span> {if $hook['module_count'] > 1}{l s='modules'}{else}{l s='module'}{/if}
{if !empty($hook['description'])} {if !empty($hook['description'])}
&nbsp;<span style="font-size:0.8em; font-weight: normal">[{$hook['description']}]</span> &nbsp;<span style="font-size:0.8em; font-weight: normal">[{$hook['description']}]</span>
{/if} {/if}
<sub style="color:grey;"><i>({l s='Technical name: '}{$hook['name']})</i></sub></th></tr> <span style="color:grey;">({l s='Technical name: '}{$hook['name']})</span></th></tr>
{if $hook['module_count']} {if $hook['module_count']}
{foreach $hook['modules'] as $position => $module} {foreach $hook['modules'] as $position => $module}
<tr id="{$hook['id_hook']}_{$module['instance']->id}" {cycle values='class="alt_row",'} style="height: 42px;"> <tr id="{$hook['id_hook']}_{$module['instance']->id}" {cycle values='class="alt_row",'} style="height: 42px;">
<td align=center > <input type="checkbox" id="mod{$hook['id_hook']}_{$module['instance']->id}" class="hook{$hook['id_hook']}" onclick="hookCheckboxes({$hook['id_hook']}, 1, this)" name="unhooks[]" value="{$hook['id_hook']}_{$module['instance']->id}"/></td>
{if !$display_key} {if !$display_key}
<td class="positions" width="40">{$module@iteration}</td> <td align=center class="positions">{$module@iteration}</td>
<td {if $can_move && $hook['module_count'] >= 2} class="dragHandle"{/if} id="td_{$hook['id_hook']}_{$module['instance']->id}" width="40"> <td {if $can_move && $hook['module_count'] >= 2} align=center class="dragHandle"{/if} id="td_{$hook['id_hook']}_{$module['instance']->id}">
{if $can_move} {if $can_move}
<a {if {$module@iteration} == 1} style="display: none;"{/if} href="{$current}&id_module={$module['instance']->id}&id_hook={$hook['id_hook']}&direction=0&token={$token}&changePosition#{$hook['name']}"> <a {if {$module@iteration} == 1} style="display: none;"{/if} href="{$current}&id_module={$module['instance']->id}&id_hook={$hook['id_hook']}&direction=0&token={$token}&changePosition#{$hook['name']}">
<img src="../img/admin/up.gif" alt="{l s='Up'}" title="{l s='Up'}" /> <img src="../img/admin/up.gif" alt="{l s='Up'}" title="{l s='Up'}" />
@@ -103,26 +113,25 @@
</a> </a>
{/if} {/if}
</td> </td>
<td style="padding-left: 10px;"><div class="lab_modules_positions" for="mod{$hook['id_hook']}_{$module['instance']->id}"> <td><div class="lab_modules_positions" for="mod{$hook['id_hook']}_{$module['instance']->id}">
{else} {else}
<td style="padding-left: 10px;" colspan="3"><div class="lab_modules_positions" for="mod{$hook['id_hook']}_{$module['instance']->id}"> <td colspan="3"><div class="lab_modules_positions" for="mod{$hook['id_hook']}_{$module['instance']->id}">
{/if} {/if}
<img src="../modules/{$module['instance']->name}/logo.png" alt="{$module['instance']->name|stripslashes}" /> <h3>{$module['instance']->displayName|stripslashes}</h3> <img src="../modules/{$module['instance']->name}/logo.png" alt="{$module['instance']->name|stripslashes}" /> <h3>{$module['instance']->displayName|stripslashes}</h3>
<span>{if $module['instance']->version}v{if $module['instance']->version|intval == $module['instance']->version}{sprintf('%.1f', $module['instance']->version)}{else}{$module['instance']->version|floatval}{/if}{/if}</span><p>{$module['instance']->description}</p> <span>{if $module['instance']->version}v{if $module['instance']->version|intval == $module['instance']->version}{sprintf('%.1f', $module['instance']->version)}{else}{$module['instance']->version|floatval}{/if}{/if}</span><p>{$module['instance']->description}</p>
</div></td> </div></td>
<td width="60"> <td>
<a href="{$current}&id_module={$module['instance']->id}&id_hook={$hook['id_hook']}&editGraft{if $display_key}&show_modules={$display_key}{/if}&token={$token}"> <a href="{$current}&id_module={$module['instance']->id}&id_hook={$hook['id_hook']}&editGraft{if $display_key}&show_modules={$display_key}{/if}&token={$token}">
<img src="../img/admin/edit.gif" border="0" alt="{l s='Edit'}" title="{l s='Edit'}" /> <img src="../img/admin/edit.gif" border="0" alt="{l s='Edit'}" title="{l s='Edit'}" />
</a> </a>
<a href="{$current}&id_module={$module['instance']->id}&id_hook={$hook['id_hook']}&deleteGraft{if $display_key}&show_modules={$display_key}{/if}&token={$token}"> <a href="{$current}&id_module={$module['instance']->id}&id_hook={$hook['id_hook']}&deleteGraft{if $display_key}&show_modules={$display_key}{/if}&token={$token}">
<img src="../img/admin/delete.gif" border="0" alt="{l s='Delete'}" title="{l s='Delete'}" /> <img src="../img/admin/delete.gif" border="0" alt="{l s='Delete'}" title="{l s='Delete'}" />
</a> </a>
<input type="checkbox" id="mod{$hook['id_hook']}_{$module['instance']->id}" class="hook{$hook['id_hook']}" onclick="hookCheckboxes({$hook['id_hook']}, 1, this)" name="unhooks[]" value="{$hook['id_hook']}_{$module['instance']->id}"/>
</td> </td>
</tr> </tr>
{/foreach} {/foreach}
{else} {else}
<tr><td colspan="4">{l s='No module for this hook'}</td></tr> <tr><td colspan="5">{l s='No module for this hook'}</td></tr>
{/if} {/if}
</table> </table>
{/foreach} {/foreach}