From: Olivier Lamy <olamy@apache.org>
Date: Thu, 15 Mar 2012 10:49:09 +0000 (+0000)
Subject: fix button class
X-Git-Tag: archiva-1.4-M3~1037
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b776661f0a6a2bd9c3a068c927ba66dfb733ec6b;p=archiva.git

fix button class

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
index 21d31239c..f8c14cb37 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
@@ -851,7 +851,7 @@ $(function() {
           searchViewModel.observableRepoIds(repos);
           ko.applyBindings(searchViewModel,mainContent.find("#search-artifacts-div").get(0));
           mainContent.find("#search-basic-repostories-select" ).chosen();
-          if (successCallbackFn!=null) successCallbackFn();
+          if (successCallbackFn && $.isFunction(successCallbackFn)) successCallbackFn();
         }
     });
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
index 8f41a29fe..871d1379e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
@@ -41,7 +41,8 @@
       </form>
   </div>
   <div class="modal-footer" id="modal-login-footer">
-    <button class="btn primary" id="modal-login-ok">${$.i18n.prop('login')}</button>
+    <button class="btn btn-primary" id="modal-login-ok">${$.i18n.prop('login')}</button>
+    <button class="btn btn-info" id="modal-login-password-reset">${$.i18n.prop('password.reset')}</button>
   </div>
 </div>
 
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 f8188dcd4..931e72d27 100644
--- 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
@@ -48,6 +48,6 @@
       </form>
   </div>
   <div class="modal-footer" id="modal-register-footer">
-      <button class="btn primary" id="modal-register-ok">${$.i18n.prop('register')}</button>
+      <button class="btn btn-primary" id="modal-register-ok">${$.i18n.prop('register')}</button>
   </div>
 </div>
\ No newline at end of file