Skip to content

Commit 07c4855

Browse files
author
Gabriel Monroy
committed
Merge pull request #272 from opdemand/267-web-ui
Fixed #267 -- updated controller web UI.
2 parents c132663 + b800549 commit 07c4855

25 files changed

Lines changed: 222 additions & 7331 deletions

‎api/static/500.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
<meta name="keywords" content="" />
1010
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1111

12-
<link rel="stylesheet" href="/static/css/bootstrap.css" media="screen" type="text/css">
13-
<link rel="stylesheet" href="/static/css/bootstrap-responsive.css" type="text/css">
12+
<link rel="stylesheet" href="/static/css/bootstrap.min.css" media="screen" type="text/css">
13+
<link rel="stylesheet" href="/static/css/bootstrap-responsive.min.css" type="text/css">
1414
<link rel="stylesheet" href="/static/css/main.css" type="text/css">
15+
<link rel="stylesheet" href="/static/css/deis-controller.css" type="text/css">
1516
<link rel="shortcut icon" href="/static/favicon.ico">
16-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
17-
<script>window.jQuery || document.write('<script src="js/vendor/jquery-1.10.1.min.js"><\/script>')</script>
17+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
18+
<script>window.jQuery || document.write('<script src="js/vendor/jquery-1.10.2.min.js"><\/script>')</script>
1819
<meta name='robots' content='noindex,nofollow' />
1920
</head>
2021
<body style="zoom: 1;">

‎deis/context_processors.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
from django.contrib.sites.models import get_current_site
3+
from django.utils.functional import SimpleLazyObject
4+
5+
6+
def site(request):
7+
return {
8+
'site': SimpleLazyObject(lambda: get_current_site(request)),
9+
}

‎deis/settings.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
"django.contrib.messages.context_processors.messages",
110110
"allauth.account.context_processors.account",
111111
"allauth.socialaccount.context_processors.socialaccount",
112+
"deis.context_processors.site",
112113
)
113114

114115
MIDDLEWARE_CLASSES = (

‎docs/theme/deis/layout.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
<meta name="keywords" content="{{ meta['keywords'] if meta }}" />
2626
<meta name="viewport" content="width=device-width, initial-scale=1.0">
2727
<meta name="msvalidate.01" content="079E754911917142D42AB2A3694F9267" />
28-
<link rel="stylesheet" href="{{ pathto('_static/css/bootstrap.css', 1) }}" type="text/css">
29-
<link rel="stylesheet" href="{{ pathto('_static/css/bootstrap-responsive.css', 1) }}" type="text/css">
28+
<link rel="stylesheet" href="{{ pathto('_static/css/bootstrap.min.css', 1) }}" type="text/css">
29+
<link rel="stylesheet" href="{{ pathto('_static/css/bootstrap-responsive.min.css', 1) }}" type="text/css">
3030
<link rel="stylesheet" href="{{ pathto('_static/css/main.css', 1) }}" type="text/css">
3131
<link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css">
3232
<link rel="shortcut icon" href="{{ pathto('_static/favicon.ico', 1) }}">
3333
<script
3434
<script src="{{ pathto('_static/js/modernizr-2.6.2-respond-1.1.0.min.js', 1) }}"></script>
35-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
36-
<script>window.jQuery || document.write('<script src="js/vendor/jquery-1.10.1.min.js"><\/script>')</script>
35+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
36+
<script>window.jQuery || document.write('<script src="js/vendor/jquery-1.10.2.min.js"><\/script>')</script>
3737
{%- if pagename == 'index' %}
3838
<link rel="canonical" href="http://docs.deis.io/en/latest">
3939
{% else %}

‎docs/theme/deis/static/searchtools.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ var Search = {
471471
$('footer').css('margin-top', '0');
472472
$('.nav-border').css('height', '600');
473473
pageHeight = $(document).height();
474-
console.log(pageHeight);
474+
// console.log(pageHeight);
475475
$('.nav-border').css('height', pageHeight);
476476

477477
var margin = pageHeight - 511 - 158;

0 commit comments

Comments
 (0)