Adjustments for initial public launch of OpenCloud
diff --git a/planetstack/templates/admin/base.html b/planetstack/templates/admin/base.html
index 477e941..b9ea01c 100644
--- a/planetstack/templates/admin/base.html
+++ b/planetstack/templates/admin/base.html
@@ -1,7 +1,7 @@
{% 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 %}{{ title }} | {{ '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/css/bootstrap.min.css' %}" media="all"/>
<link rel="stylesheet" type="text/css" href="{% static 'suit/css/suit.css' %}" media="all">
@@ -17,6 +17,8 @@
{% block extrahead %}{% endblock %}
{% block blockbots %}
<meta name="robots" content="NONE,NOARCHIVE"/>{% endblock %}
+ <link rel="shortcut icon" href="{% static 'favicon.png' %}">
+
</head>
{% load i18n %}
@@ -33,12 +35,34 @@
{% if not is_popup %}
<!-- Header -->
<div id="header" class="header">
+
<div id="branding">
- <a href="{% url 'admin:index' %}"><h1 id="site-name">{% block branding %}{{ 'ADMIN_NAME'|suit_conf }}{% endblock %}</h1></a>
+ <table width="100%">
+ <tr>
+ <td width="70%">
+ <!-- <a href="{% url 'admin:index' %}"><h1 id="site-name">{% block branding %}{{ 'ADMIN_NAME'|suit_conf }}{% endblock %}</h1></a>-->
+ <a href="{% url 'admin:index' %}"><h1 id="site-name"><img src="{% static 'open-cloud-themed.png' %}"/></h1></a>
+ </td>
+ <td width="30%">
+ {% 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 %}
+ </td>
+ </tr>
+ </table>
</div>
-
+
{% block header_time %}
- <div class="header-content header-content-first">
+ <div id="branding2">
+ <!--<div class="header-content header-content-first">
<div class="header-column icon">
<i class="icon-time"></i>
</div>
@@ -46,7 +70,8 @@
<span class="date"> {% suit_date %}</span><br>
<span class="time" id="clock">{% suit_time %}</span>
</div>
- </div>
+ </div>-->
+
{% endblock %}
{% block header_content %}
@@ -80,8 +105,11 @@
{% endblock %}
</div>
{% endif %}
+
{% block nav-global %}{% endblock %}
+
</div>
+ </div>
{% endif %}
<!-- END Header -->
{% endblock %}
@@ -94,7 +122,7 @@
{% if not is_popup %}
{% block breadcrumbs %}
- <ul class="breadcrumb">
+ <ul class="breadcrumb">
<li><a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
{% if title %}
<span class="divider">»</span>
@@ -105,6 +133,12 @@
</li>
</ul>
{% endblock %}
+ <label class="nodetextbox" >Active Nodes: </label>
+ <label class="nodelabel" >37</label>
+ <label class="nodetextbox">CPU Utilization: </label>
+ <label class="nodelabel" >12%</label>
+ <label class="nodetextbox">Bytes Transferred:</label>
+ <label class="nodelabel" style="width:60px;">4321GB</label>
{% endif %}
{% block messages %}
@@ -144,17 +178,7 @@
{% block content-left %}
{% if not is_popup %}
<div id="suit-left" class="suit-column">
- {% 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">
- <input type="text" name="q" class="input-medium search-query" id="quick-search">
- <i class="input-icon icon-search"></i>
- <input type="submit" class="submit" value="">
- </form>
- {% endif %}
- {% endwith %}
- {% endblock %}
+
{% include 'suit/menu.html' %}
diff --git a/planetstack/templates/admin/base_login.html b/planetstack/templates/admin/base_login.html
new file mode 100644
index 0000000..5532e8c
--- /dev/null
+++ b/planetstack/templates/admin/base_login.html
@@ -0,0 +1,45 @@
+{% load admin_static %}<!DOCTYPE html>
+<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
+<head>
+<title>{% block title %}{% endblock %}</title>
+<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}" />
+{% block extrastyle %}{% endblock %}
+<!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% block stylesheet_ie %}{% static "admin/css/ie.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>
+{% block extrahead %}{% endblock %}
+{% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
+</head>
+{% load i18n %}
+
+<body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}">
+
+<!-- Container -->
+
+
+
+
+ {% block messages %}
+ {% if messages %}
+ <ul class="messagelist">{% for message in messages %}
+ <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+ {% endfor %}</ul>
+ {% endif %}
+ {% endblock messages %}
+
+
+ {% block pretitle %}{% endblock %}
+ {% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
+ {% block content %}
+ {% block object-tools %}{% endblock %}
+ {{ content }}
+ {% endblock %}
+ {% block sidebar %}{% endblock %}
+ <br class="clear" />
+
+
+ {% block footer %}<div id="footer"></div>{% endblock %}
+
+
+</body>
+</html>
diff --git a/planetstack/templates/admin/base_site.html b/planetstack/templates/admin/base_site.html
index eae91f6..9a23a04 100644
--- a/planetstack/templates/admin/base_site.html
+++ b/planetstack/templates/admin/base_site.html
@@ -47,7 +47,7 @@
{# Footer branding name (center) #}
{% block footer_branding %}
-PlanetStack
+OpenCloud
{% endblock %}
diff --git a/planetstack/templates/admin/base_site_login.html b/planetstack/templates/admin/base_site_login.html
new file mode 100644
index 0000000..b381c7f
--- /dev/null
+++ b/planetstack/templates/admin/base_site_login.html
@@ -0,0 +1,8 @@
+{% extends "admin/base_login.html" %}
+{% load i18n %}
+
+{% block title %}{{ title }} | {% trans 'Django site admin' %}{% endblock %}
+
+
+
+{% block nav-global %}{% endblock %}
diff --git a/planetstack/templates/admin/dashboard/welcome.html b/planetstack/templates/admin/dashboard/welcome.html
new file mode 100644
index 0000000..9ffb3e5
--- /dev/null
+++ b/planetstack/templates/admin/dashboard/welcome.html
@@ -0,0 +1,3 @@
+{% extends "admin/base.html" %}
+{% load admin_static %}
+
diff --git a/planetstack/templates/admin/login.html b/planetstack/templates/admin/login.html
new file mode 100644
index 0000000..072f73b
--- /dev/null
+++ b/planetstack/templates/admin/login.html
@@ -0,0 +1,63 @@
+{% extends "admin/base_site_login.html" %}
+{% 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 "planetstack.css" %}" />
+{% endblock %}
+
+{% block bodyclass %}login{% endblock %}
+
+{% block nav-global %}{% endblock %}
+
+{% block content_title %}{% endblock %}
+
+{% block breadcrumbs %}{% endblock %}
+
+{% block content %}
+{% if form.errors and not form.non_field_errors and not form.this_is_the_login_form.errors %}
+<p class="errornote">
+{% blocktrans count counter=form.errors.items|length %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
+</p>
+{% endif %}
+
+{% if form.non_field_errors or form.this_is_the_login_form.errors %}
+{% for error in form.non_field_errors|add:form.this_is_the_login_form.errors %}
+<p class="errornote">
+ {{ error }}
+</p>
+{% endfor %}
+{% endif %}
+<div id="wrap">
+<div id="content-main">
+<h1><i class="icon-lock icon-white"></i> OpenCloud</h1>
+<form action="{{ app_path }}" method="post" id="login-form">{% csrf_token %}
+ <div class="form-row">
+ {% if not form.this_is_the_login_form.errors %}{{ form.username.errors }}{% endif %}
+ {{ form.username }}
+ </div>
+ <div class="form-row">
+ {% if not form.this_is_the_login_form.errors %}{{ form.password.errors }}{% endif %}
+ {{ form.password }}
+ <input type="hidden" name="this_is_the_login_form" value="1" />
+ <input type="hidden" name="next" value="{{ next }}" />
+ </div>
+ {% url 'admin_password_reset' as password_reset_url %}
+ {% if password_reset_url %}
+ <div class="password-reset-link">
+ <a href="{{ password_reset_url }}">{% trans 'Forgotten your password or username?' %}</a>
+ </div>
+ {% endif %}
+ <div class="submit-row">
+ <input type="submit" class="btn btn-info" value="{% trans 'SIGN IN' %}" />
+ </div>
+
+<div class="forgotLink"><a href="{{ password_reset_url }}">{% trans 'Forgot password?' %}</a></div><div class="createAccountLink"><a href="#">{% trans 'Create an Account' %}</a></div>
+</form>
+
+<script type="text/javascript">
+document.getElementById('id_username').focus()
+</script>
+</div>
+</div>
+{% endblock %}