diff --git a/src/postorius/forms.py b/src/postorius/forms.py index 2abfd18..db98aaa 100644 --- a/src/postorius/forms.py +++ b/src/postorius/forms.py @@ -302,7 +302,7 @@ coerce=lambda x: x == 'True', choices=((True, _('Yes')), (False, _('No'))), widget=forms.RadioSelect, - label=_('Advertise the existance of this list?'), + label=_('Advertise the existence of this list?'), help_text=( 'Choose whether to include this list on the list of all lists')) filter_content = forms.TypedChoiceField( diff --git a/src/postorius/models.py b/src/postorius/models.py index 2f002cb..296dd31 100644 --- a/src/postorius/models.py +++ b/src/postorius/models.py @@ -69,7 +69,7 @@ raise MailmanApiError(e) except HTTPError, e: if e.code == 404: - raise Mailman404Error + raise Mailman404Error('Mailman resource could not be found.') else: raise except MailmanConnectionError, e: diff --git a/src/postorius/static/postorius/css/style.css b/src/postorius/static/postorius/css/style.css index 440698e..6423b93 100755 --- a/src/postorius/static/postorius/css/style.css +++ b/src/postorius/static/postorius/css/style.css @@ -245,12 +245,22 @@ } /* Mouseover help */ -span.more_info {border-bottom: thin dotted; background: #ffeedd;} -span.more_info:hover {text-decoration: none; background: #ffffff; z-index: 6; } -span.more_info span {position: absolute; left: -9999px; - margin: 0em; padding: 0.5em; - border-style:solid; border-color:black; border-width:1px; z-index: 6;} -span.more_info:hover span {left: 2%; background: #ffffff;} +span.more_info { + border-bottom: thin dotted; + background: #ffeedd; + font-weight: normal; +} +span.more_info:hover { + text-decoration: none; background: #ffffff; z-index: 6; +} +span.more_info span { + position: absolute; left: -9999px; + margin: 0em; padding: 0.5em; + border-style:solid; border-color:black; border-width:1px; z-index: 6; +} +span.more_info:hover span { + left: 2%; background: #ffffff; +} span.more_info span { position: absolute; left: -9999px; margin: 2em; padding: 0.5em; diff --git a/src/postorius/templates/postorius/user_address_preferences.html b/src/postorius/templates/postorius/user_address_preferences.html index e8092df..96e4141 100644 --- a/src/postorius/templates/postorius/user_address_preferences.html +++ b/src/postorius/templates/postorius/user_address_preferences.html @@ -8,121 +8,93 @@
  • {% trans "Address Based Preferences" %}
  • {% trans "Subscription Based Preferences" %}
  • -
    -

    Per-Email-Address Based Preferences Overview

    -

    Table to view the preferences(for testing only)

    - - - - - - - - - - - - - - {%for a in addresses%} - - - - - - - - - - {%endfor%} - -
    {% trans 'Email Address' %}{% trans 'Delivery Status' %}{% trans 'Delivery Mode' %}{% trans 'Receive Own Postings' %}{% trans 'Acknowledge Posts' %}{% trans 'Hide Address' %}{% trans 'Receive List Copy' %}
    {{ a }}{{ a.preferences.delivery_status }}{{ a.preferences.delivery_mode }}{{ a.preferences.receive_own_postings }}{{ a.preferences.acknowledge_posts }}{{ a.preferences.hide_address }}{{ a.preferences.receive_list_copy }}
    -
    -

    Address Based Preferences Form

    - -
    - {% csrf_token %} - {{formset.management_form}} - {{formset.non_form_errors.as_ul}} - - - - - {% for form,address in zipped_data %} - - {% endfor %} - - - - - {% for form,address in zipped_data %} - - {% endfor %} - - - - {% for form,address in zipped_data %} - - {% endfor %} - - - - {% for form,address in zipped_data %} - - {% endfor %} - - - - {% for form,address in zipped_data %} - - {% endfor %} - - - - {% for form,address in zipped_data %} - - {% endfor %} - - - - {% for form,address in zipped_data %} - - {% endfor %} - -
    Preferences {{address}}
    -

    Mail Delivery:

    -

    [More info{{ helperform.delivery_status.help_text }} - ] -

    -
    {{form.delivery_status }}
    -

    Select a Mode of Delivery:

    -

    [More info{{ helperform.delivery_mode.help_text }} - ] -

    -
    {{form.delivery_mode }}
    -

    Receive your own posts to the list?

    -

    [More info{{ helperform.receive_own_postings.help_text }} - ] -

    -
    {{form.receive_own_postings }}
    -

    Receive acknowledgement mails?

    -

    [More info{{ helperform.acknowledge_posts.help_text }} - ] -

    -
    {{form.acknowledge_posts }}
    -

    Conceal yourself from the subscriber list?

    -

    [More info{{ helperform.hide_address.help_text }} - ] -

    -
    {{form.hide_address }}
    -

    Avoid duplicate copies of messages?

    -

    [More info{{ helperform.receive_list_copy.help_text }} - ] -

    -
    {{form.receive_list_copy }}
    -
    -
    +{% if nolists %} +
    +

    {% trans "No Preferences Available" %}

    +
    +

    {% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}

    +{% else %} +
    + {% csrf_token %} + {{formset.management_form}} + {{formset.non_form_errors.as_ul}} + + + + + {% for form,address in zipped_data %} + + {% endfor %} + + + + + {% for form,address in zipped_data %} + + {% endfor %} + + + + {% for form,address in zipped_data %} + + {% endfor %} + + + + {% for form,address in zipped_data %} + + {% endfor %} + + + + {% for form,address in zipped_data %} + + {% endfor %} + + + + {% for form,address in zipped_data %} + + {% endfor %} + + + + {% for form,address in zipped_data %} + + {% endfor %} + +
    Preferences {{address}}
    +

    Mail Delivery:

    +

    [More info{{ helperform.delivery_status.help_text }} + ] +

    +
    {{form.delivery_status }}
    +

    Select a Mode of Delivery:

    +

    [More info{{ helperform.delivery_mode.help_text }} + ] +

    +
    {{form.delivery_mode }}
    +

    Receive your own posts to the list?

    +

    [More info{{ helperform.receive_own_postings.help_text }} + ] +

    +
    {{form.receive_own_postings }}
    +

    Receive acknowledgement mails?

    +

    [More info{{ helperform.acknowledge_posts.help_text }} + ] +

    +
    {{form.acknowledge_posts }}
    +

    Conceal yourself from the subscriber list?

    +

    [More info{{ helperform.hide_address.help_text }} + ] +

    +
    {{form.hide_address }}
    +

    Avoid duplicate copies of messages?

    +

    [More info{{ helperform.receive_list_copy.help_text }} + ] +

    +
    {{form.receive_list_copy }}
    +
    +
    +{% endif %} {% endblock main %} - - diff --git a/src/postorius/templates/postorius/user_mailmansettings.html b/src/postorius/templates/postorius/user_mailmansettings.html index 22a791b..1f442d6 100644 --- a/src/postorius/templates/postorius/user_mailmansettings.html +++ b/src/postorius/templates/postorius/user_mailmansettings.html @@ -8,108 +8,76 @@
  • {% trans "Address Based Preferences" %}
  • {% trans "Subscription Based Preferences" %}
  • -
    -

    Global Preferences Overview

    -

    Table to view the preferences(for testing only)

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {% trans 'Preference' %} {% trans 'Value' %}
    {% trans 'Delivery Status' %}{{ mm_user.preferences.delivery_status }}
    {% trans 'Delivery Mode' %}{{ mm_user.preferences.delivery_mode }}
    {% trans 'Receive Own Postings' %}{{ mm_user.preferences.receive_own_postings }}
    {% trans 'Acknowledge Posts' %}{{ mm_user.preferences.acknowledge_posts }}
    {% trans 'Hide Address' %}{{ mm_user.preferences.hide_address }}
    {% trans 'Receive List Copy' %}{{ mm_user.preferences.receive_list_copy }}
    -
    -

    Global Preferences Form

    - -
    - {% csrf_token %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Preferences Global
    -

    Mail Delivery:

    -

    - [More info{{ settingsform.delivery_status.help_text }} - ]

    -
    {{settingsform.delivery_status }}
    -

    Select a Mode of Delivery:

    -

    - [More info{{ settingsform.delivery_mode.help_text }} - ]

    -
    {{settingsform.delivery_mode }}
    -

    Receive your own posts to the list?

    -

    - [More info{{ settingsform.receive_own_postings.help_text }} - ]

    -
    {{settingsform.receive_own_postings }}
    -

    Receive acknowledgement mails?

    -

    - [More info{{ settingsform.acknowledge_posts.help_text }} - ]

    -
    {{settingsform.acknowledge_posts }}
    -

    Conceal yourself from the subscriber list?

    -

    - [More info{{ settingsform.hide_address.help_text }} - ]

    -
    {{settingsform.hide_address }}
    -

    Avoid duplicate copies of messages?

    -

    [More info{{ settingsform.receive_list_copy.help_text }} - ]

    -
    {{settingsform.receive_list_copy }}
    -
    -
    +{% if not mm_user %} +
    +

    {% trans "No Preferences Available" %}

    +
    +

    {% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}

    +{% else %} +
    + {% csrf_token %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Preferences Global
    +

    Mail Delivery:

    +

    + [More info{{ settingsform.delivery_status.help_text }} + ]

    +
    {{settingsform.delivery_status }}
    +

    Select a Mode of Delivery:

    +

    + [More info{{ settingsform.delivery_mode.help_text }} + ]

    +
    {{settingsform.delivery_mode }}
    +

    Receive your own posts to the list?

    +

    + [More info{{ settingsform.receive_own_postings.help_text }} + ]

    +
    {{settingsform.receive_own_postings }}
    +

    Receive acknowledgement mails?

    +

    + [More info{{ settingsform.acknowledge_posts.help_text }} + ]

    +
    {{settingsform.acknowledge_posts }}
    +

    Conceal yourself from the subscriber list?

    +

    + [More info{{ settingsform.hide_address.help_text }} + ]

    +
    {{settingsform.hide_address }}
    +

    Avoid duplicate copies of messages?

    +

    [More info{{ settingsform.receive_list_copy.help_text }} + ]

    +
    {{settingsform.receive_list_copy }}
    +
    +
    +{% endif %} {% endblock main %} diff --git a/src/postorius/templates/postorius/user_subscription_preferences.html b/src/postorius/templates/postorius/user_subscription_preferences.html index 541ac0f..74678db 100644 --- a/src/postorius/templates/postorius/user_subscription_preferences.html +++ b/src/postorius/templates/postorius/user_subscription_preferences.html @@ -3,82 +3,48 @@ {% load i18n %} {% block main %} {% include 'postorius/menu/user_nav.html' %} -{% if nolists %} -
    -

    { % trans "No Preferences Available" % }

    -
    -

    { % trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' % }

    -{% else %} -