From 722335191e7632919a8602917a1776ed578f790f Mon Sep 17 00:00:00 2001
From: Sebastian Henschel <sebastian@tesobe.com>
Date: Sun, 27 Nov 2016 08:44:17 +0100
Subject: [PATCH] Extended markup for filters in consumers and users apps

---
 apimanager/base/static/css/base.css           |  4 +++
 .../consumers/templates/consumers/index.html  | 36 +++++++++++--------
 apimanager/users/templates/users/index.html   | 25 +++++++------
 3 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/apimanager/base/static/css/base.css b/apimanager/base/static/css/base.css
index 991458f..4425523 100644
--- a/apimanager/base/static/css/base.css
+++ b/apimanager/base/static/css/base.css
@@ -104,3 +104,7 @@ footer a:hover, .footer a:focus {
 .home .text-center {
 	margin-top: 80px;
 }
+
+div.filter {
+	display: inline;
+}
diff --git a/apimanager/consumers/templates/consumers/index.html b/apimanager/consumers/templates/consumers/index.html
index 2309c45..9e69cd4 100644
--- a/apimanager/consumers/templates/consumers/index.html
+++ b/apimanager/consumers/templates/consumers/index.html
@@ -7,25 +7,31 @@
 <div id="consumers">
 	<h1>Consumers</h1>
 
-	<div class="btn-group hidden-xs filter-time" role="group" aria-label="filter-time">
-		{% include "consumers/includes/filter_time.html" %}
-	</div>
-	<div class="btn-group-vertical visible-xs filter-time" role="group" aria-label="filter-time">
-		{% include "consumers/includes/filter_time.html" %}
+	<div id="filter-time" class="filter">
+		<div class="btn-group hidden-xs filter-time" role="group" aria-label="filter-time">
+			{% include "consumers/includes/filter_time.html" %}
+		</div>
+		<div class="btn-group-vertical visible-xs filter-time" role="group" aria-label="filter-time">
+			{% include "consumers/includes/filter_time.html" %}
+		</div>
 	</div>
 
-	<div class="btn-group hidden-sm hidden-xs pull-right filter-enabled" role="group" aria-label="filter-enabled">
-		{% include "consumers/includes/filter_enabled.html" %}
-	</div>
-	<div class="btn-group-vertical visible-sm visible-xs filter-enabled" role="group" aria-label="filter-enabled">
-		{% include "consumers/includes/filter_enabled.html" %}
+	<div id="filter-enabled" class="filter">
+		<div class="btn-group hidden-sm hidden-xs pull-right filter-enabled" role="group" aria-label="filter-enabled">
+			{% include "consumers/includes/filter_enabled.html" %}
+		</div>
+		<div class="btn-group-vertical visible-sm visible-xs filter-enabled" role="group" aria-label="filter-enabled">
+			{% include "consumers/includes/filter_enabled.html" %}
+		</div>
 	</div>
 
-	<div class="btn-group hidden-sm hidden-xs pull-right filter-apptype" role="group" aria-label="filter-apptype">
-		{% include "consumers/includes/filter_apptype.html" %}
-	</div>
-	<div class="btn-group-vertical visible-sm visible-xs filter-apptype" role="group" aria-label="filter-apptype">
-		{% include "consumers/includes/filter_apptype.html" %}
+	<div id="filter-apptype" class="filter">
+		<div class="btn-group hidden-sm hidden-xs pull-right filter-apptype" role="group" aria-label="filter-apptype">
+			{% include "consumers/includes/filter_apptype.html" %}
+		</div>
+		<div class="btn-group-vertical visible-sm visible-xs filter-apptype" role="group" aria-label="filter-apptype">
+			{% include "consumers/includes/filter_apptype.html" %}
+		</div>
 	</div>
 
 	<h2>Statistics</h2>
diff --git a/apimanager/users/templates/users/index.html b/apimanager/users/templates/users/index.html
index ffd5be4..747a7bd 100644
--- a/apimanager/users/templates/users/index.html
+++ b/apimanager/users/templates/users/index.html
@@ -7,17 +7,20 @@
 <div id="users">
 	<h1>Users</h1>
 
-	<div class="btn-group">
-		<button type="button" class="btn btn-default dropdown-toggle" id="filter-entitlement" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-    		{{ active_role_name }} <span class="caret"></span>
-  		</button>
-		<ul class="dropdown-menu">
-			<li><a href="">All</a></li>
-			<li role="separator" class="divider"></li>
-		{% for role_name in role_names %}
-			<li><a href="?role_name={{ role_name }}">{{ role_name }}</a></li>
-		{% endfor %}
-		</ul>
+	<div id="filter-role" class="filter">
+		Role:
+		<div class="btn-group">
+			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+				{{ active_role_name }} <span class="caret"></span>
+			</button>
+			<ul class="dropdown-menu">
+				<li><a href="">All</a></li>
+				<li role="separator" class="divider"></li>
+			{% for role_name in role_names %}
+				<li><a href="?role_name={{ role_name }}">{{ role_name }}</a></li>
+			{% endfor %}
+			</ul>
+		</div>
 	</div>
 
 	<h2>Statistics</h2>