From 733301fd158ca370d5e184aa9df39e2c3992fbb5 Mon Sep 17 00:00:00 2001
From: Sebastian Henschel <sebastian@tesobe.com>
Date: Wed, 8 Mar 2017 10:04:54 +0100
Subject: [PATCH] Moved Redirect URL and Created By User ID from consumers list
 to detail view #12

---
 .../consumers/templates/consumers/detail.html | 25 +++++++++++++++----
 .../consumers/templates/consumers/index.html  | 23 ++++++++---------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/apimanager/consumers/templates/consumers/detail.html b/apimanager/consumers/templates/consumers/detail.html
index 8635f05..8e530d1 100644
--- a/apimanager/consumers/templates/consumers/detail.html
+++ b/apimanager/consumers/templates/consumers/detail.html
@@ -1,23 +1,28 @@
 {% extends 'base.html' %}
 {% load humanize static %}
 
-{% block page_title %}{{ block.super }} / {{ consumer.name }}{% endblock page_title %}
+{% block page_title %}{{ block.super }} / Consumer {{ consumer.app_name }}{% endblock page_title %}
 
 {% block content %}
 <div id="consumers-detail">
-	<h1>Consumer {{ consumer.name }}</h1>
+	<h1>Consumer {{ consumer.app_name }}</h1>
 
-	<div id="consumers-detail-id">
+	<div id="consumers-detail-consumer_id">
 		<strong>ID</strong><br />
 		<span>{{ consumer.consumer_id }}</span>
 	</div>
 
-	<div id="consumers-detail-app-type">
+	<div id="consumers-detail-app_name">
+		<strong>App Name</strong><br />
+		<span>{{ consumer.app_name }}</span>
+	</div>
+
+	<div id="consumers-detail-app_type">
 		<strong>App Type</strong><br />
 		<span>{{ consumer.app_type }}</span>
 	</div>
 
-	<div id="consumers-detail-developer-email">
+	<div id="consumers-detail-developer_email">
 		<strong>Developer Email</strong><br />
 		<span>{{ consumer.developer_email }}</span>
 	</div>
@@ -27,6 +32,16 @@
 		<span>{{ consumer.created|naturaltime }}</span>
 	</div>
 
+	<div id="consumers-detail-created_by_user_id">
+		<strong>Created By User ID</strong><br />
+		<span>{{ consumer.created_by_user_id }}</span>
+	</div>
+
+	<div id="consumers-detail-redirect_url">
+		<strong>Redirect URL</strong><br />
+		<span>{{ consumer.redirect_url }}</span>
+	</div>
+
 	<div id="consumers-detail-description">
 		<strong>Description</strong><br />
 		<div class="well">{{ consumer.description }}</div>
diff --git a/apimanager/consumers/templates/consumers/index.html b/apimanager/consumers/templates/consumers/index.html
index d6e2d83..327a6e0 100644
--- a/apimanager/consumers/templates/consumers/index.html
+++ b/apimanager/consumers/templates/consumers/index.html
@@ -47,29 +47,26 @@
 				<th>ID</th>
 				<th>Name</th>
 				<th>Developer Email</th>
-				<th>Redirect URL</th>
-				<th>Created User ID</th>
 				<th>Created</th>
 				<th>Action</th>
 			</thead>
+
 			<tbody>
 			{% for consumer in consumers %}
 			<tr class="consumer-row {% if consumer.enabled %}consumer-enabled{% else %}consumer-disabled{% endif %}" data-consumer-id="{{ consumer.consumer_id }}">
 				{% url 'consumers-detail' consumer.consumer_id as url_detail %}
 				<td>{{ consumer.consumer_id }}</td>
 				<td class="select"><a href="{{ url_detail }}">{{ consumer.app_name }}</a></td>
-					<td class="select">{{ consumer.developer_email }}</td>
-					<td class="select">{{ consumer.redirect_url }}</td>
-					<td class="select">{{ consumer.created_by_user_id }}</td>
-					<td class="select">{{ consumer.created|naturaltime }}</td>
-					<td>
-						<form action="{% if consumer.enabled %}{% url 'consumers-disable' consumer.consumer_id %}{% else %}{% url 'consumers-enable' consumer.consumer_id %}{% endif %}?{{ request.GET.urlencode }}" method="post">
-							{% csrf_token %}
-							{% if consumer.enabled %}<button class="btn btn-primary btn-red">Disable</button>{% else %}<button class="btn btn-primary btn-green">Enable</button>{% endif %}
+				<td class="select">{{ consumer.developer_email }}</td>
+				<td class="select">{{ consumer.created|naturaltime }}</td>
+				<td>
+					<form action="{% if consumer.enabled %}{% url 'consumers-disable' consumer.consumer_id %}{% else %}{% url 'consumers-enable' consumer.consumer_id %}{% endif %}?{{ request.GET.urlencode }}" method="post">
+						{% csrf_token %}
+						{% if consumer.enabled %}<button class="btn btn-primary btn-red">Disable</button>{% else %}<button class="btn btn-primary btn-green">Enable</button>{% endif %}
 							<a href="{{ url_detail }}" class="btn btn-primary" role="button">View</a>
-						</form>
-					</td>
-				</tr>
+					</form>
+				</td>
+			</tr>
 			{% endfor %}
 			</tbody>
 		</table>