Merge pull request #1156 from rafalp/format-templates

Check templates formatting

misago/templates/misago/acl_debug.html

@@ -1,46 +1,46 @@
 {% load i18n %}
 
 <h4>
-{% if misago_user.is_authenticated %}
-  {% blocktrans with user=misago_user.username %}
-  {{ user }} roles
-  {% endblocktrans %}
-{% else %}
-  {% trans "Anonymous roles" %}
-{% endif %}
+  {% if misago_user.is_authenticated %}
+    {% blocktrans with user=misago_user.username %}
+    {{ user }} roles
+    {% endblocktrans %}
+  {% else %}
+    {% trans "Anonymous roles" %}
+  {% endif %}
 </h4>
 <table>
-    <thead>
-        <tr>
-            <th style="width: 180px;">{% trans "Role" %}</th>
-            <th>{% trans "Permissions" %}</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for role in misago_user.get_roles %}
-        <tr>
-            <td>{{ role.name }}</td>
-            <td>{{ role.permissions }}</td>
-        </tr>
-        {% endfor %}
-    </tbody>
+  <thead>
+    <tr>
+      <th style="width: 180px;">{% trans "Role" %}</th>
+      <th>{% trans "Permissions" %}</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for role in misago_user.get_roles %}
+      <tr>
+        <td>{{ role.name }}</td>
+        <td>{{ role.permissions }}</td>
+      </tr>
+    {% endfor %}
+  </tbody>
 </table>
 
 
 <h4>{% trans "Current ACL" %}</h4>
 <table>
-    <thead>
-        <tr>
-            <th style="width: 180px;">{% trans "Key" %}</th>
-            <th>{% trans "Value" %}</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for key, value in misago_acl.items %}
-        <tr>
-            <td>{{ key }}</td>
-            <td>{{ value }}</td>
-        </tr>
-        {% endfor %}
-    </tbody>
+  <thead>
+    <tr>
+      <th style="width: 180px;">{% trans "Key" %}</th>
+      <th>{% trans "Value" %}</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for key, value in misago_acl.items %}
+      <tr>
+        <td>{{ key }}</td>
+        <td>{{ value }}</td>
+      </tr>
+    {% endfor %}
+  </tbody>
 </table>

misago/templates/misago/activation/request.html

@@ -21,8 +21,12 @@
       <div class="col-md-8">
         <div class="side-form-copy">
 
-          <p class="lead">{% trans "Site administrator may impose requirement on newly regitered accounts to be activated before users will be able to sign in." %}</p>
-          <p>{% trans "Depending on time of registration, you will be able activate your account by clicking special activation link. This link will be valid only for your browser, for seven days or until your account is activated." %}</p>
+          <p class="lead">
+            {% trans "Site administrator may impose requirement on newly regitered accounts to be activated before users will be able to sign in." %}
+          </p>
+          <p>
+            {% trans "Depending on time of registration, you will be able activate your account by clicking special activation link. This link will be valid only for your browser, for seven days or until your account is activated." %}
+          </p>
           <p>
             {% blocktrans trimmed %}
               To receive this link, enter your account's e-mail addres in form and press the "Send link" button.

misago/templates/misago/activation/stopped.html

@@ -16,7 +16,9 @@
       </div>
 
       <div class="message-body">
-        <p class="lead">{% trans "Your account can't be activated at this time." %}</p>
+        <p class="lead">
+          {% trans "Your account can't be activated at this time." %}
+        </p>
         <p>{{ message }}</p>
       </div>
 

misago/templates/misago/admin/agreements/form.html

@@ -39,25 +39,25 @@ class="form-horizontal"
 {% block form-body %}
 <div class="form-body">
   {% with label_class="col-md-3" field_class="col-md-9" %}
-  <fieldset>
-    <legend>{% trans "Basic settings" %}</legend>
+    <fieldset>
+      <legend>{% trans "Basic settings" %}</legend>
 
-    {% form_row form.type label_class field_class %}
-    {% form_row form.title label_class field_class %}
-    {% form_row form.is_active "col-md-offset-3" field_class %}
+      {% form_row form.type label_class field_class %}
+      {% form_row form.title label_class field_class %}
+      {% form_row form.is_active "col-md-offset-3" field_class %}
 
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Agreement contents" %}</legend>
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Agreement contents" %}</legend>
 
-    <div class="form-group">
-      <p>{% trans "Fill in one of the fields." %}</p>
-    </div>
+      <div class="form-group">
+        <p>{% trans "Fill in one of the fields." %}</p>
+      </div>
 
-    {% form_row form.link label_class field_class %}
-    {% form_row form.text label_class field_class %}
+      {% form_row form.link label_class field_class %}
+      {% form_row form.text label_class field_class %}
 
-  </fieldset>
+    </fieldset>
   {% endwith %}
 </div>
 {% endblock form-body %}

misago/templates/misago/admin/agreements/list.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load i18n misago_capture misago_admin_form %}
+{% load i18n misago_admin_form misago_capture %}
 
 
 {% block page-actions %}
@@ -103,9 +103,9 @@
 {% block emptylist %}
 <td colspan="9">
   {% if active_filters %}
-  <p>{% trans "No agreements matching search criteria have been found" %}</p>
+    <p>{% trans "No agreements matching search criteria have been found" %}</p>
   {% else %}
-  <p>{% trans "No agreements are currently set." %}</p>
+    <p>{% trans "No agreements are currently set." %}</p>
   {% endif %}
 </td>
 {% endblock emptylist %}

misago/templates/misago/admin/attachments/list.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load i18n misago_capture misago_admin_form %}
+{% load i18n misago_admin_form misago_capture %}
 
 
 {% block table-header %}

misago/templates/misago/admin/attachmenttypes/form.html

@@ -39,23 +39,23 @@ class="form-horizontal"
 {% block form-body %}
 <div class="form-body">
   {% with label_class="col-md-3" field_class="col-md-9" %}
-  <fieldset>
-    <legend>{% trans "Basic options" %}</legend>
+    <fieldset>
+      <legend>{% trans "Basic options" %}</legend>
 
-    {% form_row form.name label_class field_class %}
-    {% form_row form.extensions label_class field_class %}
-    {% form_row form.mimetypes label_class field_class %}
-    {% form_row form.size_limit label_class field_class %}
+      {% form_row form.name label_class field_class %}
+      {% form_row form.extensions label_class field_class %}
+      {% form_row form.mimetypes label_class field_class %}
+      {% form_row form.size_limit label_class field_class %}
 
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Availability" %}</legend>
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Availability" %}</legend>
 
-    {% form_row form.status label_class field_class %}
-    {% form_row form.limit_uploads_to label_class field_class %}
-    {% form_row form.limit_downloads_to label_class field_class %}
+      {% form_row form.status label_class field_class %}
+      {% form_row form.limit_uploads_to label_class field_class %}
+      {% form_row form.limit_downloads_to label_class field_class %}
 
-  </fieldset>
+    </fieldset>
   {% endwith %}
 </div>
 {% endblock form-body %}

misago/templates/misago/admin/bans/form.html

@@ -39,22 +39,22 @@ class="form-horizontal"
 {% block form-body %}
 <div class="form-body">
   {% with label_class="col-md-3" field_class="col-md-9" %}
-  <fieldset>
-    <legend>{% trans "Ban settings" %}</legend>
+    <fieldset>
+      <legend>{% trans "Ban settings" %}</legend>
 
-    {% form_row form.check_type label_class field_class %}
-    {% form_row form.banned_value label_class field_class %}
-    {% form_row form.registration_only label_class field_class %}
-    {% form_row form.expires_on label_class field_class %}
+      {% form_row form.check_type label_class field_class %}
+      {% form_row form.banned_value label_class field_class %}
+      {% form_row form.registration_only label_class field_class %}
+      {% form_row form.expires_on label_class field_class %}
 
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Messages" %}</legend>
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Messages" %}</legend>
 
-    {% form_row form.user_message label_class field_class %}
-    {% form_row form.staff_message label_class field_class %}
+      {% form_row form.user_message label_class field_class %}
+      {% form_row form.staff_message label_class field_class %}
 
-  </fieldset>
+    </fieldset>
   {% endwith %}
 </div>
 {% endblock form-body %}

misago/templates/misago/admin/bans/list.html

@@ -17,7 +17,7 @@
 <th style="width: 30%;">{% trans "Type" %}</th>
 <th>{% trans "Expires on" %}</th>
 {% for action in extra_actions %}
-<th style="width: 1%;">&nbsp;</th>
+  <th style="width: 1%;">&nbsp;</th>
 {% endfor %}
 <th style="width: 1%;">&nbsp;</th>
 <th style="width: 1%;">&nbsp;</th>
@@ -45,11 +45,11 @@
   {% endif %}
 </td>
 {% for action in extra_actions %}
-<td class="row-action">
-  <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}default{% endif %} tooltip-top" title="{{ action.name }}">
-    <span class="{{ action.icon }}"></span>
-  </a>
-</td>
+  <td class="row-action">
+    <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}default{% endif %} tooltip-top" title="{{ action.name }}">
+      <span class="{{ action.icon }}"></span>
+    </a>
+  </td>
 {% endfor %}
 <td class="row-action">
   <a href="{% url 'misago:admin:users:bans:edit' pk=item.pk %}" class="btn btn-primary tooltip-top" title="{% trans "Edit" %}">
@@ -70,9 +70,9 @@
 {% block emptylist %}
 <td colspan="{{ 6|add:extra_actions_len }}">
   {% if active_filters %}
-  <p>{% trans "No bans matching search criteria have been found" %}</p>
+    <p>{% trans "No bans matching search criteria have been found" %}</p>
   {% else %}
-  <p>{% trans "No bans are currently set." %}</p>
+    <p>{% trans "No bans are currently set." %}</p>
   {% endif %}
 </td>
 {% endblock emptylist %}
@@ -83,7 +83,7 @@
 <script type="text/javascript">
   $(function() {
     $('.delete-prompt').submit(function() {
-      var decision = confirm("{% trans "Are you sure you want to remove this ban?" %}");
+      var decision = confirm("{% trans 'Are you sure you want to remove this ban?' %}");
       return decision;
     });
   });

misago/templates/misago/admin/categories/delete.html

@@ -1,17 +1,17 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load misago_admin_form i18n %}
+{% load i18n misago_admin_form %}
 
 
 {% block title %}
-{% blocktrans with category=target.name %}
-Delete category: {{ category }}
+{% blocktrans trimmed with category=target.name %}
+  Delete category: {{ category }}
 {% endblocktrans %} | {{ active_link.name }} | {{ block.super }}
 {% endblock title %}
 
 
 {% block page-target %}
-{% blocktrans with category=target.name %}
-Delete category: {{ category }}
+{% blocktrans trimmed with category=target.name %}
+  Delete category: {{ category }}
 {% endblocktrans %}
 {% endblock page-target %}
 

misago/templates/misago/admin/categories/form.html

@@ -4,18 +4,18 @@
 
 {% block title %}
 {% if target.pk %}
-{{ target }}
+  {{ target }}
 {% else %}
