From a2209b5d8470bbb2dfc71a58d3cf158de4474423 Mon Sep 17 00:00:00 2001
From: vKham <vKham@prestashop.com>
Date: Wed, 7 Dec 2011 10:50:11 +0000
Subject: [PATCH] // change layout module position consistency with listing
 module, new admin stylesheets

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11023 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/default/admin.css            |   8 ++--
 admin-dev/themes/default/live_edit.png        | Bin 0 -> 1586 bytes
 .../modules_positions/list_modules.tpl        |  35 +++++++++++-------
 3 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100755 admin-dev/themes/default/live_edit.png

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 0000000000000000000000000000000000000000..629d8a6b6aa9bba29dbb3cf4ee2f4b13cc4aea0f
GIT binary patch
literal 1586
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

literal 0
HcmV?d00001

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 @@
 	</div>
 {/if}
 
+<div class="filter-module">
 <form>
 	{l s='Show'} :
 	<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;
 	<label class="t" for="hook_position">{l s='Display non-positionable hook'}</label>
 </form>
-
+</div>
+<br/>
 <div>
 
 <div id="modulePosition">
@@ -80,20 +82,28 @@
 {foreach $hooks as $hook}
 	<a name="{$hook['name']}"/>
 	<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}
-	{if $hook['module_count'] && $can_move}
-		<input type="checkbox" id="Ghook{$hook['id_hook']}" class="floatr" style="margin-right: 2px;" onclick="hookCheckboxes({$hook['id_hook']}, 0, this)"/>
-	{/if}
+		<colgroup>
+			<col width="10"></col>
+			<col width="30"></col>
+			<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'])}
 		&nbsp;<span style="font-size:0.8em; font-weight: normal">[{$hook['description']}]</span>
 	{/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']}
 		{foreach $hook['modules'] as $position => $module}
 			<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}
-				<td class="positions" width="40">{$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 align=center  class="positions">{$module@iteration}</td>
+				<td {if $can_move && $hook['module_count'] >= 2} align=center class="dragHandle"{/if} id="td_{$hook['id_hook']}_{$module['instance']->id}">
 					{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']}">
 							<img src="../img/admin/up.gif" alt="{l s='Up'}" title="{l s='Up'}" />
@@ -103,26 +113,25 @@
 						</a>
 					{/if}
 				</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}
-				<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}
 			<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>
 			</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}">
 						<img src="../img/admin/edit.gif" border="0" alt="{l s='Edit'}" title="{l s='Edit'}" />
 					</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}">
 						<img src="../img/admin/delete.gif" border="0" alt="{l s='Delete'}" title="{l s='Delete'}" />
 					</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>
 			</tr>
 		{/foreach}
 	{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}
 	</table>
 {/foreach}