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

// adjustments on modules dash

Browse Source
This commit is contained in:
Kevin Granger
2013-09-02 16:41:48 +02:00
parent af3051ca8f
commit 121554026c
6 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+1 -1
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/css/admin-theme.sass
+5 -12
View File
@@ -954,7 +954,6 @@ fieldset > .row
font-family: FontAwesome
content: "\f0aa"
#dashboard
section
header
@@ -1047,10 +1046,10 @@ fieldset > .row
display: block
text-align: center
#dash_trends
#dashtrends
header
margin-bottom: 0
#dash_trends_toolbar
#dashtrends_toolbar
margin: 4px -16px
dl
margin: 0
@@ -1068,11 +1067,10 @@ fieldset > .row
height: 37px
line-height: 1em
font: 300 1.1em/120% $headings-font-family
svg
height: 350px
#dash_products
#dashproducts
header
margin-bottom: 0
nav
@@ -1089,20 +1087,18 @@ fieldset > .row
background-color: $brand-primary
a
color: white
#dash_activity
#dashactivity
svg
height: 150px
.data_value
span, .dash_trend
+transition-property(opacity)
+transition-duration(0.2s)
+transition-duration(0.6s)
+transition-timing-function(ease-in)
+opacity(1)
.loading
.data_value
//background-color: black
min-width: 30px
text-align: center
&:before
@@ -1111,7 +1107,6 @@ fieldset > .row
font-family: FontAwesome
content: "\f021"
color: #ccc
margin-right: 4px
span, .dash_trend
+opacity(0)
.data_table
@@ -1119,5 +1114,3 @@ fieldset > .row
.data_chart
.data_trends
modules/dashactivity/dashactivity.php
+1
View File
@@ -54,6 +54,7 @@ class Dashactivity extends Module
public function hookDashboardDatas($params)
{
sleep(2);
return array(
'data_value' => array(
'order_nbr' => 365,
modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl
+43 -15
View File
@@ -23,7 +23,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<section id="dash_activity" class="panel">
<section id="dashactivity" class="panel">
<div class="panel-heading">
<i class="icon-time"></i> {l s='Recent Activity'}
<span class="panel-heading-action">
@@ -58,19 +58,27 @@
<ul class="data_list">
<li>
<span class="data_label">{l s='Pending Orders'}</span>
<span class="data_value size_l" id="pending_orders"></span>
<span class="data_value size_l">
<span id="pending_orders"></span>
</span>
</li>
<li>
<span class="data_label">{l s='Return/Exchanges'}</span>
<span class="data_value size_l" id="return_exchanges"></span>
<span class="data_value size_l">
<span id="return_exchanges"></span>
</span>
</li>
<li>
<span class="data_label">{l s='Abandoned Carts'}</span>
<span class="data_value size_l" id="abandoned_cart"></span>
<span class="data_value size_l">
<span id="abandoned_cart"></span>
</span>
</li>
<li>
<span class="data_label">{l s='Products Out of Stock'}</span>
<span class="data_value size_l" id="products_out_of_stock"></span>
<span class="data_value size_l">
<span id="products_out_of_stock"></span>
</span>
</li>
</ul>
</section>
@@ -79,15 +87,21 @@
<ul class="data_list_vertical">
<li>
<span class="data_label">{l s='New Messages'}</span>
<span class="data_value size_l" id="new_messages"></span>
<span class="data_value size_l">
<span id="new_messages"></span>
</span>
</li>
<li>
<span class="data_label">{l s='Order Inquires'}</span>
<span class="data_value size_l" id="order_inquires"></span>
<span class="data_value size_l">
<span id="order_inquires"></span>
</span>
</li>
<li>
<span class="data_label">{l s='Product Reviews'}</span>
<span class="data_value size_l" id="product_reviews"></span>
<span class="data_value size_l">
<span id="product_reviews"></span>
</span>
</li>
</ul>
</section>
@@ -96,11 +110,15 @@
<ul class="data_list">
<li>
<span class="data_label">{l s='New Customers'}</span>
<span class="data_value size_md" id="new_customers"></span>
<span class="data_value size_md">
<span id="new_customers"></span>
</span>
</li>
<li>
<span class="data_label">{l s='Online Visitor'}</span>
<span class="data_value size_md" id="online_visitor"></span>
<span class="data_value size_md">
<span id="online_visitor"></span>
</span>
</li>
<li>
<span class="data_label">
@@ -109,7 +127,9 @@
{l s='In the last 30 minutes'}
</small>
</span>
<span class="data_value size_md" id="active_shopping_cart"></span>
<span class="data_value size_md">
<span id="active_shopping_cart"></span>
</span>
</li>
</ul>
</section>
@@ -118,11 +138,15 @@
<ul class="data_list">
<li>
<span class="data_label">{l s='New Registrations'}</span>
<span class="data_value size_md" id="new_registrations"></span>
<span class="data_value size_md">
<span id="new_registrations"></span>
</span>
</li>
<li>
<span class="data_label">{l s='Total Subscribers'}</span>
<span class="data_value size_md" id="total_suscribers"></span>
<span class="data_value size_md">
<span id="total_suscribers"></span>
</span>
</li>
</ul>
</section>
@@ -131,11 +155,15 @@
<ul class="data_list">
<li>
<span class="data_label">{l s='Visits'}</span>
<span class="data_value size_md" id="visits"></span>
<span class="data_value size_md">
<span id="visits"></span>
</span>
</li>
<li>
<span class="data_label">{l s='Unique Visitors'}</span>
<span class="data_value size_md" id="unique_visitors"></span>
<span class="data_value size_md">
<span id="unique_visitors"></span>
</span>
</li>
<li>
<span class="data_label">{l s='Traffic Sources'}</span>
modules/dashproducts/views/templates/hook/dashboard_zone_two.tpl
+1 -1
View File
@@ -23,7 +23,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<section id="dash_products" class="panel">
<section id="dashproducts" class="panel">
<header class="panel-heading">
<i class="icon-bar-chart"></i> {l s='Product and Sales'}
<span class="panel-heading-action">
modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl
+1 -1
View File
@@ -23,7 +23,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<section id="dash_trends" class="panel">
<section id="dashtrends" class="panel">
<header class="panel-heading">
<i class="icon-bar-chart"></i> {l s='Score Trends'}
<span class="panel-heading-action">