-{% trans "New category" %}
+  {% trans "New category" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
 {% endblock title %}
 
 
 {% block page-target %}
 {% if target.pk %}
-{{ target }}
+  {{ target }}
 {% else %}
-{% trans "New category" %}
+  {% trans "New category" %}
 {% endif %}
 {% endblock page-target %}
 
@@ -23,9 +23,9 @@
 {% block form-header %}
 <h1>
   {% if target.pk %}
-  {{ target }}
+    {{ target }}
   {% else %}
-  {% trans "New category" %}
+    {% trans "New category" %}
   {% endif %}
 </h1>
 {% endblock %}
@@ -39,38 +39,38 @@ class="form-horizontal"
 {% block form-body %}
 <div class="form-body">
   {% with label_class="col-md-3" field_class="col-md-9" %}
-  <fieldset>
-    <legend>{% trans "Display and position" %}</legend>
+    <fieldset>
+      <legend>{% trans "Display and position" %}</legend>
 
-    {% form_row form.new_parent label_class field_class %}
-    {% form_row form.name label_class field_class %}
-    {% form_row form.description label_class field_class %}
-    {% form_row form.css_class label_class field_class %}
+      {% form_row form.new_parent label_class field_class %}
+      {% form_row form.name label_class field_class %}
+      {% form_row form.description label_class field_class %}
+      {% form_row form.css_class label_class field_class %}
 
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Behaviour" %}</legend>
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Behaviour" %}</legend>
 
-    {% form_row form.copy_permissions label_class field_class %}
-    {% form_row form.is_closed label_class field_class %}
+      {% form_row form.copy_permissions label_class field_class %}
+      {% form_row form.is_closed label_class field_class %}
 
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Content approval" %}</legend>
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Content approval" %}</legend>
 
-    {% form_row form.require_threads_approval label_class field_class %}
-    {% form_row form.require_replies_approval label_class field_class %}
-    {% form_row form.require_edits_approval label_class field_class %}
+      {% form_row form.require_threads_approval label_class field_class %}
+      {% form_row form.require_replies_approval label_class field_class %}
+      {% form_row form.require_edits_approval label_class field_class %}
 
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Prune threads" %}</legend>
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Prune threads" %}</legend>
 
-    {% form_row form.prune_started_after label_class field_class %}
-    {% form_row form.prune_replied_after label_class field_class %}
-    {% form_row form.archive_pruned_in label_class field_class %}
+      {% form_row form.prune_started_after label_class field_class %}
+      {% form_row form.prune_replied_after label_class field_class %}
+      {% form_row form.archive_pruned_in label_class field_class %}
 
-  </fieldset>
+    </fieldset>
   {% endwith %}
 </div>
 {% endblock form-body %}

misago/templates/misago/admin/categories/list.html

@@ -15,7 +15,7 @@
 {% block table-header %}
 <th>{% trans "Category" %}</th>
 {% for action in extra_actions %}
-<th style="width: 1%;">&nbsp;</th>
+  <th style="width: 1%;">&nbsp;</th>
 {% endfor %}
 <th>&nbsp;</th>
 <th>&nbsp;</th>
@@ -27,40 +27,40 @@
 {% block table-row %}
 <td class="item-name">
   {% for i in item.level_range %}
-  &nbsp;&nbsp;&nbsp;&nbsp;
+    &nbsp;&nbsp;&nbsp;&nbsp;
   {% endfor %}
   {{ item }}
 </td>
 <td class="row-action">
   {% if not item.last %}
-  <form action="{% url 'misago:admin:categories:nodes:down' pk=item.pk %}" method="post">
-    <button class="btn btn-default tooltip-top" title="{% trans "Move down" %}">
-      {% csrf_token %}
-      <span class="fa fa-chevron-down"></span>
-    </button>
-  </form>
+    <form action="{% url 'misago:admin:categories:nodes:down' pk=item.pk %}" method="post">
+      <button class="btn btn-default tooltip-top" title="{% trans "Move down" %}">
+        {% csrf_token %}
+        <span class="fa fa-chevron-down"></span>
+      </button>
+    </form>
   {% else %}
-  &nbsp;
+    &nbsp;
   {% endif %}
 </td>
 <td class="row-action">
   {% if not item.first %}
-  <form action="{% url 'misago:admin:categories:nodes:up' pk=item.pk %}" method="post">
-    <button class="btn btn-default tooltip-top" title="{% trans "Move up" %}">
-      {% csrf_token %}
-      <span class="fa fa-chevron-up"></span>
-    </button>
-  </form>
+    <form action="{% url 'misago:admin:categories:nodes:up' pk=item.pk %}" method="post">
+      <button class="btn btn-default tooltip-top" title="{% trans "Move up" %}">
+        {% csrf_token %}
+        <span class="fa fa-chevron-up"></span>
+      </button>
+    </form>
   {% else %}
-  &nbsp;
+    &nbsp;
   {% endif %}
 </td>
 {% for action in extra_actions %}
-<td class="row-action">
-  <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}default{% endif %} tooltip-top" title="{{ action.name }}">
-    <span class="{{ action.icon }}"></span>
-  </a>
-</td>
+  <td class="row-action">
+    <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}default{% endif %} tooltip-top" title="{{ action.name }}">
+      <span class="{{ action.icon }}"></span>
+    </a>
+  </td>
 {% endfor %}
 <td class="row-action">
   <a href="{% url 'misago:admin:categories:nodes:edit' pk=item.pk %}" class="btn btn-primary tooltip-top" title="{% trans "Edit" %}">

misago/templates/misago/admin/categoryroles/categoryroles.html

@@ -1,10 +1,10 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load misago_admin_form i18n %}
+{% load i18n misago_admin_form %}
 
 
 {% block title %}
-{% blocktrans with category=target %}
-{{ category }}: Permissions
+{% blocktrans trimmed with category=target %}
+  {{ category }}: Permissions
 {% endblocktrans %} | {{ block.super }}
 {% endblock title%}
 
@@ -13,8 +13,8 @@
 {{ block.super }}
 <div class="sub">
   <span class="fa fa-chevron-right"></span>
-  {% blocktrans with category=target %}
-  {{ category }}: Permissions
+  {% blocktrans trimmed with category=target %}
+    {{ category }}: Permissions
   {% endblocktrans %}
 </div>
 {% endblock page-header %}
@@ -29,26 +29,23 @@
         <th>{% trans "Category" %}</ht>
         <th class="col-md-6">{% trans "Permissions" %}</ht>
       </tr>
-
       {% for form in forms %}
-      <tr>
-        <td class="item-name">
-          {{ form.role }}
-        </td>
-        <td>
-          {% form_input form.category_role %}
-        </td>
-      </tr>
+        <tr>
+          <td class="item-name">
+            {{ form.role }}
+          </td>
+          <td>
+            {% form_input form.category_role %}
+          </td>
+        </tr>
       {% endfor %}
     </table>
     <div class="table-footer">
       <div class="row">
         <div class="col-md-offset-6">
-
           <button class="btn btn-primary">{% trans "Save changes" %}</button>
           <button class="btn btn-success" name="stay" value="1">{% trans "Save and keep editing" %}</button>
           <a href="{% url root_link %}" class="btn btn-default btn-cancel">{% trans "Cancel" %}</a>
-
         </div>
       </div>
     </div>

misago/templates/misago/admin/categoryroles/form.html

@@ -4,18 +4,18 @@
 
 {% block title %}
 {% if target.pk %}
-{{ target }}
+  {{ target }}
 {% else %}
-{% trans "New role" %}
+  {% trans "New role" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
 {% endblock title %}
 
 
 {% block page-target %}
 {% if target.pk %}
-{{ target }}
+  {{ target }}
 {% else %}
-{% trans "New role" %}
+  {% trans "New role" %}
 {% endif %}
 {% endblock page-target %}
 
@@ -23,9 +23,9 @@
 {% block form-header %}
 <h1>
   {% if target.pk %}
-  {{ target }}
+    {{ target }}
   {% else %}
-  {% trans "New role" %}
+    {% trans "New role" %}
   {% endif %}
 </h1>
 {% endblock %}
@@ -38,18 +38,13 @@ class="form-horizontal"
 
 {% block form-body %}
 <div class="form-body">
-
   <fieldset>
     <legend>{% trans "Basic settings" %}</legend>
-
     {% form_row form.name "col-md-3" "col-md-9" %}
-
   </fieldset>
-
   {% for form in perms_forms %}
-  {% include "misago/admin/permissions_table.html" %}
+    {% include "misago/admin/permissions_table.html" %}
   {% endfor %}
-
 </div>
 {% endblock form-body %}
 

misago/templates/misago/admin/categoryroles/rolecategories.html

@@ -1,10 +1,10 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load misago_admin_form i18n %}
+{% load i18n misago_admin_form %}
 
 
 {% block title %}
-{% blocktrans with role=target %}
-{{ role }}: Category permissions
+{% blocktrans trimmed with role=target %}
+  {{ role }}: Category permissions
 {% endblocktrans %} | {{ block.super }}
 {% endblock title%}
 
@@ -13,8 +13,8 @@
 {{ block.super }}
 <div class="sub">
   <span class="fa fa-chevron-right"></span>
-  {% blocktrans with role=target %}
-  {{ role }}: Category permissions
+  {% blocktrans trimmed with role=target %}
+    {{ role }}: Category permissions
   {% endblocktrans %}
 </div>
 {% endblock page-header %}
@@ -31,17 +31,17 @@
       </tr>
 
       {% for form in forms %}
-      <tr>
-        <td class="item-name">
-          {% for i in form.category.level_range %}
-          &nbsp;&nbsp;&nbsp;&nbsp;
-          {% endfor %}
-          {{ form.category }}
-        </td>
-        <td>
-          {% form_input form.role %}
-        </td>
-      </tr>
+        <tr>
+          <td class="item-name">
+            {% for i in form.category.level_range %}
+              &nbsp;&nbsp;&nbsp;&nbsp;
+            {% endfor %}
+            {{ form.category }}
+          </td>
+          <td>
+            {% form_input form.role %}
+          </td>
+        </tr>
       {% endfor %}
     </table>
     <div class="table-footer">

misago/templates/misago/admin/conf/group.html

@@ -25,32 +25,31 @@
     <div class="form-header">
       <h1>{% trans active_group.name %}</h1>
       {% if active_group.description %}
-      <p>{% trans active_group.description %}</p>
+        <p>{% trans active_group.description %}</p>
       {% endif %}
     </div>
 
     {% with label_class="col-md-3" field_class="col-md-9" %}
       {% if use_single_form_template %}
-      <div class="form-body no-fieldsets">
-        {% for field in fieldsets.0.form %}
-        {% form_row field label_class field_class %}
-        {% endfor %}
-      </div>
+        <div class="form-body no-fieldsets">
+          {% for field in fieldsets.0.form %}
+            {% form_row field label_class field_class %}
+          {% endfor %}
+        </div>
       {% else %}
-      <div class="form-body">
-        {% for fieldset in fieldsets %}
-        <fieldset>
-          {% if fieldset.legend %}
-          <legend>{% trans fieldset.legend %}</legend>
-          {% endif %}
+        <div class="form-body">
+          {% for fieldset in fieldsets %}
+            <fieldset>
+              {% if fieldset.legend %}
+                <legend>{% trans fieldset.legend %}</legend>
+              {% endif %}
 
-          {% for field in fieldset.form %}
-          {% form_row field label_class field_class %}
+              {% for field in fieldset.form %}
+                {% form_row field label_class field_class %}
+              {% endfor %}
+            </fieldset>
           {% endfor %}
-
-        </fieldset>
-        {% endfor %}
-      </div>
+        </div>
       {% endif %}
     {% endwith %}
 

misago/templates/misago/admin/conf/index.html

@@ -23,11 +23,11 @@
 
       <ul class="nav nav-side">
         {% for group in settings_groups %}
-        <li {% if group.key == active_group.key %}class="active"{% endif %}>
-          <a href="{% url 'misago:admin:system:settings:group' key=group.key %}">
-            {% trans group.name %}
-          </a>
-        </li>
+          <li {% if group.key == active_group.key %}class="active"{% endif %}>
+            <a href="{% url 'misago:admin:system:settings:group' key=group.key %}">
+              {% trans group.name %}
+            </a>
+          </li>
         {% endfor %}
       </ul>
 
@@ -35,20 +35,20 @@
     <div class="col-md-9">
 
       {% block action %}
-      <div class="list-panel">
-        <div class="list-group">
-
-          {% for group in settings_groups %}
-          <a href="{% url 'misago:admin:system:settings:group' key=group.key %}" class="list-group-item">
-            <h4 class="list-group-item-heading">{% trans group.name %}</h4>
-            {% if group.description %}
-            <p class="list-group-item-text">{% trans group.description %}</p>
-            {% endif %}
-          </a>
-          {% endfor %}
-
-        </div><!-- /.list-group -->
-      </div>
+        <div class="list-panel">
+          <div class="list-group">
+
+            {% for group in settings_groups %}
+              <a href="{% url 'misago:admin:system:settings:group' key=group.key %}" class="list-group-item">
+                <h4 class="list-group-item-heading">{% trans group.name %}</h4>
+                {% if group.description %}
+                  <p class="list-group-item-text">{% trans group.description %}</p>
+                {% endif %}
+              </a>
+            {% endfor %}
+
+          </div><!-- /.list-group -->
+        </div>
       {% endblock action %}
 
     </div><!-- /.col-md-9 -->

misago/templates/misago/admin/datadownloads/form.html

@@ -13,9 +13,7 @@
 
 
 {% block form-header %}
-<h1>
-  {% trans "Request new data downloads" %}
-</h1>
+<h1>{% trans "Request new data downloads" %}</h1>
 {% endblock %}
 
 

misago/templates/misago/admin/datadownloads/list.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load i18n misago_avatars misago_admin_form %}
+{% load i18n misago_admin_form misago_avatars %}
 
 
 {% block page-actions %}
@@ -20,7 +20,7 @@
 <th style="width: 1%;">&nbsp;</th>
 <th>{% trans "Requested by" %}</th>
 {% for action in extra_actions %}
-<th style="width: 1%;">&nbsp;</th>
+  <th style="width: 1%;">&nbsp;</th>
 {% endfor %}
 <th style="width: 1%;">&nbsp;</th>
 {% endblock table-header %}
@@ -62,11 +62,11 @@
   {% endif %}
 </td>
 {% for action in extra_actions %}
-<td class="row-action">
-  <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}default{% endif %} tooltip-top" title="{{ action.name }}">
-    <span class="{{ action.icon }}"></span>
-  </a>
-</td>
+  <td class="row-action">
+    <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}default{% endif %} tooltip-top" title="{{ action.name }}">
+      <span class="{{ action.icon }}"></span>
+    </a>
+  </td>
 {% endfor %}
 <td class="row-action">
   {% if item.file %}

misago/templates/misago/admin/errorpages/403.html

@@ -16,9 +16,9 @@
 
     <h1>{% trans "Requested page is not available." %}</h1>
     {% if message %}
-    <p>{{ message }}</p>
+      <p>{{ message }}</p>
     {% else %}
-    <p>{% trans "You don't have permission to access this page." %}</p>
+      <p>{% trans "You don't have permission to access this page." %}</p>
     {% endif %}
 
   </div>

misago/templates/misago/admin/generic/base.html

@@ -6,12 +6,12 @@
   <div class="container">
     <h1>
       {% block page-header %}
-      <div class="main">
-        <a href="{{ active_link.link }}">
-          <span class="{{ active_link.icon }}"></span>
-          {{ active_link.name }}
-        </a>
-      </div>
+        <div class="main">
+          <a href="{{ active_link.link }}">
+            <span class="{{ active_link.icon }}"></span>
+            {{ active_link.name }}
+          </a>
+        </div>
       {% endblock page-header %}
     </h1>
     {% block page-actions %}{% endblock %}

misago/templates/misago/admin/generic/form.html

@@ -24,16 +24,16 @@
         </div>
 
         {% if form.is_bound and not form.is_valid %}
