From 405367fd75bcf8415ab77370086f2a81f9f11701 Mon Sep 17 00:00:00 2001
From: kakwa <carpentier.pf@gmail.com>
Date: Sun, 5 Jul 2015 17:50:42 +0200
Subject: [PATCH] various fixes in html + unit tests on html

---
 resources/static/css/custom.css      |  4 ++++
 resources/templates/adduser.tmpl     |  2 +-
 resources/templates/form.tmpl        | 18 +++++++++---------
 resources/templates/modify.tmpl      |  2 +-
 resources/templates/navbar.tmpl      |  2 +-
 resources/templates/searchadmin.tmpl | 16 ++++------------
 resources/templates/searchuser.tmpl  |  4 ++--
 tests/test_LdapCherry.py             | 14 ++++++++++----
 8 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/resources/static/css/custom.css b/resources/static/css/custom.css
index 2b9c49d..49372d6 100644
--- a/resources/static/css/custom.css
+++ b/resources/static/css/custom.css
@@ -16,6 +16,10 @@
   height: 34px;
 }
 
+.btn.pad {
+   padding: inherit;
+}
+
 .btn.blue {
   background-color: hsl(201, 100%, 30%) !important;
   background-repeat: repeat-x;
diff --git a/resources/templates/adduser.tmpl b/resources/templates/adduser.tmpl
index 21af83f..dbadbe1 100644
--- a/resources/templates/adduser.tmpl
+++ b/resources/templates/adduser.tmpl
@@ -18,7 +18,7 @@
               <div class="form-group">
                 <div class="input-group">
                   <button class="btn btn-default green" type="submit">
-                  <span class="glyphicon glyphicon-plus-sign"> Add User</button>
+                  <span class="glyphicon glyphicon-plus-sign"></span> Add User</button>
                 </div>
               </div>
               </form>
diff --git a/resources/templates/form.tmpl b/resources/templates/form.tmpl
index 9c862ca..93e4463 100644
--- a/resources/templates/form.tmpl
+++ b/resources/templates/form.tmpl
@@ -36,19 +36,19 @@ for a in sorted(attributes.keys(), key=lambda attr: attributes[attr]['weight']):
         value2 = ''
   %>
 
-  <span class="input-group-addon" id="basic-addon1">${attr['display_name']}</span>
+  <span class="input-group-addon" id="basic-addon-${a}">${attr['display_name']}</span>
     % if modify and a == keyattr:
-  <input type="hidden" name="attr.${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1" ${required} ${value}>
-  <span class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1">${tmp}</span>
+  <input type="hidden" name="attr.${a}" class="form-control" aria-describedby="basic-addon-${a}" ${required} ${value}>
+  <span class="form-control" aria-describedby="basic-addon-${a}">${tmp}</span>
     % elif attr['type'] == 'string':
-  <input type="text"   name="attr.${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1" ${required} ${value}>
+  <input type="text"   name="attr.${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon-${a}" ${required} ${value}>
     % elif attr['type'] == 'email':
-  <input type="email"  name="attr.${a}" class="form-control" delay="2000" placeholder="${attr['description']}" aria-describedby="basic-addon1" ${required} ${value} data-error="email address is invalid">
+  <input type="email"  name="attr.${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon-${a}" ${required} ${value} data-error="email address is invalid">
     % elif attr['type'] == 'int':
-  <input type="number" name="attr.${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1" ${required} ${value}>
+  <input type="number" name="attr.${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon-${a}" ${required} ${value}>
     % elif attr['type'] == 'fix':
-  <input type="hidden" name="attr.${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1" ${required} value="${attr['value']}">
-  <span class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1">${attr['value']}</span>
+  <input type="hidden" name="attr.${a}" class="form-control" aria-describedby="basic-addon-${a}" ${required} value="${attr['value']}">
+  <span class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon-${a}">${attr['value']}</span>
     % elif attr['type'] == 'stringlist':
   <select class="form-control" name="attr.${a}">
         ${value2}
@@ -58,7 +58,7 @@ for a in sorted(attributes.keys(), key=lambda attr: attributes[attr]['weight']):
   </select>
     % elif attr['type'] == 'password':
       <input type="password" class="form-control" data-error="Don't meet password policy" data-remote="/checkppolicy" name="attr.${a}1" id="${a}1" placeholder="${attr['description']}" ${required}>
-      <span class="input-group-addon" id="basic-addon1">Retype ${attr['display_name']}</span>
+      <span class="input-group-addon" id="basic-addon-${a}2">Retype ${attr['display_name']}</span>
       <input type="password" class="form-control" data-match="#${a}1"  data-match-error="Passwords don't match" name="attr.${a}2" id="#${a}2" placeholder="Confirm" ${required}>
     % endif
 </div>
diff --git a/resources/templates/modify.tmpl b/resources/templates/modify.tmpl
index e6868b9..81a6514 100644
--- a/resources/templates/modify.tmpl
+++ b/resources/templates/modify.tmpl
@@ -58,7 +58,7 @@
               <div class="form-group">
                 <div class="input-group">
                   <button class="btn btn-default blue" type="submit">
-                  <span class="glyphicon glyphicon-cog"> Modify User</button>
+                  <span class="glyphicon glyphicon-cog"></span> Modify User</button>
                 </div>
               </div>
               </form>
diff --git a/resources/templates/navbar.tmpl b/resources/templates/navbar.tmpl
index 806b48a..167a3b2 100644
--- a/resources/templates/navbar.tmpl
+++ b/resources/templates/navbar.tmpl
@@ -14,7 +14,7 @@
                 </div>
 
                 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-                    <a class="navbar-brand navbar-right" href='/logout'><span class="glyphicon glyphicon-off"> Logout</a>
+                    <a class="navbar-brand navbar-right" href='/logout'><span class="glyphicon glyphicon-off"></span> Logout</a>
 		            <form method='GET' action='/searchuser' class="navbar-form navbar-right" role="search">
                         <div class="form-group">
                             <input type="text" class="form-control" name="searchstring" placeholder="Search User">
diff --git a/resources/templates/searchadmin.tmpl b/resources/templates/searchadmin.tmpl
index b8493e2..e491b8b 100644
--- a/resources/templates/searchadmin.tmpl
+++ b/resources/templates/searchadmin.tmpl
@@ -6,11 +6,11 @@
             <form method='get' action='/searchadmin' role="form" class="form-inline">
                 <div class="form-group">
                      <label for="searchstring">Search user to modify/delete</label>
-                     <input type="text" class="form-control" name="searchstring" placeholder="Search User">
+                     <input type="text" class="form-control" id="searchstring" name="searchstring" placeholder="Search User">
                 </div>
                 <div class="form-group">
                     <label for="submit">Submit</label>
-                    <button type="submit" class="form-control btn btn-default green">
+                    <button type="submit" id="submit" class="form-control btn btn-default green">
                     <span class="glyphicon glyphicon-search"></span> Search</button>
                 </div>
             </form>
@@ -52,18 +52,10 @@
                                 </td>
                             % endfor
                                 <td>
-                                    <a href="/modify?user=${user}">
-                                    <button type="submit" class="btn btn-xs blue">
-                                    <span class="glyphicon glyphicon-cog"></span> Modify</button>
-                                    </a>
+                                    <a href="/modify?user=${user}" class="btn btn-xs blue pad" ><span class="glyphicon glyphicon-cog"></span> Modify</a>
                                 </td>
                                 <td>
-
-                                    <a href="/delete?user=${user}"  data-toggle='confirmation-delete'>
-                                    <button type="submit" class="btn btn-xs red">
-                                    <span class="glyphicon glyphicon-remove-sign"></span> Delete</button>
-                                    </a>
-
+                                    <a href="/delete?user=${user}" data-toggle='confirmation-delete' class="btn btn-xs red pad"><span class="glyphicon glyphicon-remove-sign"></span> Delete</a>
                                 </td>
                             </tr>
                             % endfor
diff --git a/resources/templates/searchuser.tmpl b/resources/templates/searchuser.tmpl
index 91a3bcc..c659a47 100644
--- a/resources/templates/searchuser.tmpl
+++ b/resources/templates/searchuser.tmpl
@@ -6,11 +6,11 @@
             <form method='get' action='/searchuser' role="form" class="form-inline">
                 <div class="form-group">
                      <label for="searchstring">Search user</label>
-                     <input type="text" class="form-control" name="searchstring" placeholder="Search User">
+                     <input type="text" id="searchstring" class="form-control" name="searchstring" placeholder="Search User">
                 </div>
                 <div class="form-group">
                     <label for="submit">Submit</label>
-                    <button type="submit" class="form-control btn btn-default green">
+                    <button type="submit" id="submit" class="form-control btn btn-default green">
                     <span class="glyphicon glyphicon-search"></span> Search</button>
                 </div>
             </form>
diff --git a/tests/test_LdapCherry.py b/tests/test_LdapCherry.py
index 8125335..1f30795 100644
--- a/tests/test_LdapCherry.py
+++ b/tests/test_LdapCherry.py
@@ -186,11 +186,17 @@ class TestError(object):
     def testHtml(self):
         app = LdapCherry()
         loadconf('./tests/cfg/ldapcherry_test.ini', app)
-        pages = [
-            app.signin(),
-        ]
+        pages = {
+                'signin': app.signin(),
+                'index': app.index(),
+                'searchuser': app.searchuser('smit'),
+                'searchadmin':app.searchadmin('smit'),
+                'adduser': app.adduser(),
+                'modify':app.modify('jsmith'),
+                }
         for page in pages:
-            htmlvalidator(page)
+            print(page)
+            htmlvalidator(pages[page])
 
     def testLogger(self):
         app = LdapCherry()