faa9b15726fdab224d2571b2842d0f68f7b70527 — Drew DeVault a month ago 20cda87 0.36.5
Updates per core.sr.ht centered design
M listssrht/templates/archive.html => listssrht/templates/archive.html +1 -1
@@ 1,4 1,4 @@-{% extends "list.html" %}
+ {% extends "list-full.html" %}
  {% block content %}
  <div class="container-fluid">
    <div class="row">

A listssrht/templates/list-full.html => listssrht/templates/list-full.html +9 -0
@@ 0,0 1,9 @@
+ {% extends "list.html" %}
+ {% block nav %}
+ <nav class="navbar navbar-light navbar-expand-sm">
+   {% include 'nav.html' %}
+ </nav>
+ {% endblock %}
+ {% block tabs_container %}
+ <div class="container-fluid">
+ {% endblock %}

M listssrht/templates/list.html => listssrht/templates/list.html +54 -54
@@ 1,63 1,63 @@-{% extends "layout-full.html" %}
+ {% extends "layout.html" %}
  {% block title %}
  <title>
    {{ owner.canonical_name }}/{{ ml.name }} archives &mdash; {{site}}
  </title>
  {% endblock %}
  {% block body %}
- <div class="container-fluid">
-   <div class="row">
-     <div class="col-md-12 header-tabbed">
-       <h2>
-         <a href="{{
-           url_for('user.user_profile', username=owner.username)
-         }}">{{ owner.canonical_name }}</a>/{{ ml.name }}
-         {% if ml.mirror_id %}
-         <small class="text-muted">(mirror)</small>
-         {% endif %}
-       </h2>
-       {% block tabs %}
-       {% macro link(path, title) %}
-       <a
-         class="nav-link {% if view == title %}active{% endif %}"
-         href="{{ path }}">{{ title }}</a>
-       {% endmacro %}
-       <ul class="nav nav-tabs">
-         <li class="nav-item">
-           {{link(url_for("archives.archive",
-             owner_name=owner.canonical_name,
-             list_name=ml.name), "archives")}}
-         </li>
-         <li class="nav-item">
-           {{link(url_for("patches.patchlist",
-             owner_name=owner.canonical_name,
-             list_name=ml.name), "patches")}}
-         </li>
-         {% if not ml.mirror_id or ml.mirror.configured %}
-         {% set posting_address = post_address(ml) %}
-         {% if posting_address %}
-         <li class="nav-item">
-           <a
-             class="nav-link {% if view == "post" %}active{% endif %}"
-             {% if posting_address.startswith("mailto:") %}
-             href="{{posting_address}}"
-             {% else %}
-             href="mailto:{{posting_address}}"
-             {% endif %}
-           >new post</a>
-         </li>
-         {% endif %}
-         {% endif %}
-         {% if current_user.id == ml.owner_id %}
-         <li class="nav-item">
-           {{link(url_for("settings.info_GET",
-             owner_name=ml.owner.canonical_name,
-             list_name=ml.name), "settings")}}
-         </li>
-         {% endif %}
-       </ul>
-       {% endblock %}
-     </div>
+ <div class="header-tabbed">
+   {% block tabs_container %}
+   <div class="container">
+   {% endblock %}
+     <h2>
+       <a href="{{
+         url_for('user.user_profile', username=owner.username)
+       }}">{{ owner.canonical_name }}</a>/{{ ml.name }}
+       {% if ml.mirror_id %}
+       <small class="text-muted">(mirror)</small>
+       {% endif %}
+     </h2>
+     {% block tabs %}
+     {% macro link(path, title) %}
+     <a
+       class="nav-link {% if view == title %}active{% endif %}"
+       href="{{ path }}">{{ title }}</a>
+     {% endmacro %}
+     <ul class="nav nav-tabs">
+       <li class="nav-item">
+         {{link(url_for("archives.archive",
+           owner_name=owner.canonical_name,
+           list_name=ml.name), "archives")}}
+       </li>
+       <li class="nav-item">
+         {{link(url_for("patches.patchlist",
+           owner_name=owner.canonical_name,
+           list_name=ml.name), "patches")}}
+       </li>
+       {% if not ml.mirror_id or ml.mirror.configured %}
+       {% set posting_address = post_address(ml) %}
+       {% if posting_address %}
+       <li class="nav-item">
+         <a
+           class="nav-link {% if view == "post" %}active{% endif %}"
+           {% if posting_address.startswith("mailto:") %}
+           href="{{posting_address}}"
+           {% else %}
+           href="mailto:{{posting_address}}"
+           {% endif %}
+         >new post</a>
+       </li>
+       {% endif %}
+       {% endif %}
+       {% if current_user.id == ml.owner_id %}
+       <li class="nav-item">
+         {{link(url_for("settings.info_GET",
+           owner_name=ml.owner.canonical_name,
+           list_name=ml.name), "settings")}}
+       </li>
+       {% endif %}
+     </ul>
+     {% endblock %}
    </div>
  </div>
  {% block content %}{% endblock %}

