From 2be04f483d16cee180c273c8b3d456080a3722e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Thu, 5 Jun 2014 13:49:44 +0000
Subject: [PATCH] Work on bootstrap theme (#670)

---
 .../example/skins/bootstrap/confirm.tpl       | 23 +++++++++++--------
 .../example/skins/bootstrap/css/styles.css    |  2 +-
 .../example/skins/bootstrap/login.tpl         |  6 +++++
 .../example/skins/bootstrap/openidform.tpl    |  4 ++--
 .../example/skins/bootstrap/standardform.tpl  |  1 -
 .../example/skins/bootstrap/yubikeyform.tpl   |  4 ++--
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/lemonldap-ng-portal/example/skins/bootstrap/confirm.tpl b/lemonldap-ng-portal/example/skins/bootstrap/confirm.tpl
index 64a06409e..e80a368a0 100644
--- a/lemonldap-ng-portal/example/skins/bootstrap/confirm.tpl
+++ b/lemonldap-ng-portal/example/skins/bootstrap/confirm.tpl
@@ -19,18 +19,18 @@
       <div class="panel-heading">
         <h3 class="panel-title"><lang en="Confirmation" fr="Confirmation"/></h3>
       </div>
-      <div class="panel-body">
-        <TMPL_VAR NAME="MSG">
-      </div>
-    </div>
+      <div class="panel-body form">
 
-    <TMPL_IF NAME="LIST">
+      <TMPL_VAR NAME="MSG">
+
+      <TMPL_IF NAME="LIST">
 
       <h3><lang en="Select your Identity Provider" fr="Choisissez votre fournisseur d'identité"/></h3>
       <input type="hidden" id="idp" name="idp"/>
 
       <TMPL_LOOP NAME="LIST">
-          <button type="submit" class="positive btn btn-success" onclick="$('#idp').val('<TMPL_VAR NAME="VAL">')">
+          <button type="submit" class="positive btn btn-info" onclick="$('#idp').val('<TMPL_VAR NAME="VAL">')">
+            <span class="glyphicon glyphicon-chevron-right"></span>
             <TMPL_VAR NAME="NAME">
           </button>
       </TMPL_LOOP>
@@ -42,7 +42,7 @@
         </label>
       </div>
 
-    <TMPL_ELSE>
+      <TMPL_ELSE>
 
       <TMPL_IF NAME="ACTIVE_TIMER">
 
@@ -58,15 +58,18 @@
           <span class="glyphicon glyphicon-ok"></span>
           <lang en="Accept" fr="Accepter" />
         </button>
-        <button type="submit" class="negative" onclick="$('#confirm').attr('value','-<TMPL_VAR NAME="CONFIRMKEY">');">
+        <button type="submit" class="negative btn btn-danger" onclick="$('#confirm').attr('value','-<TMPL_VAR NAME="CONFIRMKEY">');">
           <span class="glyphicon glyphicon-stop"></span>
           <lang en="Refuse" fr="Refuser" />
         </button>
       </div>
 
-    </TMPL_IF>
+      </TMPL_IF>
 
-    <TMPL_INCLUDE NAME="checklogins.tpl">
+      <TMPL_INCLUDE NAME="checklogins.tpl">
+
+      </div>
+    </div>
 
   </form>
 
diff --git a/lemonldap-ng-portal/example/skins/bootstrap/css/styles.css b/lemonldap-ng-portal/example/skins/bootstrap/css/styles.css
index 09caa509f..16f671431 100644
--- a/lemonldap-ng-portal/example/skins/bootstrap/css/styles.css
+++ b/lemonldap-ng-portal/example/skins/bootstrap/css/styles.css
@@ -25,7 +25,7 @@ body {
   padding-top: 20px;
 }
 
-.login, .password {
+.login, .password, .confirm {
   text-align: center;
   padding: 20px;
 }
diff --git a/lemonldap-ng-portal/example/skins/bootstrap/login.tpl b/lemonldap-ng-portal/example/skins/bootstrap/login.tpl
index 43509c4bb..0e1805cc6 100644
--- a/lemonldap-ng-portal/example/skins/bootstrap/login.tpl
+++ b/lemonldap-ng-portal/example/skins/bootstrap/login.tpl
@@ -68,6 +68,8 @@
 
             <TMPL_IF NAME="logo">
 
+              <div class="form">
+
                 <TMPL_IF NAME="module">
                   <img src="<TMPL_VAR NAME="SKIN_PATH">/common/<TMPL_VAR NAME="module">.png" alt="<TMPL_VAR NAME="module">" class="img-thumbnail" />
                 </TMPL_IF>
@@ -79,6 +81,8 @@
                     <lang en="Connect" fr="Se connecter" />
                   </button>
 
+              </div>
+
             </TMPL_IF>
 
           </form>
@@ -145,6 +149,7 @@
       <input type="hidden" name="url" value="<TMPL_VAR NAME="AUTH_URL">" />
       <input type="hidden" name="timezone" />
 
+      <div class="form">
       <TMPL_IF NAME="module">
         <img src="<TMPL_VAR NAME="SKIN_PATH">/common/<TMPL_VAR NAME="module">.png" alt="<TMPL_VAR NAME="module">" class="img-thumbnail" />
       </TMPL_IF>
@@ -155,6 +160,7 @@
         <span class="glyphicon glyphicon-log-in"></span>&nbsp;
         <lang en="Connect" fr="Se connecter" />
       </button>
+      </div>
 
     </form>
     </div>
diff --git a/lemonldap-ng-portal/example/skins/bootstrap/openidform.tpl b/lemonldap-ng-portal/example/skins/bootstrap/openidform.tpl
index aa8e3a48c..932fa0209 100644
--- a/lemonldap-ng-portal/example/skins/bootstrap/openidform.tpl
+++ b/lemonldap-ng-portal/example/skins/bootstrap/openidform.tpl
@@ -1,4 +1,4 @@
-
+<div class="form">
   <div class="form-group input-group">
     <span class="input-group-addon glyphicon glyphicon-link"> </span>
     <input name="openid_identifier" type="text" class="form-control" placeholder="<lang en="Please enter your OpenID login" fr="Entrez votre identifiant OpenID"/>" />
@@ -10,4 +10,4 @@
     <span class="glyphicon glyphicon-log-in"></span>
     <lang en="Connect" fr="Se connecter" />
   </button>
-
+</div>
diff --git a/lemonldap-ng-portal/example/skins/bootstrap/standardform.tpl b/lemonldap-ng-portal/example/skins/bootstrap/standardform.tpl
index e7b683232..ea4137abf 100644
--- a/lemonldap-ng-portal/example/skins/bootstrap/standardform.tpl
+++ b/lemonldap-ng-portal/example/skins/bootstrap/standardform.tpl
@@ -43,4 +43,3 @@
   </a>
   </TMPL_IF>
 </div>
-
diff --git a/lemonldap-ng-portal/example/skins/bootstrap/yubikeyform.tpl b/lemonldap-ng-portal/example/skins/bootstrap/yubikeyform.tpl
index c5b807937..6402af667 100644
--- a/lemonldap-ng-portal/example/skins/bootstrap/yubikeyform.tpl
+++ b/lemonldap-ng-portal/example/skins/bootstrap/yubikeyform.tpl
@@ -1,4 +1,4 @@
-
+<div class="form">
   <div class="form-group input-group">
     <span class="input-group-addon glyphicon glyphicon-chevron-right"> </span>
     <input name="yubikeyOTP" type="text" class="form-control" placeholder="<lang en="Please use your Yubikey" fr="Utilisez votre Yubikey"/>" />
@@ -10,4 +10,4 @@
     <span class="glyphicon glyphicon-log-in"></span>
     <lang en="Connect" fr="Se connecter" />
   </button>
-
+</div>