From a8812c13a2b3787cf88101f55fee3070af7c242d Mon Sep 17 00:00:00 2001 From: vKham Date: Fri, 2 Dec 2011 16:27:26 +0000 Subject: [PATCH] // add class button bt-export, new stylesheets for page stats, forget password login --- css/admin.css | 1 + css/login.css | 4 ++++ modules/pagesnotfound/pagesnotfound.php | 4 ++-- modules/sekeywords/sekeywords.php | 4 ++-- .../statsbestcategories/statsbestcategories.php | 2 +- modules/statscheckup/statscheckup.php | 4 ++++ modules/statsequipment/statsequipment.php | 8 ++++---- modules/statsforecast/statsforecast.php | 2 +- modules/statsorigin/statsorigin.php | 6 +++--- .../statspersonalinfos/statspersonalinfos.php | 10 +++++----- modules/statsproduct/statsproduct.php | 8 ++++---- .../statsregistrations/statsregistrations.php | 17 +++++++++-------- modules/statssales/statssales.php | 14 +++++++------- modules/statsvisits/statsvisits.php | 10 +++++----- 14 files changed, 52 insertions(+), 42 deletions(-) diff --git a/css/admin.css b/css/admin.css index 9a5d0a12e..7494a9fc8 100644 --- a/css/admin.css +++ b/css/admin.css @@ -48,6 +48,7 @@ input { p { margin: 0.5em 0; + color:#585A69; } hr { diff --git a/css/login.css b/css/login.css index 3e086c658..fdb0bf3e6 100644 --- a/css/login.css +++ b/css/login.css @@ -171,5 +171,9 @@ input:focus, textarea:focus { } .center { + font-size:20px; + font-weight: normal; text-align: center; } + +#login form span { font-weight:normal;} diff --git a/modules/pagesnotfound/pagesnotfound.php b/modules/pagesnotfound/pagesnotfound.php index 6d010d9b8..b21c1597e 100644 --- a/modules/pagesnotfound/pagesnotfound.php +++ b/modules/pagesnotfound/pagesnotfound.php @@ -107,7 +107,7 @@ class Pagesnotfound extends Module $this->_html .= '
'.$this->l('Pages not found have been deleted.').'
'; } - $this->_html .= '

'.$this->displayName.'

'; + $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"').'
'; @@ -146,7 +146,7 @@ class Pagesnotfound extends Module
'; $this->_html .= '
-

'.$this->l('Guide').'

+

'.$this->l('Guide').'

'.$this->l('404 errors').'

'.$this->l('A 404 error is an HTTP error code which means that the file requested by the user cannot be found. In your case it means that one of your visitors entered a wrong URL in the address bar or that you or another website has a dead link. diff --git a/modules/sekeywords/sekeywords.php b/modules/sekeywords/sekeywords.php index 3e29162de..7ddf7b3d8 100644 --- a/modules/sekeywords/sekeywords.php +++ b/modules/sekeywords/sekeywords.php @@ -105,7 +105,7 @@ class SEKeywords extends ModuleGraph $this->csvExport(array('type' => 'pie')); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.ModuleGraph::getDateBetween().$this->_query2); $total = count($result); - $this->html = '

'.$this->displayName.'

+ $this->html = '

'.$this->displayName.'

'.$total.' '.($total == 1 ? $this->l('keyword matches your query.') : $this->l('keywords match your query.')).''; if ($result && $total) { @@ -137,7 +137,7 @@ class SEKeywords extends ModuleGraph $this->html .= '

'.$this->l('No keywords').'

'; $this->html .= '

-

'.$this->l('Guide').'

+

'.$this->l('Guide').'

'.$this->l('Identify external search engines\' keywords').'

'.$this->l('One of the most common ways of finding a website through a search engine. Identifying the most popular keywords entered by your new visitors allows you to see which products you should put in front if you want to attract more visitors and potential customers.').' diff --git a/modules/statsbestcategories/statsbestcategories.php b/modules/statsbestcategories/statsbestcategories.php index d9de276f0..3c87959ef 100644 --- a/modules/statsbestcategories/statsbestcategories.php +++ b/modules/statsbestcategories/statsbestcategories.php @@ -111,7 +111,7 @@ class StatsBestCategories extends ModuleGrid $this->_html = '

'.$this->displayName.'

'.$this->engine($engineParams).' -
'.$this->l('CSV Export').' +
'.$this->l('CSV Export').'
'; return $this->_html; } diff --git a/modules/statscheckup/statscheckup.php b/modules/statscheckup/statscheckup.php index 79989554c..0144a2171 100644 --- a/modules/statscheckup/statscheckup.php +++ b/modules/statscheckup/statscheckup.php @@ -168,6 +168,7 @@ class StatsCheckUp extends Module table.checkup td {padding:5px 10px} table.checkup2 td {text-align:right} +
@@ -190,7 +191,9 @@ class StatsCheckUp extends Module $this->html .= '
+

