From 643785046326c76462ec38f57098e9e2d9714545 Mon Sep 17 00:00:00 2001 From: vKham Date: Fri, 30 Dec 2011 12:58:05 +0000 Subject: [PATCH] // fix bug stylesheet stat conversion and calendar referrer --- admin-dev/themes/default/css/admin.css | 35 ++++++++++++------- .../template/referrers/form_settings.tpl | 2 +- controllers/admin/AdminOrdersController.php | 4 +-- modules/statsforecast/statsforecast.php | 33 +++++++++++------ 4 files changed, 48 insertions(+), 26 deletions(-) diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index 90e965136..e5c35b71f 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -116,8 +116,8 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3} .table a:hover{text-decoration:none} .table tr th{ background-color: #F1F1F1; text-shadow:0 1px 0 #fff; padding:4px 6px; background: #ececec url('../img/bg-degrade-table.png') repeat-x scroll left top; - /*background-image: -moz-linear-gradient(center top , #F9F9F9, #ECECEC); - background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#ECECEC)) repeat scroll 0 0 transparent;*/ + background-image: -moz-linear-gradient(center top , #F9F9F9, #ECECEC); + background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#ECECEC)) repeat scroll 0 0 transparent; font-size:13px; text-align:left; color:#333;} .table tr th.right { text-align:center;} .table tr td{border-bottom:1px solid #ccc;color:#333;font-size:12px;padding: 4px 4px 4px 6px;} @@ -286,17 +286,25 @@ form#product_form h4 { font-size:18px; font-weight:normal;} /*STATCONTAINER*/ #statsContainer {margin-left:220px; padding:0 0 0 20px;} -#statsContainer #calendar { background-color: #EEEEEE;border-top: 1px solid #CCCCCC; display: block; margin: 10px 0;min-height: 25px; padding: 5px;} -#statsContainer #calendar form {float:left;} -#statsContainer #calendar input, #statsContainer #calendar p { float:left;} -#statsContainer #calendar input.submitDateDay { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;} -#statsContainer #calendar input.submitDateMonth { border-radius:0px;} -#statsContainer #calendar input.submitDateYear { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;} -#statsContainer #calendar input.submitDateDayPrev { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;} -#statsContainer #calendar input.submitDateMonthPrev { border-radius:0px;} -#statsContainer #calendar input.submitDateYearPrev { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;} -#statsContainer #calendar p { margin:2px;} -#statsContainer #calendar p span { float:left; display:block; padding:3px;} +#statsContainer #calendar, +#referrersContainer #calendar{ background-color: #EEEEEE;border-top: 1px solid #CCCCCC; display: block; margin: 10px 0;min-height: 25px; padding: 5px;} +#statsContainer #calendar form, +#referrersContainer #calendar form {float:left;} +#statsContainer #calendar input, #statsContainer #calendar p, +#referrersContainer #calendar input, #referrersContainer #calendar p { float:left;} +#statsContainer #calendar input.submitDateDay, #referrersContainer #calendar input.submitDateDay { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;} +#statsContainer #calendar input.submitDateMonth, #statsContainer #calendar input.submitDateMonth, +#referrersContainer #calendar input.submitDateMonth, #referrersContainer #calendar input.submitDateMonth { border-radius:0px;} +#statsContainer #calendar input.submitDateYear, +#referrersContainer #calendar input.submitDateYear { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;} +#statsContainer #calendar input.submitDateDayPrev, +#referrersContainer #calendar input.submitDateDayPrev { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;} +#statsContainer #calendar input.submitDateMonthPrev, +#referrersContainer #calendar input.submitDateMonthPrev { border-radius:0px;} +#statsContainer #calendar input.submitDateYearPrev, +#referrersContainer #calendar input.submitDateYearPrev { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;} +#statsContainer #calendar p, #referrersContainer #calendar p { margin:2px;} +#statsContainer #calendar p span, #referrersContainer #calendar p span { float:left; display:block; padding:3px;} #statsContainer .blocStats { background-color: #EBEDF4;border: 1px solid #C2C4D9; display: block; position:relative; padding: 10px;} #statsContainer .blocStats h2 { font-weight:normal; margin:0;} #statsContainer .blocStats h2.icon-statsproduct span, @@ -357,6 +365,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;} #statsContainer .blocStats form { position:absolute; top:10px; right:5px;} #statsContainer .blocStats form.checkup { position:relative; top:0; left:0;} #statsContainer .totalStats { font-size:16px; font-weight:bold;} +#statsContainer .blocStats .blocConversion { display:block; display:inline-table; min-height:80px !ie; } /*MODULECONTAINER*/ #moduleContainer { margin-left:220px; padding:13px 0 0 20px;} diff --git a/admin-dev/themes/default/template/referrers/form_settings.tpl b/admin-dev/themes/default/template/referrers/form_settings.tpl index c56e5864e..d4d256ef0 100644 --- a/admin-dev/themes/default/template/referrers/form_settings.tpl +++ b/admin-dev/themes/default/template/referrers/form_settings.tpl @@ -26,7 +26,7 @@ -
+
{l s='Settings'} diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index c7d832998..fc6c01e7a 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -68,8 +68,8 @@ class AdminOrdersControllerCore extends AdminController 'customer' => array('title' => $this->l('Customer'), 'filter_key' => 'customer', 'tmpTableFilter' => true), 'total_paid_tax_incl' => array('title' => $this->l('Total'), 'width' => 70, 'align' => 'right', 'prefix' => '', 'suffix' => '', 'type' => 'price', 'currency' => true), 'payment' => array('title' => $this->l('Payment'), 'width' => 100), - 'osname' => array('title' => $this->l('Status'), 'color' => 'color', 'width' => 230, 'type' => 'select', 'list' => $statesArray, 'filter_key' => 'os!id_order_state', 'filter_type' => 'int'), - 'date_add' => array('title' => $this->l('Date'), 'width' => 150, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'), + 'osname' => array('title' => $this->l('Status'), 'color' => 'color', 'width' => 280, 'type' => 'select', 'list' => $statesArray, 'filter_key' => 'os!id_order_state', 'filter_type' => 'int'), + 'date_add' => array('title' => $this->l('Date'), 'width' => 130, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'), 'id_pdf' => array('title' => $this->l('PDF'), 'width' => 35, 'align' => 'center', 'callback' => 'printPDFIcons', 'orderby' => false, 'search' => false, 'remove_onclick' => true)); $this->shopLinkType = 'shop'; diff --git a/modules/statsforecast/statsforecast.php b/modules/statsforecast/statsforecast.php index b4727bdbe..8dbd0551e 100644 --- a/modules/statsforecast/statsforecast.php +++ b/modules/statsforecast/statsforecast.php @@ -305,8 +305,11 @@ class StatsForecast extends Module $this->_html .= '

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

