From a893ea57ee873593b1264a3ce3fd4714cddcc8ea Mon Sep 17 00:00:00 2001
From: Michael Ziegler
Date: Wed, 27 May 2009 17:47:19 +0200
Subject: [PATCH] replaced the YAML template with a self-written one due to
License problems (Debian won't accept CCA2 and Dirk Jesse didn't respond to a
request to update the YAML license.)
---
COPYRIGHT | 26 ------
htdocs/style.css | 15 ++++
htdocs/templatestyle.css | 103 +++++++++++++++++++++++
template/index.htm | 162 ++++++++++++++++---------------------
template/mumble/mumble.htm | 5 +-
5 files changed, 189 insertions(+), 122 deletions(-)
create mode 100644 htdocs/style.css
create mode 100644 htdocs/templatestyle.css
diff --git a/COPYRIGHT b/COPYRIGHT
index 48bbf56..bb0d706 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -77,32 +77,6 @@ General Public License for more details.
===============================================================================
-The directory "htdocs/yaml" provides the base files needed for YAML, yet
-another multicolumn layout, on which the layout of Mumble-Django is based.
-
-It was downloaded from:
- http://www.yaml.de
-
-Upstream Author:
- Dirk Jesse
-
-Copyright:
-
-
-License:
- YAML has been licensed under a Creative Commons Attribution 2.0 License
- (CC-A 2.0) since version 2.2.
- The YAML framework is published under the Creative Commons Attribution
- 2.0 License, which permits both private and commercial use.
-
- Condition: For the free use of the YAML framework, a backlink to the YAML
- homepage (http://www.yaml.de) in a suitable place (e.g.: footer of the
- website or in the imprint) is required.
-
-
-===============================================================================
-
-
The images in the directory "htdocs/mumble" are displayed in the Channel
viewer. They were included in Mumble's source package, which can be obtained
from http://mumble.sf.net.
diff --git a/htdocs/style.css b/htdocs/style.css
new file mode 100644
index 0000000..1d9d1c1
--- /dev/null
+++ b/htdocs/style.css
@@ -0,0 +1,15 @@
+
+form input, form textarea {
+ background-color: lightgrey;
+ border: 1px solid darkgrey;
+ margin: 5px 0;
+ min-width: 330px;
+ padding: 2px;
+ padding-left: 3px;
+}
+
+form input[type=submit] {
+ margin-left: 30px;
+ padding: 5px;
+ min-width: 150px;
+}
diff --git a/htdocs/templatestyle.css b/htdocs/templatestyle.css
new file mode 100644
index 0000000..03069d4
--- /dev/null
+++ b/htdocs/templatestyle.css
@@ -0,0 +1,103 @@
+#content {
+ background-color: white;
+ width: 80%;
+ margin: 25px auto;
+ padding: 10px;
+ border: 2px solid grey;
+}
+
+#headpanel {
+ position: relative;
+ padding: 45px 2em 1em 20px;
+}
+
+#headlinks {
+ position:absolute;
+ right: 10px;
+ top: 10px;
+}
+
+#navipanel {
+ background-color: lightgrey;
+ border-top: 1px solid black;
+ border-bottom: 1px solid black;
+ padding-left: 20px;
+ height: 25px;
+}
+
+#navilinks {
+ display: inline;
+ list-style-type: none;
+}
+
+#navilinks li {
+ display: inline;
+ padding: 0;
+ margin: 0;
+ float: left;
+}
+
+#navilinks a, #navilinks b {
+ display: block;
+ padding: 0 5px;
+ font-size: 10pt;
+ font-weight: bold;
+ line-height: 25px;
+ width: auto;
+}
+
+#navilinks a {
+ border-left: 1px solid white;
+ border-right: 1px solid #eeeeee;
+ color: black;
+ text-decoration: none;
+}
+
+#navilinks b {
+ color: white;
+ background-color: #272727;
+}
+
+#contentpanel {
+ padding: 45px 2em 1em 20px;
+}
+
+#contentleft {
+ float:left;
+ width:40%;
+ border-right: 1px dotted grey;
+ margin-right: 5px;
+}
+
+#contentright {
+ margin-left:40%;
+}
+
+#footerpanel {
+ border-top: 5px solid #EFEFEF;
+ clear:both;
+ margin-top:10px;
+ padding-top: 5px;
+}
+
+#headpanel h2 {
+ font-family: "Times New Roman",Times,serif;
+ font-weight: normal;
+ color: #222222;
+ margin-bottom: 1em;
+ font-size: 14pt;
+}
+
+a {
+ text-decoration: none;
+ color: #4D87C7;
+}
+
+a:visited {
+ color: #003366;
+}
+
+a:focus, a:hover, a:active {
+ text-decoration: underline;
+ color: #182E7A;
+}
diff --git a/template/index.htm b/template/index.htm
index 9aeec91..dcfbc1e 100644
--- a/template/index.htm
+++ b/template/index.htm
@@ -1,94 +1,68 @@
-
-
-
- Mumble Administration
-
-
-
-
-
-
-
-
-
-
- {% block HeadTag %}
- {% endblock %}
-
-
-
-
-
-
-
-
-
-
-
-
- - Home
- {% if MumbleActive %}
- - Mumble
- {% else %}
- - Mumble
- {% endif %}
- {% if ProfileActive %}
- - Profile
- {% else %}
- - Profile
- {% endif %}
-
-
-
-
-
-
-
- {% block LeftColumn %}
- {% endblock %}
-
-
-
-
-
- {% block Content %}
- {% endblock %}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Mumble Administration
+
+
+
+
+
+
+
+
+
+
+
+ {% block HeadTag %}
+ {% endblock %}
+
+
+
+
+
+
+
{% block Headline %}{% endblock %}
+
+
+
+
+ - Home
+ {% if MumbleActive %}
+ - Mumble
+ {% else %}
+ - Mumble
+ {% endif %}
+ {% if ProfileActive %}
+ - Profile
+ {% else %}
+ - Profile
+ {% endif %}
+
+
+
+
+
+ {% block LeftColumn %}
+ {% endblock %}
+
+
+ {% block Content %}
+ {% endblock %}
+
+
+
+
+
+
+
+
diff --git a/template/mumble/mumble.htm b/template/mumble/mumble.htm
index 6f78041..5c25e8a 100644
--- a/template/mumble/mumble.htm
+++ b/template/mumble/mumble.htm
@@ -17,6 +17,7 @@
that are displayed.
+
{% if user.is_authenticated %}
Server registration
@@ -115,10 +116,10 @@
{% endif %}
var cardpanel = new Ext.Panel({
- renderTo: 'col3_content',
+ renderTo: 'mumble_ext_container',
layout: 'card',
id: 'mumble_container',
- height: 510,
+ height: 550,
activeItem: 0,
border: false,
items: [ {