From ef7cd74a4b1d28df634ac50b33f8412111f3f804 Mon Sep 17 00:00:00 2001
From: Oliver Roick <oliver.roick@gmail.com>
Date: Tue, 4 Aug 2015 12:42:29 +0100
Subject: [PATCH] Adds tabs to application pages

---
 .../applications/application_connected.html   | 20 ++++++++++---------
 .../applications/application_create.html      |  8 ++++++--
 .../applications/application_overview.html    | 14 ++++++-------
 .../applications/application_settings.html    |  8 ++++++--
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/geokey/templates/applications/application_connected.html b/geokey/templates/applications/application_connected.html
index 1fac381d..3da621a3 100644
--- a/geokey/templates/applications/application_connected.html
+++ b/geokey/templates/applications/application_connected.html
@@ -1,11 +1,16 @@
 {% extends "base.html" %}
 
-{% block title %} | Register a new application{% endblock %}
+{% block title %} | Connected applications{% endblock %}
 
 {% block main %}
         <div class="page-header">
             <div class="container">
                 <h1>Applications</h1>
+
+                <ul class="nav nav-tabs header-nav">
+                    <li role="presentation"><a href="{% url 'admin:app_overview' %}">Registered applications</a></li>
+                    <li role="presentation" class="active"><a href="{% url 'admin:app_connected' %}">Connected applications</a></li>
+                </ul>
             </div>
         </div>
 
@@ -13,16 +18,13 @@ <h1>Applications</h1>
             {% 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:app_overview' %}" class="list-group-item">Registered applications</a>
-                            <a href="{% url 'admin:app_connected' %}" class="list-group-item active">Connected applications</a>
-                        </div>
+                <div class="col-sm-4">
+                    <div class="alert alert-info">
+                        <p>Connected applications are applications that you have used before to access and edit data stored in {{ PLATFORM_NAME }}.</p>
                     </div>
                 </div>
 
-                <div class="col-md-8">
+                <div class="col-sm-8">
                     <h3 class="header">
                         Your connected applications
                     </h3>
@@ -34,7 +36,7 @@ <h3 class="header">
 
                     <li>
                         <a href="{% url 'admin:app_disconnect' app.id %}" class="btn btn-default pull-right">Disconnect</a>
-                        <h3>{{ app.name }}</h3>
+                        <h4>{{ app.name }}</h4>
                         {% if app.description %}<p>{{app.description}}</p>{% endif %}
                     </li>
 
diff --git a/geokey/templates/applications/application_create.html b/geokey/templates/applications/application_create.html
index 2c3d0ae4..2348169a 100644
--- a/geokey/templates/applications/application_create.html
+++ b/geokey/templates/applications/application_create.html
@@ -5,8 +5,12 @@
 {% block main %}
         <div class="page-header">
             <div class="container">
-                <h1 class="smaller"><a href="{% url 'admin:app_overview' %}">Applications</a></h1>
-                <a href="{% url 'admin:app_overview' %}"><span class="glyphicon glyphicon-arrow-left"></span> Applications home page</a>
+                <h1>Applications</h1>
+
+                <ul class="nav nav-tabs header-nav">
+                    <li role="presentation" class="active"><a href="{% url 'admin:app_overview' %}">Registered applications</a></li>
+                    <li role="presentation"><a href="{% url 'admin:app_connected' %}">Connected applications</a></li>
+                </ul>
             </div>
         </div>
 
diff --git a/geokey/templates/applications/application_overview.html b/geokey/templates/applications/application_overview.html
index 6b8002aa..c45d0974 100644
--- a/geokey/templates/applications/application_overview.html
+++ b/geokey/templates/applications/application_overview.html
@@ -6,6 +6,11 @@
         <div class="page-header">
             <div class="container">
                 <h1>Applications</h1>
+
+                <ul class="nav nav-tabs header-nav">
+                    <li role="presentation" class="active"><a href="{% url 'admin:app_overview' %}">Registered applications</a></li>
+                    <li role="presentation"><a href="{% url 'admin:app_connected' %}">Connected applications</a></li>
+                </ul>
             </div>
         </div>
 
@@ -14,13 +19,6 @@ <h1>Applications</h1>
 
             <div class="row">
                 <div class="col-md-4">
-                    <div class="panel panel-default">
-                        <div class="list-group">
-                            <a href="{% url 'admin:app_overview' %}" class="list-group-item active">Registered applications</a>
-                            <a href="{% url 'admin:app_connected' %}" class="list-group-item">Connected applications</a>
-                        </div>
-                    </div>
-
                     <div class="alert alert-info">
                         <h5><strong>Learn more about:</strong></h5>
                         <ul>
@@ -42,7 +40,7 @@ <h3 class="header">
                     {% endif %}
 
                     <li>
-                        <h3><a href="{% url 'admin:app_settings' app.id %}">{{app.name}}</a></h3>
+                        <h4><a href="{% url 'admin:app_settings' app.id %}">{{app.name}}</a></h4>
                         {% if app.description %}<p>{{app.description}}</p>{% endif %}
                         <p class="meta">Client ID: <span class="lower-case">{{ app.client_id }}</span></p>
                         <p class="meta">Client secret: <span class="lower-case">{{ app.client_secret }}</span></p>
diff --git a/geokey/templates/applications/application_settings.html b/geokey/templates/applications/application_settings.html
index 8901d651..fd828fd4 100644
--- a/geokey/templates/applications/application_settings.html
+++ b/geokey/templates/applications/application_settings.html
@@ -8,8 +8,12 @@
 
     <div class="page-header">
         <div class="container">
-            <h1 class="smaller"><a href="{% url 'admin:app_overview' %}">Applications</a></h1>
-            <a href="{% url 'admin:app_overview' %}"><span class="glyphicon glyphicon-arrow-left"></span> Applications home page</a>
+            <h1>Applications</h1>
+
+            <ul class="nav nav-tabs header-nav">
+                <li role="presentation" class="active"><a href="{% url 'admin:app_overview' %}">Registered applications</a></li>
+                <li role="presentation"><a href="{% url 'admin:app_connected' %}">Connected applications</a></li>
+            </ul>
         </div>
     </div>