-        <div class="form-errors-block">
-          <span class="fa fa-exclamation-triangle"></span>
-          <ul class="list-unstyled">
-            {% for error in form.non_field_errors %}
-            <li>{{ error }}</li>
-            {% empty %}
-            <li>{% trans "Form has errors." %}</li>
-            {% endfor %}
-          </ul>
-        </div>
+          <div class="form-errors-block">
+            <span class="fa fa-exclamation-triangle"></span>
+            <ul class="list-unstyled">
+              {% for error in form.non_field_errors %}
+                <li>{{ error }}</li>
+              {% empty %}
+                <li>{% trans "Form has errors." %}</li>
+              {% endfor %}
+            </ul>
+          </div>
         {% endif %}
 
         {% block form-body %}{% endblock %}
@@ -43,13 +43,13 @@
             <div class="{% block form-footer-class %}col-xs-12{% endblock form-footer-class %}">
 
               {% block form-footer %}
-              {% if target and target.pk %}
-              <button class="btn btn-primary">{% trans "Save changes" %}</button>
-              <button class="btn btn-success" name="stay" value="1">{% trans "Save and keep editing" %}</button>
-              {% else %}
-              <button class="btn btn-primary">{% trans "Save" %}</button>
-              <button class="btn btn-success" name="stay" value="1">{% trans "Save and add another" %}</button>
-              {% endif %}
+                {% if target and target.pk %}
+                  <button class="btn btn-primary">{% trans "Save changes" %}</button>
+                  <button class="btn btn-success" name="stay" value="1">{% trans "Save and keep editing" %}</button>
+                {% else %}
+                  <button class="btn btn-primary">{% trans "Save" %}</button>
+                  <button class="btn btn-success" name="stay" value="1">{% trans "Save and add another" %}</button>
+                {% endif %}
               {% endblock %}
               <a href="{% url root_link %}" class="btn btn-default">{% trans "Cancel" %}</a>
 

misago/templates/misago/admin/generic/list.html

@@ -9,181 +9,176 @@
 
 {% block view %}
 {% if paginator or order_by or search_form or mass_actions %}
-<div class="table-actions">
+  <div class="table-actions">
 
-  {% if paginator %}
-  {% include "misago/admin/generic/paginator.html" %}
-  {% endif%}
-
-  {% if order_by %}
-  <div class="btn-group pull-left">
-    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-      {% trans "Sort:" %} <span class="fa fa-sort-numeric-{{ order.type }}"></span> <strong>{{ order.name }}</strong>
-    </button>
-    <ul class="dropdown-menu" role="menu">
-      <li class="dropdown-title">
-        {% trans "Change sorting to:" %}
-      </li>
-      {% for order in order_by %}
-      <li>
-        <form method="get">
-          <input type="hidden" name="sort" value="{{ order.order_by }}">
-          <input type="hidden" name="direction" value="{{ order.type }}">
-          {% for name, value in query_filters.items %}
-          <input type="hidden" name="{{ name }}" value="{{ value }}">
+    {% if paginator %}
+      {% include "misago/admin/generic/paginator.html" %}
+    {% endif%}
+
+    {% if order_by %}
+      <div class="btn-group pull-left">
+        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+          {% trans "Sort:" %} <span class="fa fa-sort-numeric-{{ order.type }}"></span> <strong>{{ order.name }}</strong>
+        </button>
+        <ul class="dropdown-menu" role="menu">
+          <li class="dropdown-title">
+            {% trans "Change sorting to:" %}
+          </li>
+          {% for order in order_by %}
+            <li>
+              <form method="get">
+                <input type="hidden" name="sort" value="{{ order.order_by }}">
+                <input type="hidden" name="direction" value="{{ order.type }}">
+                {% for name, value in query_filters.items %}
+                  <input type="hidden" name="{{ name }}" value="{{ value }}">
+                {% endfor %}
+                <button type="submit">
+                  <span class="fa fa-sort-numeric-{{ order.type }}"></span>
+                  {{ order.name }}
+                </button>
+              </form>
+            </li>
           {% endfor %}
-          <button type="submit">
-            <span class="fa fa-sort-numeric-{{ order.type }}"></span>
-            {{ order.name }}
-          </button>
-        </form>
-      </li>
-      {% endfor %}
-    </ul>
-  </div>
-  {% endif %}
+        </ul>
+      </div>
+    {% endif %}
+
+    {% if search_form %}
+      <button class="btn btn-{% if active_filters %}success{% else %}default{% endif %} pull-left" data-toggle="modal" data-target="#filter-modal">
+        {% if active_filters %}
+          <span class="fa fa-check"></span>
+          {% trans "Change search" %}
+        {% else %}
+          <span class="fa fa-search"></span>
+          {% trans "Search list" %}
+        {% endif %}
+      </button>
 
-  {% if search_form %}
-    <button class="btn btn-{% if active_filters %}success{% else %}default{% endif %} pull-left" data-toggle="modal" data-target="#filter-modal">
       {% if active_filters %}
-      <span class="fa fa-check"></span>
-      {% trans "Change search" %}
-      {% else %}
-      <span class="fa fa-search"></span>
-      {% trans "Search list" %}
+        <form method="get" class="pull-left">
+          <input type="hidden" name="clear_filters" value="1">
+          {% for name, value in query_order.items %}
+            <input type="hidden" name="{{ name }}" value="{{ value }}">
+          {% endfor %}
+          <button type="submit" class="btn btn-default">
+            <span class="fa fa-times"></span>
+            {% trans "Remove search" %}
+          </button>
+        </form>
       {% endif %}
-    </button>
-
-    {% if active_filters %}
-    <form method="get" class="pull-left">
-      <input type="hidden" name="clear_filters" value="1">
-      {% for name, value in query_order.items %}
-      <input type="hidden" name="{{ name }}" value="{{ value }}">
-      {% endfor %}
-      <button type="submit" class="btn btn-default">
-        <span class="fa fa-times"></span>
-        {% trans "Remove search" %}
-      </button>
-    </form>
     {% endif %}
-  {% endif %}
 
-  {% if mass_actions %}
-  <button type="button" class="btn btn-default pull-right master-checkbox">
-    <span class="fa fa-check"></span>
-  </button>
-  <div class="btn-group pull-right">
-    <form id="mass-action" action="{{ querystring }}" method="post">
-      <button type="button" class="btn btn-default dropdown-toggle mass-controller" data-toggle="dropdown">
-        <span class="fa fa-gears"></span>
-        {% trans "With selected" %}
+    {% if mass_actions %}
+      <button type="button" class="btn btn-default pull-right master-checkbox">
+        <span class="fa fa-check"></span>
       </button>
-      {% csrf_token %}
-      <ul class="dropdown-menu" role="menu">
-        {% for action in mass_actions %}
-        <li>
-          <button type="submit" name="action" value="{{ action.action }}" {% if action.confirmation %}data-confirmation="{{ action.confirmation }}"{% endif %}>
-            <span class="{{ action.icon }}"></span>
-            {{ action.name }}
+      <div class="btn-group pull-right">
+        <form id="mass-action" action="{{ querystring }}" method="post">
+          <button type="button" class="btn btn-default dropdown-toggle mass-controller" data-toggle="dropdown">
+            <span class="fa fa-gears"></span>
+            {% trans "With selected" %}
           </button>
-        </li>
-        {% endfor %}
-      </ul>
-    </form>
-  </div>
-  {% endif %}
+          {% csrf_token %}
+          <ul class="dropdown-menu" role="menu">
+            {% for action in mass_actions %}
+              <li>
+                <button type="submit" name="action" value="{{ action.action }}" {% if action.confirmation %}data-confirmation="{{ action.confirmation }}"{% endif %}>
+                  <span class="{{ action.icon }}"></span>
+                  {{ action.name }}
+                </button>
+              </li>
+            {% endfor %}
+          </ul>
+        </form>
+      </div>
+    {% endif %}
 
-</div><!-- /.table-actions -->
+  </div><!-- /.table-actions -->
 {% endif %}
 
-<div class="table-panel">
-  <table class="table">
-    <tr>
-      {% block table-header %}
-      {% endblock table-header %}
-      {% if mass_actions %}
-      <th class="width: 1%;">&nbsp;</th>
-      {% endif %}
-    </tr>
-
-    {% block table-items %}
-    {% for item in items %}
-    <tr>
-      {% block table-row %}{% endblock table-row %}
-      {% if mass_actions %}
-      <td class="row-select">
-        <label>
-          <input type="checkbox" form="mass-action" name="selected_items" value="{{ item.pk }}" {% if item.pk in selected_items %} checked{% endif %}>
-        </label>
-      </td>
-      {% endif %}
-    </tr>
-    {% empty %}
-    <tr class="message-row">
-      {% block emptylist %}
-      {% endblock emptylist %}
-    </tr>
-    {% endfor %}
-    {% endblock table-items %}
-  </table>
-</div><!-- /.table-panel -->
-
-{% if paginator %}
-<div class="table-actions">
-  {% include "misago/admin/generic/paginator.html" %}
-</div><!-- /.table-actions -->
-{% endif %}
+  <div class="table-panel">
+    <table class="table">
+      <tr>
+        {% block table-header %}{% endblock table-header %}
+        {% if mass_actions %}
+          <th class="width: 1%;">&nbsp;</th>
+        {% endif %}
+      </tr>
+
+      {% block table-items %}
+        {% for item in items %}
+          <tr>
+            {% block table-row %}{% endblock table-row %}
+            {% if mass_actions %}
+              <td class="row-select">
+                <label>
+                  <input type="checkbox" form="mass-action" name="selected_items" value="{{ item.pk }}" {% if item.pk in selected_items %} checked{% endif %}>
+                </label>
+              </td>
+            {% endif %}
+          </tr>
+        {% empty %}
+          <tr class="message-row">
+            {% block emptylist %}{% endblock emptylist %}
+          </tr>
+        {% endfor %}
+      {% endblock table-items %}
+    </table>
+  </div><!-- /.table-panel -->
+
+  {% if paginator %}
+    <div class="table-actions">
+      {% include "misago/admin/generic/paginator.html" %}
+    </div><!-- /.table-actions -->
+  {% endif %}
 {% endblock view %}
 
 
 {% block content %}
 {{ block.super }}
 {% if search_form %}
-<div class="modal fade" id="filter-modal" tabindex="-1" role="dialog" aria-labelledby="filter-modal-label" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title" id="filter-modal-label">
-        {% block modal-title %}
-        {% endblock modal-title %}
-        </h4>
-      </div>
-      <form method="GET">
-        <input type="hidden" name="set_filters" value="1">
-        {% for name, value in query_order.items %}
-        <input type="hidden" name="{{ name }}" value="{{ value }}">
-        {% endfor %}
-
-        <div class="modal-body">
-        {% block modal-body %}
-        {% endblock modal-body %}
-        </div>
-        <div class="modal-footer">
-        {% block modal-footer %}
-        <button type="button" class="btn btn-default" data-dismiss="modal">
-          {% trans "Close" %}
-        </button>
-        <button type="submit" class="btn btn-primary">
-          {% trans "Save changes" %}
-        </button>
-        {% endblock modal-footer %}
+  <div class="modal fade" id="filter-modal" tabindex="-1" role="dialog" aria-labelledby="filter-modal-label" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h4 class="modal-title" id="filter-modal-label">
+            {% block modal-title %}{% endblock modal-title %}
+          </h4>
         </div>
+        <form method="GET">
+          <input type="hidden" name="set_filters" value="1">
+          {% for name, value in query_order.items %}
+            <input type="hidden" name="{{ name }}" value="{{ value }}">
+          {% endfor %}
+          <div class="modal-body">
+            {% block modal-body %}{% endblock modal-body %}
+          </div>
+          <div class="modal-footer">
+            {% block modal-footer %}
+              <button type="button" class="btn btn-default" data-dismiss="modal">
+                {% trans "Close" %}
+              </button>
+              <button type="submit" class="btn btn-primary">
+                {% trans "Save changes" %}
+              </button>
+            {% endblock modal-footer %}
+          </div>
 
-      </form>
+        </form>
+      </div>
     </div>
   </div>
-</div>
 {% endif %}
 {% endblock content%}
 
 
 {% block javascripts %}
 {% if mass_actions %}
-<script type="text/javascript">
-  $(function() {
-    tableMassActions("{{ empty_selection_label }}", "{{ selection_label }}");
-  });
-</script>
+  <script type="text/javascript">
+    $(function() {
+      tableMassActions("{{ empty_selection_label }}", "{{ selection_label }}");
+    });
+  </script>
 {% endif %}
 {% endblock javascripts %}

misago/templates/misago/admin/generic/paginator.html

@@ -2,8 +2,8 @@
 
 <ul class="pager pull-left">
   <li class="page">
-    {% blocktrans with page=page.number pages=paginator.num_pages %}
-    Page {{ page }} of {{ pages }}
+    {% blocktrans trimmed with page=page.number pages=paginator.num_pages %}
+      Page {{ page }} of {{ pages }}
     {% endblocktrans %}
   </li>
   {% if page.has_previous %}
@@ -13,20 +13,20 @@
       </a>
     </li>
     {% if page.number > 2 %}
-    <li>
-      <a href="{% url root_link page=page.previous_page_number %}{{ querystring }}" class="tooltip-top" title="{% trans "Go to previous page" %}">
-        <span class="glyphicon glyphicon-chevron-left"></span>
-      </a>
-    </li>
+      <li>
+        <a href="{% url root_link page=page.previous_page_number %}{{ querystring }}" class="tooltip-top" title="{% trans "Go to previous page" %}">
+          <span class="glyphicon glyphicon-chevron-left"></span>
+        </a>
+      </li>
     {% endif %}
   {% endif %}
   {% if page.has_next %}
     {% if page.next_page_number < paginator.num_pages %}
