From a62ae13079559ae290bc25da45db5a140cf26f07 Mon Sep 17 00:00:00 2001
From: bkfox <thomas bkfox net>
Date: Fri, 31 Mar 2017 15:15:16 +0200
Subject: [PATCH] fix tz info + editable schedule duration in display list

---
 aircox/admin.py                             | 4 ++--
 aircox_cms/static/aircox_cms/css/layout.css | 6 ++++--
 aircox_cms/static/aircox_cms/css/theme.css  | 3 +--
 instance/sample_settings.py                 | 9 +++++++++
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/aircox/admin.py b/aircox/admin.py
index 183be07..d58500e 100755
--- a/aircox/admin.py
+++ b/aircox/admin.py
@@ -162,8 +162,8 @@ class ScheduleAdmin(admin.ModelAdmin):
     rerun.boolean = True
 
     list_filter = ['frequency', 'program']
-    list_display = ['id', 'program_name', 'frequency', 'date', 'day', 'rerun']
-    list_editable = ['frequency', 'date']
+    list_display = ['id', 'program_name', 'frequency', 'day', 'date', 'duration', 'rerun']
+    list_editable = ['frequency', 'date', 'duration']
 
 
 @admin.register(Track)
diff --git a/aircox_cms/static/aircox_cms/css/layout.css b/aircox_cms/static/aircox_cms/css/layout.css
index ae363ba..e348bcd 100755
--- a/aircox_cms/static/aircox_cms/css/layout.css
+++ b/aircox_cms/static/aircox_cms/css/layout.css
@@ -2,7 +2,8 @@
  *  Define rules for the default layouts, and some useful classes
  */
 body {
-    margin: 0em;
+    max-width: 85em;
+    margin: 0em auto;
     padding: 0em;
 }
 
@@ -86,9 +87,10 @@ body > .top {
     position: fixed;
     z-index: 10000000;
     top: 0;
-    left: 0;
     width: calc(100% - 0.8em);
+    max-width: calc(85em - 0.8em);
     height: 2.5em;
+    margin: 0em auto;
     background-color: white;
     box-shadow: 0em 0em 0.2em black;
     transition: opacity 1.5s;
diff --git a/aircox_cms/static/aircox_cms/css/theme.css b/aircox_cms/static/aircox_cms/css/theme.css
index 923b1fa..c60603e 100755
--- a/aircox_cms/static/aircox_cms/css/theme.css
+++ b/aircox_cms/static/aircox_cms/css/theme.css
@@ -20,7 +20,6 @@
 body {
     background-color: #F2F2F2;
     font-family: "Myriad Pro",Calibri,Helvetica,Arial,sans-serif;
-    margin: 0em;
     padding: 0em;
 }
 
@@ -100,7 +99,7 @@ main .post_content {
 
 main .post_content section {
     display: inline-block;
-    width: calc(50% - 4em);
+    width: calc(50% - 1em);
     vertical-align: top;
 }
 
diff --git a/instance/sample_settings.py b/instance/sample_settings.py
index d2b3b13..e038778 100755
--- a/instance/sample_settings.py
+++ b/instance/sample_settings.py
@@ -16,14 +16,23 @@ Note that:
 You can also take a look at `base_settings` for more information.
 
 """
+import pytz
 import os
 # If Aircox is not installed as a regular python module, you can use:
 # import sys
 # sys.path.append('/path/to/aircox_parent_folder/')
 
+from django.utils import timezone
 
 from .base_settings import *
 
+
+# define TIME_ZONE before the call to timezone.activate
+# TIME_ZONE = os.environ.get('TZ') or 'UTC'
+timezone.activate(pytz.timezone(TIME_ZONE))
+
+
+# debug or production mode
 DEBUG = False
 if 'AIRCOX_DEBUG' in os.environ:
     DEBUG = (os.environ['AIRCOX_DEBUG'].lower()) in ('true','1')