warricksothr
/
mumble-django
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

various layout tunings

Natenom/support-murmur-13-1446181288462
Michael Ziegler 16 years ago
parent
3c92f0d376
commit
df3c1d039c
10 changed files with 53 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      htdocs/css/screen/basemod.css
  2. 4
      htdocs/css/screen/content.css
  3. 5
      htdocs/mumble/style.css
  4. 3
      pyweb/mumble/views.py
  5. 2
      pyweb/urls.py
  6. 3
      pyweb/views.py
  7. 24
      template/index.htm
  8. 2
      template/mumble/content.htm
  9. 5
      template/mumble/mumble.htm
  10. 17
      template/registration/imprint.html

5
htdocs/css/screen/basemod.css
View File

@ -41,9 +41,10 @@
* *
*/ */
#col1 { float: left; width: 25%}
#col1 { float: left; width: 30%}
#col1 { float: left }
#col2 { display:none} #col2 { display:none}
#col3 { width: auto; margin: 0 0 0 25%}
#col3 { width: auto; margin: 0 0 0 30%; border-left: 1px #ddd dotted }
#col1_content { padding: 0 10px 0 20px } #col1_content { padding: 0 10px 0 20px }
#col3_content { padding: 0 20px 0 10px } #col3_content { padding: 0 20px 0 10px }

4
htdocs/css/screen/content.css
View File