-    <li>
-      <a href="{% url root_link page=page.next_page_number %}{{ querystring }}" class="tooltip-top" title="{% trans "Go to next page" %}">
-        <span class="glyphicon glyphicon-chevron-right"></span>
-      </a>
-    </li>
+      <li>
+        <a href="{% url root_link page=page.next_page_number %}{{ querystring }}" class="tooltip-top" title="{% trans "Go to next page" %}">
+          <span class="glyphicon glyphicon-chevron-right"></span>
+        </a>
+      </li>
     {% endif %}
     <li>
       <a href="{% url root_link page=paginator.num_pages %}{{ querystring }}" class="tooltip-top" title="{% trans "Go to last page" %}">

misago/templates/misago/admin/index.html

@@ -112,12 +112,14 @@
             <td>{{ db_stats.users }}</td>
           </tr>
           {% if db_stats.inactive_users %}
-          <tr>
-            <td>{% trans "Inactive users" %}</td>
-            <td>
-              <a href="{% url "misago:admin:users:accounts:index" %}?inactive=1">{{ db_stats.inactive_users }}</a>
-            </td>
-          </tr>
+            <tr>
+              <td>{% trans "Inactive users" %}</td>
+              <td>
+                <a href="{% url "misago:admin:users:accounts:index" %}?inactive=1">
+                  {{ db_stats.inactive_users }}
+                </a>
+              </td>
+            </tr>
           {% endif %}
         </tbody>
       </table>

misago/templates/misago/admin/login.html

@@ -9,13 +9,13 @@
 <div class="login-form">
 
   {% if target == "misago" %}
-  <div class="form-admin-logo">
-    <img src="{% static 'misago/admin/img/misago.png' %}" alt="Misago">
-  </div>
+    <div class="form-admin-logo">
+      <img src="{% static 'misago/admin/img/misago.png' %}" alt="Misago">
+    </div>
   {% elif target == "django" %}
-  <div class="form-admin-logo">
-    <img src="{% static 'misago/admin/img/django.png' %}" alt="Django">
-  </div>
+    <div class="form-admin-logo">
+      <img src="{% static 'misago/admin/img/django.png' %}" alt="Django">
+    </div>
   {% endif  %}
 
   <div class="form-panel">
@@ -29,27 +29,27 @@
       <div class="form-body no-fieldsets">
 
         {% for error in form.non_field_errors %}
-        <div class="misago-alerts">
-          <p class="alert alert-danger lead">
-            {{ error }}
-            <br>{% trans "Please try again." %}
-          </p>
-        </div>
+          <div class="misago-alerts">
+            <p class="alert alert-danger lead">
+              {{ error }}
+              <br>{% trans "Please try again." %}
+            </p>
+          </div>
         {% endfor %}
         {% for message in messages %}
-        <div class="misago-alerts">
-          {% if 'success' in message.tags %}
-          <p class="alert alert-success lead">
-          {% elif 'warning' in message.tags %}
-          <p class="alert alert-warning lead">
-          {% elif 'error' in message.tags %}
-          <p class="alert alert-danger lead">
-          {% else %}
-          <p class="alert alert-info lead">
-          {% endif %}
-            {{ message }}
-          </p>
-        </div>
+          <div class="misago-alerts">
+            {% if 'success' in message.tags %}
+              <p class="alert alert-success lead">
+            {% elif 'warning' in message.tags %}
+              <p class="alert alert-warning lead">
+            {% elif 'error' in message.tags %}
+              <p class="alert alert-danger lead">
+            {% else %}
+              <p class="alert alert-info lead">
+            {% endif %}
+              {{ message }}
+            </p>
+          </div>
         {% endfor %}
 
         <div class="form-group">

misago/templates/misago/admin/messages.html

@@ -2,23 +2,23 @@
 {% if messages %}
 <div class="misago-alerts">
   {% for message in messages %}
-  <div>
-    {% if 'info' in message.tags %}
-    <p class="alert alert-info">
-      <span class="alert-icon fa fa-info-circle"></span>
-    {% elif 'success' in message.tags %}
-    <p class="alert alert-success">
-      <span class="alert-icon fa fa-check-circle"></span>
-    {% elif 'warning' in message.tags %}
-    <p class="alert alert-warning">
-      <span class="alert-icon fa fa-exclamation-triangle"></span>
-    {% elif 'error' in message.tags %}
-    <p class="alert alert-danger">
-      <span class="alert-icon fa fa-times-circle"></span>
-    {% endif %}
-      {{ message }}
-    </p>
-  </div>
+    <div>
+      {% if 'info' in message.tags %}
+        <p class="alert alert-info">
+          <span class="alert-icon fa fa-info-circle"></span>
+      {% elif 'success' in message.tags %}
+        <p class="alert alert-success">
+          <span class="alert-icon fa fa-check-circle"></span>
+      {% elif 'warning' in message.tags %}
+        <p class="alert alert-warning">
+          <span class="alert-icon fa fa-exclamation-triangle"></span>
+      {% elif 'error' in message.tags %}
+        <p class="alert alert-danger">
+          <span class="alert-icon fa fa-times-circle"></span>
+      {% endif %}
+        {{ message }}
+      </p>
+    </div>
   {% endfor %}
 </div>
 {% endif %}

misago/templates/misago/admin/navbar.html

@@ -5,12 +5,12 @@
       <a class="navbar-brand" href="{% url 'misago:index' %}"></a>
       <ul class="nav navbar-nav">
         {% for node in sections %}
-        <li{% if node.is_active %} class="active"{% endif %}>
-          <a href="{{ node.link }}">
-            <span class="{{ node.icon }}"></span>
-            {{ node.name }}
-          </a>
-        </li>
+          <li{% if node.is_active %} class="active"{% endif %}>
+            <a href="{{ node.link }}">
+              <span class="{{ node.icon }}"></span>
+              {{ node.name }}
+            </a>
+          </li>
         {% endfor %}
       </ul>
       <div class="user-nav pull-right">
@@ -27,19 +27,19 @@
     </div>
   </div>
   {% if actions %}
-  <div class="navbar navbar-inverse navbar-static-top" role="navigation">
-    <div class="container">
-      <ul class="nav navbar-nav">
-        {% for node in actions %}
-        <li{% if node.is_active %} class="active"{% endif %}>
-          <a href="{{ node.link }}">
-            <span class="{{ node.icon }}"></span>
-            {{ node.name }}
-          </a>
-        </li>
-        {% endfor %}
-      </ul>
+    <div class="navbar navbar-inverse navbar-static-top" role="navigation">
+      <div class="container">
+        <ul class="nav navbar-nav">
+          {% for node in actions %}
+            <li{% if node.is_active %} class="active"{% endif %}>
+              <a href="{{ node.link }}">
+                <span class="{{ node.icon }}"></span>
+                {{ node.name }}
+              </a>
+            </li>
+          {% endfor %}
+        </ul>
+      </div>
     </div>
-  </div>
   {% endif %}
 </div>

misago/templates/misago/admin/permissions_table.html

@@ -1,31 +1,31 @@
-{% load misago_admin_form i18n %}
+{% load i18n misago_admin_form %}
 <fieldset>
   <legend>{{ form.legend }}</legend>
 
   <table class="table table-striped table-permissions">
     {% for field in form %}
-    <tr{% if field.errors %} class="text-danger"{% endif %}>
-      <td class="col-md-8">
-        <label>{{ field.label }}:</label>
-        {% for error in field.errors %}
-        <p class="small"><strong>{{ error }}</strong></p>
-        {% endfor %}
-        {% if field.help_text %}
-        <p class="text-muted small">{{ field.help_text }}</p>
-        {% endif %}
-      </td>
-      <td>
-        <div class="form-group{% if field.errors %} has-error{% endif %}">
-          {% if field|is_radio_select_field %}
-            <div class="controls control-radioselect">
-              {% form_input field %}
-            </div>
-          {% else %}
-            {% form_input field %}
+      <tr{% if field.errors %} class="text-danger"{% endif %}>
+        <td class="col-md-8">
+          <label>{{ field.label }}:</label>
+          {% for error in field.errors %}
+            <p class="small"><strong>{{ error }}</strong></p>
+          {% endfor %}
+          {% if field.help_text %}
+            <p class="text-muted small">{{ field.help_text }}</p>
           {% endif %}
-        </div>
-      </td>
-    </tr>
+        </td>
+        <td>
+          <div class="form-group{% if field.errors %} has-error{% endif %}">
+            {% if field|is_radio_select_field %}
+              <div class="controls control-radioselect">
+                {% form_input field %}
+              </div>
+            {% else %}
+              {% form_input field %}
+            {% endif %}
+          </div>
+        </td>
+      </tr>
     {% endfor %}
   </table>
 

misago/templates/misago/admin/ranks/form.html

@@ -4,18 +4,18 @@
 
 {% block title %}
 {% if target.pk %}
-{{ target }}
+  {{ target }}
 {% else %}
-{% trans "New rank" %}
+  {% trans "New rank" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
 {% endblock title %}
 
 
 {% block page-target %}
 {% if target.pk %}
-{{ target }}
+  {{ target }}
 {% else %}
-{% trans "New rank" %}
+  {% trans "New rank" %}
 {% endif %}
 {% endblock page-target %}
 
@@ -23,9 +23,9 @@
 {% block form-header %}
 <h1>
   {% if target.pk %}
-  {{ target }}
+    {{ target }}
   {% else %}
-  {% trans "New rank" %}
+    {% trans "New rank" %}
   {% endif %}
 </h1>
 {% endblock %}
@@ -39,27 +39,27 @@ class="form-horizontal"
 {% block form-body %}
 <div class="form-body">
   {% with label_class="col-md-3" field_class="col-md-9" %}
-  <fieldset>
-    <legend>{% trans "Name and description" %}</legend>
+    <fieldset>
+      <legend>{% trans "Name and description" %}</legend>
 
-    {% form_row form.name label_class field_class %}
-    {% form_row form.title label_class field_class %}
-    {% form_row form.description label_class field_class %}
+      {% form_row form.name label_class field_class %}
+      {% form_row form.title label_class field_class %}
+      {% form_row form.description label_class field_class %}
 
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Permissions" %}</legend>
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Permissions" %}</legend>
 
-    {% form_row form.roles label_class field_class %}
+      {% form_row form.roles label_class field_class %}
 
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Display and visibility" %}</legend>
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Display and visibility" %}</legend>
 
-    {% form_row form.css_class label_class field_class %}
-    {% form_row form.is_tab "col-md-offset-3" field_class %}
+      {% form_row form.css_class label_class field_class %}
+      {% form_row form.is_tab "col-md-offset-3" field_class %}
 
-  </fieldset>
+    </fieldset>
   {% endwith %}
 </div>
 {% endblock form-body %}

misago/templates/misago/admin/ranks/list.html

@@ -17,7 +17,7 @@
 <th>{% trans "Title" %}</th>
 <th style="width: 120px;">{% trans "Special" %}</th>
 {% for action in extra_actions %}
-<th style="width: 1%;">&nbsp;</th>
+  <th style="width: 1%;">&nbsp;</th>
 {% endfor %}
 <th style="width: 1%;">&nbsp;</th>
 <th style="width: 1%;">&nbsp;</th>
@@ -36,23 +36,23 @@
   {% if item.title %}
     {{ item.title }}
   {% else %}
-  <i class="text-muted">{% trans "No title set" %}</i>
+    <i class="text-muted">{% trans "No title set" %}</i>
   {% endif %}
 </td>
 <td class="lead text-muted">
   {% if item.is_tab %}
-  <div class="fa fa-list tooltip-top" title="{% trans "Has page on users list." %}"></div>
+    <div class="fa fa-list tooltip-top" title="{% trans "Has page on users list." %}"></div>
   {% endif %}
   {% if item.is_default %}
-  <div class="fa fa-star tooltip-top" title="{% trans "This is default rank assigned to new members." %}"></div>
+    <div class="fa fa-star tooltip-top" title="{% trans "This is default rank assigned to new members." %}"></div>
   {% endif %}
 </td>
 {% for action in extra_actions %}
-<td class="row-action">
-  <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}default{% endif %} tooltip-top" title="{{ action.name }}">
-    <span class="{{ action.icon }}"></span>
-  </a>
-</td>
+  <td class="row-action">
+    <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}default{% endif %} tooltip-top" title="{{ action.name }}">
+      <span class="{{ action.icon }}"></span>
+    </a>
+  </td>
 {% endfor %}
 <td class="row-action">
   <a href="{% url 'misago:admin:users:ranks:users' pk=item.pk %}" class="btn btn-primary tooltip-top" title="{% trans "Users with rank" %}">
@@ -61,38 +61,38 @@
 </td>
 <td class="row-action">
   {% if not item.is_default %}
-  <form action="{% url 'misago:admin:users:ranks:default' pk=item.pk %}" method="post">
-    <button class="btn btn-warning tooltip-top" title="{% trans "Make default" %}">
-      {% csrf_token %}
-      <span class="fa fa-star"></span>
-    </button>
-  </form>
+    <form action="{% url 'misago:admin:users:ranks:default' pk=item.pk %}" method="post">
+      <button class="btn btn-warning tooltip-top" title="{% trans "Make default" %}">
+        {% csrf_token %}
+        <span class="fa fa-star"></span>
+      </button>
+    </form>
   {% else %}
-  &nbsp;
+    &nbsp;
   {% endif %}
 </td>
 <td class="row-action">
   {% if not forloop.last %}
-  <form action="{% url 'misago:admin:users:ranks:down' pk=item.pk %}" method="post">
-    <button class="btn btn-default tooltip-top" title="{% trans "Move down" %}">
-      {% csrf_token %}
-      <span class="fa fa-chevron-down"></span>
-    </button>
-  </form>
+    <form action="{% url 'misago:admin:users:ranks:down' pk=item.pk %}" method="post">
+      <button class="btn btn-default tooltip-top" title="{% trans "Move down" %}">
+        {% csrf_token %}
+        <span class="fa fa-chevron-down"></span>
+      </button>
+    </form>
   {% else %}
