diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index dc501486f..fa7cfdd3c 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -280,7 +280,8 @@ form#product_form h4 { font-size:18px; font-weight:normal;} .sidebar ul.categorieList {} .sidebar ul.categorieList li { border-top:1px solid #ccc; position:relative; line-height:20px;} .sidebar ul.categorieList li:first-child { border-top:none;} -.sidebar ul.categorieList li a {color:#3a6ea7; padding-left:5px;} +.sidebar ul.categorieList li a {color:#3a6ea7; display:block; padding-left:5px;} +.sidebar ul.categorieList li a:hover { background-color: #EBEDF4;} .sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left:5px; overflow:hidden;} .sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;} .sidebar .categorieStatus { display:none;} diff --git a/admin-dev/themes/default/template/customer_threads/message.tpl b/admin-dev/themes/default/template/customer_threads/message.tpl index 7a37ccb68..723a0962b 100644 --- a/admin-dev/themes/default/template/customer_threads/message.tpl +++ b/admin-dev/themes/default/template/customer_threads/message.tpl @@ -176,7 +176,7 @@
-
+
diff --git a/admin-dev/themes/default/template/import/form.tpl b/admin-dev/themes/default/template/import/form.tpl index 5196416fd..6a103e3e1 100644 --- a/admin-dev/themes/default/template/import/form.tpl +++ b/admin-dev/themes/default/template/import/form.tpl @@ -155,8 +155,8 @@ {/foreach} {/if} -   Uplaod - {l s='Upload'} +    + Uplaod{l s='Upload'}

@@ -203,10 +203,12 @@
{if !count($files_to_import)}
- {l s='There is no CSV file available, please upload one using the form above.'} -

- {l s='You can read informations on CSV import at:'} http://www.prestashop.com/wiki/Troubleshooting_6/

- {l s='Read more about CSV format at: '} http://en.wikipedia.org/wiki/Comma-separated_values +

{l s='There is no CSV file available, please upload one using the form above.'}

+
{/if} diff --git a/admin-dev/themes/default/template/import/view.tpl b/admin-dev/themes/default/template/import/view.tpl index 739c05603..997d72b95 100644 --- a/admin-dev/themes/default/template/import/view.tpl +++ b/admin-dev/themes/default/template/import/view.tpl @@ -30,6 +30,7 @@ +

{l s='View your data'}

{l s='Save and load your matching configuration'} :

@@ -134,5 +135,6 @@ +
{/block} diff --git a/admin-dev/themes/default/template/products/informations.tpl b/admin-dev/themes/default/template/products/informations.tpl index dbbbbcf74..df7207a2b 100644 --- a/admin-dev/themes/default/template/products/informations.tpl +++ b/admin-dev/themes/default/template/products/informations.tpl @@ -221,14 +221,21 @@
{l s='Do you want an image associated with the product in your description?'} {l s='Click here'}. - + +

+ + + + + + @@ -269,14 +280,19 @@ + + + -
-

- - + + + + {/if} - + +
@@ -324,6 +340,7 @@

{l s='Tags separated by commas (e.g., dvd, dvd player, hifi)'}

diff --git a/admin-dev/themes/default/template/translations/translation_form.tpl b/admin-dev/themes/default/template/translations/translation_form.tpl index 9d0d58a86..9bf7c3fe5 100644 --- a/admin-dev/themes/default/template/translations/translation_form.tpl +++ b/admin-dev/themes/default/template/translations/translation_form.tpl @@ -29,7 +29,8 @@ {block name="override_tpl"}

{l s='Language'} : {$lang} - {$translation_type}

- {l s='Expressions to translate'} : {$count}. {l s='Click on the titles to open fieldsets'}.

+ {l s='Expressions to translate'} : {$count}. +
{l s='Click on the titles to open fieldsets'}.


{l s='total missing expresssions:'} {$missing_translations|array_sum}

