Changeset 275

Timestamp:

07/13/11 14:01:05 (10 months ago)

Author:

ben

Message:

Update before switch to git

Location:

xts/trunk

Files:

• .htaccess (added)
• jsclient/index.html (modified) (1 diff)
• jsclient/snewts/config.js (modified) (1 diff)
• jsclient/snewts/ui.js (modified) (1 diff)
• jsclient/style.css (modified) (1 diff)
• xtsadmin/django.wsgi (added)
• xtsadmin/media (added)
• xtsadmin/settings.py (modified) (4 diffs)
• xtsadmin/urls.py (modified) (2 diffs)

xts/trunk/jsclient/index.html

@@ -82 +82 @@
                 <div id="tabsfunction" class="mode adminonly" onclick="UI.showFunction('tabs', BasketColumns.TAB, event)">TABS</div>
                 <div id="reportfunction" class="mode adminonly" onclick="UI.showFunction('report', BasketColumns.EPHEMERAL, event)">REPORT</div>
-                <!--<div id="logfunction" class="mode adminonly" onclick="UI.showFunction('log', BasketColumns.EPHEMERAL, event)">LOG</div>-->
+                <div id="logfunction" class="mode adminonly" onclick="UI.showFunction('log', BasketColumns.EPHEMERAL, event)">LOG</div>
                 <div id="lockbutton" onclick="UI.toggleAdminMode()"></div>
                 <div id="users">

xts/trunk/jsclient/snewts/config.js

@@ -1 @@
-SCREEN_LOCK_PASSWORD = "1234";
+SCREEN_LOCK_PASSWORD = "7539";
 
 DRINKS_CATEGORIES = "2|4";
-FOOD_CATEGORIES = "3|5";
+FOOD_CATEGORIES = "3";
 SHOP_CATEGORIES = "6";
 
 var Config = {
-    VERSION: "DEV",
-    AGENT_STRING: "boxoffice:abc"
+    VERSION: "R273 NOTINABOX",
+    AGENT_STRING: "boxoffice:9n2nf92kt04",
+    CAFE_AGENT_STRING: "cafe:ncv02oapwen"
 };

xts/trunk/jsclient/snewts/ui.js

@@ -89 +89 @@
             UI.setConsoleMode('cafe', true);
             UI.showFunction('drinks', BasketColumns.EPHEMERAL);
+            Config.AGENT_STRING = Config.CAFE_AGENT_STRING;
         } else if (initmode == "boxoffice+press") {
             UI.boxOfficeModeSwitch.switchon();

xts/trunk/jsclient/style.css

@@ -63 +63 @@
 }
 
-
+#xtsconsole.adminmode div.adminonly.old {
+    display: none;
+}
 
 #xtsconsole .boxofficeonly,

xts/trunk/xtsadmin/settings.py

@@ -32 +32 @@
 ADMINS = (
   'Alex Macmillan', 'alex@x13n.com',
+  'Ben Hussey', 'ben@blip2.net',
     # ('Your Name', 'your_email@domain.com'),
 )
@@ -39 +40 @@
 DATABASE_ENGINE = 'mysql'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
 DATABASE_NAME = 'xts2'             # Or path to database file if using sqlite3.
-DATABASE_USER = 'root'             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
+DATABASE_USER = 'xts2'             # Not used with sqlite3.
+DATABASE_PASSWORD = 'Z2QX8CpqFPPfXSAF'         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
@@ -76 +77 @@
 
 # Make this unique, and don't share it with anybody.
-SECRET_KEY = '%)9bn!l8ipz(h@k^je!kn827^=fev3udz4!5(@-k=+2(h9*l36'
+SECRET_KEY = '%)9bn!l8i22fxFk^je131d27^=Ug9vhwe8gdu2&^$Uf288*l36'
 
 # List of callables that know how to import templates from various sources.
@@ -97 +98 @@
     # Absolute paths should be used here.
     #'/Users/alex/Dropbox/Bedlam/XTS/xtsadmin/templates'
-    'templates'
+    '/data/xts/xtsadmin/templates'
 )
 

xts/trunk/xtsadmin/urls.py

@@ -28 +28 @@
 
 from django.conf.urls.defaults import *
+from django.contrib import admin
 
-from django.contrib import admin
 admin.autodiscover()
 
@@ -39 +39 @@
 
      # Show the administration interface at the root.
-     (r'(.*)', admin.site.root),
+    url(r'^doc/', include('django.contrib.admindocs.urls')),
+    url(r'^', include(admin.site.urls)),
 )