[MRM-1598] use bootstrap css 2.x fix register form

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1239823 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js
index e8ce1e31ae1cfa70b23d57a07bacd2879941be16..1dc6d6a8f4e4771f520893d15b9b16d207de1be6 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js
@@ -31,14 +31,14 @@ $(function() {
     window.modalRegisterWindow.modal('show');
     $("#user-register-form").validate({
       showErrors: function(validator, errorMap, errorList) {
-        customShowError(validator,errorMap,errorMap);
+        customShowError("user-register-form",validator,errorMap,errorMap);
       }
     });
     $("#modal-register").delegate("#modal-register-ok", "click keydown keypress", function(e) {
       e.preventDefault();
       register();
     });
-    $("#modal-register").focus();
+    //$("#modal-register").focus();
   }
 
   /**

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
index 63d8e8a6f19057bfa063bdf7d6427a2bd132cdca..f8188dcd4f716648c5dacff37f4056571fd8321d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
@@ -18,28 +18,28 @@
 -->
 <div id="modal-register" 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('register.section.title')}</h3>
   </div>
   <div class="modal-body" id="modal-register-content">
-      <form id="user-register-form">
+      <form id="user-register-form" class="form-horizontal">
         <div id="modal-register-err-message" class="alert-message error" style="display:none"></div>
         <fieldset>
-          <div class="clearfix">
-            <label for="user-register-form-username">${$.i18n.prop('username')}</label>
-            <div class="input">
+          <div class="control-group">
+            <label class="control-label" for="user-register-form-username">${$.i18n.prop('username')}</label>
+            <div class="controls">
               <input type="text" id="user-register-form-username" name="user-register-form-username" class="required" />
             </div>
           </div>
-          <div class="clearfix">
-            <label for="user-register-form-fullname">${$.i18n.prop('full.name')}</label>
-            <div class="input">
+          <div class="control-group">
+            <label class="control-label" for="user-register-form-fullname">${$.i18n.prop('full.name')}</label>
+            <div class="controls">
               <input type="text" id="user-register-form-fullname" name="user-register-form-fullname" class="required" />
             </div>
           </div>
-          <div class="clearfix">
-            <label for="user-register-form-email">${$.i18n.prop('email')}</label>
-            <div class="input">
+          <div class="control-group">
+            <label class="control-label" for="user-register-form-email">${$.i18n.prop('email')}</label>
+            <div class="controls">
               <input type="text" id="user-register-form-email" name="user-register-form-email" class="required email" />
             </div>
           </div>
@@ -48,6 +48,6 @@
       </form>
   </div>
   <div class="modal-footer" id="modal-register-footer">
-      <button class="btn primary" onclick="return register();" id="modal-register-ok">${$.i18n.prop('register')}</button>
+      <button class="btn primary" id="modal-register-ok">${$.i18n.prop('register')}</button>
   </div>
 </div>
\ No newline at end of file