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.)

16 years ago · a893ea57ee
5 changed files with 189 additions and 122 deletions
--- a/26
+++ b/26
@ -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:
    <Copyright © 2005-2009, Dirk Jesse>
 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.
--- a/htdocs/style.css
+++ 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;
 }
--- a/htdocs/templatestyle.css
+++ 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;
 }
--- a/template/index.htm
+++ b/template/index.htm
@ -1,35 +1,25 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <html>
  <head>
    <title>Mumble Administration</title>
    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
    <link rel="stylesheet"    type="text/css"  href="/static/ext-2.2/resources/css/ext-all.css" />
  <link rel="shortcut icon" href="/static/mumble/mumble.16x16.png" type="image/png" />
  <link href="/static/css/my_layout.css" rel="stylesheet" type="text/css" />
  <link href="/static/mumble/style.css"  rel="stylesheet" type="text/css" />
    <link rel="stylesheet"    type="text/css"  href="/static/style.css" />
    <link rel="stylesheet"    type="text/css"  href="/static/templatestyle.css" />
    <link rel="stylesheet"    type="text/css"  href="/static/mumble/style.css"  />
    <link rel="shortcut icon" type="image/png" href="/static/mumble/mumble.16x16.png" />
    <script type="text/javascript" src="/static/ext-2.2/adapter/ext/ext-base.js"></script>
    <script type="text/javascript" src="/static/ext-2.2/ext-all.js"></script>
  <!--[if lte IE 7]>
    <link href="/static/css/patches/patch_my_layout.css" rel="stylesheet" type="text/css" />
  <![endif]-->
    {% block HeadTag %}
    {% endblock %}
 </head>
 <body>
  <div class="page_margins">
    <div id="border-top">
      <div id="edge-tl"></div>
      <div id="edge-tr"></div>
    </div>
    <div class="page">
      <div id="header">
        <div id="topnav">
          <!-- start: skip link navigation -->
          <a class="skip" title="skip link" href="#navigation">Skip to the navigation</a><span class="hideme">.</span>
          <a class="skip" title="skip link" href="#content">Skip to the content</a><span class="hideme">.</span>
          <!-- end: skip link navigation -->
  </head>
  <body bgcolor="#3B69AD">
    <div id="content">
      <!-- header -->
      <div id="headpanel">
        <div id="headlinks">
          {% if user.is_authenticated %}
            <a href="/accounts/logout">Logout</a> |
          {% else %}
@ -40,55 +30,39 @@
        </div>
        <h2>{% block Headline %}{% endblock %}</h2>
      </div>
      <div id="nav">
        <!-- skiplink anchor: navigation -->
        <a id="navigation" name="navigation"></a>
        <div class="hlist">
          <!-- main navigation: horizontal list -->
          <ul>
      <!-- navi -->
      <div id="navipanel">
        <ul id="navilinks">
          <li><a href="/">Home</a></li>
          {% if MumbleActive %}
              <li class="active"><strong>Mumble</strong></li>
            <li><b>Mumble</b></li>
          {% else %}
            <li><a href="/mumble">Mumble</a></li>
          {% endif %}
          {% if ProfileActive %}
              <li class="active"><strong>Profile</strong></li>
            <li><b>Profile</b></li>
          {% else %}
            <li><a href="/accounts/profile">Profile</a></li>
          {% endif %}
        </ul>
      </div>
      </div>
      <div id="main">
        <div id="col1">
          <div id="col1_content" class="clearfix">
            <!-- add your content here -->
      <!-- content -->
      <div id="contentpanel">
        <div id="contentleft">
          {% block LeftColumn %}
          {% endblock %}
        </div>
        </div>
        <div id="col3">
          <div id="col3_content" class="clearfix">
            <!-- add your content here -->
        <div id="contentright">
          {% block Content %}
          {% endblock %}
        </div>
          <!-- IE Column Clearing -->
          <div id="ie_clearing"> &#160; </div>
      </div>
      </div>
      <!-- begin: #footer -->
      <div id="footer">
      <!-- footer -->
      <div id="footerpanel">
        You are using <a href="http://bitbucket.org/Svedrin/mumble-django" target="_blank">Mumble-Django</a> --
        layout based on <a href="http://www.yaml.de/" target="_blank">YAML</a> --
        interface built using <a href="http://extjs.com/" target="_blank">ExtJS</a>
      </div>
    </div>
    <div id="border-bottom">
      <div id="edge-bl"></div>
      <div id="edge-br"></div>
    </div>
  </div>
 </body>
  </body>
 </html>
--- a/template/mumble/mumble.htm
+++ b/template/mumble/mumble.htm
@ -17,6 +17,7 @@
      that are displayed.
    </p>
  </noscript>
    <div id="mumble_ext_container"></div>
    <div id="mumble_registration">
  {% if user.is_authenticated %}
      <h2>Server registration</h2>
@ -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:      [ {