dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// breaking things

Browse Source
This commit is contained in:
Kevin Granger
2013-08-20 16:38:31 +02:00
parent f73f84dbf2
commit 44655ecdef
18 changed files with 3561 additions and 2936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/modules/favorites.tpl
+2 -2
View File
@@ -2,11 +2,11 @@
<div class="row">
<div class="col-lg-12">
<div class="btn-group pull-right">
<a class="btn btn-default btn-small{if !isset($smarty.get.select)} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}">
<a class="btn btn-default {if !isset($smarty.get.select)} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}">
<i class="icon-list"></i>
{l s='Normal view'}
</a>
<a class="btn btn-default btn-small{if $smarty.get.select == 'favorites'} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites">
<a class="btn btn-default {if $smarty.get.select == 'favorites'} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites">
<i class="icon-star"></i>
{l s='Favorites view'}
</a>
admin-dev/themes/default/template/controllers/modules/list.tpl
+2 -2
View File
@@ -32,11 +32,11 @@
</th>
<th colspan="3">
<div class="btn-group pull-right">
<a class="btn btn-default btn-small{if !isset($smarty.get.select)} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}">
<a class="btn btn-default {if !isset($smarty.get.select)} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}">
<i class="icon-list"></i>
{l s='Normal view'}
</a>
<a class="btn btn-default btn-small{if $smarty.get.select == 'favorites'} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites">
<a class="btn btn-default {if $smarty.get.select == 'favorites'} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites">
<i class="icon-star"></i>
{l s='Favorites view'}
</a>
admin-dev/themes/default/template/controllers/modules/login_addons.tpl
+3 -3
View File
@@ -24,7 +24,7 @@
*}
{if $add_permission eq '1'}
<div class="panel">
<div class="panel">
{if isset($logged_on_addons)}
<!--start addons login-->
<div class="panel-heading">
@@ -57,14 +57,14 @@
<label class="control-label col-lg-3">{l s='Addons Login'} :</label>
<div class="input-group col-lg-4">
<span class="input-group-addon"><i class="icon-user"></i></span>
<input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
<input type="text" value="" id="username_addons" autocomplete="off" class="form-control ac_input">
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s= 'Password Addons'} :</label>
<div class="input-group col-lg-4">
<span class="input-group-addon"><i class="icon-key"></i></span>
<input type="password" value="" id="password_addons" autocomplete="off" class="ac_input">
<input type="password" value="" id="password_addons" autocomplete="off" class="form-control ac_input">
</div>
</div>
<div class="row">
admin-dev/themes/default/template/controllers/modules/page.tpl
-3
View File
@@ -39,8 +39,6 @@
</ul>
</div>
{/if}
<div class="panel">
<div class="panel-heading">
<i class="icon-list-ul"></i>
@@ -49,7 +47,6 @@
{include file='controllers/modules/filters.tpl'}
<!--start sidebar module-->
<div class="row">
<div class="categorieTitle col col-lg-3">
<div class="list-group">
admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
+3 -3
View File
@@ -149,8 +149,8 @@
</td>
<td>
<div class="btn-group btn-group-action">
<span class="btn btn-default btn-small">{l s='Choose an action'}</span>
<button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
<span class="btn btn-default">{l s='Choose an action'}</span>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>&nbsp;
</button>
<ul class="dropdown-menu">
@@ -199,7 +199,7 @@
<p>{l s='You have to select a shop to use LiveEdit'}</p>
{else}
<p>{l s='Click here to be redirected to the Front Office of your shop where you can move and delete modules directly.'}</p>
<a class="btn btn-default btn-small pull-right" href="{$url_live_edit}" target="_blank">
<a class="btn btn-default pull-right" href="{$url_live_edit}" target="_blank">
<i class="icon-edit"></i>
{l s='Run LiveEdit'}
</a>
admin-dev/themes/default/template/controllers/orders/form.tpl
+13 -13
View File
@@ -569,7 +569,7 @@
stock[id_product] = new Array();
if (this.customizable == '1')
{
customization_html += '<fieldset class="width3"><legend>{l s='Customization'}</legend><form id="customization_'+id_product+'" class="id_customization" method="post" enctype="multipart/form-data" action="'+admin_cart_link+'" style="display:none;">';
customization_html += '<fieldset class="width3"><h3>{l s='Customization'}</h3><form id="customization_'+id_product+'" class="id_customization" method="post" enctype="multipart/form-data" action="'+admin_cart_link+'" style="display:none;">';
customization_html += '<input type="hidden" name="id_product" value="'+id_product+'" />';
customization_html += '<input type="hidden" name="id_cart" value="'+id_cart+'" />';
customization_html += '<input type="hidden" name="action" value="updateCustomizationFields" />';
@@ -983,10 +983,10 @@
<form action="" method="" class="form-horizontal">
<fieldset id="customer_part">
<legend>
<h3>
<i class="icon-user"></i>
{l s='Customer'}
</legend>
</h3>
<div class="row">
<div class="col-lg-12">
<a class="fancybox btn btn-default" href="{$link->getAdminLink('AdminCustomers')|escape:'htmlall':'UTF-8'}&addcustomer&liteDisplaying=1&submitFormAjax=1#">
@@ -1010,10 +1010,10 @@
</form>
<form class="form-horizontal" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&submitAdd{$table}=1" method="post" autocomplete="off">
<fieldset id="products_part" style="display:none;">
<legend>
<h3>
<i class="icon-folder-close"></i>
{l s='Cart'}
</legend>
</h3>
<div class="row">
<label class="control-label col-lg-3">
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='Search a product by tapping the first letters of his/her name.'}">
@@ -1189,10 +1189,10 @@
</div>
</fieldset>
<fieldset id="vouchers_part" style="display:none;">
<legend>
<h3>
<i class="icon-table"></i>
{l s='Vouchers'}
</legend>
</h3>
<div class="row">
<div class="col-lg-12">
<a class="fancybox btn btn-default" href="{$link->getAdminLink('AdminCartRules')|escape:'htmlall':'UTF-8'}&addcart_rule&liteDisplaying=1&submitFormAjax=1#">
@@ -1225,10 +1225,10 @@
<div id="vouchers_err" class="alert alert-block" style="display:none;"></div>
</fieldset>
<fieldset id="address_part" style="display:none;">
<legend>
<h3>
<i class="icon-envelope"></i>
{l s='Addresses'}
</legend>
</h3>
<div id="addresses_err" class="alert alert-block" style="display:none;"></div>
<div class="row">
@@ -1261,10 +1261,10 @@
</div>
</fieldset>
<fieldset id="carriers_part" style="display:none;">
<legend>
<h3>
<i class="icon-truck"></i>
{l s='Shipping'}
</legend>
</h3>
<div id="carriers_err" style="display:none;" class="alert alert-block"></div>
<div id="carrier_form">
<div class="row">
@@ -1304,10 +1304,10 @@
</div>
</fieldset>
<fieldset id="summary_part" style="display:none;">
<legend>
<h3>
<i class="icon-align-justify"></i>
{l s='Summary'}
</legend>
</h3>
<div class="row">
<div id="send_email_feedback" class="col-lg-12"></div>
</div>
admin-dev/themes/default/template/footer.tpl
+4 -4
View File
@@ -27,12 +27,12 @@
</div>
{if $display_footer}
{hook h="displayBackOfficeFooter"}
<div id="footer">
<div class="col-lg-4">
<div id="footer" class="affix" data-offset-bottom="0">
<div class="col-lg-3">
<a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a><br />
<span>{l s='Load time: '} {number_format(microtime(true) - $timer_start, 3, '.', '')}s</span>
</div>
<div class="col-lg-3">
<div class="col-lg-2">
<a class="link-social link-twitter" href="#" title="Twitter">
<i class="icon-twitter"></i>
</a>
@@ -47,7 +47,7 @@
</a>
</div>
<div class="col-lg-4">
<div class="col-lg-7">
<a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">{l s='Contact'}</a>
|&nbsp;<a href="http://forge.prestashop.com" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
|&nbsp;<a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">{l s='Forum'}</a>
admin-dev/themes/default/template/header.tpl
+200 -97
View File
@@ -30,13 +30,9 @@
<html lang="{$iso}">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="robots" content="NOFOLLOW, NOINDEX">
<title>{$meta_title} - PrestaShop&trade;</title>
{if $display_header}
<script type="text/javascript">
@@ -44,7 +40,6 @@
var iso_user = '{$iso_user}';
var country_iso_code = '{$country_iso_code}';
var _PS_VERSION_ = '{$smarty.const._PS_VERSION_}';
var helpboxes = {$help_box};
var roundMode = {$round_mode};
{if isset($shop_context)}
@@ -77,32 +72,26 @@
var currentIndex = '{$currentIndex}';
var default_language = '{$default_language|intval}';
var choose_language_translate = "{l s='Choose language' slashes=1}";
</script>
{/if}
{if isset($css_files)}
{foreach from=$css_files key=css_uri item=media}
<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
{/foreach}
{/if}
{if isset($js_files)}
{foreach from=$js_files item=js_uri}
<script type="text/javascript" src="{$js_uri}"></script>
{/foreach}
{/if}
<link rel="icon" type="image/vnd.microsoft.icon" href="{$img_dir}favicon.ico" />
<link rel="shortcut icon" type="image/x-icon" href="{$img_dir}favicon.ico" />
{if isset($displayBackOfficeHeader)}
{$displayBackOfficeHeader}
{/if}
<!--[if IE]>
<link type="text/css" rel="stylesheet" href="{$base_url}css/admin-ie.css" />
<![endif]-->
{if isset($brightness)}
<!--
/// multishop
@@ -111,21 +100,28 @@
</style>
-->
{/if}
<link href='http://fonts.googleapis.com/css?family=Ubuntu:300|Open+Sans' rel='stylesheet' type='text/css'>
</head>
<body class="fixed-top page-sidebar-closed">
{if $display_header}
{* begin HEADER *}
<div id="header">
<div id="header_infos" class="navbar navbar-fixed-top">
<a id="header_shopname" class="navbar-brand" href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}">{$shop_name}</a>
<ul id="notifs_icon_wrapper" class="nav navbar-nav nav-pills">
<header id="header">
<nav id="header_infos" class="navbar navbar-fixed-top" role="navigation">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-secondary">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a id="header_shopname" class="navbar-brand" href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}">
<img src="{$img_dir}prestashop-avatar.png" height="20" width="20" />
{$shop_name}
</a>
<ul id="notifs_icon_wrapper" class="nav navbar-nav nav-pills">
{if {$show_new_orders} == 1}
<li id="orders_notif" class="dropdown" >
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -134,16 +130,35 @@
<span id="orders_notif_value">0</span>
</span>
</a>
<ul id="orders_notif_wrapper" class="dropdown-menu notification">
<div class="dropdown-menu notification-dropdown">
<section id="orders_notif_wrapper" class="notification-panel">
<header class="panel-heading">
{l s='Last orders'}
</header>
<div id="list_orders_notif" class="list-group">
<a href="#" class="media list-group-item no_notifs">
<span class="pull-left">
<i class="icon-time"></i>
</span>
<span class="media-body">
{l s='No new orders has been placed on your shop'}<br>
<small class="text-muted">1 minute ago</small>
</span>
</a>
</div>
<footer class="panel-footer text-small">
<a href="index.php?controller=AdminOrders&amp;token={getAdminToken tab='AdminOrders'}">{l s='Show all orders'}</a>
</footer>
</section>
</div>
<!-- <ul id="orders_notif_wrapper" class="dropdown-menu notification">
<li><p>{l s='Last orders'}</p></li>
<li><p class="no_notifs">{l s='No new orders has been placed on your shop'}</p></li>
<li><ul id="list_orders_notif"></ul></li>
<li><a href="index.php?controller=AdminOrders&amp;token={getAdminToken tab='AdminOrders'}">{l s='Show all orders'} <i class="icon-circle-arrow-right"></i></a></li>
</ul>
</ul> -->
</li>
{/if}
{if ($show_new_customers == 1)}
<li id="customers_notif" class="notifs dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -152,16 +167,35 @@
<span id="customers_notif_value">0</span>
</span>
</a>
<ul id="customers_notif_wrapper" class="dropdown-menu notification">
<div class="dropdown-menu notification-dropdown">
<section id="customers_notif_wrapper" class="notification-panel">
<header class="panel-heading">
{l s='Last customers'}
</header>
<div id="list_orders_notif" class="list-group">
<a href="#" class="media list-group-item no_notifs">
<span class="pull-left">
<i class="icon-time"></i>
</span>
<span class="media-body">
{l s='No new customers registered on your shop'}<br>
<small class="text-muted">1 minute ago</small>
</span>
</a>
</div>
<footer class="panel-footer text-small">
<a href="index.php?controller=AdminCustomers&amp;token={getAdminToken tab='AdminCustomers'}">{l s='Show all customers'}</a>
</footer>
</section>
</div>
<!-- <ul id="customers_notif_wrapper" class="dropdown-menu notification">
<li><p>{l s='Last customers'}</p></li>
<li><p class="no_notifs">{l s='No new customers registered on your shop'}</p></li>
<li><ul id="list_customers_notif"></ul></li>
<li><a href="index.php?controller=AdminCustomers&amp;token={getAdminToken tab='AdminCustomers'}">{l s='Show all customers'} <i class="icon-circle-arrow-right"></i></a></li>
</ul>
</ul> -->
</li>
{/if}
{if {$show_new_messages} == 1}
<li id="customer_messages_notif" class="notifs dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -170,94 +204,118 @@
<span id="customer_messages_notif_value" >0</span>
</span>
</a>
<ul id="customer_messages_notif_wrapper" class="dropdown-menu notification">
<div class="dropdown-menu notification-dropdown">
<section id="customer_messages_notif_wrapper" class="notification-panel">
<header class="panel-heading">
{l s='Last messages'}
</header>
<div id="list_orders_notif" class="list-group">
<a href="#" class="media list-group-item no_notifs">
<span class="pull-left">
<i class="icon-time"></i>
</span>
<span class="media-body">
{l s='No new messages posted on your shop'}<br>
<small class="text-muted">1 minute ago</small>
</span>
</a>
</div>
<footer class="panel-footer text-small">
<a href="index.php?tab=AdminCustomerThreads&amp;token={getAdminToken tab='AdminCustomerThreads'}">{l s='Show all messages'}</a>
</footer>
</section>
</div>
<!-- <ul id="customer_messages_notif_wrapper" class="dropdown-menu notification">
<li>{l s='Last messages'}</li>
<li><p class="no_notifs">{l s='No new messages posted on your shop'}</p></li>
<li><ul id="list_customer_messages_notif"></ul></li>
<li><a href="index.php?tab=AdminCustomerThreads&amp;token={getAdminToken tab='AdminCustomerThreads'}">{l s='Show all messages'} <i class="icon-circle-arrow-right"></i></a></li>
</ul>
</ul> -->
</li>
{/if}
</ul>
</ul>
<ul id="employee_box" class="nav navbar-nav pull-right">
<li id="employee_infos" class="dropdown">
<a href='#' class="employee_name dropdown-toggle" data-toggle="dropdown">{$first_name}&nbsp;{$last_name} <i class="icon-angle-down"></i></a>
<ul id="employee_links" class="dropdown-menu">
<li><a href="{$link->getAdminLink('AdminEmployees')|escape:'htmlall':'UTF-8'}&id_employee={$employee->id}&amp;updateemployee"><i class="icon-wrench"></i> {l s='My preferences'}</a></li>
<li><a id="header_logout" href="index.php?logout"><i class="icon-signout"></i> {l s='logout'}</a></li>
<ul id="employee_box" class="nav navbar-nav navbar-right">
<li id="employee_infos" class="dropdown">
<a href='#' class="employee_name dropdown-toggle" data-toggle="dropdown">
{$first_name}&nbsp;{$last_name}
<img src="{$img_dir}prestashop-avatar.png" height="15" width="15" />
<i class="icon-angle-down"></i>
</a>
<ul id="employee_links" class="dropdown-menu">
<li><a href="{$link->getAdminLink('AdminEmployees')|escape:'htmlall':'UTF-8'}&id_employee={$employee->id}&amp;updateemployee"><i class="icon-wrench"></i> {l s='My preferences'}</a></li>
<li><a id="header_logout" href="index.php?logout"><i class="icon-signout"></i> {l s='logout'}</a></li>
{if {$base_url}}
<li class="divider"></li>
<li><a href="{$base_url}" id="header_foaccess" target="_blank" title="{l s='View my shop'}"><i class="icon-eye-open"></i> {l s='View my shop'}</a></li>
<li class="divider"></li>
<li><a href="{$base_url}" id="header_foaccess" target="_blank" title="{l s='View my shop'}"><i class="icon-eye-open"></i> {l s='View my shop'}</a></li>
{/if}
</ul>
</li>
</ul>
</ul>
</li>
</ul>
<div id="header_search">
<form class="navbar-form" method="post" action="index.php?controller=AdminSearch&amp;token={getAdminToken tab='AdminSearch'}">
<div class="input-group col-lg-2">
<input type="text" name="bo_query" id="bo_query" value="{$bo_query}" class="input-medium" palceholder="{l s='Search'}"/>
<span class="input-group-btn">
<button type="submit" id="bo_search_submit" class="btn btn-default">
<i class="icon-search"></i>
</button>
</span>
</div>
<!-- //todo Search in section
<select name="bo_search_type" id="bo_search_type" class="chosen no-search">
<option value="0">{l s='everywhere'}</option>
<option value="1" {if {$search_type} == 1} selected="selected" {/if}>{l s='catalog'}</option>
<optgroup label="{l s='customers'}:">
<option value="2" {if {$search_type} == 2} selected="selected" {/if}>{l s='by name'}</option>
<option value="6" {if {$search_type} == 6} selected="selected" {/if}>{l s='by ip address'}</option>
</optgroup>
<option value="3" {if {$search_type} == 3} selected="selected" {/if}>{l s='orders'}</option>
<option value="4" {if {$search_type} == 4} selected="selected" {/if}>{l s='invoices'}</option>
<option value="5" {if {$search_type} == 5} selected="selected" {/if}>{l s='carts'}</option>
<option value="7" {if {$search_type} == 7} selected="selected" {/if}>{l s='modules'}</option>
</select> -->
</form>
</div>
<div class="collapse navbar-collapse navbar-collapse-secondary">
<form id="header_search" class="navbar-form" method="post" action="index.php?controller=AdminSearch&amp;token={getAdminToken tab='AdminSearch'}">
<div class="input-group col-lg-2">
<input type="text" name="bo_query" id="bo_query" value="{$bo_query}" class="form-control" palceholder="{l s='Search'}"/>
<span class="input-group-btn">
<button type="submit" id="bo_search_submit" class="btn btn-default">
<i class="icon-search"></i>
</button>
</span>
</div>
<!-- //todo Search in section
<select name="bo_search_type" id="bo_search_type" class="chosen no-search">
<option value="0">{l s='everywhere'}</option>
<option value="1" {if {$search_type} == 1} selected="selected" {/if}>{l s='catalog'}</option>
<optgroup label="{l s='customers'}:">
<option value="2" {if {$search_type} == 2} selected="selected" {/if}>{l s='by name'}</option>
<option value="6" {if {$search_type} == 6} selected="selected" {/if}>{l s='by ip address'}</option>
</optgroup>
<option value="3" {if {$search_type} == 3} selected="selected" {/if}>{l s='orders'}</option>
<option value="4" {if {$search_type} == 4} selected="selected" {/if}>{l s='invoices'}</option>
<option value="5" {if {$search_type} == 5} selected="selected" {/if}>{l s='carts'}</option>
<option value="7" {if {$search_type} == 7} selected="selected" {/if}>{l s='modules'}</option>
</select> -->
</form>
{if count($quick_access) > 0}
<div id="header_quick" class="btn-group navbar-nav">
<a href="#" id="quick_select" class="btn btn-default dropdown-toggle" data-toggle="dropdown">{l s='Quick Access'} <b class="caret"></b></a>
<ul class="dropdown-menu">
{foreach $quick_access as $quick}
<li><a href="{$quick.link|escape:'htmlall':'UTF-8'}{if $quick.new_window}_blank{/if}"><i class="icon-chevron-right"></i> {$quick.name}</a></li>
{/foreach}
</ul>
</div>
<div id="header_quick" class="btn-group navbar-nav">
<a href="#" id="quick_select" class="btn btn-default dropdown-toggle" data-toggle="dropdown">{l s='Quick Access'} <b class="caret"></b></a>
<ul class="dropdown-menu">
{foreach $quick_access as $quick}
<li><a href="{$quick.link|escape:'htmlall':'UTF-8'}{if $quick.new_window}_blank{/if}"><i class="icon-chevron-right"></i> {$quick.name}</a></li>
{/foreach}
</ul>
</div>
{/if}
<span id="ajax_running" class="navbar-text">
<i class="icon-refresh icon-spin"></i> {l s='Loading...'}
</span>
</div>
</div>
<span id="ajax_running" class="navbar-text">
<i class="icon-refresh icon-spin"></i> {l s='Loading...'}
</span>
{if isset($displayBackOfficeTop)}{$displayBackOfficeTop}{/if}
</div>{* end header_infos*}
</div>
</nav>{* end header_infos*}
</header>
{* end header*}
{/if}
<div id="main">
<div id="sidebar" data-spy="affix" data-offset-top="0" class="page-sidebar nav-collapse collapse">
{if !$tab}
<nav id="topbar" class="hide" role="navigation">
{if !$tab}
<div class="mainsubtablist" style="display:none"></div>
{/if}
<span class="menu-collapse">
<i class="icon-align-justify"></i>
</span>
<script type="text/javascript">
$('.menu-collapse').click(function(){
$('body').toggleClass('page-sidebar-closed');
});
</script>
{if $controller_name != 'AdminLogin'}
<ul id="menu">
<ul class="menu">
<li class="maintab">
<a href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}" class="title">
<i class="icon-AdminDashboard"></i>
@@ -288,18 +346,63 @@
{/foreach}
</ul>
{/if}
</div>
</nav>
<nav id="sidebar" data-spy="affix" data-offset-top="0" class="page-sidebar nav-collapse collapse navbar-collapse-primary" role="navigation">
{if !$tab}
<div class="mainsubtablist" style="display:none"></div>
{/if}
<span class="menu-collapse">
<i class="icon-align-justify"></i>
</span>
<script type="text/javascript">
$('.menu-collapse').click(function(){
$('body').toggleClass('page-sidebar-closed');
});
</script>
{if $controller_name != 'AdminLogin'}
<ul class="menu">
<li class="maintab">
<a href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}" class="title">
<i class="icon-AdminDashboard"></i>
<span class="title">{l s='Dashboard'}</span>
</a>
</li>
{foreach $tabs as $t}
{if $t.active}
<li class="maintab {if $t.current}active{/if}" id="maintab{$t.id_tab}">
<a href="javascript:adminNav('#maintab{$t.id_tab}');" class="title">
<i class="icon-{$t.class_name}"></i>
<span class="title">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</span>
</a>
<ul class="submenu">
{foreach from=$t.sub_tabs item=t2}
{if $t2.active}
<li {if $t2.current} class="active"{/if}>
<a href="{$t2.href|escape:'htmlall':'UTF-8'}">
{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}
<!-- <i class="icon-chevron-sign-right pull-right"></i> -->
</a>
</li>
{/if}
{/foreach}
</ul>
</li>
{/if}
{/foreach}
</ul>
{/if}
</nav>
<div id="content" class="page-content">
{if $display_header && $install_dir_exists}
<div class="alert alert-block">
{l s='For security reasons, you must also:'}&nbsp;{l s='delete the /install folder'}
</div>
{/if}
{if $display_header && $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
<div class="multishop_toolbar">
<span class="text_multishop">{l s='Multistore configuration for'}</span> {$shop_list}
</div>
{/if}
{if $display_header && $install_dir_exists}
<div class="alert alert-block">
{l s='For security reasons, you must also:'}&nbsp;{l s='delete the /install folder'}
</div>
{/if}
{if $display_header && $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
<div class="multishop_toolbar">
<span class="text_multishop">{l s='Multistore configuration for'}</span> {$shop_list}
</div>
{/if}
admin-dev/themes/default/template/helpers/dataviz/graph.tpl
+214
View File
@@ -0,0 +1,214 @@
{*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
<div id="box-clients" class="col-lg-3 box-stats color1" >
<div class="boxchart-overlay">
<div class="boxchart"></div>
</div>
<span class="title">Clients / 1 month</span>
<span class="value">4 589</span>
</div>
<div id="box-orders" class="col-lg-3 box-stats color2">
<div class="boxchart-overlay">
<div class="boxchart"></div>
</div>
<span class="title">Orders / 1 month</span>
<span class="value">789</span>
</div>
<div id="box-income" class="col-lg-3 box-stats color3">
<i class="icon-money"></i>
<span class="title">Income / 1 month</span>
<span class="value">$999,99</span>
</div>
<div id="box-messages" class="col-lg-3 box-stats color4">
<i class="icon-envelope-alt"></i>
<span class="title">Messages / 1 month</span>
<span class="value">19</span>
</div>
<div class="clearfix"></div>
<div id="box-pie" class="col-lg-6 box-stats">
<div class="boxchart-overlay">
<div class="boxchart"></div>
</div>
<span class="title">Total</span>
<span class="value">19</span>
<ul class="list-unstyled">
<!-- <li>Nombre total de sujets <span class="badge">0</span></li> -->
<li>{l s='Sujets en attente'} <span class="badge">0</span></li>
<li>{l s='Total de messages de clients'}<span class="badge">0</span></li>
<li>{l s='Total de messages d\'employés'}<span class="badge">0</span></li>
<li>{l s='Sujets non lu'}<span class="badge">0</span></li>
<li>{l s='Sujets clos'}<span class="badge">0</span></li>
</ul>
</div>
<div id="box-line" class="col-lg-3 box-stats color1" >
<div class="boxchart-overlay">
<div class="boxchart"></div>
</div>
<span class="title">Trafic / 1 month</span>
<span class="value">4 589</span>
</div>
<div id="box-spline" class="col-lg-3 box-stats color2" >
<div class="boxchart-overlay">
<div class="boxchart"></div>
</div>
<span class="title">Conversion / 1 month</span>
<span class="value">4 589</span>
</div>
<div class="clearfix"></div>
<script>
var data = [4, 8, 15, 16, 23, 42, 8, 15, 16, 23, 42, 16, 23, 42, 8, 15, 15, 16, 23];
var chart = d3.select("#box-clients .boxchart").append("svg")
.attr("class", "chart")
.attr("width", data.length * 6)
.attr("height", 30);
var y = d3.scale.linear()
.domain([0, d3.max(data)])
.range([0, d3.max(data)]);
chart.selectAll("rect")
.data(data)
.enter().append("rect")
.attr("y", function(d) { return 30 - d; })
.attr("x", function(d, i) { return i * 6; })
.attr("width", 4)
.attr("height", y);
</script>
<script>
var data = [4, 8, 15, 16, 23, 42, 8, 15, 16];
var chart = d3.select("#box-orders .boxchart").append("svg")
.attr("class", "chart")
.attr("width", data.length * 6)
.attr("height", 30);
var y = d3.scale.linear()
.domain([0, d3.max(data)])
.range([0, d3.max(data)]);
chart.selectAll("rect")
.data(data)
.enter().append("rect")
.attr("y", function(d) { return 30 - d; })
.attr("x", function(d, i) { return i * 6; })
.attr("width", 4)
.attr("height", y);
</script>
<script>
var myColors = ["#1f77b4", "#ff7f0e", "#2ca02c", "#d62728", "#9467bd", "#8c564b", "#e377c2", "#7f7f7f", "#bcbd22", "#17becf"];
d3.scale.myColors = function() {
return d3.scale.ordinal().range(myColors);
};
var data = [53245, 28479, 19697, 24037, 30245];
var width = 140,
height = 140,
radius = Math.min(width, height) / 2;
var color = d3.scale.ordinal().range(myColors);
var pie = d3.layout.pie()
.sort(null);
var arc = d3.svg.arc()
.innerRadius(radius - 140)
.outerRadius(radius - 120);
var svg = d3.select("#box-pie .boxchart").append("svg")
.attr("width", width)
.attr("height", height)
.append("g")
.attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
var path = svg.selectAll("path")
.data(pie(data))
.enter().append("path")
.attr("fill", function(d, i) { return color(i); })
.attr("d", arc);
</script>
<script>
var data = [3, 6, 2, 7, 5, 12, 1, 3, 8, 9, 2, 5, 7],
w = 120,
h = 50,
margin = 5,
y = d3.scale.linear().domain([0, d3.max(data)]).range([0 + margin, h - margin]),
x = d3.scale.linear().domain([0, data.length]).range([0 + margin, w - margin]);
var vis = d3.select("#box-line .boxchart").append("svg")
.attr("class", "chart")
.attr("width", w)
.attr("height", h);
var g = vis.append("g")
.attr("transform", "translate(0, 50)");
var line = d3.svg.line()
.x(function(d,i) { return x(i); })
.y(function(d) { return -1 * y(d); });
g.append("path").attr("d", line(data));
vis.selectAll("dot")
.data(data)
.enter().append("circle")
.attr("stroke", "#1BA6E5")
.attr("stroke-width", 1)
.attr("r", 3)
.attr("transform", "translate(0, 50)")
.attr("fill", "white")
.attr("cx", function(d, i) { return x(i); })
.attr("cy", function(d, i) { return -1 * y(d); });
var area = d3.svg.area()
.x(function(d, i) { return x(i); })
.y0(h)
.y1(function(d, i) { return -1 * y(d); });
g.append("path")
.datum(data)
.attr("class", "area")
.attr("d", area);
</script>
<script>
var data = [3, 6, 2, 7, 5, 12, 1, 3, 8, 9, 2, 5, 7],
w = 120,
h = 50,
margin = 5,
y = d3.scale.linear().domain([0, d3.max(data)]).range([0 + margin, h - margin]),
x = d3.scale.linear().domain([0, data.length]).range([0 + margin, w - margin]);
var vis = d3.select("#box-spline .boxchart").append("svg")
.attr("class", "chart")
.attr("width", w)
.attr("height", h);
var g = vis.append("g")
.attr("transform", "translate(0, 50)");
var line = d3.svg.line()
.interpolate("basis")
.x(function(d,i) { return x(i); })
.y(function(d) { return -1 * y(d); });
g.append("path").attr("d", line(data));
</script>