Author: olamy
Date: Thu Mar 15 10:49:09 2012
New Revision: 1300905
URL: http://svn.apache.org/viewvc?rev=1300905&view=rev
Log:
fix button class
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1300905&r1=1300904&r2=1300905&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
Thu Mar 15 10:49:09 2012
@@ -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();
}
});
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html?rev=1300905&r1=1300904&r2=1300905&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
Thu Mar 15 10:49:09 2012
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html?rev=1300905&r1=1300904&r2=1300905&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
Thu Mar 15 10:49:09 2012
@@ -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
