From 8005277b88db0d14110ac31c0e76c678f4fa3efa Mon Sep 17 00:00:00 2001
From: Howard Johnson <merlin@merlinthp.org>
Date: Jul 21 2016 12:39:02 +0000
Subject: [PATCH 1/2] Add help buttons to the login stack page


The various login stack plugins (mostly) have description attributes,
but these are not exposed in the UI.  Add a help button to each row of
the login stack page that uses bootstrap popovers to display the text.

Signed-off-by: Howard Johnson <merlin@merlinthp.org>

---

diff --git a/templates/admin/loginstack.html b/templates/admin/loginstack.html
index df8dac4..40913be 100644
--- a/templates/admin/loginstack.html
+++ b/templates/admin/loginstack.html
@@ -31,16 +31,16 @@
         <div class="col-md-3 col-sm-3 col-xs-5">
           <p><strong>{{ p }}</strong></p>
         </div>
-        <div class="col-md-7 col-sm-7 col-xs-5">
+        <div class="col-md-6 col-sm-6 col-xs-5">
           <div class="row">
-          <div class="col-md-6 col-sm-6 col-xs-12">
-              <p class="text-info"><a href="{{ s["baseurl"] }}/disable/{{ p }}">Disable</a></p>
-          </div>
-          <div class="col-md-6 col-sm-6 col-xs-12">
-            {%- if s["available"][p].get_config_obj() %}
-              <p class="text-primary"><a href="{{ s["baseurl"] }}/{{ p }}">Configure</a></p>
-            {% endif %}
-          </div>
+            <div class="col-md-6 col-sm-6 col-xs-12">
+                <p class="text-info"><a href="{{ s["baseurl"] }}/disable/{{ p }}">Disable</a></p>
+            </div>
+            <div class="col-md-6 col-sm-6 col-xs-12">
+              {%- if s["available"][p].get_config_obj() %}
+                <p class="text-primary"><a href="{{ s["baseurl"] }}/{{ p }}">Configure</a></p>
+              {% endif %}
+            </div>
           </div>
         </div>
         <div class="col-md-2 col-sm-2 col-xs-1">
@@ -81,6 +81,9 @@
           </form>
           {%- endif %}
         </div>
+        <div class="col-md-1 col-sm-1 col-xs-1">
+          <a href="#" data-toggle="popover" data-html="true" title="" data-content="{{ s["available"][p].description }}" data-placement="left"><span class="pficon pficon-help"></span></a>
+        </div>
       </div>
     {% endfor %}
 
@@ -95,20 +98,23 @@
         <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="col-md-6 col-sm-6 col-xs-5">
           <div class="row">
-          <div class="col-md-6 col-sm-6 col-xs-12">
-              <a class="text-info" href="{{ s["baseurl"] }}/enable/{{ p }}">Enable</a>
-          </div>
-          <div class="col-md-6 col-sm-6 col-xs-12">
-            {%- if s["available"][p].get_config_obj() %}
-              <span class="text-muted">Configure</span>
-            {% endif %}
-          </div>
+            <div class="col-md-6 col-sm-6 col-xs-12">
+                <a class="text-info" href="{{ s["baseurl"] }}/enable/{{ p }}">Enable</a>
+            </div>
+            <div class="col-md-6 col-sm-6 col-xs-12">
+              {%- if s["available"][p].get_config_obj() %}
+                <span class="text-muted">Configure</span>
+              {% endif %}
+            </div>
           </div>
         </div>
         <div class="col-md-2 col-sm-2 col-xs-1">
         </div>
+        <div class="col-md-1 col-sm-1 col-xs-1">
+          <a href="#" data-toggle="popover" data-html="true" title="" data-content="{{ s["available"][p].description }}" data-placement="left"><span class="pficon pficon-help text-muted"></span></a>
+        </div>
       </div>
     {% endfor %}
   {% endfor %}
diff --git a/templates/master-admin.html b/templates/master-admin.html
index f7cd163..849c81f 100644
--- a/templates/master-admin.html
+++ b/templates/master-admin.html
@@ -16,6 +16,9 @@
             function() {
                 history.replaceState({} , document.title, "{{ newurl }}");
                 $('[data-toggle="tooltip"]').tooltip();
+                $('[data-toggle="popover"]').popover({
+                  container: 'body'
+                });
             }
         );
     </script>

From 10911e954b1dd2637dc0703c2a6fc2986f7b030c Mon Sep 17 00:00:00 2001
From: Howard Johnson <merlin@merlinthp.org>
Date: Jul 21 2016 12:39:29 +0000
Subject: [PATCH 2/2] Add missing descriptions to infonss and infosssd plugins


Signed-off-by: Howard Johnson <merlin@merlinthp.org>

---

diff --git a/ipsilon/info/infonss.py b/ipsilon/info/infonss.py
index 0cd6fa0..abc7b89 100644
--- a/ipsilon/info/infonss.py
+++ b/ipsilon/info/infonss.py
@@ -20,6 +20,8 @@ class InfoProvider(InfoProviderBase):
         super(InfoProvider, self).__init__(*pargs)
         self.mapper = Policy(posix_map)
         self.name = 'nss'
+        self.description = """
+Info plugin that uses the system NSS functions to retrieve user data."""
         self.new_config(self.name)
 
     def _get_posix_user(self, user):
diff --git a/ipsilon/info/infosssd.py b/ipsilon/info/infosssd.py
index 6b75965..fad327c 100644
--- a/ipsilon/info/infosssd.py
+++ b/ipsilon/info/infosssd.py
@@ -48,6 +48,8 @@ class InfoProvider(InfoProviderBase):
         super(InfoProvider, self).__init__(*pargs)
         self.mapper = Policy(sssd_mapping)
         self.name = 'sssd'
+        self.description = """
+Info plugin that uses mod_lookup_identity and SSSD to retrieve user data."""
         self.new_config(
             self.name,
             pconfig.Condition(