@ -196,7 +196,9 @@
* *
* @section content-misc * @section content-misc
*/ */
input, textarea {
border: 1px solid #CCCCCC;
}
/** /**
* (en) Emphasizing external Hyperlinks via CSS * (en) Emphasizing external Hyperlinks via CSS
* (de) Hervorhebung externer Hyperlinks mit CSS * (de) Hervorhebung externer Hyperlinks mit CSS

5
htdocs/mumble/style.css
View File

@ -19,10 +19,11 @@ td.mumble {
} }
div.mumble { div.mumble {
background-color: #BDDAFF;
background-color: #FFFFFF;
color: #283E53; color: #283E53;
padding: 10px; padding: 10px;
margin-top: 20px; margin-top: 20px;
margin-bottom: 20px; margin-bottom: 20px;
width: 100%;
width: 80%;
min-height: 250px;
} }

3
pyweb/mumble/views.py
View File

@ -72,6 +72,7 @@ def show( request, server ):
else: else:
adminform = None; adminform = None;
registered = False;
if request.user.is_authenticated(): if request.user.is_authenticated():
if request.method == 'POST' and 'mode' in request.POST and request.POST['mode'] == 'reg': if request.method == 'POST' and 'mode' in request.POST and request.POST['mode'] == 'reg':
try: try:
@ -97,6 +98,7 @@ def show( request, server ):
regform = MumbleUserForm(); regform = MumbleUserForm();
else: else:
regform = MumbleUserForm( instance=user ); regform = MumbleUserForm( instance=user );
registered = True;
else: else:
regform = None; regform = None;
@ -109,6 +111,7 @@ def show( request, server ):
"CurrentUserIsAdmin": isAdmin, "CurrentUserIsAdmin": isAdmin,
"AdminForm": adminform, "AdminForm": adminform,
"RegForm": regform, "RegForm": regform,
"Registered": registered,
}, },
context_instance = RequestContext(request) context_instance = RequestContext(request)
); );

2
pyweb/urls.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
from django.conf.urls.defaults import * from django.conf.urls.defaults import *
# Uncomment the next two lines to enable the admin: # Uncomment the next two lines to enable the admin:
@ -14,6 +15,7 @@ urlpatterns = patterns('',
# (r'^admin/doc/', include('django.contrib.admindocs.urls')), # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^accounts/profile/', 'views.profile' ), (r'^accounts/profile/', 'views.profile' ),
(r'^accounts/imprint/', 'views.imprint' ),
(r'^accounts/', include('registration.urls')), (r'^accounts/', include('registration.urls')),
(r'^mumble/', include('mumble.urls')), (r'^mumble/', include('mumble.urls')),

3
pyweb/views.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
from django.shortcuts import render_to_response, get_object_or_404, get_list_or_404 from django.shortcuts import render_to_response, get_object_or_404, get_list_or_404
from django.template import RequestContext from django.template import RequestContext
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
@ -24,3 +25,5 @@ def profile( request ):
context_instance = RequestContext(request) context_instance = RequestContext(request)
); );
def imprint( request ):
return render_to_response( 'registration/imprint.html' );

24
template/index.htm
View File

@ -1,17 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head> <head>
<title>Your Page Title</title>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<!-- add your meta tags here -->
<link href="/static/css/my_layout.css" rel="stylesheet" type="text/css" />
<link href="/static/mumble/style.css" rel="stylesheet" type="text/css" />
<script src="/static/js/lib/jquery-1.3.min.js" type="text/javascript" ></script>
<!--[if lte IE 7]>
<link href="/static/css/patches/patch_my_layout.css" rel="stylesheet" type="text/css" />
<![endif]-->
<title>Mumble Administration</title>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<!-- add your meta tags here -->
<link href="/static/css/my_layout.css" rel="stylesheet" type="text/css" />
<link href="/static/mumble/style.css" rel="stylesheet" type="text/css" />
<script src="/static/js/lib/jquery-1.3.min.js" type="text/javascript" ></script>
<!--[if lte IE 7]>
<link href="/static/css/patches/patch_my_layout.css" rel="stylesheet" type="text/css" />
<![endif]-->
</head> </head>
<body> <body>
<div class="page_margins"> <div class="page_margins">
@ -26,7 +24,9 @@
<a class="skip" title="skip link" href="#navigation">Skip to the navigation</a><span class="hideme">.</span> <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> <a class="skip" title="skip link" href="#content">Skip to the content</a><span class="hideme">.</span>
<!-- end: skip link navigation --> <!-- end: skip link navigation -->
<a href="/accounts/login">Login</a> | <a href="/admin">Admin</a> | <a href="#">Imprint</a>
<a href="/accounts/login">Login</a> |
<a href="/admin" target="_blank">Admin</a> |
<a href="/accounts/imprint">Imprint</a>
</div> </div>
<h2>{% block Headline %}{% endblock %}</h2> <h2>{% block Headline %}{% endblock %}</h2>
</div> </div>

2
template/mumble/content.htm
View File

@ -1,6 +1,6 @@
{% load mumble_extras %} {% load mumble_extras %}
<div class="mumble"> <div class="mumble">
<table cellspacing="0" cellpadding="0" style="width:100%">
<table cellspacing="0" cellpadding="0" style="width:100%; border:none">
<tr> <tr>
<td class="mumble"> <td class="mumble">
<img src="/static/mumble/mumble.16x16.png" alt="mumble" /> <img src="/static/mumble/mumble.16x16.png" alt="mumble" />

5
template/mumble/mumble.htm
View File

@ -13,6 +13,11 @@
<div id="mumble_registration"> <div id="mumble_registration">
<h2>Server registration</h2> <h2>Server registration</h2>
<form action="" method="post"> <form action="" method="post">
{% if Registered %}
You are registered on this server.<br />
{% else %}
You do not have an account on this server.<br />
{% endif %}
<table> <table>
{{ RegForm }} {{ RegForm }}
</table> </table>

17
template/registration/imprint.html
View File

@ -0,0 +1,17 @@
{% extends "index.htm" %}
{% load mumble_extras %}
{% block Content %}
<div class="rahmen">
<h1>Imprint</h1>
<p>
This is <a href="http://bitbucket.org/Svedrin/mumble-django/">Mumble-Django</a>, a Murmur config application for Django that configures a Mumble server. It is able to create and remove server instances, start/stop them, and configure them.<br />
<br />
Furthermore, registered Django users can sign up for user accounts on the configured vservers and change their registration names and passwords, and Django admins can manage server admins through the webinterface.<br />
<br />
It is being developed by <a href="mailto:diese-addy@funzt-halt.net">Michael "Svedrin" Ziegler</a>, who can be contacted via <a href="mailto:diese-addy@funzt-halt.net">e-Mail</a>, <a href="jabber://mistagee@jabber.funzt-halt.net/">Jabber</a> or IRC (Svedrin in <a href="irc://freenode.net/#mumble">Freenode</a>).
</p>
<p>
The default design is based on <a href="http://www.yaml.de">YAML, Yet Another Multicolumn Layout</a> by Dirk Jesse.
</p>
</div>
{% endblock %}
Write Preview
Loading…
Cancel
Save