{$limit_warning} {if !$suoshin_exceeded} diff --git a/admin-dev/themes/default/template/translations/translation_mails.tpl b/admin-dev/themes/default/template/translations/translation_mails.tpl index 891865303..e5f41fc4d 100644 --- a/admin-dev/themes/default/template/translations/translation_mails.tpl +++ b/admin-dev/themes/default/template/translations/translation_mails.tpl @@ -31,7 +31,7 @@ {$tinyMCE}

{l s='Language'} : {$lang} - {$translation_type}

- {l s='Click on the titles to open fieldsets'}.

+
{l s='Click on the titles to open fieldsets'}.

{if !$suoshin_exceeded}
{$toggle_button} @@ -39,23 +39,22 @@ {**} -

- {l s='Core e-mails:'} +

{l s='Core e-mails:'}

{$mail_content} - - {l s='Modules e-mails:'} + +

{l s='Modules e-mails:'}

{foreach $module_mails as $module_name => $mails} {$mails['display']} {/foreach} {if !empty($theme_mails)} - {l s='Themes e-mails:'} +

{l s='Themes e-mails:'}

{$bool_title = false} {foreach $theme_mails as $theme_or_module_name => $mails} {if $theme_or_module_name != 'theme_mail' && !$bool_title} {$bool_title = true} - {l s='E-mails modules in theme:'} +

{l s='E-mails modules in theme:'}

{/if} {$mails['display']} {/foreach} diff --git a/admin-dev/themes/default/template/translations/translation_modules.tpl b/admin-dev/themes/default/template/translations/translation_modules.tpl index 5f3e012c9..88fe0bd77 100644 --- a/admin-dev/themes/default/template/translations/translation_modules.tpl +++ b/admin-dev/themes/default/template/translations/translation_modules.tpl @@ -29,7 +29,8 @@ {block name="override_tpl"}

{l s='Language'} : {$lang} - {$translation_type}

- {l s='Expressions to translate'} : {$count}. {l s='Click on the titles to open fieldsets'}.

+ {l s='Expressions to translate'} : {$count}. +
{l s='Click on the titles to open fieldsets'}.

{$limit_warning} {if !$suoshin_exceeded} @@ -37,7 +38,7 @@ {*{include file="translations/auto_translate.tpl"}*} -

+
{if count($modules_translations) > 1}

{l s='List of Themes - Click to access theme translation:'}

@@ -51,7 +52,7 @@ {foreach $modules_translations as $theme_name => $theme}

>{l s='Theme:'} {if $theme_name === $default_theme_name}{l s='default'}{else}{$theme_name}{/if}

{foreach $theme as $module_name => $module} - {l s='Module:'} {$module_name} +

{l s='Module:'} {$module_name}