-  &nbsp;
+    &nbsp;
   {% endif %}
 </td>
 <td class="row-action">
   {% if not forloop.first %}
-  <form action="{% url 'misago:admin:users:ranks:up' pk=item.pk %}" method="post">
-    <button class="btn btn-default tooltip-top" title="{% trans "Move up" %}">
-      {% csrf_token %}
-      <span class="fa fa-chevron-up"></span>
-    </button>
-  </form>
+    <form action="{% url 'misago:admin:users:ranks:up' pk=item.pk %}" method="post">
+      <button class="btn btn-default tooltip-top" title="{% trans "Move up" %}">
+        {% csrf_token %}
+        <span class="fa fa-chevron-up"></span>
+      </button>
+    </form>
   {% else %}
-  &nbsp;
+    &nbsp;
   {% endif %}
 </td>
 <td class="row-action">

misago/templates/misago/admin/roles/form.html

@@ -4,18 +4,18 @@
 
 {% block title %}
 {% if target.pk %}
-{{ target }}
+  {{ target }}
 {% else %}
-{% trans "New role" %}
+  {% trans "New role" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
 {% endblock title %}
 
 
 {% block page-target %}
 {% if target.pk %}
-{{ target }}
+  {{ target }}
 {% else %}
-{% trans "New role" %}
+  {% trans "New role" %}
 {% endif %}
 {% endblock page-target %}
 
@@ -23,9 +23,9 @@
 {% block form-header %}
 <h1>
   {% if target.pk %}
-  {{ target }}
+    {{ target }}
   {% else %}
-  {% trans "New role" %}
+    {% trans "New role" %}
   {% endif %}
 </h1>
 {% endblock %}
@@ -38,18 +38,13 @@ class="form-horizontal"
 
 {% block form-body %}
 <div class="form-body">
-
   <fieldset>
     <legend>{% trans "Basic settings" %}</legend>
-
     {% form_row form.name "col-md-3" "col-md-9" %}
-
   </fieldset>
-
   {% for form in perms_forms %}
-  {% include "misago/admin/permissions_table.html" %}
+    {% include "misago/admin/permissions_table.html" %}
   {% endfor %}
-
 </div>
 {% endblock form-body %}
 

misago/templates/misago/admin/roles/list.html

@@ -15,7 +15,7 @@
 {% block table-header %}
 <th>{% trans "Role" %}</th>
 {% for action in extra_actions %}
-<th style="width: 1%;">&nbsp;</th>
+  <th style="width: 1%;">&nbsp;</th>
 {% endfor %}
 <th style="width: 1%;">&nbsp;</th>
 <th style="width: 1%;">&nbsp;</th>
@@ -28,11 +28,11 @@
   {{ item }}
 </td>
 {% for action in extra_actions %}
-<td class="row-action">
-  <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}default{% endif %} tooltip-top" title="{{ action.name }}">
-    <span class="{{ action.icon }}"></span>
-  </a>
-</td>
+  <td class="row-action">
+    <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}default{% endif %} tooltip-top" title="{{ action.name }}">
+      <span class="{{ action.icon }}"></span>
+    </a>
+  </td>
 {% endfor %}
 <td class="row-action">
   <a href="{% url 'misago:admin:permissions:users:users' pk=item.pk %}" class="btn btn-primary tooltip-top" title="{% trans "Users with role" %}">

misago/templates/misago/admin/users/ban.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load i18n misago_avatars misago_capture misago_admin_form %}
+{% load i18n misago_admin_form misago_avatars misago_capture %}
 
 
 {% block title %}
@@ -25,48 +25,48 @@ class="form-horizontal"
 {% block form-body %}
 <input type="hidden" name="action" value="ban">
 {% for user in users %}
-<input type="hidden" name="selected_items" value="{{ user.pk }}">
+  <input type="hidden" name="selected_items" value="{{ user.pk }}">
 {% endfor %}
 <table class="table table-condensed form-table">
   {% for user in users %}
-  <tr>
-    <td style="width: 1%;">
-      <a href="{{ user.get_absolute_url }}">
-        <img src="{{ user|avatar:24 }}" alt="{% trans "Avatar" %}" width="24" height="24">
-      </a>
-    </td>
-    <td class="item-name">
-      <a href="{{ user.get_absolute_url }}">{{ user }}</a>
-    </td>
-    <td>
-      {{ user.email }}
-    </td>
-    <td>
-      {% if user.joined_from_ip %}
-        {{ user.joined_from_ip }}
-      {% else %}
-        <i>{% trans "IP not available" %}</i>
-      {% endif %}
-    </td>
-  </tr>
+    <tr>
+      <td style="width: 1%;">
+        <a href="{{ user.get_absolute_url }}">
+          <img src="{{ user|avatar:24 }}" alt="{% trans "Avatar" %}" width="24" height="24">
+        </a>
+      </td>
+      <td class="item-name">
+        <a href="{{ user.get_absolute_url }}">{{ user }}</a>
+      </td>
+      <td>
+        {{ user.email }}
+      </td>
+      <td>
+        {% if user.joined_from_ip %}
+          {{ user.joined_from_ip }}
+        {% else %}
+          <i>{% trans "IP not available" %}</i>
+        {% endif %}
+      </td>
+    </tr>
   {% endfor %}
 </table>
 <div class="form-body">
   {% with label_class="col-md-3" field_class="col-md-9" %}
-  <fieldset>
-    <legend>{% trans "Ban settings" %}</legend>
+    <fieldset>
+      <legend>{% trans "Ban settings" %}</legend>
 
-    {% form_row form.ban_type label_class field_class %}
-    {% form_row form.expires_on label_class field_class %}
+      {% form_row form.ban_type label_class field_class %}
+      {% form_row form.expires_on label_class field_class %}
 
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Messages" %}</legend>
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Messages" %}</legend>
 
-    {% form_row form.user_message label_class field_class %}
-    {% form_row form.staff_message label_class field_class %}
+      {% form_row form.user_message label_class field_class %}
+      {% form_row form.staff_message label_class field_class %}
 
-  </fieldset>
+    </fieldset>
   {% endwith %}
 </div>
 {% endblock form-body %}

misago/templates/misago/admin/users/delete.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load i18n misago_avatars misago_capture misago_admin_form %}
+{% load i18n misago_admin_form misago_avatars misago_capture %}
 
 
 {% block title %}
@@ -13,36 +13,34 @@
 
 
 {% block form-header %}
-<h1>
-  {% trans "Deleting users..." %}
-</h1>
+<h1>{% trans "Deleting users..." %}</h1>
 {% endblock %}
 
 
 {% block form-body %}
 <div class="form-body">
   {% for user in users %}
-  <fieldset class="user queued">
-    <legend>{{ user.username }}</legend>
-
-    <div class="extra-padding">
-      <ul class="list-unstyled">
-        <li class="step queued" data-url="{% url 'misago:admin:users:accounts:delete-threads' pk=user.pk %}" data-total="{{ user.thread_set.count }}">
-          <span class="fa fa-clock-o fa-fw text-muted"></span>
-          {% trans "Threads" %}: <strong><em class="text-muted">{% trans "queued" %}</em></strong>
-        </li>
-        <li class="step queued" data-url="{% url 'misago:admin:users:accounts:delete-posts' pk=user.pk %}" data-total="{{ user.post_set.count }}">
-          <span class="fa fa-clock-o fa-fw text-muted"></span>
-          {% trans "Posts" %}: <strong><em class="text-muted">{% trans "queued" %}</em></strong>
-        </li>
-        <li class="step queued" data-url="{% url 'misago:admin:users:accounts:delete-account' pk=user.pk %}">
-          <span class="fa fa-clock-o fa-fw text-muted"></span>
-          {% trans "Account" %}: <strong><em class="text-muted">{% trans "queued" %}</em></strong>
-        </li>
-      </ul>
-    </div>
-
-  </fieldset>
+    <fieldset class="user queued">
+      <legend>{{ user.username }}</legend>
+
+      <div class="extra-padding">
+        <ul class="list-unstyled">
+          <li class="step queued" data-url="{% url 'misago:admin:users:accounts:delete-threads' pk=user.pk %}" data-total="{{ user.thread_set.count }}">
+            <span class="fa fa-clock-o fa-fw text-muted"></span>
+            {% trans "Threads" %}: <strong><em class="text-muted">{% trans "queued" %}</em></strong>
+          </li>
+          <li class="step queued" data-url="{% url 'misago:admin:users:accounts:delete-posts' pk=user.pk %}" data-total="{{ user.post_set.count }}">
+            <span class="fa fa-clock-o fa-fw text-muted"></span>
+            {% trans "Posts" %}: <strong><em class="text-muted">{% trans "queued" %}</em></strong>
+          </li>
+          <li class="step queued" data-url="{% url 'misago:admin:users:accounts:delete-account' pk=user.pk %}">
+            <span class="fa fa-clock-o fa-fw text-muted"></span>
+            {% trans "Account" %}: <strong><em class="text-muted">{% trans "queued" %}</em></strong>
+          </li>
+        </ul>
+      </div>
+
+    </fieldset>
   {% endfor %}
 </div>
 {% endblock form-body %}
@@ -50,12 +48,11 @@
 
 {% block form-footer %}{% endblock form-footer %}
 
+
 {% block javascripts %}
 <script type="text/javascript">
   $(function() {
-
     DeletionController = function($e, on_complete) {
-
       this.lang_deleting = "{% trans 'deleting...' %}";
       this.done = "{% trans 'done' %}";
 
@@ -66,7 +63,6 @@
       var _this = this;
 
       this.step = function($step) {
-
         var url = $step.data('url');
         var total = $step.data('total');
 
@@ -106,20 +102,15 @@
 
           });
         }
-
         query_server();
-
       }
 
       this.complete = function() {
-
         this.$e.removeClass('queued');
         on_complete();
-
       }
 
       this.process = function() {
-
         var $step = this.$e.find('.step.queued').first();
 
         if ($step.length) {
@@ -130,28 +121,21 @@
 
       }
       this.process();
-
     };
 
     function delete_user() {
-
       var $user = $('.user.queued').first();
-
       if ($user.length) {
         var controller = new DeletionController($user, delete_user);
       } else {
-
         var $form = $('.user').first().parents('form');
         var $btn = $form.find('.btn-default');
 
         $btn.text("{% trans 'Return to list of users' %}");
         $btn.attr('class', 'btn btn-success');
-
       }
-
     }
     delete_user();
-
   });
 </script>
 {% endblock %}

misago/templates/misago/admin/users/edit.html

@@ -27,222 +27,222 @@ class="form-horizontal"
 {% block form-body %}
 <div class="form-body">
   {% with label_class="col-md-3" field_class="col-md-9" %}
-  <fieldset>
-    <legend>{% trans "Basic account settings" %}</legend>
-
-    {% form_row form.username label_class field_class %}
-
-    {% if 'rank' in form.fields %}
-      {% form_row form.rank label_class field_class %}
-    {% endif %}
-
-    {% form_row form.title label_class field_class %}
-    {% form_row form.roles label_class field_class %}
-
-    {% if 'staff_level' in form.fields %}
-      {% form_row form.staff_level label_class field_class %}
-    {% endif %}
-
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Administrator status" %}</legend>
-
-    {% if 'is_staff' in form.fields %}
-      {% form_row form.is_staff label_class field_class %}
-      {% form_row form.is_superuser label_class field_class %}
-    {% else %}
-      <div id="div_id_is_staff" class="form-group">
-        <label for="id_is_staff_0" class="control-label {{ label_class }}">
-          {{ form.IS_STAFF_LABEL }}:
-        </label>
-        <div class="{{ field_class }}">
-          <p class="form-control-static">
-            {% if target.is_staff %}
-              <strong class="text-primary">{% trans "Yes" %}</strong>
-            {% else %}
-              <strong class="text-muted">{% trans "No" %}</strong>
-            {% endif %}
-          </p>
-          <p id="hint_id_is_staff" class="help-block">
-            {{ form.IS_STAFF_HELP_TEXT }}
-          </p>
-        </div>
-      </div>
-      <div id="div_id_is_superuser" class="form-group">
-        <label for="id_is_superuser_0" class="control-label {{ label_class }}">
-          {{ form.IS_SUPERUSER_LABEL }}:
-        </label>
-        <div class="{{ field_class }}">
-          <p class="form-control-static">
-            {% if target.is_superuser %}
-              <strong class="text-primary">{% trans "Yes" %}</strong>
-            {% else %}
-              <strong class="text-muted">{% trans "No" %}</strong>
-            {% endif %}
-          </p>
-          <p id="hint_id_is_superuser" class="help-block">
-            {{ form.IS_SUPERUSER_HELP_TEXT }}
-          </p>
-        </div>
-      </div>
-      <p class="text-center">
-        <strong>{% trans "Note" %}:</strong>
-        {% trans "Only superusers can change other users administrator status." %}
-      </p>
-    {% endif %}
-
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Sign-in credentials" %}</legend>
-
-    {% form_row form.email label_class field_class %}
-    {% form_row form.new_password label_class field_class %}
-
-    {% if not target.has_usable_password %}
-      <div id="div_id_has_usable_password" class="form-group">
-        <div class="{{ field_class }} col-md-offset-3">
-          <p class="form-control-static">
-            {% trans "This user has not set account password and uses other service to authenticate." %}
-          </p>
-        </div>
-      </div>
-    {% endif %}
+    <fieldset>
+      <legend>{% trans "Basic account settings" %}</legend>
 
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Avatar" %}</legend>
+      {% form_row form.username label_class field_class %}
 
