Adds tabs to super user pages

ExCiteS · Aug 4, 2015 · 8eb8349 · 8eb8349
1 parent ef7cd74
commit 8eb8349
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@
     - `geokey/templates/users/data_fields_rules.html` > `geokey/templates/snippets/data_fields_rules.html`
     - `geokey/users/templatetags/tags.py` > `geokey/users/templatetags/filter_tags.py`
 
+- Redesign of navigation elements
+
 ## Version 0.6
 
 - Separation of contribution serialiser into parser, serialiser and renderer. This enables rendering of geographic data into formats other than GeoJSON.

diff --git a/geokey/templates/superusertools/manage_users.html b/geokey/templates/superusertools/manage_users.html
@@ -5,33 +5,24 @@
 {% block main %}
 <div class="page-header">
     <div class="container">
-        <div class="row">
-            <div class="col-sm-12">
-                <h1>Superuser tools</h1>
-            </div>
-        </div>
+        <h1>Superuser tools</h1>
 
+        <ul class="nav nav-tabs header-nav">
+            <li role="presentation"><a href="{% url 'admin:superuser_index' %}">Platform settings</a></li>
+            <li role="presentation" class="active"><a href="{% url 'admin:superuser_manage_users' %}">Manage super users</a></li>
+            <li role="presentation"><a href="{% url 'admin:superuser_projects' %}">Manage all projects</a></li>
+        </ul>
     </div>
 </div>
 
 
 <div class="container">
     {% include 'snippets/messages.html' %}
     <div class="row">
-        <div class="col-md-4">
-            <div class="panel panel-default">
-                <div class="list-group">
-                    <a href="{% url 'admin:superuser_index' %}" class="list-group-item">Platform settings</a>
-                    <a href="{% url 'admin:superuser_projects' %}" class="list-group-item">Manage all projects</a>
-                    <a href="{% url 'admin:superuser_manage_users' %}" class="list-group-item active">Add + remove super users</a>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-sm-8" id="members">
+        <div class="col-sm-8 col-sm-offset-2" id="members">
             <div class="header">
                 <div class="row">
-                    <div class="col-sm-6"><h3>Add + remove super users</h3></div>
+                    <div class="col-sm-6"><h3>Manage super users</h3></div>
                     <div class="col-sm-6 dropdown">
                         <input type="text" id="find-users" class="pull-right form-control" placeholder="Search for users to add to the group">
                         <ul class="dropdown-menu type-away">

diff --git a/geokey/templates/superusertools/platform_settings.html b/geokey/templates/superusertools/platform_settings.html
@@ -5,31 +5,22 @@
 {% block main %}
 <div class="page-header">
     <div class="container">
-        <div class="row">
-            <div class="col-sm-12">
-                <h1>Superuser tools</h1>
-            </div>
-        </div>
+        <h1>Superuser tools</h1>
 
+        <ul class="nav nav-tabs header-nav">
+            <li role="presentation" class="active"><a href="{% url 'admin:superuser_index' %}">Platform settings</a></li>
+            <li role="presentation"><a href="{% url 'admin:superuser_manage_users' %}">Manage super users</a></li>
+            <li role="presentation"><a href="{% url 'admin:superuser_projects' %}">Manage all projects</a></li>
+        </ul>
     </div>
 </div>
 
 
 <div class="container">
     {% include 'snippets/messages.html' %}
     <div class="row">
-        <div class="col-md-4">
-            <div class="panel panel-default">
-                <div class="list-group">
-                    <a href="{% url 'admin:superuser_index' %}" class="list-group-item active">Platform settings</a>
-                    <a href="{% url 'admin:superuser_projects' %}" class="list-group-item">Manage all projects</a>
-                    <a href="{% url 'admin:superuser_manage_users' %}" class="list-group-item">Add + remove super users</a>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-8">
-            <h3>Platform Settings</h3>
+        <div class="col-md-8 col-md-offset-2">
+            <h3 class="header">Platform Settings</h3>
 
             <form method="POST" action="{% url 'admin:superuser_index' %}" novalidate>
                 {% csrf_token %}

diff --git a/geokey/templates/superusertools/projects_list.html b/geokey/templates/superusertools/projects_list.html
@@ -5,31 +5,22 @@
 {% block main %}
 <div class="page-header">
     <div class="container">
-        <div class="row">
-            <div class="col-sm-12">
-                <h1>Superuser tools</h1>
-            </div>
-        </div>
+        <h1>Superuser tools</h1>
 
+        <ul class="nav nav-tabs header-nav">
+            <li role="presentation"><a href="{% url 'admin:superuser_index' %}">Platform settings</a></li>
+            <li role="presentation"><a href="{% url 'admin:superuser_manage_users' %}">Manage super users</a></li>
+            <li role="presentation" class="active"><a href="{% url 'admin:superuser_projects' %}">Manage all projects</a></li>
+        </ul>
     </div>
 </div>
 
 
 <div class="container">
     {% include 'snippets/messages.html' %}
     <div class="row">
-        <div class="col-md-4">
-            <div class="panel panel-default">
-                <div class="list-group">
-                    <a href="{% url 'admin:superuser_index' %}" class="list-group-item">Platform settings</a>
-                    <a href="{% url 'admin:superuser_projects' %}" class="list-group-item active">Manage all projects</a>
-                    <a href="{% url 'admin:superuser_manage_users' %}" class="list-group-item">Add + remove super users</a>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-8">
-            <h3>Manage all projects</h3>
+        <div class="col-md-8 col-md-offset-2">
+            <h3 class="header">Manage all projects</h3>
             {% for project in projects %}
 
             {% if forloop.first %}