M listssrht/templates/settings-access.html => listssrht/templates/settings-access.html +38 -38
@@ 102,44 102,8 @@ {% endif %}
    {% if not hide_user %}
    <div class="row">
-     <div class="col-md-10">
-       <form method="POST" action="{{url_for("settings.acl_POST", 
-             owner_name=ml.owner.canonical_name, list_name=ml.name)}}">
-         <h3>User permissions</h3>
-         {{csrf_token()}}
-         <div class="form-group">
-           <label for="user">Username or email</label>
-           <input
-             type="text"
-             class="form-control {{valid.cls("user")}}"
-             id="user"
-             name="user"
-             placeholder="~{{ current_user.username }} or {{current_user.email}}"
-             value="{{user or ""}}"
-           />
-           {{valid.summary("user")}}
-         </div>
-         <div class="event-list">
-           <div class="event">
-             <h4>Access grants</h4>
-             <p>These will override any other permissions for this user.</p>
-             {% for a in access_type_list %}
-             {{ perm_checkbox(a, ListAccess.all, "acl") }}
-             {% endfor %}
-             {{ valid.summary("list_acl_access") }}
-           </div>
-         </div>
-         {{ valid.summary() }}
-         <span class="pull-right">
-           <button type="submit" class="btn btn-primary">
-             Set access {{icon("caret-right")}}
-           </button>
-         </span>
-       </form>
-     </div>
-   </div>
-   <div class="row">
-     <div class="col-md-10">
+     <div class="col-md-12">
+       <h3>User permissions</h3>
        {% if any(ml.acls) %}
        <table class="table">
          <thead>


@@ 189,6 153,42 @@ {% endif %}
      </div>
    </div>
+   <div class="row">
+     <div class="col-md-12">
+       <form method="POST" action="{{url_for("settings.acl_POST", 
+             owner_name=ml.owner.canonical_name, list_name=ml.name)}}">
+         {{csrf_token()}}
+         <div class="form-group">
+           <label for="user">Username or email</label>
+           <input
+             type="text"
+             class="form-control {{valid.cls("user")}}"
+             id="user"
+             name="user"
+             placeholder="~{{ current_user.username }} or {{current_user.email}}"
+             value="{{user or ""}}"
+           />
+           {{valid.summary("user")}}
+         </div>
+         <div class="event-list">
+           <div class="event">
+             <h4>Access grants</h4>
+             <p>These will override any other permissions for this user.</p>
+             {% for a in access_type_list %}
+             {{ perm_checkbox(a, ListAccess.all, "acl") }}
+             {% endfor %}
+             {{ valid.summary("list_acl_access") }}
+           </div>
+         </div>
+         {{ valid.summary() }}
+         <span class="pull-right">
+           <button type="submit" class="btn btn-primary">
+             Set access {{icon("caret-right")}}
+           </button>
+         </span>
+       </form>
+     </div>
+   </div>
    {% endif %}
  </div>
  {% endblock %}

M listssrht/templates/settings-import-export.html => listssrht/templates/settings-import-export.html +1 -1
@@ 2,7 2,7 @@ {% block content %}
  <div class="container">
    <div class="row">
-     <div class="col-md-8">
+     <div class="col-md-10">
        <h3>Export mail spool</h3>
        <p>
          This tool allows you to export your mailing list in mbox format.

M listssrht/templates/settings-info.html => listssrht/templates/settings-info.html +1 -1
@@ 7,7 7,7 @@ {% block content %}
  <div class="container">
    <div class="row">
-     <div class="col-md-7">
+     <div class="col-md-8">
        <form method="POST">
          {{csrf_token()}}
          <div class="form-group">