Fork: 0
kalle / postorius
Browse code
- modified nav bar
- rest api changes
master
1 parent 4271df2 commit 1a2ebbc020c4ff620448f75f16e3527a9d5da921
@Florian Fuchs Florian Fuchs authored on 17 Mar 2013
Patch
Unified Split
Showing 9 changed files
View
7
■■■■■
 src/postorius/models.py
from django.db import models
from django.dispatch import receiver
from django.http import Http404
from mailmanclient import Client, MailmanConnectionError
from social_auth.signals import socialauth_registered
from urllib2 import HTTPError
 
 
logger = logging.getLogger(__name__)
"""Member model class.
"""
objects = MailmanRestManager('member', 'members')
 
@receiver(socialauth_registered, sender=None)
def social_auth_update_handler(sender, **kwargs):
print 'user was registered by social auth'
 
View
59
■■■■■
 src/postorius/static/postorius/css/style.css
html {
overflow-y: scroll;
}
 
body {
color: #444;
font-size: 13px;
background-color: #F7F7F7;
background: -webkit-linear-gradient(top, #fff 0%,#efefef 100%);
background: -o-linear-gradient(top, #fff 0%,#efefef 100%);
background: -ms-linear-gradient(top, #fff 0%,#efefef 100%);
background: linear-gradient(to bottom, #fff 0%,#efefef 100%);
position: absolute;
top: 0;
left: 0;
width: 100%;
z-index: 10;
box-shadow: 0 2px 5px #d8d8d8;
}
.mm_header .mm_logo {
float: left;
}
.mm_metaNav {
float: left;
list-style: none;
margin: 0 0 0 20px;
padding: 5px 0 0 0;
}
.mm_loginName {
float: right;
list-style: none;
margin: 0;
padding: 5px 0 0 0;
}
.mm_loginName {
position: absolute;
right: 0;
bottom: 0;
}
padding-top: 5px;
}
.mm_logout {
margin-left: 10px;
}
 
.mm_metaNav li {
float: left;
margin-left: 20px;
}
color: #444;
padding: 5px 0 5px 5px;
text-shadow: #fff 0px 1px 1px;
}
.mm_metaNav .mm_tasks,
.mm_metaNav .mm_settings,
.mm_metaNav .mm_logout,
.mm_metaNav .mm_lists,
.mm_metaNav .mm_users {
background-color: transparent;
background-image: url(../img/icons.png);
background-repeat: no-repeat;
padding-left: 20px;
}
.mm_tasks { background-position: 0px 5px; }
.mm_settings { background-position: 0px -30px; }
.mm_users { background-position: 0px -65px; }
.mm_logout { background-position: 0px -240px; }
.mm_lists { background-position: 0px -311px; }
.mm_tasks:hover { background-position: 0px -100px; }
.mm_settings:hover { background-position: 0px -135px; }
.mm_users:hover { background-position: 0px -170px; }
.mm_logout:hover { background-position: 0px -205px; }
.mm_lists:hover { background-position: 0px -276px; }
 
.mm_main {
background-color: #fff;
clear: both;
border-top-width: 0;
border-radius: 5px;
border-top-left-radius: 0px;
border-top-right-radius: 0px;
padding: 20px 40px;
padding: 60px 40px 20px 40px;
}
 
.mm_subHeader {
padding-top: 10px;
View
src/postorius/static/postorius/img/mailman_logo_small_trans.png 0 → 100644
View
19
■■■■■
 src/postorius/templates/postorius/base.html
 
<header>
<div class="mm_header">
<div class="mm_canvas">
<a href="{% url 'list_index' %}" class="mm_logo"><img src="{% static 'postorius/img/mailman_logo_small_trans.png' %}" alt="{% trans 'Home' %}" /></a>
<ul class="mm_metaNav">
<li><a class="mm_lists" href="{% url 'list_index' %}">Lists</a></li>
<li><i class="icon-envelope"></i> <a href="{% url 'list_index' %}">Lists</a></li>
{% if user.is_authenticated %}
<li><a class="mm_tasks" href="{% url 'user_tasks' %}">{% trans "To Do" %}</a></li>
<li><i class="icon-tasks"></i><a href="{% url 'user_tasks' %}">{% trans "To Do" %}</a></li>
{% endif %}
{% if user.is_superuser %}
<li><a class="mm_users" href="{% url 'user_index' %}">Users</a></li>
<li><a class="mm_settings" href="{% url 'site_settings' %}">Settings</a></li>
<li><i class="icon-user"></i> <a href="{% url 'user_index' %}">Users</a></li>
<li><i class="icon-cog"></i> <a href="{% url 'site_settings' %}">Settings</a></li>
{% endif %}
<li>{% if user.is_authenticated %}<a class="mm_logout" href="{% url 'user_logout' %}">Logout</a>{% else %}<a class="mm_user" href="{% url 'user_login' %}">Login</a>{% endif %}</li>
</ul>
<a href="{% url 'list_index' %}" class="mm_logo"><img src="{% static 'postorius/img/mailman_logo_trans.png' %}" alt="{% trans 'Home' %}" /></a>
<div class="mm_loginName">
{% if user.is_authenticated %}
<div class="mm_loginName">Logged in as: <a href="{% url 'user_profile' %}">{{ user.username }}</a></div>
Logged in as: <a href="{% url 'user_profile' %}">{{ user.username }}</a> <a href="{% url 'user_logout' %}" title="{% trans 'Logout' %}" class="mm_logout"><i class="icon-off"></i></a>
{% else %}
<a href="{% url 'user_login' %}">Login</a>
{% endif %}
</div>
</div>
</div>
</header>
 
View
2
■■■■■
 src/postorius/templates/postorius/domain_confirm_delete.html
{% load i18n %}
{% load nav_helpers %}
 
{% block main %}
<h1>{% trans 'Confirm Deletion' %}</h1>
 
<p>{% trans "Are you sure you want to permanently delete this Domain?" %}</p>
<form action="{{submit_url}}" method="post"> {% csrf_token %}
<button class="btn btn-danger" type="submit">{% trans "Delete" %} {{ domain }}</button>
<a class="btn" href="{% url 'domain_index' %}">{% trans "Cancel" %}</a>
View
2
■■■■■
 src/postorius/templates/postorius/domain_index.html
<td>{{ domain.mail_host }}</td>
<td>{{ domain.base_url }}</td>
<td>{{ domain.contact_address }}</td>
<td>{{ domain.description }}</td>
<td><a href="{% url 'domain_delete' domain.base_url %}" class="btn btn-mini btn-danger">{% trans 'Delete' %}</a></td>
<td><a href="{% url 'domain_delete' domain.mail_host %}" class="btn btn-mini btn-danger">{% trans 'Delete' %}</a></td>
</tr>
{% endfor %}
</tbody>
</table>
View
8
■■■■■
 src/postorius/templates/postorius/lists/held_messages.html
<td>{{ msg.sender }}</td>
<td>{{ msg.reason }}</td>
<td>{{ msg.hold_date }}</td>
<td class="mm_action">
<a href="{% url 'accept_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-success">{% trans 'Accept' %}</a>
<a href="{% url 'defer_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-warning">{% trans 'Defer' %}</a>
<a href="{% url 'reject_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Reject' %}</a>
<a href="{% url 'discard_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Discard' %}</a>
<a href="{% url 'accept_held_message' list.fqdn_listname msg.request_id %}" class="btn btn-mini btn-success">{% trans 'Accept' %}</a>
<a href="{% url 'defer_held_message' list.fqdn_listname msg.request_id %}" class="btn btn-mini btn-warning">{% trans 'Defer' %}</a>
<a href="{% url 'reject_held_message' list.fqdn_listname msg.request_id %}" class="btn btn-mini btn-danger">{% trans 'Reject' %}</a>
<a href="{% url 'discard_held_message' list.fqdn_listname msg.request_id %}" class="btn btn-mini btn-danger">{% trans 'Discard' %}</a>
</td>
</td>
</tr>
{% endfor %}
View
10
■■■■■
 src/postorius/templates/postorius/lists/index.html
 
{% block main %}
<div class="mm_subHeader">
<span class="mm_context">{% trans "Mailing Lists" %}</span>
</div>
{% if user.is_superuser %}
<ul class="mm_nav">
<li class="mm_nav_item"><a href="{% url 'list_index' %}">{% trans "List Index" %}</a></li>
<li class="mm_new_list mm_action"><a class="btn btn-mini btn-success" href="{% url 'list_new' %}">{% trans "Create List" %}</a></li>
</ul>
<p>
<a class="btn btn-success" href="{% url 'list_new' %}">{% trans "Create New List" %}</a>
</p>
{% endif %}
</div>
 
<table class="table table-bordered table-striped">
<thead>
<tr>
View
4
■■■■■
 src/postorius/templates/postorius/lists/summary.html
<a href="{% url 'list_unsubscribe' list.fqdn_listname user.email %}" class="btn btn-danger">Unsubscribe</a>
</form>
{% else %}
<p>To subscribe or unsubscribe this list you have to be logged in.</p>
<<<<<<< TREE
<p><a href="{% url 'user_login' %}"class="btn btn-primary">Log In</a></p>
=======
<p><a href="{% url user_login %}" class="btn btn-small btn-primary">Login</a></p>
>>>>>>> MERGE-SOURCE
{% endif %}
{% endblock %}