You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/01/23 09:33:54 UTC
svn commit: r1234698 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva:
main.js templates/topbar.html
Author: olamy
Date: Mon Jan 23 08:33:54 2012
New Revision: 1234698
URL: http://svn.apache.org/viewvc?rev=1234698&view=rev
Log:
do not display login and register links when creating admin is needed
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1234698&r1=1234697&r2=1234698&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Mon Jan 23 08:33:54 2012
@@ -115,23 +115,6 @@ $(function() {
}
-
-
- checkCreateAdminLink=function(){
- $.ajax("restServices/redbackServices/userService/isAdminUserExists", {
- type: "GET",
- dataType: 'json',
- success: function(data) {
- var adminExists = JSON.parse(data);
- if (adminExists == false) {
- $("#create-admin-link").show();
- } else {
- $("#create-admin-link").hide();
- }
- }
- });
- }
-
checkSecurityLinks=function(){
var user = userLogged();
$.log("checkSecurityLinks, user:"+user);
@@ -149,7 +132,22 @@ $(function() {
}
}
-
+ checkCreateAdminLink=function(){
+ $.ajax("restServices/redbackServices/userService/isAdminUserExists", {
+ type: "GET",
+ dataType: 'json',
+ success: function(data) {
+ var adminExists = JSON.parse(data);
+ if (adminExists == false) {
+ $("#create-admin-link").show();
+ $("#login-link").hide();
+ $("#register-link").hide();
+ } else {
+ $("#create-admin-link").hide();
+ }
+ }
+ });
+ }
// handle url with registration link
$(document).ready(function() {
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html?rev=1234698&r1=1234697&r2=1234698&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html Mon Jan 23 08:33:54 2012
@@ -40,7 +40,7 @@
</a>
</li>
<li id="register-link" style="display: none">
- <a href="#" onclick="registerBox();">
+ <a href="#" onclick="registerBox();" id="register-link-a">
<span class="label notice">${register}</span>
</a>
</li>