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 21d31239c4730ce80a706a222fa01fd540324228..f8c14cb37d03298719ac51db04d3fe556bdf61e0 100644 (file)
--- 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 8f41a29fe8e5f264c595b14a1cf96d3b19fe513f..871d1379e98ba26ca32275ae85462cbe44601da7 100644 (file)
--- 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 f8188dcd4f716648c5dacff37f4056571fd8321d..931e72d2724b7377ab8bb623dd234f21befb059f 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
@@ -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