+
'.$this->l('Order by').' diff --git a/modules/statsorigin/statsorigin.php b/modules/statsorigin/statsorigin.php index d5a09f181..d82a09d9f 100644 --- a/modules/statsorigin/statsorigin.php +++ b/modules/statsorigin/statsorigin.php @@ -89,8 +89,8 @@ class StatsOrigin extends ModuleGraph { $this->_html .= '

'.$this->l('Here is the percentage of the 10 most popular referrer websites by which visitors went through to get to your shop.').'

-
'.$this->engine(array('type' => 'pie')).'
-

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



+
'.$this->engine(array('type' => 'pie')).'

+

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


@@ -106,7 +106,7 @@ class StatsOrigin extends ModuleGraph else $this->_html .= '

'.$this->l('Direct links only').'

'; $this->_html .= '
-

'.$this->l('Guide').'

+

'.$this->l('Guide').'

'.$this->l('What is a referrer website?').'

'.$this->l('When visiting a webpage, the referrer is the URL of the previous webpage from which a link was followed.').'
diff --git a/modules/statspersonalinfos/statspersonalinfos.php b/modules/statspersonalinfos/statspersonalinfos.php index 643d85c3c..ddec619b7 100644 --- a/modules/statspersonalinfos/statspersonalinfos.php +++ b/modules/statspersonalinfos/statspersonalinfos.php @@ -73,20 +73,20 @@ class StatsPersonalInfos extends ModuleGraph $this->html .= '

'.$this->l('Gender distribution allows you to determine the percentage of men and women among your customers.').'

'.$this->engine(array('type' => 'pie', 'option' => 'gender')).'

-

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

+

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



'.$this->l('Age ranges allows you to determine in which age range your customers are.').'

'.$this->engine(array('type' => 'pie', 'option' => 'age')).'

-

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



+

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



'.$this->l('Country distribution allows you to determine in which part of the world your customers are shopping from.').'

'.$this->engine(array('type' => 'pie', 'option' => 'country')).'

-

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



+

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



'.$this->l('Currency ranges allows you to determine which currencies your customers are using.').'

'.$this->engine(array('type' => 'pie', 'option' => 'currency')).'

-

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



+

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



'.$this->l('Language distribution allows you to determine the general languages your customers are using on your shop.').'

'.$this->engine(array('type' => 'pie', 'option' => 'language')).'

-

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

+

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

'; } else diff --git a/modules/statsproduct/statsproduct.php b/modules/statsproduct/statsproduct.php index 8ac68fafa..5f8f0d9f7 100644 --- a/modules/statsproduct/statsproduct.php +++ b/modules/statsproduct/statsproduct.php @@ -155,7 +155,7 @@ class StatsProduct extends ModuleGraph if (!Tools::getValue('exportType')) $this->csvExport(array('layers' => 2, 'type' => 'line', 'option' => '42')); - $this->html = '

'.$this->displayName.'

'; + $this->html = '

'.$this->displayName.'

'; if ($id_product = (int)Tools::getValue('id_product')) { if (Tools::getValue('export')) @@ -239,9 +239,9 @@ class StatsProduct extends ModuleGraph { $categories = Category::getCategories((int)$this->context->language->id, true, false); $this->html .= ' -
+
'; $this->html .= '


- '.$this->l('CSV Export').'
'; + '.$this->l('CSV Export').'
'; } $this->html .= '

-

'.$this->l('Guide').'

+

'.$this->l('Guide').'

'.$this->l('Number of purchases compared to number of viewings').'

'.$this->l('After choosing a category and selecting a product, informational graphs will appear. Then, you will be able to analyze them.').' diff --git a/modules/statsregistrations/statsregistrations.php b/modules/statsregistrations/statsregistrations.php index 76e4dfa6b..7dd3ef0fa 100644 --- a/modules/statsregistrations/statsregistrations.php +++ b/modules/statsregistrations/statsregistrations.php @@ -109,16 +109,17 @@ class StatsRegistrations extends ModuleGraph if (Tools::getValue('export')) $this->csvExport(array('layers' => 0, 'type' => 'line')); $this->_html = ' -

'.$this->displayName.'

-

- '.$this->l('Visitors who have stopped at the registering step:').' '.(int)($totalBlocked).($totalRegistrations ? ' ('.number_format(100*$totalBlocked/($totalRegistrations+$totalBlocked), 2).'%)' : '').'
- '.$this->l('Visitors who have placed an order directly after registration:').' '.(int)($totalBuyers).($totalRegistrations ? ' ('.number_format(100*$totalBuyers/($totalRegistrations), 2).'%)' : '').' -

-

'.$this->l('Total customer accounts:').' '.$totalRegistrations.'

+

'.$this->displayName.'

+
    +
  • + '.$this->l('Visitors who have stopped at the registering step:').' '.(int)($totalBlocked).($totalRegistrations ? ' ('.number_format(100*$totalBlocked/($totalRegistrations+$totalBlocked), 2).'%)' : '').'
  • + '.$this->l('Visitors who have placed an order directly after registration:').' '.(int)($totalBuyers).($totalRegistrations ? ' ('.number_format(100*$totalBuyers/($totalRegistrations), 2).'%)' : '').' +
  • '.$this->l('Total customer accounts:').' '.$totalRegistrations.'
    • +
'.$this->engine(array('type' => 'line')).'
-

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

+

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


-

'.$this->l('Guide').' +

'.$this->l('Guide').'

'.$this->l('Number of customer accounts created').'

'.$this->l('The total number of accounts created is not in itself important information. However, it is beneficial to analyze the number created over time. This will indicate whether or not things are on the right track.').'


'.$this->l('How to act on the registrations\' evolution?').'