{foreach $module as $template_name => $newLang} {if !empty($newLang)} {$occurrences = $newLang|array_count_values} diff --git a/css/admin.css b/css/admin.css index 0e222489b..2c89385a9 100644 --- a/css/admin.css +++ b/css/admin.css @@ -150,23 +150,26 @@ form .simulate-disable-input{ } .mails_field { margin:0; - background: none repeat scroll 0 0 #FFFFF0; - border: 1px solid #DFD5C3; + background: none repeat scroll 0 0 #FFF; + border: 1px solid #CCCCCC; font-size: 1.1em; margin: 20px 0 20px 0; - padding: 2em 1em 1em 1em; + padding:0; position:relative; + border-radius:3px; } .mails_field h3{ - position:absolute; +background: -moz-linear-gradient(center top , #F9F9F9, #ECECEC) repeat-x scroll left top #ECECEC; + color: #333333; + font-size: 13px; + padding: 4px 6px; + text-align: left; + text-shadow: 0 1px 0 #FFFFFF; margin:0; - top:-10px; font-size:1em; - background-color:#FFF6D3; - border:1px solid #DFD5C3; - padding: 2px 5px 2px 5px; - display:inline-block; + padding: 10px 5px; + display:block; } .style-themeModuleMail { @@ -425,7 +428,6 @@ select optgroup option { } #content .warning { - width: 400px; margin: 0 0 15px 0; line-height: 20px; padding: 10px 20px 10px 20px; @@ -512,7 +514,7 @@ select optgroup option { min-height:32px; } -#content .warn a { +#content .warn ul li, #content .warn p, #content .warn a { color:#9e6014; } @@ -1844,13 +1846,13 @@ div.progressBarImage height: 100%; } -#createImageDescription ul li{ +#createImageDescription ul.smallImage li{ list-style-type: none; display: block; - width: 90px; text-align: center; float: left; margin-bottom:15px; + margin-right:20px; } #menu .submenu_size .submenu { display: none; position:absolute} #menu .submenu_size:hover > .submenu { display: block; } diff --git a/modules/pagesnotfound/pagesnotfound.php b/modules/pagesnotfound/pagesnotfound.php index b21c1597e..66d1aec41 100644 --- a/modules/pagesnotfound/pagesnotfound.php +++ b/modules/pagesnotfound/pagesnotfound.php @@ -109,7 +109,7 @@ class Pagesnotfound extends Module $this->_html .= '

'.$this->displayName.'

'; if (!file_exists(dirname(__FILE__).'/../../.htaccess')) - $this->_html .= '
'.$this->l('You must use a .htaccess file to redirect 404 errors to the page "404.php"').'
'; + $this->_html .= '
'.$this->l('You must use a .htaccess file to redirect 404 errors to the page "404.php"').'
'; $pages = $this->getPages(); if (count($pages)) diff --git a/modules/sekeywords/sekeywords.php b/modules/sekeywords/sekeywords.php index 7ddf7b3d8..5dacda4c4 100644 --- a/modules/sekeywords/sekeywords.php +++ b/modules/sekeywords/sekeywords.php @@ -106,7 +106,8 @@ class SEKeywords extends ModuleGraph $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.ModuleGraph::getDateBetween().$this->_query2); $total = count($result); $this->html = '

'.$this->displayName.'

- '.$total.' '.($total == 1 ? $this->l('keyword matches your query.') : $this->l('keywords match your query.')).''; +

+ '.$total.' '.($total == 1 ? $this->l('keyword matches your query.') : $this->l('keywords match your query.')).'

'; if ($result && $total) { $table = ' diff --git a/modules/statsnewsletter/statsnewsletter.php b/modules/statsnewsletter/statsnewsletter.php index 99465d2d6..070c59645 100644 --- a/modules/statsnewsletter/statsnewsletter.php +++ b/modules/statsnewsletter/statsnewsletter.php @@ -62,13 +62,14 @@ class StatsNewsletter extends ModuleGraph if (Tools::getValue('export')) $this->csvExport(array('type' => 'line', 'layers' => 3)); $this->_html = ' -
'.$this->displayName.' +
+

'.$this->displayName.'

'.$this->l('Registrations from customers:').' '.(int)$totals['customers'].'

'.$this->l('Registrations from visitors:').' '.(int)$totals['visitors'].'

'.$this->l('Both:').' '.(int)$totals['both'].'

'.$this->engine(array('type' => 'line', 'layers' => 3)).'
-

'.$this->l('CSV Export').'

-
'; +

'.$this->l('CSV Export').'

+
'; } else $this->_html = '

'.$this->l('Module Newsletter Block must be installed').'

'; diff --git a/modules/statsproduct/statsproduct.php b/modules/statsproduct/statsproduct.php index 815bb42c0..d98d6bd80 100644 --- a/modules/statsproduct/statsproduct.php +++ b/modules/statsproduct/statsproduct.php @@ -242,7 +242,7 @@ class StatsProduct extends ModuleGraph $this->html .= '
- +
- '.$this->l('Click on a product to access its statistics.').' +

'.$this->l('Click on a product to access its statistics.').'

+

'.$this->l('Products available').'