From 1aad33ce17b8596a9d380448166bdf69d101b505 Mon Sep 17 00:00:00 2001 From: Sebastian Henschel Date: Sat, 19 Nov 2016 12:56:54 +0100 Subject: [PATCH] Switched from dialog to detail page in consumers app --- .../static/consumers/css/consumers.css | 27 +++----- .../static/consumers/js/consumers.js | 33 ---------- .../consumers/templates/consumers/detail.html | 63 +++++++++++++++++++ .../consumers/includes/filter_apptype.html | 2 +- .../consumers/includes/filter_enabled.html | 2 +- .../consumers/includes/filter_time.html | 2 +- .../consumers/templates/consumers/index.html | 53 ++++------------ apimanager/consumers/urls.py | 7 ++- apimanager/consumers/views.py | 35 +++++++++-- 9 files changed, 121 insertions(+), 103 deletions(-) create mode 100644 apimanager/consumers/templates/consumers/detail.html diff --git a/apimanager/consumers/static/consumers/css/consumers.css b/apimanager/consumers/static/consumers/css/consumers.css index 037b660..27bb21c 100644 --- a/apimanager/consumers/static/consumers/css/consumers.css +++ b/apimanager/consumers/static/consumers/css/consumers.css @@ -2,28 +2,15 @@ margin-top: 20px; } -.consumers .consumer-row { - cursor: pointer; -} - -.consumers .consumer-enabled { - background-color: rgba(0, 255, 0, 0.1); -} - -.consumers .consumer-disabled { - background-color: rgba(255, 0, 0, 0.1); -} - -.consumers .table > tbody > tr.active > td { - background-color: #fff; -} - - -.consumers .btn-group.filter-enabled { +#consumers .btn-group.filter-enabled { margin-left: 10px; } -.consumers .btn-group-vertical.filter-enabled, -.consumers .btn-group-vertical.filter-apptype { +#consumers .btn-group-vertical.filter-enabled, +#consumers .btn-group-vertical.filter-apptype { margin-top: 10px; } + +#consumers-detail div { + margin: 10px 0; +} diff --git a/apimanager/consumers/static/consumers/js/consumers.js b/apimanager/consumers/static/consumers/js/consumers.js index 38cf678..8da0463 100644 --- a/apimanager/consumers/static/consumers/js/consumers.js +++ b/apimanager/consumers/static/consumers/js/consumers.js @@ -1,35 +1,2 @@ $(document).ready(function($) { - $('#consumer-detail').hide(); - $('.consumers .consumer-row td.select').click(function() { - $('.consumers .consumer-row').removeClass('active'); - var tr = $(this).parent(); - tr.addClass('active'); - var consumer_id = tr.data('consumer-id'); - $.each(CONSUMERS, function (idx, consumer) { - if (consumer['id'] == consumer_id) { - $('#consumer-detail-id').val(consumer['id']); - $('#consumer-detail-name').html(consumer['name']); - $('#consumer-detail-developerEmail').html(consumer['developerEmail']); - $('#consumer-detail-created').html(consumer['created']); - $('#consumer-detail-description').html(consumer['description']); - var isactive = $('#consumer-detail-isactive'); - var enableButton = $('#consumer-detail-enable'); - enableButton.removeClass('btn-green').removeClass('btn-red'); - if (consumer['enabled']) { - enableButton.addClass('btn-red'); - enableButton.html('Disable'); - enableButton.attr('href', - CONSUMERS_DISABLE.replace('0', consumer['id'])); - isactive.prop('checked', true); - } else { - enableButton.addClass('btn-green'); - enableButton.html('Enable'); - enableButton.attr('href', - CONSUMERS_ENABLE.replace('0', consumer['id'])); - isactive.prop('checked', false); - } - $('#consumer-detail').modal('show'); - } - }); - }); }); diff --git a/apimanager/consumers/templates/consumers/detail.html b/apimanager/consumers/templates/consumers/detail.html new file mode 100644 index 0000000..c25e771 --- /dev/null +++ b/apimanager/consumers/templates/consumers/detail.html @@ -0,0 +1,63 @@ +{% extends 'base.html' %} +{% load humanize static %} + +{% block page_title %}{{ block.super }} / {{ consumer.name }}{% endblock page_title %} + +{% block content %} +
+

Consumer {{ consumer.name }}

+ +
+ ID
+ {{ consumer.id }} +
+ + +
+ Developer Email
+ {{ consumer.developerEmail }} +
+ +
+ Created
+ {{ consumer.created|naturaltime }} +
+ +
+ Description
+
{{ consumer.description }}
+
+ +
+ {% if consumer.enabled %} + {% url 'consumers-disable' consumer.id as url_action %} + {% else %} + {% url 'consumers-enable' consumer.id as url_action %} + {% endif %} +
+ {% csrf_token %} + +
+ {% if consumer.enabled %} +
+
+
+
+{% endblock %} + +{% block extrajs %} +{% comment %} + + +{% endcomment %} +{% endblock extrajs %} + + +{% block extracss %} + +{% endblock extracss %} diff --git a/apimanager/consumers/templates/consumers/includes/filter_apptype.html b/apimanager/consumers/templates/consumers/includes/filter_apptype.html index 80f3ec6..287e380 100644 --- a/apimanager/consumers/templates/consumers/includes/filter_apptype.html +++ b/apimanager/consumers/templates/consumers/includes/filter_apptype.html @@ -1,3 +1,3 @@ Web Mobile -All +All diff --git a/apimanager/consumers/templates/consumers/includes/filter_enabled.html b/apimanager/consumers/templates/consumers/includes/filter_enabled.html index 63592f8..2aaa7fc 100644 --- a/apimanager/consumers/templates/consumers/includes/filter_enabled.html +++ b/apimanager/consumers/templates/consumers/includes/filter_enabled.html @@ -1,3 +1,3 @@ Enabled Disabled -All +All diff --git a/apimanager/consumers/templates/consumers/includes/filter_time.html b/apimanager/consumers/templates/consumers/includes/filter_time.html index ba2fac8..6f25d5f 100644 --- a/apimanager/consumers/templates/consumers/includes/filter_time.html +++ b/apimanager/consumers/templates/consumers/includes/filter_time.html @@ -4,4 +4,4 @@ Last Week Last Month Last Year -All +All diff --git a/apimanager/consumers/templates/consumers/index.html b/apimanager/consumers/templates/consumers/index.html index c64e608..861e131 100644 --- a/apimanager/consumers/templates/consumers/index.html +++ b/apimanager/consumers/templates/consumers/index.html @@ -4,7 +4,7 @@ {% block page_title %}{{ block.super }} / Consumers{% endblock page_title %} {% block content %} -
+

Consumers