From 1f9c305ede23b3848d216b34d4c7f19b7d23e1a4 Mon Sep 17 00:00:00 2001
From: Sebastian Henschel <sebastian@tesobe.com>
Date: Thu, 30 Mar 2017 13:01:02 +0200
Subject: [PATCH] Removed 'Last Minute' filter and reduced font size in filter
 buttons

This will show all buttons in one row in 'medium' size
---
 .../static/consumers/css/consumers.css         |  4 ++++
 .../consumers/includes/filter_time.html        |  1 -
 .../consumers/templates/consumers/index.html   | 18 +++++++++---------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/apimanager/consumers/static/consumers/css/consumers.css b/apimanager/consumers/static/consumers/css/consumers.css
index 9d399e2..3834ff1 100644
--- a/apimanager/consumers/static/consumers/css/consumers.css
+++ b/apimanager/consumers/static/consumers/css/consumers.css
@@ -14,3 +14,7 @@
 #consumers .noborder {
 	border: none;
 }
+
+#consumers .filter a {
+	font-size: 12px;
+}
diff --git a/apimanager/consumers/templates/consumers/includes/filter_time.html b/apimanager/consumers/templates/consumers/includes/filter_time.html
index a114482..3ffddb2 100644
--- a/apimanager/consumers/templates/consumers/includes/filter_time.html
+++ b/apimanager/consumers/templates/consumers/includes/filter_time.html
@@ -1,4 +1,3 @@
-<a href="?time=minute&app_type={{ request.GET.app_type }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_minute %} active{% endif %}">Last Minute</a>
 <a href="?time=hour&app_type={{ request.GET.app_type }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_hour %} active{% endif %}">Last Hour</a>
 <a href="?time=day&app_type={{ request.GET.app_type }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_day %} active{% endif %}">Last Day</a>
 <a href="?time=week&app_type={{ request.GET.app_type }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_week %} active{% endif %}">Last Week</a>
diff --git a/apimanager/consumers/templates/consumers/index.html b/apimanager/consumers/templates/consumers/index.html
index dc76620..de5fd54 100644
--- a/apimanager/consumers/templates/consumers/index.html
+++ b/apimanager/consumers/templates/consumers/index.html
@@ -8,34 +8,34 @@
 	<h1>Consumers</h1>
 
 	<div class="row">
-		<div class="col-xs-12 col-lg-7">
+		<div class="col-xs-12 col-md-6">
 			<div id="filter-time" class="filter">
-				<div class="btn-group hidden-md hidden-sm hidden-xs filter-time" role="group" aria-label="filter-time">
+				<div class="btn-group hidden-sm hidden-xs filter-time" role="group" aria-label="filter-time">
 					{% include "consumers/includes/filter_time.html" %}
 				</div>
-				<div class="btn-group-vertical visible-md visible-sm visible-xs filter-time" role="group" aria-label="filter-time">
+				<div class="btn-group-vertical visible-sm visible-xs filter-time" role="group" aria-label="filter-time">
 					{% include "consumers/includes/filter_time.html" %}
 				</div>
 			</div>
 		</div>
 
-		<div class="col-xs-12 col-lg-3">
+		<div class="col-xs-12 col-md-3">
 			<div id="filter-enabled" class="filter">
-				<div class="btn-group hidden-md hidden-sm hidden-xs filter-enabled" role="group" aria-label="filter-enabled">
+				<div class="btn-group hidden-sm hidden-xs filter-enabled" role="group" aria-label="filter-enabled">
 					{% include "consumers/includes/filter_enabled.html" %}
 				</div>
-				<div class="btn-group-vertical visible-md visible-sm visible-xs filter-enabled" role="group" aria-label="filter-enabled">
+				<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>
 
-		<div class="col-xs-12 col-lg-2">
+		<div class="col-xs-12 col-md-3">
 			<div id="filter-apptype" class="filter">
-				<div class="btn-group hidden-md hidden-sm hidden-xs filter-apptype" role="group" aria-label="filter-apptype">
+				<div class="btn-group hidden-sm hidden-xs filter-apptype" role="group" aria-label="filter-apptype">
 					{% include "consumers/includes/filter_apptype.html" %}
 				</div>
-				<div class="btn-group-vertical visible-md visible-sm visible-xs filter-apptype" role="group" aria-label="filter-apptype">
+				<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>