From 4d5637eebdc86316c34be8f7e3f3d0a7fa184e42 Mon Sep 17 00:00:00 2001
From: Trever Fischer <tdfischer@fedoraproject.org>
Date: Mon, 5 Mar 2012 00:16:27 -0500
Subject: [PATCH] Use caminus theme for admin pages

---
 static/css/admin.css                 | 19 ++++++++++++++++
 templates/_sidebar.html              | 22 ++++++++++++++++++
 templates/admin/base.html            | 17 ++++++++++++++
 templates/base.html                  |  9 +++++---
 templates/base_full.html             | 34 +++++++---------------------
 templates/base_fullwidth.html        | 10 ++++++++
 templates/base_fullwidth_simple.html | 12 ++++++++++
 templates/base_simple.html           | 15 +++++++-----
 templates/registration/login.html    |  2 +-
 9 files changed, 104 insertions(+), 36 deletions(-)
 create mode 100644 static/css/admin.css
 create mode 100644 templates/_sidebar.html
 create mode 100644 templates/admin/base.html
 create mode 100644 templates/base_fullwidth.html
 create mode 100644 templates/base_fullwidth_simple.html

diff --git a/static/css/admin.css b/static/css/admin.css
new file mode 100644
index 0000000..ae40aea
--- /dev/null
+++ b/static/css/admin.css
@@ -0,0 +1,19 @@
+.module {
+    background-color: #111;
+    padding: 5px;
+    margin-bottom: 1em;
+    border:1px solid black;
+}
+
+.module table {
+    background-color: #444;
+}
+
+.module caption {
+    padding: 3px;
+    background-color:#222;
+}
+
+.module tr {
+    border-bottom: 3px solid #333;
+}
diff --git a/templates/_sidebar.html b/templates/_sidebar.html
new file mode 100644
index 0000000..78f0f8c
--- /dev/null
+++ b/templates/_sidebar.html
@@ -0,0 +1,22 @@
+<div class="grid_4">
+    <div id="statbox" class="stat-box">
+        <h2 class="title">World Status</h2>
+        <div class="time">
+          Current time: <span id="time-display"></span>
+        </div>
+        {% for server in minecraft_servers %}
+            <a href="http://{{server.hostname}}/map/">Live Map</a>
+            <h3>{{server.hostname}}:{{server.port}}</h3>
+            <ul>
+            {% if server.online_players %}
+              {% for player in server.online_players%}
+                  <li>{{player}}</li>
+              {% endfor %}
+            {% else %}
+                <li><em>Nobody...</em></li>
+            {% endif %}
+        {% endfor %}
+        </ul>
+    </div>
+</div>
+
diff --git a/templates/admin/base.html b/templates/admin/base.html
new file mode 100644
index 0000000..4923531
--- /dev/null
+++ b/templates/admin/base.html
@@ -0,0 +1,17 @@
+{% extends 'base_fullwidth_simple.html' %}
+{% load adminmedia %}
+{% load static %}
+
+{% block sectiontitle %}Administration{% endblock sectiontitle %}
+
+{%
+
+{% block breadcrumb %}
+    {% block breadcrumbs %}
+    {% endblock breadcrumbs %}
+{% endblock breadcrumb %}
+
+{% block extracss %}
+    {% get_static_prefix as STATIC_PREFIX %}
+    <link rel="stylesheet" type="text/css" href="{{ STATIC_PREFIX }}css/admin.css"/>
+{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index 4d34265..49ecd2c 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,8 +1,11 @@
 {% extends 'base_full.html' %}
 
 {% block main %}
-<div class="grid_8">
-    {% block content %}
-    {% endblock %}
+<div id="content">
+    <div class="grid_8">
+        {% block content %}
+        {% endblock %}
+    </div>
 </div>
+{% include '_sidebar.html' %}
 {% endblock main %}
diff --git a/templates/base_full.html b/templates/base_full.html
index c04d7f7..d7bafef 100644
--- a/templates/base_full.html
+++ b/templates/base_full.html
@@ -10,15 +10,17 @@
 <link rel="stylesheet" type="text/css" href="{{ STATIC_PREFIX }}/css/text.css"/>
 <link rel="stylesheet" type="text/css" href="{{ STATIC_PREFIX }}/css/960.css"/>
 <link rel="stylesheet" type="text/css" href="{{ STATIC_PREFIX }}/css/main.css"/>
-</style>
+{% block extracss %}{% endblock extracss %}
 <script type="text/javascript" language="javascript" src="{{STATIC_PREFIX}}/js/jquery.js"></script>
 <script type="text/javascript" language="javascript" src="{{STATIC_PREFIX}}/js/server-poll.js"></script>
 {% if user.is_authenticated %}
 <script type="text/javascript" language="javascript" src="{{STATIC_PREFIX}}/js/balance-poll.js"></script>
 {% endif %}
+{% block extrahead %}{% endblock %}
 </head>
 <body>
 <div id="wrapper" class="container_12">
+    {% if not is_popup %}
     <div id="header">
       <div class="grid_4">
           <div id="title" class="stat-box">
@@ -82,38 +84,18 @@
       </div>
     </div>
     <div class="clear"></div>
-    <div id="content">
-        {% block main %}
-        {% endblock main %}
-    </div>
-    <div class="grid_4">
-        <div id="statbox" class="stat-box">
-            <h2 class="title">World Status</h2>
-            <div class="time">
-              Current time: <span id="time-display"></span>
-            </div>
-            {% for server in minecraft_servers %}
-                <a href="http://{{server.hostname}}/map/">Live Map</a>
-                <h3>{{server.hostname}}:{{server.port}}</h3>
-                <ul>
-                {% if server.online_players %}
-                  {% for player in server.online_players%}
-                      <li>{{player}}</li>
-                  {% endfor %}
-                {% else %}
-                    <li><em>Nobody...</em></li>
-                {% endif %}
-            {% endfor %}
-            </ul>
-        </div>
-    </div>
+    {% endif %}
+    {% block main %}
+    {% endblock main %}
     <div class="clear"></div>
+    {% if not is_popup %}
     <div class="grid_12">
         <div id="footer">
             <p>&copy;2012 Team Caminus. All Rights Reserved.</p>
             <p><a href="http://github.com/tdfischer/caminus/commit/{{app_version}}">Running {{app_version}}</a></p>
         </div>
     </div>
+    {% endif %}
 </div>
 </body>
 </html>
diff --git a/templates/base_fullwidth.html b/templates/base_fullwidth.html
new file mode 100644
index 0000000..01c8bab
--- /dev/null
+++ b/templates/base_fullwidth.html
@@ -0,0 +1,10 @@
+{% extends 'base_full.html' %}
+
+{% block main %}
+<div id="content">
+    <div class="grid_12">
+        {% block content %}
+        {% endblock %}
+    </div>
+</div>
+{% endblock %}
diff --git a/templates/base_fullwidth_simple.html b/templates/base_fullwidth_simple.html
new file mode 100644
index 0000000..bc38b56
--- /dev/null
+++ b/templates/base_fullwidth_simple.html
@@ -0,0 +1,12 @@
+{% extends 'base_full.html' %}
+
+{% block main %}
+<div id="content">
+    <div class="grid_12">
+        <div class="item">
+            {% block content %}
+            {% endblock %}
+        </div>
+    </div>
+</div>
+{% endblock %}
diff --git a/templates/base_simple.html b/templates/base_simple.html
index 37116cc..a3b93bc 100644
--- a/templates/base_simple.html
+++ b/templates/base_simple.html
@@ -1,11 +1,14 @@
 {% extends 'base.html' %}
 
 {% block main %}
-<div class="grid_8">
-<div class="item">
-    {% block content %}
-    {% endblock content %}
-    <br style="clear:both"/>
-</div>
+<div id="content">
+    <div class="grid_8">
+        <div class="item">
+            {% block content %}
+            {% endblock content %}
+            <br style="clear:both"/>
+        </div>
+    </div>
 </div>
+{% include '_sidebar.html' %}
 {% endblock main %}
diff --git a/templates/registration/login.html b/templates/registration/login.html
index ef887b8..d62d2e3 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base_simple.html" %}
 
 {%block title %}Login{% endblock %}