-    {% form_row form.is_avatar_locked label_class field_class %}
-    {% form_row form.avatar_lock_user_message label_class field_class %}
-    {% form_row form.avatar_lock_staff_message label_class field_class %}
+      {% if 'rank' in form.fields %}
+        {% form_row form.rank label_class field_class %}
+      {% endif %}
 
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Signature" %}</legend>
+      {% form_row form.title label_class field_class %}
+      {% form_row form.roles label_class field_class %}
 
-    {% form_row form.signature label_class field_class %}
-    {% form_row form.is_signature_locked label_class field_class %}
-    {% form_row form.signature_lock_user_message label_class field_class %}
-    {% form_row form.signature_lock_staff_message label_class field_class %}
+      {% if 'staff_level' in form.fields %}
+        {% form_row form.staff_level label_class field_class %}
+      {% endif %}
 
-  </fieldset>
-  {% for group in form.get_profile_fields_groups %}
+    </fieldset>
     <fieldset>
-      <legend>{% trans group.name %}</legend>
+      <legend>{% trans "Administrator status" %}</legend>
 
-      {% for field in group.fields %}
-        {% form_row field label_class field_class %}
-      {% endfor %}
-
-    </fieldset>
-  {% endfor %}
-  <fieldset>
-    <legend>{% trans "Forum options" %}</legend>
-
-    {% form_row form.is_hiding_presence label_class field_class %}
-    {% form_row form.limits_private_thread_invites_to label_class field_class %}
-
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Automatic subscription preferences" %}</legend>
-
-    {% form_row form.subscribe_to_started_threads label_class field_class %}
-    {% form_row form.subscribe_to_replied_threads label_class field_class %}
-
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Account status" %}</legend>
-
-    {% if target.is_deleting_account %}
-      <div id="div_id_is_deleting_account" class="form-group">
-        <label for="id_is_ais_deleting_account_0" class="control-label {{ label_class }}">
-          {{ form.IS_ACTIVE_LABEL }}:
-        </label>
-        <div class="{{ field_class }}">
-          <p class="form-control-static">
-            <strong class="text-danger">
-              {% trans "This user is deleting their account. It has been deactivated for the duration of the process." %}
-            </strong>
-          </p>
-          <p id="hint_id_is_active" class="help-block">
-            {% trans "No additional action is required. This account will be deleted automatically." %}
-          </p>
-        </div>
-      </div>
-    {% else %}
-      {% if 'is_active' in form.fields %}
-        {% form_row form.is_active label_class field_class %}
-        {% form_row form.is_active_staff_message label_class field_class %}
+      {% if 'is_staff' in form.fields %}
+        {% form_row form.is_staff label_class field_class %}
+        {% form_row form.is_superuser label_class field_class %}
       {% else %}
-        <div id="div_id_is_active" class="form-group">
-          <label for="id_is_active_0" class="control-label {{ label_class }}">
-            {{ form.IS_ACTIVE_LABEL }}:
+        <div id="div_id_is_staff" class="form-group">
+          <label for="id_is_staff_0" class="control-label {{ label_class }}">
+            {{ form.IS_STAFF_LABEL }}:
           </label>
           <div class="{{ field_class }}">
             <p class="form-control-static">
-              {% if target.is_active %}
-                <strong class="text-success">{% trans "Yes" %}</strong>
+              {% if target.is_staff %}
+                <strong class="text-primary">{% trans "Yes" %}</strong>
               {% else %}
-                <strong class="text-danger">{% trans "No" %}</strong>
+                <strong class="text-muted">{% trans "No" %}</strong>
               {% endif %}
             </p>
-            <p id="hint_id_is_active" class="help-block">
-              {{ form.IS_ACTIVE_HELP_TEXT }}
+            <p id="hint_id_is_staff" class="help-block">
+              {{ form.IS_STAFF_HELP_TEXT }}
             </p>
           </div>
         </div>
         <div id="div_id_is_superuser" class="form-group">
           <label for="id_is_superuser_0" class="control-label {{ label_class }}">
-            {{ form.IS_ACTIVE_STAFF_MESSAGE_LABEL }}:
+            {{ form.IS_SUPERUSER_LABEL }}:
           </label>
           <div class="{{ field_class }}">
-            <div class="form-control-static">
-              {% if target.is_active_staff_message %}
-                {{ target.is_active_staff_message|force_escape|urlize|linebreaks }}
+            <p class="form-control-static">
+              {% if target.is_superuser %}
+                <strong class="text-primary">{% trans "Yes" %}</strong>
               {% else %}
-                <em>{% trans "No staff message is available." %}</em>
+                <strong class="text-muted">{% trans "No" %}</strong>
               {% endif %}
-            </div>
+            </p>
             <p id="hint_id_is_superuser" class="help-block">
-              {{ form.IS_ACTIVE_STAFF_MESSAGE_HELP_TEXT }}
+              {{ form.IS_SUPERUSER_HELP_TEXT }}
             </p>
           </div>
         </div>
+        <p class="text-center">
+          <strong>{% trans "Note" %}:</strong>
+          {% trans "Only superusers can change other users administrator status." %}
+        </p>
       {% endif %}
-    {% endif %}
-
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Agreements" %}</legend>
-    <table class="table table-condensed">
-      <thead>
-        <tr>
-          <th>{% trans "Agreement" %}</th>
-          <th style="width: 250px;">{% trans "Accepted on" %}</th>
-        </tr>
-      </thead>
-      <tbody>
-        {% for agreement in target.useragreement_set.select_related.iterator %}
-          <tr>
-            <td>
-              <a href="{% url 'misago:admin:users:agreements:edit' pk=agreement.agreement_id %}">
-                {{ agreement.agreement.get_final_title }}
-              </a>
-            </td>
-            <td>
-              <abbr class="moment" data-iso="{{ agreement.accepted_on.isoformat }}" data-format="LL"></abbr>
-            </td>
-          </tr>
-        {% empty %}
+
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Sign-in credentials" %}</legend>
+
+      {% form_row form.email label_class field_class %}
+      {% form_row form.new_password label_class field_class %}
+
+      {% if not target.has_usable_password %}
+        <div id="div_id_has_usable_password" class="form-group">
+          <div class="{{ field_class }} col-md-offset-3">
+            <p class="form-control-static">
+              {% trans "This user has not set account password and uses other service to authenticate." %}
+            </p>
+          </div>
+        </div>
+      {% endif %}
+
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Avatar" %}</legend>
+
+      {% form_row form.is_avatar_locked label_class field_class %}
+      {% form_row form.avatar_lock_user_message label_class field_class %}
+      {% form_row form.avatar_lock_staff_message label_class field_class %}
+
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Signature" %}</legend>
+
+      {% form_row form.signature label_class field_class %}
+      {% form_row form.is_signature_locked label_class field_class %}
+      {% form_row form.signature_lock_user_message label_class field_class %}
+      {% form_row form.signature_lock_staff_message label_class field_class %}
+
+    </fieldset>
+    {% for group in form.get_profile_fields_groups %}
+      <fieldset>
+        <legend>{% trans group.name %}</legend>
+
+        {% for field in group.fields %}
+          {% form_row field label_class field_class %}
+        {% endfor %}
+
+      </fieldset>
+    {% endfor %}
+    <fieldset>
+      <legend>{% trans "Forum options" %}</legend>
+
+      {% form_row form.is_hiding_presence label_class field_class %}
+      {% form_row form.limits_private_thread_invites_to label_class field_class %}
+
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Automatic subscription preferences" %}</legend>
+
+      {% form_row form.subscribe_to_started_threads label_class field_class %}
+      {% form_row form.subscribe_to_replied_threads label_class field_class %}
+
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Account status" %}</legend>
+
+      {% if target.is_deleting_account %}
+        <div id="div_id_is_deleting_account" class="form-group">
+          <label for="id_is_ais_deleting_account_0" class="control-label {{ label_class }}">
+            {{ form.IS_ACTIVE_LABEL }}:
+          </label>
+          <div class="{{ field_class }}">
+            <p class="form-control-static">
+              <strong class="text-danger">
+                {% trans "This user is deleting their account. It has been deactivated for the duration of the process." %}
+              </strong>
+            </p>
+            <p id="hint_id_is_active" class="help-block">
+              {% trans "No additional action is required. This account will be deleted automatically." %}
+            </p>
+          </div>
+        </div>
+      {% else %}
+        {% if 'is_active' in form.fields %}
+          {% form_row form.is_active label_class field_class %}
+          {% form_row form.is_active_staff_message label_class field_class %}
+        {% else %}
+          <div id="div_id_is_active" class="form-group">
+            <label for="id_is_active_0" class="control-label {{ label_class }}">
+              {{ form.IS_ACTIVE_LABEL }}:
+            </label>
+            <div class="{{ field_class }}">
+              <p class="form-control-static">
+                {% if target.is_active %}
+                  <strong class="text-success">{% trans "Yes" %}</strong>
+                {% else %}
+                  <strong class="text-danger">{% trans "No" %}</strong>
+                {% endif %}
+              </p>
+              <p id="hint_id_is_active" class="help-block">
+                {{ form.IS_ACTIVE_HELP_TEXT }}
+              </p>
+            </div>
+          </div>
+          <div id="div_id_is_superuser" class="form-group">
+            <label for="id_is_superuser_0" class="control-label {{ label_class }}">
+              {{ form.IS_ACTIVE_STAFF_MESSAGE_LABEL }}:
+            </label>
+            <div class="{{ field_class }}">
+              <div class="form-control-static">
+                {% if target.is_active_staff_message %}
+                  {{ target.is_active_staff_message|force_escape|urlize|linebreaks }}
+                {% else %}
+                  <em>{% trans "No staff message is available." %}</em>
+                {% endif %}
+              </div>
+              <p id="hint_id_is_superuser" class="help-block">
+                {{ form.IS_ACTIVE_STAFF_MESSAGE_HELP_TEXT }}
+              </p>
+            </div>
+          </div>
+        {% endif %}
+      {% endif %}
+
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Agreements" %}</legend>
+      <table class="table table-condensed">
+        <thead>
           <tr>
-            <td colspan="2">
-              {% trans "This user didn't accept any agreements." %}
-            </td>
+            <th>{% trans "Agreement" %}</th>
+            <th style="width: 250px;">{% trans "Accepted on" %}</th>
           </tr>
-        {% endfor %}
-      </tbody>
-    </table>
-  </fieldset>
+        </thead>
+        <tbody>
+          {% for agreement in target.useragreement_set.select_related.iterator %}
+            <tr>
+              <td>
+                <a href="{% url 'misago:admin:users:agreements:edit' pk=agreement.agreement_id %}">
+                  {{ agreement.agreement.get_final_title }}
+                </a>
+              </td>
+              <td>
+                <abbr class="moment" data-iso="{{ agreement.accepted_on.isoformat }}" data-format="LL"></abbr>
+              </td>
+            </tr>
+          {% empty %}
+            <tr>
+              <td colspan="2">
+                {% trans "This user didn't accept any agreements." %}
+              </td>
+            </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+    </fieldset>
   {% endwith %}
 </div>
 {% endblock form-body %}

misago/templates/misago/admin/users/list.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load i18n misago_avatars misago_admin_form %}
+{% load i18n misago_admin_form misago_avatars %}
 
 
 {% block page-actions %}
@@ -23,7 +23,7 @@
 <th style="width: 200px;">{% trans "Joined" %}</th>
 <th style="width: 128px;">{% trans "Posts" %}</th>
 {% for action in extra_actions %}
-<th style="width: 1%;">&nbsp;</th>
+  <th style="width: 1%;">&nbsp;</th>
 {% endfor %}
 <th style="width: 1%;">&nbsp;</th>
 {% endblock table-header %}
@@ -52,20 +52,20 @@
 </td>
 <td class="lead text-muted">
   {% if item.requires_activation_by_admin %}
-  <span class="fa fa-eye tooltip-top" title="{% trans "Requires activation by administrator" %}"></span>
+    <span class="fa fa-eye tooltip-top" title="{% trans "Requires activation by administrator" %}"></span>
   {% elif item.requires_activation_by_user %}
-  <span class="fa fa-ticket tooltip-top" title="{% trans "Has to activate account" %}"></span>
+    <span class="fa fa-ticket tooltip-top" title="{% trans "Has to activate account" %}"></span>
   {% else %}
-  &nbsp;
+    &nbsp;
   {% endif %}
 </td>
 <td class="lead text-muted">
   {% if item.is_superuser %}
-  <span class="fa fa-star tooltip-top" title="{% trans "Super administrator" %}"></span>
+    <span class="fa fa-star tooltip-top" title="{% trans "Super administrator" %}"></span>
   {% elif item.is_staff %}
-  <span class="fa fa-star-half-o tooltip-top" title="{% trans "Administrator" %}"></span>
+    <span class="fa fa-star-half-o tooltip-top" title="{% trans "Administrator" %}"></span>
   {% else %}
-  &nbsp;
+    &nbsp;
   {% endif %}
 </td>
 <td>
@@ -88,11 +88,11 @@
   {{ item.posts }}
 </td>
 {% for action in extra_actions %}
-<td class="row-action">
-  <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}default{% endif %} tooltip-top" title="{{ action.name }}">
-    <span class="{{ action.icon }}"></span>
-  </a>
-</td>
+  <td class="row-action">
+    <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}default{% endif %} tooltip-top" title="{{ action.name }}">
+      <span class="{{ action.icon }}"></span>
+    </a>
+  </td>
 {% endfor %}
 <td class="row-action">
   <a href="{% url 'misago:admin:users:accounts:edit' pk=item.pk %}" class="btn btn-primary tooltip-top" title="{% trans "Edit user" %}">

