diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index ea6d4c7a7..301846673 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -47,7 +47,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3} #header #header_infos{ position:relative; margin: 0; padding:0; height:60px; } #header #header_shopname {float: left; margin:10px 15px 0 10px;} #header #employee_box {float: right; display:block;} -#header #employee_infos {display:block; margin:10px 15px 0 10px;} +#header #employee_infos {display:block; margin:5px 15px 0 10px;} #header #employee_infos a{color:#BABABA; text-transform:capitalize;margin-right: 5px} #header #employee_infos a:hover {color:#fff;} #header #employee_infos .employee_name { float:left; color:#fff;padding: 0 20px 0 0;} @@ -518,20 +518,31 @@ form#product_form h4 { font-size:18px; font-weight:normal;} #moduleContainer ul.listing-grid-module li select { position:absolute; top:0; right:0px; } /*TAB MODULES LIST*/ + +#modules_list_container_tab #modules_list_container_content{ + list-style-type:none; + padding:0; + margin:0; + white-space: nowrap; + overflow: auto; + height: 335px; +} +#modules_list_container_tab #modules_list_container_content li{display:inline-block;} #modules_list_container_tab table tr th { height:40px;} #modules_list_container_tab table tr td { font-size:12px; padding: 3px 3px 3px; border-top:1px solid #ccc; border-bottom:none;} #modules_list_container_tab table tr td tr td {border: none} #modules_list_container_tab table tr:first-child {border-top:1px solid #ccc} +#modules_list_container_tab table td.tab_modules_actions_row {border-top:1px solid #ccc} #modules_list_container_tab .imgm {width:32px;} -#modules_list_container_tab .moduleDesc { font-size:12px;} -#modules_list_container_tab .moduleDesc h3 { color:#3A6EA7;margin: 0;font-size: 1.1em;text-align: left} +#modules_list_container_tab .moduleDesc { font-size:12px;width: 238px;} +#modules_list_container_tab .moduleDesc h3 { color:#3A6EA7;margin: 0;font-size: 1.1em;text-align: left;white-space: normal;} #modules_list_container_tab .moduleDesc .metadata { float:left; display:block; margin:5px 0;} #modules_list_container_tab .moduleDesc .metadata dl { float:left; margin:0; padding-right:10px;} #modules_list_container_tab .moduleDesc .metadata dl dt, .moduleDesc .metadata dl dd { float:left; margin:0; padding:0;} #modules_list_container_tab .moduleDesc .metadata dl dd { padding-right:10px;} #modules_list_container_tab .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;} -#modules_list_container_tab .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic; font-size:12px; display:block; clear:both;text-align: left} -#modules_list_container_tab .setup {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; position:relative; padding:2px 3px; display: inline-block; border-radius:3px;} +#modules_list_container_tab .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic; font-size:12px; text-align: left;white-space: normal;} +#modules_list_container_tab .setup {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; padding:2px 10px; display: inline-block; border-radius:3px;} #modules_list_container_tab .row-actions-module {float: right;} #modules_list_container_tab .setup.non-install { background-color:#ec7000;} #modules_list_container_tab .setup.must-have { background-color: #ec7000;} @@ -545,9 +556,16 @@ form#product_form h4 { font-size:18px; font-weight:normal;} #modules_list_container_tab ul.listing-grid-module li select { position:absolute; top:0; right:0px; } .default_modules_list_display_type #modules_list_container_content li table tr td{border: none} -.default_modules_list_display_type #modules_list_container_content li table {border: solid 1px #ccc; height: 115px} +.default_modules_list_display_type #modules_list_container_content li table {border: solid 1px #ccc; height: 140px;width: 100%;margin-bottom:15px} #modules_list_container_tab ul li {margin:5px;height:140px} + /******** ie7 ******/ + .ie7 #modules_list_container_tab #modules_list_container_content li{zoom:1;display:inline;} + .ie7 #modules_list_container_content li table {width: 21%;} + .ie7 #modules_list_container_content li table td .btn_right{width:100%;float:right;} + .ie7 #modules_list_container_content li table td .btn_right select{float:left;} + .ie7 #modules_list_container_content li table td a.button{display:block;float:right;} + /*MODULE POSITION*/ .blocLiveEdit { float:right; clear:right; background-color: #EBEDF4; border: 1px solid #C2C4D9;display: block; width:250px;} .blocLiveEdit h2 { background: transparent url('../img/live_edit.png') no-repeat scroll 10px 10px; height: 40px; line-height: 50px;margin: 0; padding: 0 10px; text-indent: 40px;} @@ -636,4 +654,3 @@ ul.listForm li {padding-bottom:3px;} background: linear-gradient(top, #ddd, #aaa); color: #666 } - diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl index 68b709244..c857ea137 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -77,7 +77,7 @@
- +
@@ -154,7 +154,7 @@

{l s='Groups'} ({count($groups)}) - +

diff --git a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl index 3a0f76fff..4bbace5b9 100644 --- a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl +++ b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl @@ -25,57 +25,58 @@ *} - - - - - \ No newline at end of file + + + +
- - -
-

{$module->displayName|truncate:40:'…'} {$module->version} - -

-

- {if isset($module->description) && $module->description ne ''} - {$module->description|truncate:100:'…'} +

+ + + + + + + - - - - - -
+ + +
+

{$module->displayName|truncate:40:'…'} {$module->version} + +

+

+ {if isset($module->description) && $module->description ne ''} + {$module->description|truncate:100:'…'} + {else} +   + {/if} +

+
+
+ {if isset($module->id) && $module->id gt 0 } + {if $module->active} + {l s='Enabled'} {else} -   + {l s='Disabled'} {/if} -

- -
- {if isset($module->id) && $module->id gt 0 } - {if $module->active} - {l s='Enabled'} {else} - {l s='Disabled'} + {if isset($module->type) && $module->type == 'addonsMustHave'} + {l s='Must Have'} + {else} + {l s='Not installed'} + {/if} + {/if} - {else} - {if isset($module->type) && $module->type == 'addonsMustHave'} - {l s='Must Have'} - {else} - {l s='Not installed'} - {/if} - - {/if} - -
- {if isset($module->type) && $module->type == 'addonsMustHave'} - -   {displayPrice price=$module->price currency=$module->id_currency} - {else if !isset($module->not_on_disk)} - {$module->optionsHtml} - Valider - {else} - {l s='Install'} - {/if} -
-
-		 +
+ {if isset($module->type) && $module->type == 'addonsMustHave'} + +   {displayPrice price=$module->price currency=$module->id_currency} + {else if !isset($module->not_on_disk)} + {$module->optionsHtml} + Valider + {else} + {l s='Install'} + {/if} +
+
+ + \ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/modules_list/list.tpl b/admin-dev/themes/default/template/helpers/modules_list/list.tpl index 2bab32eb1..edbf3166c 100644 --- a/admin-dev/themes/default/template/helpers/modules_list/list.tpl +++ b/admin-dev/themes/default/template/helpers/modules_list/list.tpl @@ -25,13 +25,19 @@

{l s='Modules list'}

-