diff --git a/src/postorius/static/postorius/css/style.css b/src/postorius/static/postorius/css/style.css index e75a898..b9d0823 100755 --- a/src/postorius/static/postorius/css/style.css +++ b/src/postorius/static/postorius/css/style.css @@ -1,5 +1,8 @@ body { - font-color: #444; + color: #444; +} +a { + color: #069; } h1 { clear: both; @@ -24,9 +27,13 @@ /***** meta nav *****/ .mm_header { padding: 5px; - background-image: -webkit-linear-gradient(#FAFAFA, #EFEFEF); - background-image: -moz-linear-gradient(#FAFAFA, #EFEFEF); border-bottom: 1px solid #CACACA; + background: #fafafa; + background: -moz-linear-gradient(top, #fff 0%, #efefef 100%); + 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%); } .mm_metaNav { float: right; @@ -99,6 +106,15 @@ font-weight: bold; font-size: 14px; } +.mm_nav li .btn { + font-weight: normal; +} + +.nav-pills > li > a { + border-radius: 2px; + padding-top: 6px; + padding-bottom: 6px; +} /* messages */ .mm_messages { @@ -120,6 +136,12 @@ legend { border: none; } +input, textarea, select, .uneditable-input { + border-radius: 2px; +} +.btn { + border-radius: 2px; +} /* tables */ .table .mm_action { @@ -148,6 +170,15 @@ color: #A22630; } +/* login form */ +.mm_login { + width: 400px; + margin: 40px auto; +} +.mm_login label { + display: block; +} + /* Mouseover help */ span.more_info {border-bottom: thin dotted; background: #ffeedd;} span.more_info:hover {text-decoration: none; background: #ffffff; z-index: 6; } diff --git a/src/postorius/templates/postorius/lists/confirm_delete.html b/src/postorius/templates/postorius/lists/confirm_delete.html new file mode 100644 index 0000000..19cb66b --- /dev/null +++ b/src/postorius/templates/postorius/lists/confirm_delete.html @@ -0,0 +1,13 @@ +{% extends extend_template %} +{% load url from future %} +{% load i18n %} + +{% block main %} +

{% trans 'Confirm' %}

+

{% trans "Are you sure you want to permanently delete this list?" %}

+

{% trans "All settings and membership data will be lost!" %}

+
{% csrf_token %} + + {% trans "Cancel" %} +
+{% endblock main %} diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html index 2ca6152..16ae1f0 100644 --- a/src/postorius/templates/postorius/lists/summary.html +++ b/src/postorius/templates/postorius/lists/summary.html @@ -10,7 +10,6 @@ {% endif %}

{{list.display_name}}

-

{% trans 'Description' %}

{{list.settings.description }} @@ -23,6 +22,6 @@ {% else %}

To subscribe or unsubscribe this list you have to be logged in.

-

Log In

+

Log In

{% endif %} {% endblock %} diff --git a/src/postorius/templates/postorius/login.html b/src/postorius/templates/postorius/login.html index ba19c1e..1b89d25 100644 --- a/src/postorius/templates/postorius/login.html +++ b/src/postorius/templates/postorius/login.html @@ -4,34 +4,36 @@ {% block main %} -

Login with username and password

- -
{% csrf_token %} - {{ form.as_p }} -
- -
-
- -
- - - -

Login using BrowserID

- -
{% csrf_token %} - - Login using BrowserID -
+
+

Login with username and password

+ +
{% csrf_token %} + {{ form.as_p }} +
+ +
+
+ +
+ + + +

Login using BrowserID

+ +
{% csrf_token %} + + Login using BrowserID +
+
{% endblock %} {% block additionaljs %} diff --git a/src/postorius/templates/postorius/menu/list_nav.html b/src/postorius/templates/postorius/menu/list_nav.html index 304ae9e..5711866 100644 --- a/src/postorius/templates/postorius/menu/list_nav.html +++ b/src/postorius/templates/postorius/menu/list_nav.html @@ -9,7 +9,6 @@
  • {% trans "Metrics" %}
  • {% trans "Settings" %}
  • {% trans "Mass Subscribe" %}
  • -
  • {% trans "Delete List" %}
  • -
  • {% trans "New List" %}
  • +
  • {% trans "Delete List" %}
  • diff --git a/src/postorius/views/views.py b/src/postorius/views/views.py index a80658d..18bb476 100644 --- a/src/postorius/views/views.py +++ b/src/postorius/views/views.py @@ -409,7 +409,7 @@ kwargs={'fqdn_listname': fqdn_listname}) cancel_url = reverse('list_index',) return render_to_response( - 'postorius/confirm_dialog.html', + 'postorius/lists/confirm_delete.html', {'submit_url': submit_url, 'cancel_url': cancel_url, 'list': the_list}, context_instance=RequestContext(request))