Skip to content

Commit 1bafa41

Browse files
OliverRandellcodeinthehole
authored andcommitted
Restyle dashboard
* Re-skin of the dashboard home page. * Ensure the graph on the home page dashboard shows only 12 segments on the x-axis and not 24. * Add auto refresh of 5mins to dashboard index Fixes 366
1 parent 18c3341 commit 1bafa41

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+12115
-3440
lines changed

db.sqlite

Whitespace-only changes.

oscar/apps/dashboard/views.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ def get_hourly_report(self, hours=24, segments=10):
8484
orders_last_day = Order.objects.filter(date_placed__gt=start_time)
8585

8686
order_total_hourly = []
87-
for hour in range(0, hours):
88-
end_time = start_time + timedelta(hours=1)
87+
for hour in range(0, hours, 2):
88+
end_time = start_time + timedelta(hours=2)
8989
hourly_orders = orders_last_day.filter(date_placed__gt=start_time,
9090
date_placed__lt=end_time)
9191
total = hourly_orders.aggregate(

oscar/static/oscar/css/dashboard.css

+2,584-577
Large diffs are not rendered by default.

oscar/static/oscar/css/styles.css

+7,348-1,354
Large diffs are not rendered by default.
219 KB
Binary file not shown.
212 KB
Binary file not shown.
Loading
Loading

oscar/static/oscar/less/bootstrap/navbar.less

+1
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@
390390
.nav > li > a {
391391
color: @navbarInverseLinkColor;
392392
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
393+
background: red;
393394
&:hover {
394395
color: @navbarInverseLinkColorHover;
395396
}

0 commit comments

Comments
 (0)