diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index 299f96678..419324ec5 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -393,7 +393,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;} #moduleContainer .moduleDesc .metadata dl dd { padding-right:10px;} #moduleContainer .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;} #moduleContainer .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic; font-size:12px; display:block; clear:both;} -#moduleContainer .setup {background-color:#6db300;font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;} +#moduleContainer .setup {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;} #moduleContainer .setup.non-install { background-color:#ec7000;} #moduleContainer .setup.off{ background-color:#ccc;} #moduleContainer .row-actions-module span { padding-right:5px;} @@ -436,3 +436,28 @@ ul.listForm li {padding-bottom:3px;} #footer .footerRight {float:right; margin-right:10px;} #footer .footer_link, #footer .footer_link:hover { color:#268CCD;} +/*DASHBOARD*/ +.pageTitleHome { font-size: 1.6em; font-weight: normal; margin:0; padding:10px 0;} +.pageTitleHome h3 { font-weight: normal; margin:0;} +#dashboard { background-color: #EBEDF4; border: 1px solid #C2C4D9; display: block; padding: 10px; position: relative; min-width:1200px;} +#dashboard h2 {font-size: 1.4em; font-weight:normal; margin:0 0 15px 0;} +#iframe {} +#iframe #video-content { float:left;} +#iframe {position:relative; display:block; min-height:180px;} +#adminpresentation #video { float:left; padding-right:15px; min-height:150px;} +#adminpresentation #video a { position:relative; height:128px; width:220px; display:block; padding:6px; } +#adminpresentation #video a img { } +#adminpresentation #video a span {background: transparent url("../img/play.png") no-repeat scroll left top; height:128px; width:220px; position:absolute; top:0; left:0; z-index:1; display:block; border:6px solid #fff; border-radius:3px; } +#adminpresentation #video a span:hover {background-position:left bottom;border:6px solid #C2C4D9; transition:background 0.5s;} +#adminpresentation #video-content { padding-left:10px; min-height:150px; } +#adminpresentation #video-content p { font-size:20px; line-height: 26px; color:#585A69; text-shadow: 0 1px 0 #fff;} + +.view-modules { float:right; margin: 10px 0;} +.view-modules li { float:left;} +.view-modules li img { padding-right:5px;} +.view-modules li.normal-view-disabled { background: -moz-linear-gradient(center top ,#cccccc, #F9F9F9 ) repeat scroll 0 0 transparent; border-bottom-right-radius: 0; border-right: 1px solid #ccc; border-top-right-radius: 0; color:#999; } +.view-modules li.favorites-view-disabled { background: -moz-linear-gradient(center top ,#cccccc, #F9F9F9 ) repeat scroll 0 0 transparent; border-bottom-left-radius: 0; border-left: 1px solid #fff; border-top-left-radius: 0; color:#999; } +.view-modules li.normal-view-disabled:hover, +.view-modules li.favorites-view-disabled:hover {border-color: #CCCCCC #BBBBBB #A0A0A0;} +.view-modules li.favorites-view {border-bottom-left-radius: 0;border-left: 1px solid #fff; border-top-left-radius: 0;} +.view-modules li.normal-view {border-bottom-right-radius: 0;border-right: 1px solid #ccc; border-top-right-radius: 0;} diff --git a/admin-dev/themes/default/img/modules_view_layout_sidebar.png b/admin-dev/themes/default/img/modules_view_layout_sidebar.png index fff8da0fb..c333e7b6b 100755 Binary files a/admin-dev/themes/default/img/modules_view_layout_sidebar.png and b/admin-dev/themes/default/img/modules_view_layout_sidebar.png differ diff --git a/admin-dev/themes/default/img/modules_view_table_select_row.png b/admin-dev/themes/default/img/modules_view_table_select_row.png index 7ae398042..8a7c0436f 100755 Binary files a/admin-dev/themes/default/img/modules_view_table_select_row.png and b/admin-dev/themes/default/img/modules_view_table_select_row.png differ diff --git a/admin-dev/themes/default/img/play.png b/admin-dev/themes/default/img/play.png new file mode 100644 index 000000000..8f7dbdf81 Binary files /dev/null and b/admin-dev/themes/default/img/play.png differ diff --git a/admin-dev/themes/default/template/controllers/home/content.tpl b/admin-dev/themes/default/template/controllers/home/content.tpl index e46f60923..6c49cb70d 100644 --- a/admin-dev/themes/default/template/controllers/home/content.tpl +++ b/admin-dev/themes/default/template/controllers/home/content.tpl @@ -24,12 +24,15 @@ * International Registered Trademark & Property of PrestaShop SA *} -
-
+

