diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css index 18a69a742..73abe4073 100644 --- a/admin-dev/themes/default/admin.css +++ b/admin-dev/themes/default/admin.css @@ -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 dd { padding-right:10px;} #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 .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 .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.non-install { background-color:#ec7000;} #moduleContainer .setup.off{ background-color:#ccc;} #moduleContainer .row-actions-module span { padding-right:5px;} @@ -352,7 +352,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;} /*MODULE POSITION*/ .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 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 span { font-size:12px; padding-left:5px;} +select#show_modules { font-size:12px;} + /*FOOTER*/ #footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666} #footer .footer_link, #footer .footer_link:hover {color:#D41958;} diff --git a/admin-dev/themes/default/live_edit.png b/admin-dev/themes/default/live_edit.png new file mode 100755 index 000000000..629d8a6b6 Binary files /dev/null and b/admin-dev/themes/default/live_edit.png differ diff --git a/admin-dev/themes/template/modules_positions/list_modules.tpl b/admin-dev/themes/template/modules_positions/list_modules.tpl index e102e98ee..ff353ac10 100644 --- a/admin-dev/themes/template/modules_positions/list_modules.tpl +++ b/admin-dev/themes/template/modules_positions/list_modules.tpl @@ -44,6 +44,7 @@ {/if} +
{l s='Show'} :  
- +
+
@@ -80,20 +82,28 @@ {foreach $hooks as $hook} - + + + + + + + + ({l s='Technical name: '}{$hook['name']}) {if $hook['module_count']} {foreach $hook['modules'] as $position => $module} + {if !$display_key} - - + - - {/foreach} {else} - + {/if}
{$hook['title']} - {$hook['module_count']} {if $hook['module_count'] > 1}{l s='modules'}{else}{l s='module'}{/if} - {if $hook['module_count'] && $can_move} - - {/if} +
{if $hook['module_count'] && $can_move} + + {/if}{$hook['title']} - {$hook['module_count']} {if $hook['module_count'] > 1}{l s='modules'}{else}{l s='module'}{/if} + {if !empty($hook['description'])}  [{$hook['description']}] {/if} - ({l s='Technical name: '}{$hook['name']})
{$module@iteration}= 2} class="dragHandle"{/if} id="td_{$hook['id_hook']}_{$module['instance']->id}" width="40"> + {$module@iteration}= 2} align=center class="dragHandle"{/if} id="td_{$hook['id_hook']}_{$module['instance']->id}"> {if $can_move} {l s='Up'} @@ -103,26 +113,25 @@ {/if}
+
{else} -
+
{/if} {$module['instance']->name|stripslashes}

{$module['instance']->displayName|stripslashes}

{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}

{$module['instance']->description}

+ {l s='Edit'} {l s='Delete'} -
{l s='No module for this hook'}
{l s='No module for this hook'}
{/foreach}