Moved to bootstrap, responsive nav
diff --git a/xos/core/static/xos.css b/xos/core/static/xos.css
index 5058664..6117d24 100644
--- a/xos/core/static/xos.css
+++ b/xos/core/static/xos.css
@@ -23,6 +23,241 @@
overflow: scroll;
}
+/* ************************* SIDENAV TOGGLE ************************* */
+
+#wrapper {
+ padding-left: 0;
+ -webkit-transition: all 0.5s ease;
+ -moz-transition: all 0.5s ease;
+ -o-transition: all 0.5s ease;
+ transition: all 0.5s ease;
+}
+
+#wrapper.toggled {
+ padding-left: 250px;
+}
+
+#sidebar-wrapper {
+ z-index: 1000;
+ position: fixed;
+ left: 250px;
+ width: 0;
+ height: 100%;
+ margin-left: -250px;
+ overflow-y: auto;
+ -webkit-transition: all 0.5s ease;
+ -moz-transition: all 0.5s ease;
+ -o-transition: all 0.5s ease;
+ transition: all 0.5s ease;
+}
+
+#wrapper.toggled #sidebar-wrapper {
+ width: 250px;
+ padding: 10px;
+}
+
+#page-content-wrapper {
+ width: 100%;
+ position: absolute;
+ padding: 15px;
+}
+
+#wrapper.toggled #page-content-wrapper {
+ position: absolute;
+ margin-right: -250px;
+}
+
+@media(min-width:768px) {
+ #wrapper {
+ padding-left: 250px;
+ }
+
+ #wrapper.toggled {
+ padding-left: 0;
+ }
+
+ #sidebar-wrapper {
+ width: 250px;
+ padding: 10px;
+ }
+
+ #wrapper.toggled #sidebar-wrapper {
+ width: 0;
+ }
+
+ #page-content-wrapper {
+ padding: 20px;
+ position: relative;
+ }
+
+ #wrapper.toggled #page-content-wrapper {
+ position: relative;
+ margin-right: 0;
+ }
+}
+
+.navbar-toggle{
+ border: 1px solid #08C;
+}
+
+.navbar-toggle .icon-bar{
+ background: #08C;
+}
+/* ************************* END SIDENAV TOGGLE ************************* */
+
+/* ************************* HEADER STYLE ************************* */
+
+.header{
+ background-color: #ffffff !important;
+ border-bottom: 3px solid #C5CCD4;
+ margin-bottom: 14px;
+ height: 85px;
+}
+
+.header .logo{
+ max-height: 80px;
+}
+
+.nav-quick-search{
+ margin: 30px -10px 0px 0px !important;
+ padding:0 25px 0 0 !important;
+ float:right !important;
+}
+
+.nav-quick-search .search-query{
+ border-radius:5px;
+ border:none;
+ box-shadow:0px;
+ background-color:lightGrey;
+ padding-left: 27px;
+}
+
+
+.header #branding {
+ width: 100%;
+ height:60px;
+ border-right:none;
+}
+
+.header a {
+ color: #08C;
+ font-weight: bold;
+ /*border-bottom: 1px solid #C5CCD4;*/
+}
+a {
+ color: #08C;
+ font-weight: bold;
+ /*border-bottom: 1px solid #C5CCD4;*/
+}
+
+
+#branding2{
+height:20px;
+width:100%;
+color: #333;
+/*background-color: #000000;*/
+margin-bottom: 10px;
+}
+
+.header #user-tools {
+ padding: 12px 20px 0px 0px;
+ float: right;
+ margin-top: -5px;
+}
+
+.header .header-content .date{
+padding-left:10px;
+}
+
+.header .header-content .time {
+font-weight: normal;
+}
+.header .header-content.header-content-first{
+height: 15px;
+padding-bottom: 0px;
+}
+
+.header .header-content {
+padding-bottom: 0px;
+padding: 7px 0 0 0px;
+}
+
+/************************* END HEADER *************************/
+
+/************************* FOOTER *************************/
+
+.footer{
+ z-index: 1001;
+}
+
+.footer .content .statusMsg {
+ float: right;
+ padding: 15px 20px 0 0;
+ display: block;
+}
+/************************* END FOOTER *************************/
+
+/************************* NAV *************************/
+#sidebar-wrapper .logo{
+ max-width: 100%;
+}
+
+.icon-app {
+background-image: url("opencloudApp.png");
+}
+.icon-home {
+/* Going with darker standard color nav -- so using over png's background-image: url("Home.png"); */
+background-image: url("Home.png");
+}
+.icon-deployment{
+background-image: url("Deployments.png");
+}
+.icon-site{
+background-image: url("Sites.png");
+}
+.icon-slice{
+background-image: url("Slices.png");
+}
+.icon-user{
+background-image: url("Users.png");
+}
+.icon-reservation{
+background-image: url("Reservations.png");
+}
+
+#sidebar-wrapper>ul>li.active>a>.icon-home ,
+/*#sidebar-wrapper>ul>li:hover>a>.icon-home ,*/
+#sidebar-wrapper>ul>li.focus>a>.icon-home{
+ background-image: url("Home_over.png");
+}
+
+#sidebar-wrapper>ul>li.active>a>.icon-deployment,
+/*#sidebar-wrapper>ul>li:hover>a>.icon-deployment,*/
+#sidebar-wrapper>ul>li.focus>a>.icon-deployment{
+ background-image: url("Deployments_over.png");
+}
+#sidebar-wrapper>ul>li.active>a>.icon-site,
+/*#sidebar-wrapper>ul>li:hover>a>.icon-site,*/
+#sidebar-wrapper>ul>li.focus>a>.icon-site{
+ background-image: url("Sites_over.png");
+}
+#sidebar-wrapper>ul>li.active>a>.icon-slice,
+/*#sidebar-wrapper>ul>li:hover>a>.icon-slice,*/
+#sidebar-wrapper>ul>li.focus>a>.icon-slice{
+ background-image: url("Slices_over.png");
+}
+#sidebar-wrapper>ul>li.active>a>.icon-user,
+/*#sidebar-wrapper>ul>li:hover>a>.icon-user,*/
+#sidebar-wrapper>ul>li.focus>a>.icon-user{
+ background-image: url("Users_over.png");
+}
+#sidebar-wrapper>ul>li.active>a>.icon-reservation,
+/*#sidebar-wrapper>ul>li:hover>a>.icon-reservation,*/
+#sidebar-wrapper>ul>li.focus>a>.icon-reservation{
+ background-image: url("Reservations_over.png");
+}
+/************************* END NAV *************************/
+
/* CSS for jquery Tabs */
#hometabs {
border-bottom: 1px solid #105E9E;
@@ -61,97 +296,7 @@
text-shadow: rgb(46, 43, 43) 0.1em 0.1em 0.2em;
font-weight: normal;
}
-/*************************/
-/* Header elements */
-.logo {
-}
-.header{
- background-color: #ffffff !important;
- /*background-image: url('bg2.jpg');*/
- background-size: 100% auto;
- background-image: none !important;
- text-shadow: none;
- border-bottom: 3px solid #C5CCD4;
- margin-bottom: 14px;
- margin-top: -120px;
- height: 85px;
- /*min-width: 1321px;*/
-}
-
-.nav-quick-search{
-margin: 30px -10px 0px 0px !important;
-padding:0 25px 0 0 !important;
-float:right !important;
-}
-
-.nav-quick-search .search-query{
-border-radius:5px;
-border:none;
-box-shadow:0px;
-background-color:lightGrey;
-padding-left: 27px;
-}
-
-
-.header #branding {
-width: 100%;
-height:60px;
-}
-
-.header a {
-color: #08C;
-font-weight: bold;
-/*border-bottom: 1px solid #C5CCD4;*/
-}
-a {
-color: #08C;
-font-weight: bold;
-/*border-bottom: 1px solid #C5CCD4;*/
-}
-
-.header #branding {
-border-right:none;
-}
-
-#branding2{
-height:20px;
-width:100%;
-color: #333;
-/*background-color: #000000;*/
-margin-bottom: 10px;
-}
-
-.header #user-tools {
- padding: 12px 20px 0px 0px;
- float: right;
- margin-top: -5px;
-}
-
-.header .header-content .date{
-padding-left:10px;
-}
-
-.header .header-content .time {
-font-weight: normal;
-}
-.header .header-content.header-content-first{
-height: 15px;
-padding-bottom: 0px;
-}
-
-.header .header-content {
-padding-bottom: 0px;
-padding: 7px 0 0 0px;
-}
-
-/*************************/
-
-.footer .content .statusMsg {
- float: right;
- padding: 15px 20px 0 0;
- display: block;
-}
.alignCenter {
text-align: center !important;
@@ -532,9 +677,10 @@
}*/
.login {
-background-image: url('bg.jpg');
-background-size: 100%;
-background-repeat: no-repeat;
+ background-image: url('bg.jpg');
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
}
@@ -641,7 +787,6 @@
/*Added by Beena for adding the three components in dashboard*/
.breadcrumb{
- width: 37%;
display:inline-block;
background-color: #fff;
@@ -707,135 +852,6 @@
top: 5px;
}
-.icon-app {
-background-image: url("opencloudApp.png");
-}
-.icon-home {
-/* Going with darker standard color nav -- so using over png's background-image: url("Home.png"); */
-background-image: url("Home.png");
-}
-.icon-deployment{
-background-image: url("Deployments.png");
-}
-.icon-site{
-background-image: url("Sites.png");
-}
-.icon-slice{
-background-image: url("Slices.png");
-}
-.icon-user{
-background-image: url("Users.png");
-}
-.icon-reservation{
-background-image: url("Reservations.png");
-}
-
-
-/*For giving the padding for the left side navigation*/
-.left-nav>ul {
- padding-left: 5px;
-}
-
-/*For increasing the height of left side navigation list items*/
-.left-nav>ul>li {
- padding-top:4px;
- line-height: 35px;
-}
-
-/*For changing the background color of the left side navigation list items*/
-/*For changing the color of the left side navigation list items*/
-/*For changing the font of the left side navigation list items*/
-.left-nav>ul>li>a {
- /*background-color: #448CCA;*/
- /*ONlab.us reg color blue*/
- /*background-color: #ccffff;*/
- /*font-weight: normal;*/
- /*color: #105E9E;*/
- /*color: #ffffff;*/
- /*text-shadow: rgb(46, 43, 43) 0.1em 0.1em 0.2em;*/
- /*letter-spacing: 1px;*/
- /*font-size: 12px;*/
- /*border-bottom: none;*/
-}
-
-.left-nav>ul>li.active>a {
- /*background-color: #448CCA;*/
- /* Last Active
- background-color: #0061B7; */
- /*background-color: #515151;*/
- /*background-color: #448CCA;*/
- /*font-weight:normal;*/
- /*color:#ffffff;*/
- /*text-shadow: rgb(46, 43, 43) 0.1em 0.1em 0.2em;*/
- /*letter-spacing: 1px;*/
-
- /*left: 10px;*/
- /*background-image: url("right_arrow.png");*/
- /*background-position: 97% center;*/
-}
-
-/* create an arrow that points down */
-
-
-.left-nav>ul>li.active>a:hover{
- /*background-color: #448CCA;*/
- /*background-color: #91BFE4;*/
- /*background-color: #D6E7F8;*/
- /*font-weight:normal;*/
- /*font-size: 1.2em;*/
- /*font-weight: bold;*/
- /*color:#ffffff;*/
- /*padding-top:10px;*/
- /*text-decoration:none;*/
-}
-
-/* Adjust font weight to normal on hover, else white blurs */
-.left-nav>ul>li>a:hover{
- /*background-color: #448CCA;*/
- /*background-color: #004775;*/
- /*background-color: #515151;*/
- /*color:#ffffff;*/
- /*font-weight:normal;*/
- /*font-size: 1.2em;*/
- /*padding-top:10px;*/
- /*text-decoration:none;*/
- /*border-left: 10px solid #ffffff;*/
- /*text-shadow: rgb(46, 43, 43) 0.1em 0.1em 0.2em;*/
- /*letter-spacing: 1px;*/
-}
-
-.left-nav>ul>li.active>a>.icon-home ,
-/*.left-nav>ul>li:hover>a>.icon-home ,*/
-.left-nav>ul>li.focus>a>.icon-home{
- background-image: url("Home_over.png");
-}
-
-.left-nav>ul>li.active>a>.icon-deployment,
-/*.left-nav>ul>li:hover>a>.icon-deployment,*/
-.left-nav>ul>li.focus>a>.icon-deployment{
- background-image: url("Deployments_over.png");
-}
-.left-nav>ul>li.active>a>.icon-site,
-/*.left-nav>ul>li:hover>a>.icon-site,*/
-.left-nav>ul>li.focus>a>.icon-site{
- background-image: url("Sites_over.png");
-}
-.left-nav>ul>li.active>a>.icon-slice,
-/*.left-nav>ul>li:hover>a>.icon-slice,*/
-.left-nav>ul>li.focus>a>.icon-slice{
- background-image: url("Slices_over.png");
-}
-.left-nav>ul>li.active>a>.icon-user,
-/*.left-nav>ul>li:hover>a>.icon-user,*/
-.left-nav>ul>li.focus>a>.icon-user{
- background-image: url("Users_over.png");
-}
-.left-nav>ul>li.active>a>.icon-reservation,
-/*.left-nav>ul>li:hover>a>.icon-reservation,*/
-.left-nav>ul>li.focus>a>.icon-reservation{
- background-image: url("Reservations_over.png");
-}
-
#dashboardHPC {
padding-bottom: 10px;
}
diff --git a/xos/templates/admin/base.html b/xos/templates/admin/base.html
index 3fb9309..fb1b27e 100644
--- a/xos/templates/admin/base.html
+++ b/xos/templates/admin/base.html
@@ -1,17 +1,20 @@
-{% load admin_static %}{% load suit_tags %}{% load url from future %}<!DOCTYPE html>
+{% load admin_static %}{% load suit_tags %}{% load url from future %}
+<!DOCTYPE html>
<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
<head>
- <title>{% block title %} {%if title %} {{ title }} | {% endif %} {{ 'ADMIN_NAME'|suit_conf }}{% endblock %}</title>
+ <title>{% block title %} {%if title %} {{ title }} | {% endif %} {{ 'ADMIN_NAME'|suit_conf }}{% endblock %}</title>
<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% endblock %}"/>
<link rel="stylesheet" type="text/css" href="{% static 'suit/bootstrap/dist/css/bootstrap.min.css' %}" media="all"/>
<link rel="stylesheet" type="text/css" href="{% static 'suit/css/suit.css' %}" media="all">
<link rel="stylesheet" type="text/css" href="{% static 'xos.css' %}" media="all">
- <link rel="stylesheet" type="text/css" href="{% static 'cord.css' %}" media="all">
+ <!-- <link rel="stylesheet" type="text/css" href="{% static 'cord.css' %}" media="all"> -->
{% if XOS_BRANDING_CSS %}
- <link rel="stylesheet" type="text/css" href="{{ XOS_BRANDING_CSS }}">
+ <link rel="stylesheet" type="text/css" href="{{ XOS_BRANDING_CSS }}">
{% endif %}
{% block extrastyle %}{% endblock %}
- {% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}"/>{% endif %}
+ {% if LANGUAGE_BIDI %}
+ <link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}"/>
+ {% endif %}
<script type="text/javascript">window.__admin_media_prefix__ = "{% filter escapejs %}{% static "admin/" %}{% endfilter %}";</script>
<script src="{% static 'suit/js/jquery-1.9.1.min.js' %}"></script>
<script src="http://code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
@@ -31,263 +34,288 @@
{% endif %}
{% block extrahead %}{% endblock %}
{% block blockbots %}
- <meta name="robots" content="NONE,NOARCHIVE"/>{% endblock %}
- <link rel="shortcut icon" href="{{ XOS_BRANDING_ICON }}">
-</head>
-{% load i18n %}
-
+ <meta name="robots" content="NONE,NOARCHIVE"/>
+ {% endblock %}
+ <link rel="shortcut icon" href="{{ XOS_BRANDING_ICON }}"></head>
+ {% load i18n %}
<body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}">
-<div id="dialog-placeholder">
-<!-- This is a placeholder for dialog boxes, like the observer calendar -->
-</div>
+ <div id="dialog-placeholder">
+ <!-- This is a placeholder for dialog boxes, like the observer calendar -->
+ </div>
-<!-- Sticky footer wrap -->
-<div id="wrap">
+ <!-- Sticky footer wrap -->
+ <div id="wrap">
- <!-- Container -->
- {% block container %}
- <div id="container">
+ <!-- Container -->
+ {% block container %}
+ <!-- <div id="container"> -->
+
+ <!-- </div> -->
+ <!-- END Header -->
+ <div id="wrapper">
- {% block logo %}
- <a href="{% url 'admin:index' %}"><h1 id="site-name"><img class="logo" height="70" width="259" src="{% static 'cord_logo_3.png' %}"/></h1></a>
- {% endblock %}
- {% block header %}
- {% if not is_popup %}
- <!-- Header -->
- <div id="header" class="header">
-
- <div id="branding">
- {% block quick-search %}
- {% with 'SEARCH_URL'|suit_conf as search_url %}
- {% if search_url %}
- <form class="form-search nav-quick-search" autocomplete="off" action="{% if '/' in search_url %}{{ search_url }}{% else %}{% url search_url %}{% endif %}" method="GET">
- <i class="input-icon icon-search"></i>
- <input type="text" name="q" class="input-medium search-query" id="quick-search">
- <input type="submit" class="submit" value="">
- </form>
- {% endif %}
- {% endwith %}
+ <!-- Sidebar -->
+ <div id="sidebar-wrapper">
+ <a href="{% url 'admin:index' %}" class="hidden-xs">
+ <img class="logo" src="{% static 'cord_logo_3.png' %}"/>
+ </a>
+ {% include 'suit/menu.html' %}
+ <button class="navbar-toggle collapsed visible-xs" type="button">
+ <i class="glyphicon glyphicon-arrow-left"></i>
+ </button>
+ </div>
+ <!-- /#sidebar-wrapper -->
+
+ <!-- Page Content -->
+ <div id="page-content-wrapper">
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-xs-12">
+ {% block header %}
+ {% if not is_popup %}
+ <!-- Header -->
+ <div id="header" class="header">
+ <button class="navbar-toggle collapsed" type="button">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ {% block logo %}
+ <a href="{% url 'admin:index' %}" class="visible-xs">
+ <img class="logo" src="{% static 'cord_logo_3.png' %}"/>
+ </a>
+ {% endblock %}
+ <!-- <div id="branding">
+ {% block quick-search %}
+ {% with 'SEARCH_URL'|suit_conf as search_url %}
+ {% if search_url %}
+ <form class="form-search nav-quick-search" autocomplete="off" action="{% if '/' in search_url %}{{ search_url }}{% else %}{% url search_url %}{% endif %}" method="GET"> <i class="input-icon icon-search"></i>
+ <input type="text" name="q" class="input-medium search-query" id="quick-search">
+ <input type="submit" class="submit" value="">
+ </form>
+ {% endif %}
+ {% endwith %}
+ {% endblock %}
+ </div> -->
+ {% block header_time %}
+ <!-- <div id="branding2">
+ <div class="header-content header-content-first">
+ <div class="header-column icon"> <i class="icon-time"></i></div>
+ <div class="header-column">
+ <span class="date">{% suit_date %}</span>
+ <br>
+ <span class="time" id="clock">{% suit_time %}</span>
+ </div>
+ </div>
+ </div> -->
+ {% endblock %}
+
+ {% block header_content %}
+ <div class="header-content">
+ <div class="header-column icon">
+ <i class="icon-comment"></i>
+ </div>
+ <div class="header-column">
+ <a href="" class="grey"> <b>2</b>
+ new messages
+ </a>
+ </div>
+ </div>
+ {% endblock %}
+
+ {% if user.is_active and user.is_staff %}
+ <div id="user-tools">
+ {% trans 'Welcome,' %}
+ <a href="http://{{ request.get_host}}/admin/core/user/{{user.id}}">{{user.email}}</a>
+ <span id="observer-status"></span>
+ <span class="user-links">
+ {% block userlinks %}
+ {% url 'django-admindocs-docroot' as docsroot %}
+ {% if docsroot %}
+ <a href="http://guide.xosproject.org/">{% trans 'Documentation' %}</a>
+ <span class="separator">|</span>
+ {% endif %}
+ <a href="{% url 'admin:password_change' %}">{% trans 'Change password' %}</a>
+ <span class="separator">|</span>
+ <a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>
+ {% endblock %}
+ </span>
+ </div>
+ {% endif %}
+
+ {% block nav-global %}
+ {% endblock %}
+ </div>
+ {% endif %}
{% endblock %}
</div>
-
- {% block header_time %}
- <div id="branding2">
- <!--<div class="header-content header-content-first">
- <div class="header-column icon">
- <i class="icon-time"></i>
- </div>
- <div class="header-column">
- <span class="date"> {% suit_date %}</span><br>
- <span class="time" id="clock">{% suit_time %}</span>
- </div>
- </div>-->
-
- {% endblock %}
-
- {% block header_content %}
- <!--<div class="header-content">
- <div class="header-column icon">
- <i class="icon-comment"></i>
- </div>
- <div class="header-column">
- <a href="" class="grey"><b>2</b> new messages</a>
- </div>
- </div>-->
- {% endblock %}
-
- {% if user.is_active and user.is_staff %}
- <div id="user-tools">
- {% trans 'Welcome,' %}
- <a href="http://{{ request.get_host}}/admin/core/user/{{user.id}}">{{user.email}}</a>
- <span id="observer-status"></span>
- <span class="user-links">
- {% block userlinks %}
- {% url 'django-admindocs-docroot' as docsroot %}
- {% if docsroot %}
- <a href="http://guide.xosproject.org/">{% trans 'Documentation' %}</a>
- <span class="separator">|</span>
- {% endif %}
- <a href="{% url 'admin:password_change' %}">{% trans 'Change password' %}</a>
- <span class="separator">|</span>
- <a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>
- </span>
- {% endblock %}
- </div>
- {% endif %}
-
- {% block nav-global %}{% endblock %}
-
</div>
- </div>
- {% endif %}
- <!-- END Header -->
- {% endblock %}
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="suit-columns {{ is_popup|yesno:'one-column,two-columns' }}">
+ {% block content-center %}
+ <!-- <div id="suit-center" class="suit-column">
+ -->
- <div class="container-fluid">
- <div class="col-xs-4 left-nav">
-
- {% include 'suit/menu.html' %}
- </div>
- <div class="col-xs-8">
- <div class="suit-columns {{ is_popup|yesno:'one-column,two-columns' }}">
+ {% if not is_popup %}
+ {% block minidash %}
+ <div id=openCloudTopPage>{% include "admin/newminidashboard.html" %}</div>
+ {% endblock %}
- {% block content-center %}
- <!-- <div id="suit-center" class="suit-column"> -->
-
- {% if not is_popup %}
- {% block minidash %}
- <div id=openCloudTopPage>
- {% include "admin/newminidashboard.html" %}
- </div>
- {% endblock %}
-
- {% block breadcrumbs %}
- <ul class="breadcrumb">
- <li><a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
- {% if title %}
- <span class="divider">»</span>
- </li>
- <li class="active">
- {{ title }}
- {% endif %}
- </li>
- </ul>
+ {% block breadcrumbs %}
+ <ul class="breadcrumb">
+ <li>
+ <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
+ {% if title %}
+ <span class="divider">»</span>
+ </li>
+ <li class="active">
+ {{ title }}
+ {% endif %}
+ </li>
+ </ul>
{% endblock %}
- {% endif %}
+ {% endif %}
- {% block messages %}
- {% if messages %}
+ {% block messages %}
+ {% if messages %}
- {% for message in messages %}
- <div class="alert alert-{% firstof message.tags 'info' %}">
- <button class="close" data-dismiss="alert">×</button>
- <strong>
- {% if message.tags %}{{ message.tags|capfirst }}{% else %}
- Message{% endif %}!</strong>
- {{ message }}
- </div>
- {% endfor %}
- {% endif %}
- {% endblock messages %}
-
- <!-- Content -->
- <div id="content" class="{% block coltype %}colM{% endblock %} row-fluid">
- {% block pretitle %}{% endblock %}
- {% block content_title %}{% if title %}
+ {% for message in messages %}
+ <div class="alert alert-{% firstof message.tags 'info' %}">
+ <button class="close" data-dismiss="alert">×</button> <strong>{% if message.tags %}{{ message.tags|capfirst }}{% else %}
+ Message{% endif %}!</strong>
+ {{ message }}
+ </div>
+ {% endfor %}
+ {% endif %}
+ {% endblock messages %}
+ <!-- Content -->
+ <div id="content" class="{% block coltype %}colM{% endblock %} row-fluid">
+ {% block pretitle %}{% endblock %}
+ {% block content_title %}{% if title %}
<h2 class="content-title">{{ title }}</h2>
- {% endif %}{% endblock %}
- {% block content %}
- {% block object-tools %}{% endblock %}
- {{ content }}
- {% endblock %}
- {% block sidebar_content %}
- {% block sidebar %}{% endblock %}
- {% endblock %}
+ {% endif %}{% endblock %}
+ {% block content %}
+ {% block object-tools %}{% endblock %}
+ {{ content }}
+ {% endblock %}
+ {% block sidebar_content %}
+ {% block sidebar %}{% endblock %}
+ {% endblock %}
+ </div>
+ <!-- END Content -->
+ <span class="clearfix"></span>
+ <!-- </div>
+ -->
+ {% endblock %}
</div>
- <!-- END Content -->
- <span class="clearfix"></span>
- <!-- </div> -->
- {% endblock %}
-
+ </div>
+ </div>
</div>
</div>
</div>
-
- </div>
- {% endblock %}
-
- {% if not is_popup %}
- <!-- Sticky footer push -->
- <div id="push"></div>
- {% endif %}
-
-</div>
-
-{% block footer %}
- {% if not is_popup %}
- <div id="footer" class="footer">
- <div class="content">
- <div class="tools">
- {% block footer_links %}
- <a href="http://djangosuit.com/support/" target="_blank" class="icon"><i class="icon-question-sign"></i>Support</a>
- <a href="http://djangosuit.com/pricing/" target="_blank" class="icon"><i class="icon-bookmark"></i>Licence</a>
- <a href="http://github.com/darklow/django-suit/issues" target="_blank" class="icon"><i class="icon-comment"></i>Report a bug</a>
- {% endblock %}
- </div>
-
- <div class="statusMsg" id="statusMsg">
- <!-- this is a placeholder for xoslib views to display status messages -->
- </div>
-
- <!-- <div class="copyright">
- {% block copyright %}
- Copyright © 2013 DjangoSuit.com<br>Developed by <a href="http://djangosuit.com" target="_blank">DjangoSuit.com</a>
- {% endblock %}
- </div> -->
-
- <div class="branding">{% block footer_branding %}
- {% with 'ADMIN_NAME'|suit_conf as admin_name %}
- {{ admin_name }}
- {% if admin_name == 'Django Suit' %}
- v{{ 'VERSION'|suit_conf }}
- {% endif %}
- {% endwith %}
- {% endblock %}</div>
+ <!-- /#page-content-wrapper -->
+ <!-- /#wrapper -->
+ {% endblock %}
</div>
</div>
+
+ {% if not is_popup %}
+ <!-- Sticky footer push -->
+ <div id="push"></div>
{% endif %}
-{% endblock %}
+
+ {% block footer %}
+ {% if not is_popup %}
+ <div id="footer" class="footer">
+ <div class="content">
+ <div class="tools">
+ {% block footer_links %}
+ <a href="http://djangosuit.com/support/" target="_blank" class="icon">
+ <i class="icon-question-sign"></i>
+ Support
+ </a>
+ <a href="http://djangosuit.com/pricing/" target="_blank" class="icon">
+ <i class="icon-bookmark"></i>
+ Licence
+ </a>
+ <a href="http://github.com/darklow/django-suit/issues" target="_blank" class="icon">
+ <i class="icon-comment"></i>
+ Report a bug
+ </a>
+ {% endblock %}
+ </div>
+
+ <div class="statusMsg" id="statusMsg">
+ <!-- this is a placeholder for xoslib views to display status messages -->
+ </div>
+
+ <div class="branding">
+ {% block footer_branding %}
+ {% with 'ADMIN_NAME'|suit_conf as admin_name %}
+ {{ admin_name }}
+ {% if admin_name == 'Django Suit' %}
+ v{{ 'VERSION'|suit_conf }}
+ {% endif %}
+ {% endwith %}
+ {% endblock %}
+ </div>
+ </div>
+ </div>
+ {% endif %}
+ {% endblock %}
<script src="{% static 'suit/bootstrap/dist/js/bootstrap.min.js' %}"></script>
<script src="{% static 'suit/js/suit.js' %}"></script>
<script type="text/javascript" src="//www.google.com/jsapi"></script>
- <!-- src="{% static 'xos_graphs.js' %}" -->
+ {% block extrajs %}
+ {% endblock %}
+ <script src="http://d3js.org/d3.v3.js"></script>
+ <div class="modal fade hide" id="chartsModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <!--<div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+ <h4 class="modal-title" id="myModalLabel">OpenCloud</h4>
+ </div>-->
+ <div class="modal-body" style="overflow-y:hidden; overflow-x:hidden;">
+ <div class="chartContainer">
+ <div class="row">
+ <div class=" padding"></div>
+ </div>
- {% block extrajs %}{% endblock %}
-<script src="http://d3js.org/d3.v3.js"></script>
- <div class="modal fade hide" id="chartsModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
- <div class="modal-dialog">
- <div class="modal-content">
- <!--<div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
- <h4 class="modal-title" id="myModalLabel">OpenCloud</h4>
- </div>-->
- <div class="modal-body" style="overflow-y:hidden; overflow-x:hidden;">
- <div class="chartContainer">
- <div class="row">
- <div class=" padding">
- </div>
- </div>
+ <div class="row">
+ <div class=" heading">
+ <p id="chartHeading" class="heading">OpenCloud</p>
+ </div>
+ </div>
+ <div class="row">
+ <div class="padding"></div>
+ <div class="padding"></div>
+ </div>
+ <div class="row">
+ <div id="graph" class="graph"></div>
+ </div>
+ </div>
+ <div id="graph_work" style="display:none"></div>
+ </div>
+ <!--<div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+ </div>
+ -->
+ </div>
+ <!-- /.modal-content -->
+ </div>
+ <!-- /.modal-dialog -->
+ </div>
+ <!-- /.modal -->
- <div class="row">
- <div class=" heading">
- <p id="chartHeading" class="heading">OpenCloud</p>
- </div>
- </div>
- <div class="row">
- <div class="padding"></div>
- <div class="padding"></div>
- </div>
- <div class="row">
- <div id="graph" class="graph">
- </div>
- </div>
- </div>
- <div id="graph_work" style="display:none"></div>
- </div>
- <!--<div class="modal-footer">
- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
- </div>-->
- </div><!-- /.modal-content -->
- </div><!-- /.modal-dialog -->
- </div><!-- /.modal -->
-
-
-<script>
-
-
-
-
-</script>
+ <!-- Menu Toggle Script -->
+ <script>
+ $(".navbar-toggle").click(function(e) {
+ e.preventDefault();
+ $("#wrapper").toggleClass("toggled");
+ });
+ </script>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/xos/templates/admin/login.html b/xos/templates/admin/login.html
index da44628..5b7ec4d 100644
--- a/xos/templates/admin/login.html
+++ b/xos/templates/admin/login.html
@@ -2,7 +2,6 @@
{% load i18n admin_static %}
{% block extrastyle %}{{ block.super }}
-<link rel="stylesheet" type="text/css" href="/static/suit/bootstrap/css/bootstrap.min.css" media="all"/>
<link rel="stylesheet" type="text/css" href="{% static "xos.css" %}" />
{% if XOS_BRANDING_CSS %}
<link rel="stylesheet" type="text/css" href="{{ XOS_BRANDING_CSS }}">