misago/templates/misago/admin/users/new.html

@@ -13,9 +13,7 @@
 
 
 {% block form-header %}
-<h1>
-  {% trans "New user" %}
-</h1>
+<h1>{% trans "New user" %}</h1>
 {% endblock %}
 
 
@@ -27,30 +25,30 @@ class="form-horizontal"
 {% block form-body %}
 <div class="form-body">
   {% with label_class="col-md-3" field_class="col-md-9" %}
-  <fieldset>
-    <legend>{% trans "Basic account settings" %}</legend>
+    <fieldset>
+      <legend>{% trans "Basic account settings" %}</legend>
 
-    {% form_row form.username label_class field_class %}
+      {% form_row form.username label_class field_class %}
 
-    {% if 'rank' in form.fields %}
-      {% form_row form.rank label_class field_class %}
-    {% endif %}
+      {% if 'rank' in form.fields %}
+        {% form_row form.rank label_class field_class %}
+      {% endif %}
 
-    {% form_row form.title label_class field_class %}
-    {% form_row form.roles label_class field_class %}
+      {% form_row form.title label_class field_class %}
+      {% form_row form.roles label_class field_class %}
 
-    {% if 'staff_level' in form.fields %}
-      {% form_row form.staff_level label_class field_class %}
-    {% endif %}
+      {% if 'staff_level' in form.fields %}
+        {% form_row form.staff_level label_class field_class %}
+      {% endif %}
 
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Sign-in credentials" %}</legend>
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Sign-in credentials" %}</legend>
 
-    {% form_row form.email label_class field_class %}
-    {% form_row form.new_password label_class field_class %}
+      {% form_row form.email label_class field_class %}
+      {% form_row form.new_password label_class field_class %}
 
-  </fieldset>
+    </fieldset>
   {% endwith %}
 </div>
 {% endblock form-body %}

misago/templates/misago/admin/warnings/form.html

@@ -4,18 +4,18 @@
 
 {% block title %}
 {% if target.pk %}
-{{ target }}
+  {{ target }}
 {% else %}
-{% trans "New warning level" %}
+  {% trans "New warning level" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
 {% endblock title %}
 
 
 {% block page-target %}
 {% if target.pk %}
-{{ target }}
+  {{ target }}
 {% else %}
-{% trans "New warning level" %}
+  {% trans "New warning level" %}
 {% endif %}
 {% endblock page-target %}
 
@@ -23,9 +23,9 @@
 {% block form-header %}
 <h1>
   {% if target.pk %}
-  {{ target }}
+    {{ target }}
   {% else %}
-  {% trans "New warning level" %}
+    {% trans "New warning level" %}
   {% endif %}
 </h1>
 {% endblock %}
@@ -39,20 +39,20 @@ class="form-horizontal"
 {% block form-body %}
 <div class="form-body">
   {% with label_class="col-md-3" field_class="col-md-9" %}
-  <fieldset>
-    <legend>{% trans "Basic options" %}</legend>
+    <fieldset>
+      <legend>{% trans "Basic options" %}</legend>
 
-    {% form_row form.name label_class field_class %}
-    {% form_row form.length_in_minutes label_class field_class %}
+      {% form_row form.name label_class field_class %}
+      {% form_row form.length_in_minutes label_class field_class %}
 
-  </fieldset>
-  <fieldset>
-    <legend>{% trans "Restrictions" %}</legend>
+    </fieldset>
+    <fieldset>
+      <legend>{% trans "Restrictions" %}</legend>
 
-    {% form_row form.restricts_posting_replies label_class field_class %}
-    {% form_row form.restricts_posting_threads label_class field_class %}
+      {% form_row form.restricts_posting_replies label_class field_class %}
+      {% form_row form.restricts_posting_threads label_class field_class %}
 
-  </fieldset>
+    </fieldset>
   {% endwith %}
 </div>
 {% endblock form-body %}

misago/templates/misago/admin/warnings/list.html

@@ -18,7 +18,7 @@
 <th style="width: 20%;">{% trans "Replying" %}</th>
 <th style="width: 20%;">{% trans "Starting threads" %}</th>
 {% for action in extra_actions %}
-<th style="width: 1%;">&nbsp;</th>
+  <th style="width: 1%;">&nbsp;</th>
 {% endfor %}
 <th style="width: 1%;">&nbsp;</th>
 <th style="width: 1%;">&nbsp;</th>
@@ -40,69 +40,69 @@
 </td>
 <td>
   {% if item.restricts_posting_replies == 0 %}
-  <div class="text-success">
-    <span class="fa fa-check-circle"></span>
-    {% trans "Not restricted" %}
-  </div>
+    <div class="text-success">
+      <span class="fa fa-check-circle"></span>
+      {% trans "Not restricted" %}
+    </div>
   {% elif item.restricts_posting_replies == 1 %}
-  <div class="text-warning">
-    <span class="fa fa-exclamation-circle"></span>
-    {% trans "Moderated" %}
-  </div>
+    <div class="text-warning">
+      <span class="fa fa-exclamation-circle"></span>
+      {% trans "Moderated" %}
+    </div>
   {% else %}
-  <div class="text-danger">
-    <span class="fa fa-times-circle"></span>
-    {% trans "Forbidden" %}
-  </div>
+    <div class="text-danger">
+      <span class="fa fa-times-circle"></span>
+      {% trans "Forbidden" %}
+    </div>
   {% endif %}
 </td>
 <td>
   {% if item.restricts_posting_threads == 0 %}
-  <div class="text-success">
-    <span class="fa fa-check-circle"></span>
-    {% trans "Not restricted" %}
-  </div>
+    <div class="text-success">
+      <span class="fa fa-check-circle"></span>
+      {% trans "Not restricted" %}
+    </div>
   {% elif item.restricts_posting_threads == 1 %}
-  <div class="text-warning">
-    <span class="fa fa-exclamation-circle"></span>
-    {% trans "Moderated" %}
-  </div>
+    <div class="text-warning">
+      <span class="fa fa-exclamation-circle"></span>
+      {% trans "Moderated" %}
+    </div>
   {% else %}
-  <div class="text-danger">
-    <span class="fa fa-times-circle"></span>
-    {% trans "Forbidden" %}
-  </div>
+    <div class="text-danger">
+      <span class="fa fa-times-circle"></span>
+      {% trans "Forbidden" %}
+    </div>
   {% endif %}
 </td>
 {% for action in extra_actions %}
-<td class="row-action">
-  <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}default{% endif %} tooltip-top" title="{{ action.name }}">
-    <span class="{{ action.icon }}"></span>
-  </a>
-</td>
+  <td class="row-action">
+    <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}default{% endif %} tooltip-top" title="{{ action.name }}">
+      <span class="{{ action.icon }}"></span>
+    </a>
+  </td>
 {% endfor %}
 <td class="row-action">
   {% if not forloop.last %}
-  <form action="{% url 'misago:admin:users:warnings:down' pk=item.pk %}" method="post">
-    <button class="btn btn-default tooltip-top" title="{% trans "Move down" %}">
-      {% csrf_token %}
-      <span class="fa fa-chevron-down"></span>
-    </button>
-  </form>
+    <form action="{% url 'misago:admin:users:warnings:down' pk=item.pk %}" method="post">
+      <button class="btn btn-default tooltip-top" title="{% trans "Move down" %}">
+        {% csrf_token %}
+        <span class="fa fa-chevron-down"></span>
+      </button>
+    </form>
   {% else %}
-  &nbsp;
+    &nbsp;
   {% endif %}
 </td>
 <td class="row-action">
   {% if not forloop.first %}
-  <form action="{% url 'misago:admin:users:warnings:up' pk=item.pk %}" method="post">
-    <button class="btn btn-default tooltip-top" title="{% trans "Move up" %}">
-      {% csrf_token %}
-      <span class="fa fa-chevron-up"></span>
-    </button>
-  </form>
+    <form action="{% url 'misago:admin:users:warnings:up' pk=item.pk %}" method="post">
+      <button class="btn btn-default tooltip-top" title="{% trans "Move up" %}">
+        {% csrf_token %}
+        <span class="fa fa-chevron-up"></span>
+      </button>
+    </form>
   {% else %}
-  &nbsp;
+    &nbsp;
   {% endif %}
 </td>
 <td class="row-action">

misago/templates/misago/auth.html

@@ -5,8 +5,8 @@
   <input type="submit" id="signin-button" value="{% trans "Sign in" %}">
 </form>
 {% if user.is_authenticated %}
-<form id="hidden-logout-form" method="post" action="{% url LOGOUT_URL %}" style="display: none;">
-  {% csrf_token %}
-  <input type="submit" id="signin-button" value="{% trans "Log out" %}">
-</form>
+  <form id="hidden-logout-form" method="post" action="{% url LOGOUT_URL %}" style="display: none;">
+    {% csrf_token %}
+    <input type="submit" id="signin-button" value="{% trans "Log out" %}">
+  </form>
 {% endif %}

misago/templates/misago/base.html

@@ -55,7 +55,7 @@
     </script>
     <script src="{% static 'misago/js/vendor.js' %}"></script>
     {% if LANGUAGE_CODE != "en-us" and MOMENTJS_LOCALE_URL %}
-    <script src="{% static MOMENTJS_LOCALE_URL %}"></script>
+      <script src="{% static MOMENTJS_LOCALE_URL %}"></script>
     {% endif %}
     <script src="{% static 'misago/js/misago.js' %}"></script>
     {% include "misago/scripts.html" %}

misago/templates/misago/categories/base.html

@@ -19,7 +19,7 @@
   {% if not THREADS_ON_INDEX and settings.forum_index_meta_description %}
     {{ settings.forum_index_meta_description }}
   {% else %}
-  {% blocktrans trimmed count categories=categories|length with forum_name=settings.forum_name %}
+    {% blocktrans trimmed count categories=categories|length with forum_name=settings.forum_name %}
       There is {{ categories }} main category currenty available on the {{ forum_name }}.
     {% plural %}
       There are {{ categories }} main categories currenty available on the {{ forum_name }}.

misago/templates/misago/categories/list_item.html

@@ -26,28 +26,28 @@
   {% if category.subcategories and not first %}
     <div class="row subcategories-list">
       {% for subcategory in category.subcategories %}
-      <div class="col-xs-12 col-sm-4 col-md-3">
-        <a class="btn btn-default btn-block btn-sm btn-subcategory {{ subcategory.is_read|iffalse:'btn-subcategory-new' }}" href="{{ subcategory.get_absolute_url }}">
-          <span class="material-icon">
-            {% if category.is_closed %}
-              {% if category.is_read %}
-                lock_outline
+        <div class="col-xs-12 col-sm-4 col-md-3">
+          <a class="btn btn-default btn-block btn-sm btn-subcategory {{ subcategory.is_read|iffalse:'btn-subcategory-new' }}" href="{{ subcategory.get_absolute_url }}">
+            <span class="material-icon">
+              {% if category.is_closed %}
+                {% if category.is_read %}
+                  lock_outline
+                {% else %}
+                  lock
+                {% endif %}
               {% else %}
-                lock
+                {% if category.is_read %}
+                  chat_bubble_outline
+                {% else %}
+                  chat_bubble
+                {% endif %}
               {% endif %}
-            {% else %}
-              {% if category.is_read %}
-                chat_bubble_outline
-              {% else %}
-                chat_bubble
-              {% endif %}
-            {% endif %}
-          </span>
-          <span class="icon-text">
-            {{ subcategory }}
-          </span>
-        </a>
-      </div>
+            </span>
+            <span class="icon-text">
+              {{ subcategory }}
+            </span>
+          </a>
+        </div>
       {% endfor %}
     </div>
   {% endif %}

misago/templates/misago/errorpages/ban_message.html

@@ -1,21 +1,21 @@
 {% load i18n %}
 {% with ban.get_serialized_message.message as ban_message %}
-    {% if ban_message.html %}
-        <div class="lead">
-            {{ ban_message.html|safe }}
-        </div>
-    {% else %}
-        <p class="lead">
-            {{ ban_message.plain }}
-        </p>
-    {% endif %}
+  {% if ban_message.html %}
+    <div class="lead">
+      {{ ban_message.html|safe }}
+    </div>
+  {% else %}
+    <p class="lead">
+      {{ ban_message.plain }}
+    </p>
+  {% endif %}
 {% endwith %}
 <p className="message-footnote">
-    {% if ban.expires_on %}
-        {% blocktrans trimmed with expires_on=ban.expires_on|date:"DATETIME_FORMAT" %}
-            This ban expires on {{ expires_on }}.
-        {% endblocktrans %}
-    {% else %}
-        {% trans "This ban is permanent." %}
-    {% endif %}
+  {% if ban.expires_on %}
+    {% blocktrans trimmed with expires_on=ban.expires_on|date:"DATETIME_FORMAT" %}
+      This ban expires on {{ expires_on }}.
+    {% endblocktrans %}
+  {% else %}
+    {% trans "This ban is permanent." %}
+  {% endif %}
 </p>

misago/templates/misago/footer.html

@@ -12,21 +12,21 @@
 
       {% if TERMS_OF_SERVICE_URL or PRIVACY_POLICY_URL or settings.forum_footnote %}
         <ul class="list-inline footer-nav">
