github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #21 + layout refactoring.

Browse Source
This commit is contained in:
tonio
2009-10-27 15:13:33 +01:00
parent ce0cbcedb4
commit 5929aaec21
11 changed files with 36 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/views.py
+1
View File
@@ -167,6 +167,7 @@ def newmailbox(request, dom_id=None):
events.raiseEvent("CreateMailbox", mbox=mb)
request.user.message_set.create(message=_("Mailbox created."))
ctx = _ctx_ok(reverse(admin.views.mailboxes, args=[domain.id]))
return HttpResponse(simplejson.dumps(ctx),
mimetype="application/json")
extensions/amavis_quarantine/templates/index.html
+6 -19
View File
@@ -148,23 +148,10 @@ window.addEvent("domready", function() {
});
</script>
{% endblock %}
{% block content %}
<div class="header">
<h1>{% trans "Quarantine" %}</h1>
{% if messages %}
<div id="infos">
{% for m in messages %}
{{ m }}
{% endfor %}
</div>
{% endif %}
</div>
<div id="menubar" class="menu2">
{% block middletitle %}{% trans "Quarantine" %}{% endblock %}
{% block menu %}
{% quar_menu "" perms %}
<div id="searchbox">
<div id="searchbox">
<img src="/static/pics/search.png" id="searchopts" />
<input type="text" name="searchfield" id="searchfield" value="{% trans "Search..." %}" />
<div id="searchparams">
@@ -173,8 +160,8 @@ window.addEvent("domready", function() {
<input type="radio" name="scriteria" value="from_addr,subject">{% trans "Both" %}<br/>
</div>
</div>
</div>
{% endblock %}
{% block content %}
<div id="form-container">
{% url extensions.amavis_quarantine.main.process as actionurl %}
<form method="POST" action="{{ actionurl }}" id="quarlistingform">
@@ -185,4 +172,4 @@ window.addEvent("domready", function() {
</div>
</form>
</div>
{% endblock %}
{% endblock %}
extensions/amavis_quarantine/templates/viewmail.html
+5 -5
View File
@@ -29,12 +29,12 @@ td.left {
}
</style>
{% endblock %}
{% block content %}
<div class="menu2" id="menu2">
{% block middletitle %}{% trans "Mail content" %}{% endblock %}
{% block menu %}
{% load amextras %}
{% viewm_menu "" mail_id page_id perms %}
</div>
{% endblock %}
{% block content %}
<div id="table-container">
<table border="0">
<tr>
@@ -51,4 +51,4 @@ td.left {
{% url extensions.amavis_quarantine.main.getmailcontent mail_id as geturl %}
<iframe id="mailcontent" src="{{ geturl }}?mode={{ params.mode }}&links={{ params.links }}"></iframe>
{% endblock %}
{% endblock %}
static/js/common.js
+2 -2
View File
@@ -1,6 +1,6 @@
window.addEvent('domready', function(){
if ($('menu2')) {
$('menu2').getElements('li.dropdown').each( function( elem ){
if ($('menubar')) {
$('menubar').getElements('li.dropdown').each( function( elem ){
var list = elem.getElement('ul.links');
var myFx = new Fx.Slide(list).hide();
elem.addEvents({
static/stylesheets/basic.css
+2 -9
View File
@@ -144,7 +144,6 @@ body {
#menubar {
margin-left: 20px;
display: table;
margin-bottom: 15px;
width: 730px;
position: absolute;
}
@@ -153,14 +152,8 @@ body {
margin-top: 60px;
}
#menu2 {
position: absolute;
height: 30px;
clear: both;
}
#table-container {
margin-top: 30px;
margin-top: 60px;
}
.menu2 {
@@ -288,7 +281,7 @@ body {
#domcontent {
margin: 0 auto;
margin-top: 60px;
margin-top: 25px;
margin-bottom: 10px;
width: 90%;
}
templates/admin/domain_header.html
+3 -10
View File
@@ -1,19 +1,12 @@
{% extends "layout.html" %}
{% load i18n %}
{% block html_head %}
<script src="/static/js/common.js" type="text/javascript"></script>
<script src="/static/js/domains.js" type="text/javascript"></script>
{% endblock %}
{% block middletitle %}{% trans "Domain" %} {{ domain.name }}{% endblock %}
{% block content %}
{% load i18n %}
<div class="header">
<h1>{% trans "Domain" %} {{ domain.name }}</h1>
</div>
<div id="menubar" class="menu2">
{% block menu %}{% endblock %}
</div>
<div id="domcontent">
<div id="subcontent">
{% block domcontent %}{% endblock %}
</div>
{% endblock %}
templates/admin/domains.html
+2 -5
View File
@@ -1,13 +1,10 @@
{% extends "layout.html" %}
{% load i18n %}
{% block html_head %}
<script src="/static/js/domains.js" type="text/javascript"></script>
{% endblock %}
{% block middletitle %}{% trans "Available domains" %}{% endblock %}
{% block content %}
{% load i18n %}
<div class="header">
<h1>{% trans "Available domains" %}</h1>
</div>
<div id="domcontent">
{% if not domains %}
{% trans "No domain defined." %}
templates/admin/mailboxes.html
-10
View File
@@ -7,16 +7,6 @@
{% endblock %}
{% block domcontent %}
{% load i18n %}
{% if messages %}
<div class="error">
<ul>
{% for msg in messages %}
<li>{{ msg }}</li>
{% endfor %}
</ul>
</div>
{% endif %}
{% if not mailboxes %}
<p>{% trans "No mailbox defined." %}</p>
{% else %}
templates/admin/settings_header.html
+2 -16
View File
@@ -1,24 +1,10 @@
{% extends "layout.html" %}
{% load i18n %}
{% block html_head %}
<script src="/static/js/settings.js" type="text/javascript"></script>
{% endblock %}
{% block middletitle %}{% trans "Settings" %}{% endblock %}
{% block content %}
{% load i18n %}
<div class="header">
<h1>{% trans "Settings" %}</h1>
{% if messages %}
<div id="infos">
{% for m in messages %}
{{ m }}
{% endfor %}
</div>
{% endif %}
</div>
<div id="menubar" class="menu2">
{% block menu %}{% endblock %}
</div>
<div id="setcontent">
{% block setcontent %}{% endblock %}
</div>
templates/layout.html
+11
View File
@@ -93,6 +93,17 @@
{% else %}
<div id="content2">
{% endif %}
<div class="header">
<h1>{% block middletitle %}{% endblock %}</h1>
{% if messages %}
<div id="infos">
{% for m in messages %}{{ m }}{% endfor %}
</div>
{% endif %}
</div>
<div id="menubar" class="menu2">
{% block menu %}{% endblock %}
</div>
{% block content %}{% endblock %}
</div>
</div>
templates/main/header.html
+2 -16
View File
@@ -1,24 +1,10 @@
{% extends "layout.html" %}
{% load i18n %}
{% block html_head %}
<script src="/static/js/main.js" type="text/javascript"></script>
{% endblock %}
{% block middletitle %}{% trans "General" %}{% endblock %}
{% block content %}
{% load i18n %}
<div class="header">
<h1>{% trans "General" %}</h1>
{% if messages %}
<div id="infos">
{% for m in messages %}
{{ m }}
{% endfor %}
</div>
{% endif %}
</div>
<div id="menubar" class="menu2">
{% block menu %}{% endblock %}
</div>
<div id="subcontent">
{% block subcontent %}{% endblock %}
</div>