Fix bug where the #signup view was not working for the default and KNB

themes
NCEAS · Oct 18, 2017 · 4ca1eac · 4ca1eac
1 parent da756f4
commit 4ca1eac
Show file tree

Hide file tree

Showing 6 changed files with 474 additions and 6 deletions.
diff --git a/metacatui/src/main/webapp/js/models/AppModel.js b/metacatui/src/main/webapp/js/models/AppModel.js
@@ -54,7 +54,7 @@ define(['jquery', 'underscore', 'backbone'],
 			queryServiceUrl: null,
 			metaServiceUrl: null,
 			registryServiceUrl: null,
-			//ldapwebServiceUrl: null,
+			ldapwebServiceUrl: null,
 			metacatBaseUrl: null,
 			metacatServiceUrl: null,
 			objectServiceUrl: null,
@@ -98,7 +98,7 @@ define(['jquery', 'underscore', 'backbone'],
 			this.set('metaServiceUrl', this.get('baseUrl') + this.get('context') + this.get('d1Service') + '/meta/');
 			this.set('objectServiceUrl', this.get('baseUrl') + this.get('context') + this.get('d1Service') + '/object/');
 			this.set('registryServiceUrl', this.get('baseUrl') + this.get('context') + '/cgi-bin/register-dataset.cgi');
-			//this.set('ldapwebServiceUrl', this.get('baseUrl') + this.get('context') + '/cgi-bin/ldapweb.cgi');
+			this.set('ldapwebServiceUrl', this.get('baseUrl') + this.get('context') + '/cgi-bin/ldapweb.cgi');
 			this.set('metacatServiceUrl', this.get('baseUrl') + this.get('context') + '/metacat');
 
 			//Add a ? character to the end of the Solr queries when we are appending JSONP parameters (which use ?'s)

diff --git a/metacatui/src/main/webapp/js/themes/arctic/routers/router.js b/metacatui/src/main/webapp/js/themes/arctic/routers/router.js
@@ -313,7 +313,7 @@ function ($, _, Backbone) {
 
 			if(!appView.signInView){
 				require(['views/SignInView'], function(SignInView){
-					appView.signInView = new SignInView({ el: "#Content"});
+					appView.signInView = new SignInView({ el: "#Content", fullPage: true });
 					appView.showView(appView.signInView);
 				});
 			}

diff --git a/metacatui/src/main/webapp/js/themes/dataone/routers/router.js b/metacatui/src/main/webapp/js/themes/dataone/routers/router.js
@@ -316,7 +316,7 @@ function ($, _, Backbone) {
 
 			if(!appView.signInView){
 				require(["views/SignInView"], function(SignInView){
-					appView.signInView = new SignInView({ el: "#Content"});
+					appView.signInView = new SignInView({ el: "#Content", fullPage: true });
 					appView.showView(appView.signInView);
 				});
 			}

diff --git a/metacatui/src/main/webapp/js/themes/knb/config.js b/metacatui/src/main/webapp/js/themes/knb/config.js
@@ -7,7 +7,7 @@ var themeMap =
 
 		// Resources (js) omit extension
 		//'views/AboutView' : 'themes/' + theme + '/views/AboutView',
-		//'routers/router' : 'themes/' + theme + '/routers/router',
+		'routers/router' : 'themes/' + theme + '/routers/router',
 		'models/AppModel' : 'themes/' + theme + '/models/AppModel',
 
 		// Templates include extension