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 committed 2013-09-02 16:41:48 +02:00
1 parent af3051ca8f
commit 121554026c
6 files changed
+52 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/css/admin-theme.css
+1 -1
View File
@@ -30,4 +30,4 @@
* Email: dave@fontawesome.io * Email: dave@fontawesome.io
* Twitter: http://twitter.com/byscuits * Twitter: http://twitter.com/byscuits
* Work: Lead Product Designer @ Kyruus - http://kyruus.com * Work: Lead Product Designer @ Kyruus - http://kyruus.com
*/@font-face{font-family:'FontAwesome';src:url("../font/fontawesome-webfont.eot?v=3.2.1");src:url("../font/fontawesome-webfont.eot?#iefix&v=3.2.1") format("embedded-opentype"),url("../font/fontawesome-webfont.woff?v=3.2.1") format("woff"),url("../font/fontawesome-webfont.ttf?v=3.2.1") format("truetype"),url("../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1") format("svg");font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em}[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}a [class^="icon-"],a [class*=" icon-"]{display:inline}[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em}.icons-ul{margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit}[class^="icon-"].hide,[class*=" icon-"].hide{display:none}.icon-muted{color:#eeeeee}.icon-light{color:#ffffff}.icon-dark{color:#333333}.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.icon-5x{font-size:5em}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.pull-right,.panel-heading-action{float:right}.pull-left,.page-head h2.page-title{float:left}[class^="icon-"].pull-left,.page-head h2[class^="icon-"].page-title,[class*=" icon-"].pull-left,.page-head h2[class*=" icon-"].page-title{margin-right:.3em}[class^="icon-"].pull-right,[class^="icon-"].panel-heading-action,[class*=" icon-"].pull-right,[class*=" icon-"].panel-heading-action{margin-left:.3em}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],#header_infos .nav>.active>a>[class^="icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class^="icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class^="icon-"],.navbar-inverse #header_employee_box>.active>a>[class^="icon-"],#header_infos #header_employee_box>.active>a>[class^="icon-"],.navbar-inverse #header_quick>.active>a>[class^="icon-"],#header_infos #header_quick>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],#header_infos .nav>.active>a>[class*=" icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],.navbar-inverse #header_employee_box>.active>a>[class*=" icon-"],#header_infos #header_employee_box>.active>a>[class*=" icon-"],.navbar-inverse #header_quick>.active>a>[class*=" icon-"],#header_infos #header_quick>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none}.btn [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,#header_notifs_icon_wrapper [class^="icon-"].icon-large,#header_employee_box [class^="icon-"].icon-large,#header_quick [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large,#header_notifs_icon_wrapper [class*=" icon-"].icon-large,#header_employee_box [class*=" icon-"].icon-large,#header_quick [class*=" icon-"].icon-large{line-height:.9em}.btn [class^="icon-"].icon-spin,.btn #dashboard .loading [class^="icon-"].data_value:before,#dashboard .loading .btn [class^="icon-"].data_value:before,.nav [class^="icon-"].icon-spin,#header_notifs_icon_wrapper [class^="icon-"].icon-spin,#header_employee_box [class^="icon-"].icon-spin,#header_quick [class^="icon-"].icon-spin,.nav #dashboard .loading [class^="icon-"].data_value:before,#dashboard .loading .nav [class^="icon-"].data_value:Line truncated */@font-face{font-family:'FontAwesome';src:url("../font/fontawesome-webfont.eot?v=3.2.1");src:url("../font/fontawesome-webfont.eot?#iefix&v=3.2.1") format("embedded-opentype"),url("../font/fontawesome-webfont.woff?v=3.2.1") format("woff"),url("../font/fontawesome-webfont.ttf?v=3.2.1") format("truetype"),url("../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1") format("svg");font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em}[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}a [class^="icon-"],a [class*=" icon-"]{display:inline}[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em}.icons-ul{margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit}[class^="icon-"].hide,[class*=" icon-"].hide{display:none}.icon-muted{color:#eeeeee}.icon-light{color:#ffffff}.icon-dark{color:#333333}.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.icon-5x{font-size:5em}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.pull-right,.panel-heading-action{float:right}.pull-left,.page-head h2.page-title{float:left}[class^="icon-"].pull-left,.page-head h2[class^="icon-"].page-title,[class*=" icon-"].pull-left,.page-head h2[class*=" icon-"].page-title{margin-right:.3em}[class^="icon-"].pull-right,[class^="icon-"].panel-heading-action,[class*=" icon-"].pull-right,[class*=" icon-"].panel-heading-action{margin-left:.3em}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],#header_infos .nav>.active>a>[class^="icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class^="icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class^="icon-"],.navbar-inverse #header_employee_box>.active>a>[class^="icon-"],#header_infos #header_employee_box>.active>a>[class^="icon-"],.navbar-inverse #header_quick>.active>a>[class^="icon-"],#header_infos #header_quick>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],#header_infos .nav>.active>a>[class*=" icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],.navbar-inverse #header_employee_box>.active>a>[class*=" icon-"],#header_infos #header_employee_box>.active>a>[class*=" icon-"],.navbar-inverse #header_quick>.active>a>[class*=" icon-"],#header_infos #header_quick>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none}.btn [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,#header_notifs_icon_wrapper [class^="icon-"].icon-large,#header_employee_box [class^="icon-"].icon-large,#header_quick [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large,#header_notifs_icon_wrapper [class*=" icon-"].icon-large,#header_employee_box [class*=" icon-"].icon-large,#header_quick [class*=" icon-"].icon-large{line-height:.9em}.btn [class^="icon-"].icon-spin,.btn #dashboard .loading [class^="icon-"].data_value:before,#dashboard .loading .btn [class^="icon-"].data_value:before,.nav [class^="icon-"].icon-spin,#header_notifs_icon_wrapper [class^="icon-"].icon-spin,#header_employee_box [class^="icon-"].icon-spin,#header_quick [class^="icon-"].icon-spin,.nav #dashboard .loading [class^="icon-"].data_value:before,#dashboard .loading .nav [class^="icon-"].data_value:Line truncated
admin-dev/themes/default/css/admin-theme.sass
+5 -12
View File
@@ -954,7 +954,6 @@ fieldset > .row
font-family: FontAwesome font-family: FontAwesome
content: "\f0aa" content: "\f0aa"
#dashboard #dashboard
section section
header header
@@ -1047,10 +1046,10 @@ fieldset > .row
display: block display: block
text-align: center text-align: center
#dash_trends #dashtrends
header header
margin-bottom: 0 margin-bottom: 0
#dash_trends_toolbar #dashtrends_toolbar
margin: 4px -16px margin: 4px -16px
dl dl
margin: 0 margin: 0
@@ -1068,11 +1067,10 @@ fieldset > .row
height: 37px height: 37px
line-height: 1em line-height: 1em
font: 300 1.1em/120% $headings-font-family font: 300 1.1em/120% $headings-font-family
svg svg
height: 350px height: 350px
#dash_products #dashproducts
header header
margin-bottom: 0 margin-bottom: 0
nav nav
@@ -1089,20 +1087,18 @@ fieldset > .row
background-color: $brand-primary background-color: $brand-primary
a a
color: white color: white
#dash_activity #dashactivity
svg svg
height: 150px height: 150px
.data_value .data_value
span, .dash_trend span, .dash_trend
+transition-property(opacity) +transition-property(opacity)
+transition-duration(0.2s) +transition-duration(0.6s)
+transition-timing-function(ease-in) +transition-timing-function(ease-in)
+opacity(1) +opacity(1)
.loading .loading
.data_value .data_value
//background-color: black
min-width: 30px min-width: 30px
text-align: center text-align: center
&:before &:before
@@ -1111,7 +1107,6 @@ fieldset > .row
font-family: FontAwesome font-family: FontAwesome
content: "\f021" content: "\f021"
color: #ccc color: #ccc
margin-right: 4px
span, .dash_trend span, .dash_trend
+opacity(0) +opacity(0)
.data_table .data_table
@@ -1119,5 +1114,3 @@ fieldset > .row
.data_chart .data_chart
.data_trends .data_trends
modules/dashactivity/dashactivity.php
+1
View File
@@ -54,6 +54,7 @@ class Dashactivity extends Module
public function hookDashboardDatas($params) public function hookDashboardDatas($params)
{ {
sleep(2);
return array( return array(
'data_value' => array( 'data_value' => array(
'order_nbr' => 365, '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 * International Registered Trademark & Property of PrestaShop SA
*} *}
<section id="dash_activity" class="panel"> <section id="dashactivity" class="panel">
<div class="panel-heading"> <div class="panel-heading">
<i class="icon-time"></i> {l s='Recent Activity'} <i class="icon-time"></i> {l s='Recent Activity'}
<span class="panel-heading-action"> <span class="panel-heading-action">
@@ -58,19 +58,27 @@
<ul class="data_list"> <ul class="data_list">
<li> <li>
<span class="data_label">{l s='Pending Orders'}</span> <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>
<li> <li>
<span class="data_label">{l s='Return/Exchanges'}</span> <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>
<li> <li>
<span class="data_label">{l s='Abandoned Carts'}</span> <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>
<li> <li>
<span class="data_label">{l s='Products Out of Stock'}</span> <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> </li>
</ul> </ul>
</section> </section>
@@ -79,15 +87,21 @@
<ul class="data_list_vertical"> <ul class="data_list_vertical">
<li> <li>
<span class="data_label">{l s='New Messages'}</span> <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>
<li> <li>
<span class="data_label">{l s='Order Inquires'}</span> <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>
<li> <li>
<span class="data_label">{l s='Product Reviews'}</span> <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> </li>
</ul> </ul>
</section> </section>
@@ -96,11 +110,15 @@
<ul class="data_list"> <ul class="data_list">
<li> <li>
<span class="data_label">{l s='New Customers'}</span> <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>
<li> <li>
<span class="data_label">{l s='Online Visitor'}</span> <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>
<li> <li>
<span class="data_label"> <span class="data_label">
@@ -109,7 +127,9 @@
{l s='In the last 30 minutes'} {l s='In the last 30 minutes'}
</small> </small>
</span> </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> </li>
</ul> </ul>
</section> </section>
@@ -118,11 +138,15 @@
<ul class="data_list"> <ul class="data_list">
<li> <li>
<span class="data_label">{l s='New Registrations'}</span> <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>
<li> <li>
<span class="data_label">{l s='Total Subscribers'}</span> <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> </li>
</ul> </ul>
</section> </section>
@@ -131,11 +155,15 @@
<ul class="data_list"> <ul class="data_list">
<li> <li>
<span class="data_label">{l s='Visits'}</span> <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>
<li> <li>
<span class="data_label">{l s='Unique Visitors'}</span> <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>
<li> <li>
<span class="data_label">{l s='Traffic Sources'}</span> <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 * International Registered Trademark & Property of PrestaShop SA
*} *}
<section id="dash_products" class="panel"> <section id="dashproducts" class="panel">
<header class="panel-heading"> <header class="panel-heading">
<i class="icon-bar-chart"></i> {l s='Product and Sales'} <i class="icon-bar-chart"></i> {l s='Product and Sales'}
<span class="panel-heading-action"> <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 * International Registered Trademark & Property of PrestaShop SA
*} *}
<section id="dash_trends" class="panel"> <section id="dashtrends" class="panel">
<header class="panel-heading"> <header class="panel-heading">
<i class="icon-bar-chart"></i> {l s='Score Trends'} <i class="icon-bar-chart"></i> {l s='Score Trends'}
<span class="panel-heading-action"> <span class="panel-heading-action">