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

// add process icon images export csv toolbarstock, new page layout flexible module position, uniformisation stylesheet module

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10957 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vKham
2011-12-05 17:47:45 +00:00
parent caf0402115
commit ebbfcab754
6 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/admin.css
+15 -5
View File
@@ -177,6 +177,8 @@ a.module_toggle_all{color: #268CCD;}
.toolbarBox .process-icon-new-module { background-image: url(process-icon-new-module.png);} .toolbarBox .process-icon-new-module { background-image: url(process-icon-new-module.png);}
.toolbarBox .process-icon-new-module-addon { background-image: url(process-icon-new-module-addon.png);} .toolbarBox .process-icon-new-module-addon { background-image: url(process-icon-new-module-addon.png);}
.toolbarBox .process-icon-save-and-preview { background-image: url(process-icon-preview.png);} .toolbarBox .process-icon-save-and-preview { background-image: url(process-icon-preview.png);}
.toolbarBox .process-icon-export-csv-orders { background-image: url(process-icon-export-csv.png);}
.toolbarBox .process-icon-export-csv-details { background-image: url(process-icon-export-csv-details.png);}
div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;} div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}
@@ -231,7 +233,6 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
#addons_login_div input { float:left; margin-right:10px;} #addons_login_div input { float:left; margin-right:10px;}
#addons_login_div input#addons_login_button { margin-right: 0px; } #addons_login_div input#addons_login_button { margin-right: 0px; }
/*SIDEBAR*/ /*SIDEBAR*/
.sidebar { position:relative; float:left; width:220px; display:inline;} .sidebar { position:relative; float:left; width:220px; display:inline;}
.sidebar h3 { background-color:#ebedf4; font-weight:bold; display:block; padding:5px;} .sidebar h3 { background-color:#ebedf4; font-weight:bold; display:block; padding:5px;}
@@ -315,14 +316,10 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
#statsContainer .blocStats h2.icon-currency span { background-position : -90px -36px;} #statsContainer .blocStats h2.icon-currency span { background-position : -90px -36px;}
#statsContainer .blocStats h2.icon-language span { background-position : -106px -36px;} #statsContainer .blocStats h2.icon-language span { background-position : -106px -36px;}
#statsContainer .blocStats h2.icon-attribute span { background-position : -126px -36px;} #statsContainer .blocStats h2.icon-attribute span { background-position : -126px -36px;}
#statsContainer .blocStats form { position:absolute; top:10px; right:5px;} #statsContainer .blocStats form { position:absolute; top:10px; right:5px;}
#statsContainer .blocStats form.checkup { position:relative; top:0; left:0;} #statsContainer .blocStats form.checkup { position:relative; top:0; left:0;}
#statsContainer .totalStats { font-size:16px; font-weight:bold;} #statsContainer .totalStats { font-size:16px; font-weight:bold;}
/*MODULECONTAINER*/ /*MODULECONTAINER*/
#moduleContainer { margin-left:220px; padding:13px 0 0 20px;} #moduleContainer { margin-left:220px; padding:13px 0 0 20px;}
#moduleContainer .table tr th { height:40px;} #moduleContainer .table tr th { height:40px;}
@@ -350,6 +347,19 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
#moduleContainer .moduleGridDesc h3 { color:#3A6EA7; margin:0;} #moduleContainer .moduleGridDesc h3 { color:#3A6EA7; margin:0;}
#moduleContainer ul.listing-grid-module li select { position:absolute; top:0; right:0px; } #moduleContainer ul.listing-grid-module li select { position:absolute; top:0; right:0px; }
/*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 p { padding: 0 10px;}
.blocLiveEdit a.button {Êfloat: left; margin:10px; display: inline-block;}
#modulePosition { width:100%; float:left; clear:left; margin-right:270px;}
#modulePosition .table tr th { height:40px;}
#modulePosition form{ margin-right:270px;}
#modulePosition .lab_modules_positions h3 { color:#3A6EA7; margin:0 0 0 10px; float:left;}
#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;}
/*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}
admin-dev/themes/default/process-icon-export-csv-details.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

admin-dev/themes/default/process-icon-export-csv.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

admin-dev/themes/template/addons_my_account/content.tpl
+1 -1
View File
@@ -1,2 +1,2 @@
<iframe frameborder="no" style="margin:0px;padding:0px;width:100%;height:920px" src="http://addons.prestashop.com/iframe/myaccount.php?parentUrl={$parentDomain}"></iframe> <iframe frameborder="no" style="margin:0px;padding:0px;width:960px;height:920px" src="http://addons.prestashop.com/iframe/myaccount.php?parentUrl={$parentDomain}"></iframe>
<div class="clear">&nbsp;</div> <div class="clear">&nbsp;</div>
admin-dev/themes/template/modules_positions/list_modules.tpl
+16 -11
View File
@@ -59,16 +59,17 @@
<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>
<fieldset style="width:250px;float:right"><legend>{l s='Live edit'}</legend> <div>
<div id="modulePosition">
<div class="blocLiveEdit"><h2>{l s='Live edit'}</h2>
{if $live_edit} {if $live_edit}
<p>{l s='You have to select a shop to use live edit'}</p> <p>{l s='You have to select a shop to use live edit'}</p>
{else} {else}
<p>{l s='By clicking here you will be redirected to the front office of your shop to move and delete modules directly.'}</p> <p>{l s='By clicking here you will be redirected to the front office of your shop to move and delete modules directly.'}</p>
<br>
<a href="{$url_live_edit}" target="_blank" class="button">{l s='Run LiveEdit'}</a> <a href="{$url_live_edit}" target="_blank" class="button">{l s='Run LiveEdit'}</a>
{/if} {/if}
</fieldset> </div>
<form method="post" action="{$url_submit}"> <form method="post" action="{$url_submit}">
<div id="unhook_button_position_top"> <div id="unhook_button_position_top">
<input class="button floatr" type="submit" name="unhookform" value="{l s='Unhook the selection'}"/></div> <input class="button floatr" type="submit" name="unhookform" value="{l s='Unhook the selection'}"/></div>
@@ -78,7 +79,7 @@
{/if} {/if}
{foreach $hooks as $hook} {foreach $hooks as $hook}
<a name="{$hook['name']}"/> <a name="{$hook['name']}"/>
<table cellpadding="0" cellspacing="0" class="table width3 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} <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} {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)"/> <input type="checkbox" id="Ghook{$hook['id_hook']}" class="floatr" style="margin-right: 2px;" onclick="hookCheckboxes({$hook['id_hook']}, 0, this)"/>
@@ -102,13 +103,13 @@
</a> </a>
{/if} {/if}
</td> </td>
<td style="padding-left: 10px;"><label class="lab_modules_positions" for="mod{$hook['id_hook']}_{$module['instance']->id}"> <td style="padding-left: 10px;"><div class="lab_modules_positions" for="mod{$hook['id_hook']}_{$module['instance']->id}">
{else} {else}
<td style="padding-left: 10px;" colspan="3"><label class="lab_modules_positions" for="mod{$hook['id_hook']}_{$module['instance']->id}"> <td style="padding-left: 10px;" colspan="3"><div class="lab_modules_positions" for="mod{$hook['id_hook']}_{$module['instance']->id}">
{/if} {/if}
<img src="../modules/{$module['instance']->name}/logo.gif" alt="{$module['instance']->name|stripslashes}" /> <strong>{$module['instance']->displayName|stripslashes}</strong> <img src="../modules/{$module['instance']->name}/logo.png" alt="{$module['instance']->name|stripslashes}" /> <h3>{$module['instance']->displayName|stripslashes}</h3>
{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}<br />{$module['instance']->description} <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>
</label></td> </div></td>
<td width="60"> <td width="60">
<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'}" />
@@ -125,4 +126,8 @@
{/if} {/if}
</table> </table>
{/foreach} {/foreach}
<div id="unhook_button_position_bottom"><input class="button floatr" type="submit" name="unhookform" value="{l s='Unhook the selection'}"/></div></form> <div id="unhook_button_position_bottom"><input class="button floatr" type="submit" name="unhookform" value="{l s='Unhook the selection'}"/></div>
</div>
</div>
</form>
css/admin.css
+7 -2
View File
@@ -320,6 +320,11 @@ select optgroup option {
width: 350px; width: 350px;
} }
.lab_modules_positions img {
float:left;
}
/* STRUCTURE */ /* STRUCTURE */
#container { #container {
@@ -428,13 +433,13 @@ select optgroup option {
#unhook_button_position_bottom { #unhook_button_position_bottom {
overflow: hidden; overflow: hidden;
width: 600px; width: 100%;
padding-top: 10px; padding-top: 10px;
} }
#unhook_button_position_top { #unhook_button_position_top {
overflow: hidden; overflow: hidden;
width: 600px; width: 100%;
} }
#content .conf, #content .warn, #content .error { #content .conf, #content .warn, #content .error {