From fb1c34e7aeac67a75c29a132ded87edeb557cdaf Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Wed, 15 Oct 2014 00:17:53 -0400
Subject: Improve UI for enabling/disabling plugins config

Use the same templates for both info and login plugins

Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>
---
 templates/admin/info.html        |  31 -----------
 templates/admin/info_order.html  |  25 ---------
 templates/admin/login.html       |  31 -----------
 templates/admin/login_order.html |  25 ---------
 templates/admin/plugins.html     | 108 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 108 insertions(+), 112 deletions(-)
 delete mode 100644 templates/admin/info.html
 delete mode 100644 templates/admin/info_order.html
 delete mode 100644 templates/admin/login.html
 delete mode 100644 templates/admin/login_order.html
 create mode 100644 templates/admin/plugins.html

(limited to 'templates')

diff --git a/templates/admin/info.html b/templates/admin/info.html
deleted file mode 100644
index d51231f..0000000
--- a/templates/admin/info.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "master-admin.html" %}
-{% block main %}
-{% if user.is_admin %}
-    <h2>Info plugins</h2>
-    {% if message %}
-    <div class="alert alert-{{message_type}}">
-        <p>{{ message }}</p>
-    </div>
-    {% endif %}
-
-    {% for p in available %}
-        <div class="row">
-        <div class="col-md-3 col-sm-3 col-xs-6">{{ p }}</div>
-        <div class="col-md-3 col-sm-3 col-xs-6">
-        {% if p in enabled %}
-            <a class="btn btn-default" href="{{ basepath }}/admin/info/disable/{{ p }}">Disable</a>
-            <a class="btn btn-default" href="{{ basepath }}/admin/info/{{ p }}">Configure</a>
-        {% else %}
-            <a class="btn btn-default" href="{{ basepath }}/admin/info/enable/{{ p }}">Enable</a>
-        {% endif %}
-        </div>
-        </div>
-    {% endfor %}
-
-    <h3>Plugins order</h3>
-    <div class="col-md-3 col-sm-3 col-xs-6">{{ ', '.join(enabled) }}</div>
-    <div class="col-md-3 col-sm-3 col-xs-6">
-        <a class="btn btn-default" href="{{ basepath }}/admin/info/order">configure</a>
-    </div>
-{% endif %}
-{% endblock %}
diff --git a/templates/admin/info_order.html b/templates/admin/info_order.html
deleted file mode 100644
index 5d929be..0000000
--- a/templates/admin/info_order.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "master-admin.html" %}
-{% block main %}
-    <h2>{{ title }}</h2>
-    {% if message %}
-    <div class="alert alert-{{message_type}}">
-        <p>{{ message }}</p>
-    </div>
-    {% endif %}
-    <div id="options">
-        <form role="form" id="{{ name }}" action="{{ action }}" method="post" enctype="application/x-www-form-urlencoded">
-
-        <div class="form-group">
-        <label for="order">Info plugins order:</label>
-            <input type="text" class="form-control" name="order" value="{{ ', '.join(options) }}" />
-        </div>
-        <span class="help-block">Plugins order</span>
-
-        <button id="submit" class="btn btn-primary" name="submit" type="submit" value="Submit">
-            Save
-        </button>
-        <a href="{{ basepath }}/admin/info" class="btn btn-default" title="Back">Back</a>
-        </form>
-    </div>
-{% endblock %}
-
diff --git a/templates/admin/login.html b/templates/admin/login.html
deleted file mode 100644
index 9f51d02..0000000
--- a/templates/admin/login.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "master-admin.html" %}
-{% block main %}
-{% if user.is_admin %}
-    <h2>Login plugins</h2>
-    {% if message %}
-    <div class="alert alert-{{message_type}}">
-        <p>{{ message }}</p>
-    </div>
-    {% endif %}
-
-    {% for p in available %}
-        <div class="row">
-        <div class="col-md-3 col-sm-3 col-xs-6">{{ p }}</div>
-        <div class="col-md-3 col-sm-3 col-xs-6">
-        {% if p in enabled %}
-            <a class="btn btn-default" href="{{ basepath }}/admin/login/disable/{{ p }}">Disable</a>
-            <a class="btn btn-default" href="{{ basepath }}/admin/login/{{ p }}">Configure</a>
-        {% else %}
-            <a class="btn btn-default" href="{{ basepath }}/admin/login/enable/{{ p }}">Enable</a>
-        {% endif %}
-        </div>
-        </div>
-    {% endfor %}
-
-    <h3>Plugins order</h3>
-    <div class="col-md-3 col-sm-3 col-xs-6">{{ ', '.join(enabled) }}</div>
-    <div class="col-md-3 col-sm-3 col-xs-6">
-        <a class="btn btn-default" href="{{ basepath }}/admin/login/order">configure</a>
-    </div>
-{% endif %}
-{% endblock %}
diff --git a/templates/admin/login_order.html b/templates/admin/login_order.html
deleted file mode 100644
index b14c4d9..0000000
--- a/templates/admin/login_order.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "master-admin.html" %}
-{% block main %}
-    <h2>{{ title }}</h2>
-    {% if message %}
-    <div class="alert alert-{{message_type}}">
-        <p>{{ message }}</p>
-    </div>
-    {% endif %}
-    <div id="options">
-        <form role="form" id="{{ name }}" action="{{ action }}" method="post" enctype="application/x-www-form-urlencoded">
-
-        <div class="form-group">
-        <label for="order">Login plugins order:</label>
-            <input type="text" class="form-control" name="order" value="{{ ', '.join(options) }}" />
-        </div>
-        <span class="help-block">Plugins order</span>
-
-        <button id="submit" class="btn btn-primary" name="submit" type="submit" value="Submit">
-            Save
-        </button>
-        <a href="{{ basepath }}/admin/login" class="btn btn-default" title="Back">Back</a>
-        </form>
-    </div>
-{% endblock %}
-
diff --git a/templates/admin/plugins.html b/templates/admin/plugins.html
new file mode 100644
index 0000000..7bbe544
--- /dev/null
+++ b/templates/admin/plugins.html
@@ -0,0 +1,108 @@
+{% extends "master-admin.html" %}
+{% block main %}
+{% if user.is_admin %}
+
+    <div class = "row">
+        <div class="col-md-6 col-sm-6 col-xs-6">
+            <h2>{{ title }}</h2>
+        </div>
+        <div class="col-md-6 col-sm-6 col-xs-6" role="alert">
+          {% if message and message_type != 'success' %}
+            <div class="alert alert-{{message_type}}">
+                <p>{{ message }}</p>
+            </div>
+          {% endif %}
+        </div>
+    </div>
+
+    <table class="table">
+    {% for p in enabled %}
+    <tr><td>
+      <div class="row">
+        <div class="col-md-3 col-sm-3 col-xs-5">
+          <strong>{{ p }}</strong>
+        </div>
+        <div class="col-md-7 col-sm-7 col-xs-5">
+          <div class="row">
+          <div class="col-md-6 col-sm-6 col-xs-12">
+              <a class="text-info" href="{{ baseurl }}/disable/{{ p }}">Disable</a>
+          </div>
+          <div class="col-md-6 col-sm-6 col-xs-12">
+            {%- if available[p].get_config_desc() %}
+              <a class="text-primary" href="{{ baseurl }}/{{ p }}">Configure</a>
+            {% endif %}
+          </div>
+          </div>
+        </div>
+        <div class="col-md-2 col-sm-2 col-xs-1">
+          {%- if not (loop.first and loop.last) %}
+          <form role="form" id="{{ order_name }}" action="{{ order_action }}" method="post" enctype="application/x-www-form-urlencoded">
+            {%- set outer_loop = loop %}
+            {%- for move in ['&uarr;', '&darr;'] %}
+              {%- if move == '&uarr;' %}
+                {%- if outer_loop.first %}
+                  {%- set state='disabled' %}
+                {%- else %}
+                  {%- set state='btn-default' %}
+                  {%- set idx0=outer_loop.index0-1 %}
+                  {%- set idx1=outer_loop.index0 %}
+                {%- endif %}
+              {%- else %}
+                {%- if outer_loop.last %}
+                  {%- set state='disabled' %}
+                {%- else %}
+                  {%- set state='btn-default' %}
+                  {%- set idx0=outer_loop.index0 %}
+                  {%- set idx1=outer_loop.index0+1 %}
+                {%- endif %}
+              {%- endif %}
+              <button id="submit" class="btn {{ state }}" name="order" type="submit" value="
+              {%- for i in range(enabled|length) %}
+                {%- if i == idx0 -%}
+                  {{- enabled[idx1] -}}
+                {%- elif i == idx1 -%}
+                  {{- enabled[idx0] -}}
+                {%- else -%}
+                  {{- enabled[i] -}}
+                {%- endif -%}
+                {%- if not loop.last -%},{%- endif -%}
+              {%- endfor -%}
+              ">{{ move }}</button>
+            {%- endfor %}
+          </form>
+          {%- endif %}
+        </div>
+      </div>
+    </td></tr>
+    {% endfor %}
+
+    {% for p in available if not p in enabled %}
+    <tr><td>
+      <div class="row">
+        <div class="col-md-3 col-sm-3 col-xs-5">
+            <strong>{{ p }}</strong>
+        </div>
+        <div class="col-md-7 col-sm-7 col-xs-6">
+          <div class="row">
+          <div class="col-md-6 col-sm-6 col-xs-12">
+              <a class="text-info" href="{{ baseurl }}/enable/{{ p }}">Enable</a>
+          </div>
+          <div class="col-md-6 col-sm-6 col-xs-12">
+            {%- if available[p].get_config_desc() %}
+              <span class="text-muted">Configure</span>
+            {% endif %}
+          </div>
+          </div>
+        </div>
+        <div class="col-md-2 col-sm-2 col-xs-1">
+        </div>
+      </div>
+    </td></tr>
+    {% endfor %}
+
+    <tr><td>
+    </td></tr>
+    </table>
+
+{% endif %}
+{% endblock %}
-- 
cgit