-        {% if settings.forum_footnote %}
-          <li class="site-footnote">
-            {{ settings.forum_footnote }}
-          </li>
-        {% endif %}
-        {% if TERMS_OF_SERVICE_URL %}
-          <li>
-            <a href="{{ TERMS_OF_SERVICE_URL }}">{% trans "Terms of service" %}</a>
-          </li>
-        {% endif %}
-        {% if PRIVACY_POLICY_URL %}
-          <li>
-            <a href="{{ PRIVACY_POLICY_URL }}">{% trans "Privacy policy" %}</a>
-          </li>
-        {% endif %}
+          {% if settings.forum_footnote %}
+            <li class="site-footnote">
+              {{ settings.forum_footnote }}
+            </li>
+          {% endif %}
+          {% if TERMS_OF_SERVICE_URL %}
+            <li>
+              <a href="{{ TERMS_OF_SERVICE_URL }}">{% trans "Terms of service" %}</a>
+            </li>
+          {% endif %}
+          {% if PRIVACY_POLICY_URL %}
+            <li>
+              <a href="{{ PRIVACY_POLICY_URL }}">{% trans "Privacy policy" %}</a>
+            </li>
+          {% endif %}
         </ul>
       {% endif %}
 

misago/templates/misago/index.html

@@ -4,9 +4,9 @@
 
 {% block title %}
 {% if settings.forum_index_title %}
-{{ settings.forum_index_title }}
+  {{ settings.forum_index_title }}
 {% else %}
-{{ settings.forum_name }}
+  {{ settings.forum_name }}
 {% endif %}
 {% endblock title %}
 

misago/templates/misago/profile/ban_details.html

@@ -18,23 +18,19 @@
 
       {% if ban.user_message %}
         <div class="panel-body ban-message ban-user-message">
-
           <h4>{% trans "User-shown ban message" %}</h4>
           <div class="lead">
             {{ ban.user_message|force_escape|urlize|linebreaks }}
           </div>
-
         </div>
       {% endif %}
 
       {% if ban.staff_message %}
         <div class="panel-body ban-message ban-staff-message">
-
           <h4>{% trans "Team-shown ban message" %}</h4>
           <div class="lead">
             {{ ban.staff_message|force_escape|urlize|linebreaks }}
           </div>
-
         </div>
       {% endif %}
 

misago/templates/misago/profile/base.html

@@ -46,14 +46,10 @@
   <div class="container">
     <div class="row">
       <div class="col-md-3 hidden-xs hidden-sm">
-
         {% include "misago/profile/nav.html" %}
-
       </div>
       <div class="col-xs-12 col-md-9">
-
         {% block section %}{% endblock section %}
-
       </div>
     </div>
   </div>

misago/templates/misago/profile/header.html

@@ -27,20 +27,20 @@
 
         <ul class="list-inline">
           {% if profile.rank.is_tab %}
-          <li class="user-rank">
-            <a href="{% url 'misago:users-rank' slug=profile.rank.slug %}" class="item-title">
-              {{ profile.rank.name }}
-            </a>
-          </li>
+            <li class="user-rank">
+              <a href="{% url 'misago:users-rank' slug=profile.rank.slug %}" class="item-title">
+                {{ profile.rank.name }}
+              </a>
+            </li>
           {% else %}
-          <li class="user-rank">
-            <span class="item-title">{{ profile.rank.name }}</span>
-          </li>
+            <li class="user-rank">
+              <span class="item-title">{{ profile.rank.name }}</span>
+            </li>
           {% endif %}
           {% if profile.title %}
-          <li class="user-title">{{ profile.title }}</li>
+            <li class="user-title">{{ profile.title }}</li>
           {% elif profile.rank.title %}
-          <li class="user-title">{{ profile.rank.title }}</li>
+            <li class="user-title">{{ profile.rank.title }}</li>
           {% endif %}
           <li class="user-joined-on">
             {% blocktrans trimmed with joined_on=profile.joined_on|date %}

misago/templates/misago/profile/username_history.html

@@ -46,13 +46,13 @@
           </div>
           <div class="username-change-author">
             {% if change.changed_by %}
-            <a href="{{ change.changed_by.get_absolute_url }}" class="item-title">
-              {{ change.changed_by.username }}
-            </a>
+              <a href="{{ change.changed_by.get_absolute_url }}" class="item-title">
+                {{ change.changed_by.username }}
+              </a>
             {% else %}
-            <span class="item-title">
-              {{ change.changed_by_username }}
-            </span>
+              <span class="item-title">
+                {{ change.changed_by_username }}
+              </span>
             {% endif %}
           </div>
           <div class="username-change">

misago/templates/misago/thread/paginator.html

@@ -1,40 +1,40 @@
 {% load i18n %}
 <nav class="misago-pagination" role="nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
   {% if paginator.pages > 1 %}
-  <ul class="pagination">
-    {% if paginator.first %}
-      <li>
-        <a href="{% url url_name slug=thread.slug pk=thread.pk %}" title="{% trans 'Go to first page' %}">
-          <span class="material-icon">first_page</span>
-        </a>
-      </li>
-      {% if paginator.previous > 1 %}
+    <ul class="pagination">
+      {% if paginator.first %}
         <li>
-          <a href="{% url url_name slug=thread.slug pk=thread.pk page=paginator.previous %}" rel="prev" title="{% trans 'Go to previous page' %}">
-            <span class="material-icon">chevron_left</span>
+          <a href="{% url url_name slug=thread.slug pk=thread.pk %}" title="{% trans 'Go to first page' %}">
+            <span class="material-icon">first_page</span>
+          </a>
+        </li>
+        {% if paginator.previous > 1 %}
+          <li>
+            <a href="{% url url_name slug=thread.slug pk=thread.pk page=paginator.previous %}" rel="prev" title="{% trans 'Go to previous page' %}">
+              <span class="material-icon">chevron_left</span>
+            </a>
+          </li>
+        {% else %}
+          <li>
+            <a href="{% url url_name slug=thread.slug pk=thread.pk %}" rel="prev" title="{% trans 'Go to previous page' %}">
+              <span class="material-icon">chevron_left</span>
+            </a>
+          </li>
+        {% endif %}
+      {% endif %}
+      {% if paginator.last %}
+        <li>
+          <a href="{% url url_name slug=thread.slug pk=thread.pk page=paginator.next %}" rel="next" title="{% trans 'Go to next page' %}">
+            <span class="material-icon">chevron_right</span>
           </a>
         </li>
-      {% else %}
         <li>
-          <a href="{% url url_name slug=thread.slug pk=thread.pk %}" rel="prev" title="{% trans 'Go to previous page' %}">
-            <span class="material-icon">chevron_left</span>
+          <a href="{% url url_name slug=thread.slug pk=thread.pk page=paginator.last %}" title="{% trans 'Go to last page' %}">
+            <span class="material-icon">last_page</span>
           </a>
         </li>
       {% endif %}
-    {% endif %}
-    {% if paginator.last %}
-      <li>
-        <a href="{% url url_name slug=thread.slug pk=thread.pk page=paginator.next %}" rel="next" title="{% trans 'Go to next page' %}">
-          <span class="material-icon">chevron_right</span>
-        </a>
-      </li>
-      <li>
-        <a href="{% url url_name slug=thread.slug pk=thread.pk page=paginator.last %}" title="{% trans 'Go to last page' %}">
-          <span class="material-icon">last_page</span>
-        </a>
-      </li>
-    {% endif %}
-  </ul>
+    </ul>
   {% endif %}
   <p>
     {% if paginator.more %}

misago/templates/misago/thread/posts/post/body-hidden.html

@@ -1,6 +1,8 @@
 {% load i18n misago_capture %}
 <div class="post-body post-body-hidden" itemprop="articleBody">
-  <p class="lead">{% trans "This post is hidden. You cannot not see its contents." %}</p>
+  <p class="lead">
+    {% trans "This post is hidden. You cannot not see its contents." %}
+  </p>
   {% capture trimmed as hidden_by %}
     {% if post.hidden_by_id %}
       <a href="{% url 'misago:user' pk=post.hidden_by_id slug=post.hidden_by_slug %}" class="item-title">{{ post.hidden_by_name }}</a>

misago/templates/misago/thread/thread.html

@@ -32,17 +32,17 @@
 
 {% block meta-extra %}
 {% if paginator.page > 1 %}
-<link rel="canonical" href="{% url url_name slug=thread.slug pk=thread.pk page=paginator.page %}" />
+  <link rel="canonical" href="{% url url_name slug=thread.slug pk=thread.pk page=paginator.page %}" />
 {% else %}
-<link rel="canonical" href="{% url url_name slug=thread.slug pk=thread.pk %}" />
+  <link rel="canonical" href="{% url url_name slug=thread.slug pk=thread.pk %}" />
 {% endif %}
 {% if paginator.previous > 1 %}
-<link rel="prev" href="{% url url_name slug=thread.slug pk=thread.pk page=paginator.previous %}" />
+  <link rel="prev" href="{% url url_name slug=thread.slug pk=thread.pk page=paginator.previous %}" />
 {% elif paginator.first %}
-<link rel="prev" href="{% url url_name slug=thread.slug pk=thread.pk %}" />
+  <link rel="prev" href="{% url url_name slug=thread.slug pk=thread.pk %}" />
 {% endif %}
 {% if paginator.next %}
-<link rel="next" href="{% url url_name slug=thread.slug pk=thread.pk page=paginator.next %}" />
+  <link rel="next" href="{% url url_name slug=thread.slug pk=thread.pk page=paginator.next %}" />
 {% endif %}
 {% endblock meta-extra %}
 

misago/templates/misago/threadslist/private_threads.html

@@ -43,30 +43,30 @@ page-private-threads
 
 
 {% block list-container %}
-  <div class="category-description">
-    <div class="page-lead">
-      <p>{% trans "Private threads are threads which only those that started them and those they have invited may see and participate in." %}</p>
-    </div>
+<div class="category-description">
+  <div class="page-lead">
+    <p>{% trans "Private threads are threads which only those that started them and those they have invited may see and participate in." %}</p>
   </div>
+</div>
 
-  {{ block.super }}
+{{ block.super }}
 {% endblock list-container%}
 
 
 {% block thread %}
-  {% include "misago/threadslist/thread.html" with hide_path=True %}
+{% include "misago/threadslist/thread.html" with hide_path=True %}
 {% endblock thread %}
 
 
 {% block list-empty-message %}
-  {% if list_type == 'all' %}
-    <p class="lead">
-      {% trans "You aren't participating in any private threads." %}
-    </p>
-    <p>
-      {% trans "Why not start one yourself?" %}
-    </p>
-  {% else %}
-    {% trans "No threads matching specified criteria were found." %}
-  {% endif %}
+{% if list_type == 'all' %}
+  <p class="lead">
+    {% trans "You aren't participating in any private threads." %}
+  </p>
+  <p>
+    {% trans "Why not start one yourself?" %}
+  </p>
+{% else %}
+  {% trans "No threads matching specified criteria were found." %}
+{% endif %}
 {% endblock list-empty-message %}

misago/templates/misago/userslists/active_posters.html

@@ -50,9 +50,9 @@
     {% if users_count %}
       <p class="lead">
         {% blocktrans trimmed with posters=users_count days=tracked_period count counter=users_count %}
-        {{ posters }} most active poster from last {{ days }} days.
+          {{ posters }} most active poster from last {{ days }} days.
         {% plural %}
-        {{ posters }} most active posters from last {{ days }} days.
+          {{ posters }} most active posters from last {{ days }} days.
         {% endblocktrans %}
       </p>
 
@@ -126,7 +126,7 @@
     {% else %}
       <p class="lead">
         {% blocktrans trimmed with days=tracked_period %}
-        No users have posted any new messages during last {{ days }} days.
+          No users have posted any new messages during last {{ days }} days.
         {% endblocktrans %}
       </p>
     {% endif %}

misago/templates/misago/userslists/rank.html

@@ -84,30 +84,30 @@
             <nav role="navigation" itemscope itemtype="http://schema.org/SiteNavigationElement">
               <ul class="pager">
                 {% if paginator.previous > 1 %}
-                <li class="previous">
-                  <a href="{% url 'misago:users-rank' slug=rank.slug page=paginator.previous %}" rel="prev" title="{% trans 'Go to previous page' %}">
-                    <span aria-hidden="true" class="material-icon">
-                      arrow_back
-                    </span>
-                  </a>
-                </li>
+                  <li class="previous">
+                    <a href="{% url 'misago:users-rank' slug=rank.slug page=paginator.previous %}" rel="prev" title="{% trans 'Go to previous page' %}">
+                      <span aria-hidden="true" class="material-icon">
+                        arrow_back
+                      </span>
+                    </a>
+                  </li>
                 {% elif paginator.first %}
-                <li class="previous">
-                  <a href="{% url 'misago:users-rank' slug=rank.slug %}" rel="prev" title="{% trans 'Go to previous page' %}">
-                    <span aria-hidden="true" class="material-icon">
-                      arrow_back
-                    </span>
-                  </a>
-                </li>
+                  <li class="previous">
+                    <a href="{% url 'misago:users-rank' slug=rank.slug %}" rel="prev" title="{% trans 'Go to previous page' %}">
+                      <span aria-hidden="true" class="material-icon">
+                        arrow_back
+                      </span>
+                    </a>
+                  </li>
                 {% endif %}
                 {% if paginator.next %}
-                <li class="next">
-                  <a href="{% url 'misago:users-rank' slug=rank.slug page=paginator.next %}" rel="next" title="{% trans 'Go to next page' %}">
-                    <span aria-hidden="true" class="material-icon">
-                      arrow_forward
-                    </span>
-                  </a>
-                </li>
+                  <li class="next">
+                    <a href="{% url 'misago:users-rank' slug=rank.slug page=paginator.next %}" rel="next" title="{% trans 'Go to next page' %}">
+                      <span aria-hidden="true" class="material-icon">
+                        arrow_forward
+                      </span>
+                    </a>
+                  </li>
                 {% endif %}
               </ul>
             </nav>