{l s='Dashboard'}
-
- {if $upgrade} +
+
+ + +
+ {if $upgrade}
{if $upgrade->need_upgrade}

{l s ='New PrestaShop version available'} : {l s ='Download'} {$upgrade->version_name} !

@@ -42,13 +45,20 @@

{l s ='If you don\'t know how to do that, please contact your host administrator !'}


{/if} {if $employee->bo_show_screencast} -
- +
+

{l s ='Video'}

+
+ +
+
+

{l s ='Start now with PrestaShop and all new features to help you sell more and simplify management of your shop'}

+
+
-
{/if} -
-
+

{l s='Quick link'}

    {foreach from=$quick_links key=k item=link}
  • @@ -99,20 +107,32 @@ $(document).ready(function() {
    • {/foreach}
+
+

{l s='Your Required'}

+
+
+ + {$tips_optimization} +

{l s='Loading...'}

+ + + +
+ + +
+

{l s='Your Indicators'}

{$monthly_statistics} {$customers_service} {$stats_sales} {$last_orders} - - -
- {$tips_optimization} -

{l s='Loading...'}

-

{l s='Loading...'}

{hook h="displayBackOfficeHome"}
 
+ +
+ diff --git a/admin-dev/themes/default/template/controllers/modules/favorites.tpl b/admin-dev/themes/default/template/controllers/modules/favorites.tpl index d4f26f938..26fcc5307 100755 --- a/admin-dev/themes/default/template/controllers/modules/favorites.tpl +++ b/admin-dev/themes/default/template/controllers/modules/favorites.tpl @@ -1,23 +1,25 @@
{include file='controllers/modules/header.tpl'} + - {l s='Normal view'} - {l s='Favorites view'}
- + + + + - - - - + diff --git a/admin-dev/themes/default/template/controllers/modules/page.tpl b/admin-dev/themes/default/template/controllers/modules/page.tpl index e1c21ddfb..412945a90 100644 --- a/admin-dev/themes/default/template/controllers/modules/page.tpl +++ b/admin-dev/themes/default/template/controllers/modules/page.tpl @@ -29,9 +29,11 @@ {include file='controllers/modules/header.tpl'} {include file='controllers/modules/filters.tpl'} -
- {l s='Normal view'} - {l s='Favorites view'}
+
diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index bb1393892..50490c44e 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -89,9 +89,9 @@ class AdminHomeControllerCore extends AdminController $shopEnabled = (Configuration::get('PS_SHOP_ENABLE') ? 2 : 1); $lights = array( - 0 => array('image'=>'bullet_red.png','color'=>'red'), - 1 => array('image'=>'bullet_orange.png','color'=>'orange'), - 2 => array('image'=>'bullet_green.png','color'=>'green')); + 0 => array('image'=>'cross.png','color'=>'red'), + 1 => array('image'=>'error.png','color'=>'orange'), + 2 => array('image'=>'tick.png','color'=>'green')); if ($rewrite + $htaccessOptimized + $smartyOptimized + $cccOptimized + $shopEnabled + $htaccessAfterUpdate + $indexRebuiltAfterUpdate != 14) @@ -158,6 +158,7 @@ class AdminHomeControllerCore extends AdminController if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) $this->addJqueryPlugin('excanvas'); $this->addJqueryPlugin('flot'); + $this->addJqueryPlugin('fancybox'); } protected function warnDomainName() @@ -172,26 +173,50 @@ class AdminHomeControllerCore extends AdminController protected function getQuickLinks() { $quick_links['first'] = array( - 'href' => $this->context->link->getAdminLink('AdminCategories').'&addcategory', - 'title' => $this->l('New category'), + 'href' => $this->context->link->getAdminLink('AdminStats'), + 'title' => $this->l('Product sold recently'), 'description' => $this->l('Create a new category and organize your products.'), ); $quick_links['second'] = array( - 'href' => $this->context->link->getAdminLink('AdminProducts').'&addproduct', - 'title' => $this->l('New product'), + 'href' => $this->context->link->getAdminLink('AdminOrders').'&addorder', + 'title' => $this->l('New order'), 'description' => $this->l('Fill up your catalog with new articles and attributes.'), ); $quick_links['third'] = array( - 'href' => $this->context->link->getAdminLink('AdminStats'), - 'title' => $this->l('Statistics'), + 'href' => $this->context->link->getAdminLink('AdminSpecificPriceRule').'&addspecific_price_rule', + 'title' => $this->l('New Specific Price'), 'description' => $this->l('Manage your activity with a thorough analysis of your e-shop.'), ); $quick_links['fourth'] = array( - 'href' => $this->context->link->getAdminLink('AdminEmployees').'&addemployee', - 'title' => $this->l('New employee'), + 'href' => $this->context->link->getAdminLink('AdminProducts').'&addproduct', + 'title' => $this->l('New Product'), + 'description' => $this->l('Add a new employee account and discharge a part of your duties of shop owner.'), + ); + + $quick_links['fifth'] = array( + 'href' => $this->context->link->getAdminLink('AdminModules').'&addcategory', + 'title' => $this->l('New module'), + 'description' => $this->l('Create a new category and organize your products.'), + ); + + $quick_links['sixth'] = array( + 'href' => $this->context->link->getAdminLink('AdminOrders').'&id_order', + 'title' => $this->l('New admin order'), + 'description' => $this->l('Fill up your catalog with new articles and attributes.'), + ); + + $quick_links['seventh'] = array( + 'href' => $this->context->link->getAdminLink('AdminCmsContent').'&addcms', + 'title' => $this->l('New Page CMS'), + 'description' => $this->l('Manage your activity with a thorough analysis of your e-shop.'), + ); + + $quick_links['eighth'] = array( + 'href' => $this->context->link->getAdminLink('AdminCartRules').'&addcart_rule', + 'title' => $this->l('New Cart Rules'), 'description' => $this->l('Add a new employee account and discharge a part of your duties of shop owner.'), ); return $quick_links; @@ -206,7 +231,11 @@ class AdminHomeControllerCore extends AdminController $content = '
'.$this->l('View more').' '.$this->l('Customers service').'
-
+
+ + + +
'.$this->l('Thread unread').' @@ -269,7 +298,11 @@ class AdminHomeControllerCore extends AdminController $content = '
'.$this->l('View more').' '.$this->l('Monthly Statistics').'
- +
+ + + +
'.$this->l('Sales').' @@ -337,7 +370,7 @@ class AdminHomeControllerCore extends AdminController public function getLastOrders() { $content = ' - +
@@ -371,7 +404,7 @@ class AdminHomeControllerCore extends AdminController $content .= '
'.$this->l('ID').'
- '; + '; return $content; } @@ -437,16 +470,16 @@ class AdminHomeControllerCore extends AdminController $result['discover_prestashop'] = '
'.$this->getBlockDiscover().'
'; if (@fsockopen('api.prestashop.com', 80, $errno, $errst, AdminHomeController::TIPS_TIMEOUT)) - $result['discover_prestashop'] .= '
'; + $result['discover_prestashop'] .= '
'; else $result['discover_prestashop'] .= ''; // SHOW PAYPAL TIPS $content = ''; - $content = @file_get_contents($protocol.'://api.prestashop.com/partner/paypal/paypal-tips.php?protocol='.$protocol.'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context); + $content = @file_get_contents($protocol.'://www.dev.prestashop.com/partner/paypal/paypal-tips.php?protocol='.$protocol.'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context); $content = explode('|', $content); if ($content[0] == 'OK' && Validate::isCleanHtml($content[1])) - $result['discover_prestashop'] .= '
'.$content[1].'
'; + $result['discover_prestashop'] .= '
'.$content[1].'
'; $this->content = Tools::jsonEncode($result); } @@ -514,7 +547,7 @@ class AdminHomeControllerCore extends AdminController $isoUser = Context::getContext()->language->iso_code; $isoCountry = Context::getContext()->country->iso_code; - $content = @file_get_contents($protocol.'://api.prestashop.com/partner/prestashop/prestashop-link.php?iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context); + $content = @file_get_contents($protocol.'://localhost:8888/partner/prestashop/prestashop-link.php?iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context); if (!$content) return ''; // NOK diff --git a/css/admin.css b/css/admin.css index c159fc35e..0b77eeec7 100644 --- a/css/admin.css +++ b/css/admin.css @@ -1105,13 +1105,8 @@ html[xmlns] .clearfix { margin-top: 5px; } #adminpresentation{ - width: 902px; - border:1px solid #cccccc; - background-color: #F8F8F8; - float: left; - margin: 0 0 15px; - padding: 10px; position:relative; + width:100%; } #listpresentation{ @@ -1160,14 +1155,14 @@ html[xmlns] .clearfix { #footer_iframe_home{ position:absolute; - top:379px; - left:675px; + top:0; + right:0; } #footer_iframe_home label{ float: none; - padding-left: 10px; - color: #903E5B; + color: #585A69; + font-weight:normal; line-height: 15px; } @@ -1183,19 +1178,27 @@ html[xmlns] .clearfix { } #column_left{ - width: 610px; + width: 49.1%; float: left; padding-top: 5px; } #column_right{ - width: 315px; + width: 49.1%; float: right; - padding-top: 5px; + padding:0; +} + +#column_right .table_info { + width:48.1%; + float:left; +} + +#column_right #table_info_last.table_info { + width:48.1%; + float:right; } -/*homepage*/ -#homepage { width:925px;} .F_list{ list-style: none; @@ -1204,46 +1207,64 @@ html[xmlns] .clearfix { } -#first_block a, #second_block a, #third_block a, #fourth_block a{ background: #F8F8F8 none no-repeat scroll center 6px;} +#first_block a, #second_block a, #third_block a, #fourth_block a, +#fifth_block a, #sixth_block a, #seventh_block a, #eighth_block a{ background: #F8F8F8 none no-repeat scroll center 25px;} #first_block a{ - background-image: url('../img/admin/folder_add.png'); - margin-left:0; + background-image: url('../img/admin/package_go.png'); } #second_block a{ - background-image: url('../img/admin/package_add.png'); + background-image: url('../img/admin/cart_add.png'); } #third_block a { - background-image: url('../img/admin/chart_bar.png'); + background-image: url('../img/admin/book.png'); } #fourth_block a{ - background-image: url('../img/admin/user_add.png'); + background-image: url('../img/admin/package_add.png'); +} + +#fifth_block a{ + background-image: url('../img/admin/plugin_add.png'); +} + +#sixth_block a{ + background-image: url('../img/admin/cart_remove.png'); +} + +#seventh_block a { + background-image: url('../img/admin/page_white_add.png'); +} + +#eighth_block a{ + background-image: url('../img/admin/advertising.png'); } .F_list li{ float: left; + margin-right:15px; + margin-bottom:15px; + display: block; } .F_list li h4{ - width: 115px; - font-size: 14px; - font-weight:bold; - margin-top: 35px; + width: 95px; + font-size: 11px; + font-weight:normal; + margin-top: 55px; margin-bottom: 0; - line-height: 14px; + line-height: 16px; } .F_list a{ float:left; color: #333; - width: 125px; - margin-left: 14px; + width: 95px; border: 1px solid #ccc; padding: 5px; - height: 120px; + height: 95px; text-align:center; border-radius:3px; } @@ -1254,16 +1275,16 @@ html[xmlns] .clearfix { .F_list li p{ font-size: 8pt; + display:none; } .table_info{ - width: 283px; float: left; - padding: 0; + padding:0; + margin:0; border: 1px solid #ccc; - margin-right: 15px; - margin-top: 20px; border-radius:3px; + background-color:#fff; } .table_info h5{ @@ -1310,7 +1331,6 @@ html[xmlns] .clearfix { .table_info_details{ border-collapse: collapse; - width: 283px; border: none; } @@ -1334,8 +1354,7 @@ html[xmlns] .clearfix { font-weight:normal; text-align: left; padding-left: 10px; - width: 150px; - font-size:12px; + font-size:13px; } .table_info_details tr td{ @@ -1347,11 +1366,12 @@ html[xmlns] .clearfix { #table_info_large{ margin-top: 20px; margin-bottom: 20px; - width: 586px; + width: 100%; float: left; padding: 0; border: 1px solid #ccc; border-radius:3px; + background-color:#fff; } #table_info_large h5{ @@ -1379,11 +1399,13 @@ html[xmlns] .clearfix { width: 586px; height: 175px; background-color: #fff; + margin: 15px auto; + text-align: center; } .admin-box1{ background-color:#F8F8F8; - width: 310px; + width: 48.1%; float: left; padding: 0; border: 1px solid #ccc; @@ -1407,14 +1429,14 @@ html[xmlns] .clearfix { } .admin-box2{ - width: 310px; - float: left; + float: right; padding: 0; border: 1px solid #CCCCCC; font-size: 8pt; margin-bottom: 20px; background-color: #f2f2f2; border-radius:3px; + width:100%; } .admin-box2 h5{ @@ -1430,6 +1452,7 @@ html[xmlns] .clearfix { font-weight:normal; } +#discover_prestashop { width:48.1% !important; float:right !important;} .admin-home-box-list li img{ margin: 0 5px; @@ -1481,10 +1504,10 @@ html[xmlns] .clearfix { #table_customer{ border:1px solid #ccc; - width: 590px; cellpadding: 0; cellspacing: 0; border-radius:3px; + background-color:#fff; } #table_customer thead span{ @@ -1494,13 +1517,13 @@ html[xmlns] .clearfix { text-shadow: 0 1px 0 #fff; line-height: 35px; display: block; - text-align: center; - height: 30px; + height: 39px; border-left: none; border-right: none; } #table_customer thead span.first{ +text-align: center; } #table_customer thead span.last{ @@ -1547,8 +1570,8 @@ html[xmlns] .clearfix { #table_customer tbody tr td{ border: none; - padding-left: 10px; height: 35px; + font-size:12px; } #table_info_news{ @@ -2246,6 +2269,7 @@ margin-bottom:7px; width: 300px; } + #container_category_tree { border: 1px solid #ccc; border-radius: 3px; @@ -2258,4 +2282,11 @@ margin-bottom:7px; #container_category_tree a input{ margin-right: 3px; -} \ No newline at end of file +} + + +#block_tips {float:right; width:48.1%} +#block_discover {float:left; width:48.1%} +#block_partner_tips {float:right; width:48.1%} +.row-news { width:100%;float:left;} +#table_info_news { border:1px solid #ccc;} \ No newline at end of file diff --git a/img/admin/advertising.png b/img/admin/advertising.png new file mode 100755 index 000000000..300fc6fdc Binary files /dev/null and b/img/admin/advertising.png differ diff --git a/img/admin/book.png b/img/admin/book.png new file mode 100755 index 000000000..45c9edfe2 Binary files /dev/null and b/img/admin/book.png differ diff --git a/img/admin/cart_add.png b/img/admin/cart_add.png new file mode 100755 index 000000000..de36c1efa Binary files /dev/null and b/img/admin/cart_add.png differ diff --git a/img/admin/cart_remove.png b/img/admin/cart_remove.png new file mode 100755 index 000000000..071bdcf87 Binary files /dev/null and b/img/admin/cart_remove.png differ diff --git a/img/admin/cross.png b/img/admin/cross.png new file mode 100755 index 000000000..33a383748 Binary files /dev/null and b/img/admin/cross.png differ diff --git a/img/admin/error.png b/img/admin/error.png index 3c19c0ba1..dbfda2297 100644 Binary files a/img/admin/error.png and b/img/admin/error.png differ diff --git a/img/admin/package_go.png b/img/admin/package_go.png new file mode 100755 index 000000000..ff6247fb1 Binary files /dev/null and b/img/admin/package_go.png differ diff --git a/img/admin/page_white_add.png b/img/admin/page_white_add.png new file mode 100755 index 000000000..d33fc2bd2 Binary files /dev/null and b/img/admin/page_white_add.png differ diff --git a/img/admin/play.png b/img/admin/play.png new file mode 100644 index 000000000..1011f6569 Binary files /dev/null and b/img/admin/play.png differ diff --git a/img/admin/plugin_add.png b/img/admin/plugin_add.png new file mode 100755 index 000000000..3a16f2019 Binary files /dev/null and b/img/admin/plugin_add.png differ diff --git a/img/admin/tick.png b/img/admin/tick.png new file mode 100755 index 000000000..c277e6b40 Binary files /dev/null and b/img/admin/tick.png differ diff --git a/js/jquery/plugins/fancybox/jquery.fancybox.css b/js/jquery/plugins/fancybox/jquery.fancybox.css index 91824bb7e..d5fcf183d 100755 --- a/js/jquery/plugins/fancybox/jquery.fancybox.css +++ b/js/jquery/plugins/fancybox/jquery.fancybox.css @@ -49,6 +49,7 @@ } #fancybox-overlay { + background-color :#000 !important; position: absolute; top: 0; left: 0; @@ -66,13 +67,16 @@ } #fancybox-wrap { + background: none repeat scroll 0 0 rgb(255, 255, 255) !important; + background: none repeat scroll 0 0 rgba(255, 255, 255, 0.3) !important; position: absolute; top: 0; left: 0; - padding: 20px; + padding: 8px; z-index: 1101; outline: none; display: none; + border-radius:8px; } #fancybox-outer {