- '.$this->l('Visitors').'
'.$visitors.' - +
+ +
+ '.$this->l('Visitors').'
'.$visitors.' +
'.round(100 * $customers / max(1, $visitors)).' %

'.round(100 * $carts / max(1, $visitors)).' % @@ -321,23 +324,33 @@ class StatsForecast extends Module '.$this->l('Full carts').'
'.$fullcarts.'
'.round(100 * $orders / max(1, $fullcarts)).' % '.$this->l('Orders').'
'.$orders.' -
- '.$this->l('Registered visitors').' +
+ +
+
+ '.$this->l('Registered visitors').' '.round(100 * $orders / max(1, $customers), 2).' % '.$this->l('Orders').' -
- '.$this->l('Visitors').' +
+ +
+ +
+ '.$this->l('Visitors').' - '.round(100 * $orders / max(1, $visitors), 2).' % + '.round(100 * $orders / max(1, $visitors), 2).' % '.$this->l('Orders').' +
+
+

'.$this->l('Turn your visitors into money:').' -
'.$this->l('Each visitor yields').' '.Tools::displayPrice($ca['ventil']['total'] / max(1, $visitors), $currency).'. -
'.$this->l('Each registered visitor yields').' '.Tools::displayPrice($ca['ventil']['total'] / max(1, $customers), $currency).'. -

'; +
'.$this->l('Each visitor yields').' '.Tools::displayPrice($ca['ventil']['total'] / max(1, $visitors), $currency).'. +
'.$this->l('Each registered visitor yields').' '.Tools::displayPrice($ca['ventil']['total'] / max(1, $customers), $currency).'. +

'; $from = strtotime($employee->stats_date_from.' 00:00:00'); $to = strtotime($employee->stats_date_to.' 23:59:59');