Fixed #267 -- updated controller web UI.

deis · Oct 30, 2013 · b800549 · b800549
1 parent c132663
commit b800549
Show file tree

Hide file tree

Showing 25 changed files with 222 additions and 7,331 deletions.
diff --git a/api/static/500.html b/api/static/500.html
@@ -9,12 +9,13 @@
   <meta name="keywords" content="" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <link rel="stylesheet" href="/static/css/bootstrap.css" media="screen" type="text/css">
-  <link rel="stylesheet" href="/static/css/bootstrap-responsive.css" type="text/css">
+  <link rel="stylesheet" href="/static/css/bootstrap.min.css" media="screen" type="text/css">
+  <link rel="stylesheet" href="/static/css/bootstrap-responsive.min.css" type="text/css">
   <link rel="stylesheet" href="/static/css/main.css" type="text/css">
+  <link rel="stylesheet" href="/static/css/deis-controller.css" type="text/css">
   <link rel="shortcut icon" href="/static/favicon.ico">
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
-  <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.10.1.min.js"><\/script>')</script>
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+  <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.10.2.min.js"><\/script>')</script>
   <meta name='robots' content='noindex,nofollow' />
 </head>
 <body style="zoom: 1;">

diff --git a/deis/context_processors.py b/deis/context_processors.py
@@ -0,0 +1,9 @@
+
+from django.contrib.sites.models import get_current_site
+from django.utils.functional import SimpleLazyObject
+
+
+def site(request):
+    return {
+        'site': SimpleLazyObject(lambda: get_current_site(request)),
+    }
diff --git a/deis/settings.py b/deis/settings.py
@@ -109,6 +109,7 @@
     "django.contrib.messages.context_processors.messages",
     "allauth.account.context_processors.account",
     "allauth.socialaccount.context_processors.socialaccount",
+    "deis.context_processors.site",
 )
 
 MIDDLEWARE_CLASSES = (

diff --git a/docs/theme/deis/layout.html b/docs/theme/deis/layout.html
@@ -25,15 +25,15 @@
     <meta name="keywords" content="{{ meta['keywords'] if meta }}" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="msvalidate.01" content="079E754911917142D42AB2A3694F9267" />
-    <link rel="stylesheet" href="{{ pathto('_static/css/bootstrap.css', 1) }}" type="text/css">
-    <link rel="stylesheet" href="{{ pathto('_static/css/bootstrap-responsive.css', 1) }}" type="text/css">
+    <link rel="stylesheet" href="{{ pathto('_static/css/bootstrap.min.css', 1) }}" type="text/css">
+    <link rel="stylesheet" href="{{ pathto('_static/css/bootstrap-responsive.min.css', 1) }}" type="text/css">
     <link rel="stylesheet" href="{{ pathto('_static/css/main.css', 1) }}" type="text/css">
     <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css">
     <link rel="shortcut icon" href="{{ pathto('_static/favicon.ico', 1) }}">
     <script
     <script src="{{ pathto('_static/js/modernizr-2.6.2-respond-1.1.0.min.js', 1) }}"></script>
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
-    <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.10.1.min.js"><\/script>')</script>
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+    <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.10.2.min.js"><\/script>')</script>
   {%- if pagename == 'index' %}
   <link rel="canonical" href="http://docs.deis.io/en/latest">
   {% else %}

diff --git a/docs/theme/deis/static/searchtools.js b/docs/theme/deis/static/searchtools.js
@@ -471,7 +471,7 @@ var Search = {
           $('footer').css('margin-top', '0');
           $('.nav-border').css('height', '600');
           pageHeight = $(document).height();
-          console.log(pageHeight);
+          // console.log(pageHeight);
           $('.nav-border').css('height', pageHeight);
 
           var margin = pageHeight - 511 - 158;