From 3956cd07713e8e0fa960674d67a4b09f6c862c65 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 2 Feb 2012 20:41:38 +0000
Subject: [PATCH] [MRM-1598] use bootstrap css 2.x fix edit user details form

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1239821 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva-web/archiva-webapp-js/pom.xml     |  3 ++
 .../templates/password-change-form.html       |  2 +-
 .../js/redback/templates/user-edit-form.html  | 40 +++++++++----------
 .../src/main/webapp/js/redback/user.js        |  2 +-
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index e1ab376c4..cf0132c06 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -615,6 +615,9 @@
             <archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
             <archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
           </systemProperties>
+          <additionalClasspathDirs>
+            <additionalClasspathDir>src/test/tomcat</additionalClasspathDir>
+          </additionalClasspathDirs>
         </configuration>
         <dependencies>
           <dependency>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
index 4207d2224..18ce617c5 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
@@ -18,7 +18,7 @@
 -->
 <div id="modal-password-change" class="modal hide fade">
   <div class="modal-header">
-    <a href="#" class="close">&times;</a>
+    <a href="#" class="close" data-dismiss="modal">&times;</a>
     <h3>${$.i18n.prop('password.section.title')}</h3>
   </div>
   <div class="modal-body" id="modal-password-change-content">
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit-form.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit-form.html
index 9c6db3667..3df4d84fb 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit-form.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit-form.html
@@ -18,48 +18,48 @@
 -->
 <div id="modal-user-edit" class="modal hide fade">
   <div class="modal-header">
-    <a href="#" class="close">&times;</a>
+    <a href="#" class="close" data-dismiss="modal">&times;</a>
     <h3>${$.i18n.prop('password.section.title')}</h3>
   </div>
   <div class="modal-body" id="modal-user-edit-content">
-      <form id="user-edit-form">
+      <form id="user-edit-form" class="form-horizontal">
         <div id="modal-user-edit-err-message" class="alert-message error" style="display:none"></div>
         <fieldset>
-          <div class="clearfix">
-            <label for="username">${$.i18n.prop('username')}</label>
-            <div class="input" id="username-div">
+          <div class="control-group">
+            <label class="control-label" for="username">${$.i18n.prop('username')}</label>
+            <div class="controls" id="username-div">
               <span class="uneditable-input" id="username"></span>
             </div>
           </div>
-          <div class="clearfix">
-            <label for="fullname">${$.i18n.prop('full.name')}</label>
-            <div class="input">
+          <div class="control-group">
+            <label class="control-label" for="fullname">${$.i18n.prop('full.name')}</label>
+            <div class="controls">
               <input type="text" id="fullname" name="fullname" size="30" class="required"/>
             </div>
           </div>
-          <div class="clearfix">
-            <label for="email">${$.i18n.prop('email.address')}</label>
-            <div class="input">
+          <div class="control-group">
+            <label class="control-label" for="email">${$.i18n.prop('email.address')}</label>
+            <div class="controls">
               <input type="text" id="email" name="email" size="30" class="required email"/>
             </div>
           </div>
-          <div class="clearfix" id="user-edit-form-current-password-div">
-            <label for="userEditFormCurrentPassword">${$.i18n.prop('password.existing')}</label>
-            <div class="input">
+          <div class="control-group" id="user-edit-form-current-password-div">
+            <label class="control-label" for="userEditFormCurrentPassword">${$.i18n.prop('password.existing')}</label>
+            <div class="controls">
               <input type="password" id="userEditFormCurrentPassword" name="userEditFormCurrentPassword" class="required" value=""/>
             </div>
           </div>
 
-          <div class="clearfix">
-            <label for="userEditFormNewPassword">${$.i18n.prop('password.new')}</label>
-            <div class="input">
+          <div class="control-group">
+            <label class="control-label" for="userEditFormNewPassword">${$.i18n.prop('password.new')}</label>
+            <div class="controls">
               <input type="password" id="userEditFormNewPassword" name="userEditFormNewPassword" class="" value=""/>
             </div>
           </div>
 
-          <div class="clearfix">
-            <label for="userEditFormNewPasswordConfirm">${$.i18n.prop('password.new.confirm')}</label>
-            <div class="input">
+          <div class="control-group">
+            <label class="control-label" for="userEditFormNewPasswordConfirm">${$.i18n.prop('password.new.confirm')}</label>
+            <div class="controls">
               <input type="password" id="userEditFormNewPasswordConfirm" name="userEditFormNewPasswordConfirm" class="" value=""/>
             </div>
           </div>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
index c71f8f1a8..6783ae457 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
@@ -528,7 +528,7 @@ $(function() {
         }
       },
       showErrors: function(validator, errorMap, errorList) {
-        customShowError(validator,errorMap,errorMap);
+        customShowError("user-edit-form",validator,errorMap,errorMap);
       }
     });
 
-- 
2.39.5