diff --git a/modules/statssales/statssales.php b/modules/statssales/statssales.php index 64a31830f..6adf575b4 100644 --- a/modules/statssales/statssales.php +++ b/modules/statssales/statssales.php @@ -79,21 +79,21 @@ class StatsSales extends ModuleGraph

'.$this->l('These graphs represent the evolution of your orders and sales turnover for a given period. This tool allows for quick overview of the viability of your shop. You can also keep watch on the difference between time periods (like the holiday season). Only valid orders are included in these two graphs.').'

-

'.$this->l('Orders placed:').' '.(int)($totals['orderCount']).'

-

'.$this->l('Products bought:').' '.(int)($totals['products']).'

+

'.$this->l('Orders placed:').' '.(int)($totals['orderCount']).'

+

'.$this->l('Products bought:').' '.(int)($totals['products']).'

'.$this->engine(array('type' => 'line', 'option' => '1-'.(int)Tools::getValue('id_country'), 'layers' => 2)).'
-

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

-

'.$this->l('Sales:').' '.Tools::displayPrice($totals['orderSum'], $currency).'

+

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

+

'.$this->l('Sales:').' '.Tools::displayPrice($totals['orderSum'], $currency).'

'.$this->engine(array('type' => 'line', 'option' => '2-'.(int)Tools::getValue('id_country'))).'
-

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

+

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

'.$this->l('You can see the order state distribution below.').'


'.($totals['orderCount'] ? $this->engine(array('type' => 'pie', 'option' => '3-'.(int)Tools::getValue('id_country'))) : $this->l('No orders for this period.')).' -

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

+

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


-

'.$this->l('Guide').'

+

'.$this->l('Guide').'

'.$this->l('Various order statuses').'

'.$this->l('In your back-office, you can find the following order statuses : Awaiting check payment, Payment accepted, Preparation in progress, Shipping, Delivered, Cancelled, Refund, Payment error, Out of stock, and Awaiting bank wire payment.').'
diff --git a/modules/statsvisits/statsvisits.php b/modules/statsvisits/statsvisits.php index 45631036f..f333233aa 100644 --- a/modules/statsvisits/statsvisits.php +++ b/modules/statsvisits/statsvisits.php @@ -85,18 +85,18 @@ class StatsVisits extends ModuleGraph if (Tools::getValue('export')) $this->csvExport(array('layers' => 2, 'type' => 'line', 'option' => 3)); $this->html = ' -

'.$this->displayName.'

+

'.$this->displayName.'

'.$this->l('A visit corresponds to an internet user coming to your shop. Until the end of their session, only one visit is counted.').' '.$this->l('A visitor is an unknown person, who has not registered or logged on, surfing on your shop. A visitor can come and visit your shop many times.').'

-

'.$this->l('Total visits:').' '.$totalVisits.'

-

'.$this->l('Total visitors:').' '.$totalGuests.'

- '.($totalVisits ? $this->engine($graphParams).'

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

' : '').' +

'.$this->l('Total visits:').' '.$totalVisits.'

+

'.$this->l('Total visitors:').' '.$totalGuests.'

+ '.($totalVisits ? $this->engine($graphParams).'

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

' : '').'

-

'.$this->l('Guide').'

+

'.$this->l('Guide').'

'.$this->l('Determine the interest of a visit').'

'.$this->l('The visitors\' evolution graph strongly resembles the visits\' graph, but provides additional information:').'