From 4bfeadf3ad89fdf45cd61c2d6cd0da43adf98e0b Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 20 Jul 2010 23:24:01 +0000
Subject: [PATCH] Merging r5332 r5336:5338 r5341 r5349 from
 http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint

---
 .classpath                                      |  6 ++++++
 .project                                        | 17 +++++++++++++++++
 .settings/org.eclipse.jdt.core.prefs            | 12 ++++++++++++
 .../controller/freemarker/UrlBuilder.java       |  9 ++++++---
 webapp/web/js/customFormUtils.js                |  8 ++++++--
 webapp/web/js/login/loginUtils.js               |  1 +
 webapp/web/siteAdmin/siteAdminScripts.jsp       |  6 ------
 .../freemarker/body/login/login-form.ftl        |  3 ---
 8 files changed, 48 insertions(+), 14 deletions(-)
 create mode 100644 .classpath
 create mode 100644 .project
 create mode 100644 .settings/org.eclipse.jdt.core.prefs
 delete mode 100644 webapp/web/siteAdmin/siteAdminScripts.jsp

diff --git a/.classpath b/.classpath
new file mode 100644
index 000000000..07ca123c6
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/.project b/.project
new file mode 100644
index 000000000..50fa3db72
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>vitro</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..72d484718
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Tue Jul 20 19:04:25 EDT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
index 3aa224d4b..503e816ce 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
@@ -106,7 +106,8 @@ public class UrlBuilder {
     
     public String getHomeUrl() {
         String rootBreadCrumbUrl = portal.getRootBreadCrumbURL();
-        return StringUtils.isEmpty(rootBreadCrumbUrl) ? contextPath : rootBreadCrumbUrl;  
+        String path = StringUtils.isEmpty(rootBreadCrumbUrl) ? "" : rootBreadCrumbUrl;
+        return getUrl(path);
     }
     
     public String getLogoutUrl() {
@@ -155,10 +156,12 @@ public class UrlBuilder {
     /********** Static utility methods **********/
     
     public static String getUrl(String path) {
-        if ( ! path.startsWith("/") ) {
+    	
+        if ( !path.isEmpty() && !path.startsWith("/") ) {
             path = "/" + path;
         }
-        return contextPath + path;
+        path = contextPath + path;
+        return path.isEmpty() ? "/" : path;
     }
     
     public static String getUrl(String path, Params params) {
diff --git a/webapp/web/js/customFormUtils.js b/webapp/web/js/customFormUtils.js
index 2458121a7..9edf039e6 100644
--- a/webapp/web/js/customFormUtils.js
+++ b/webapp/web/js/customFormUtils.js
@@ -1,7 +1,11 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
 var vitro;
-if (!vitro) {
+
+// vitro == null: true
+// vitro === null: false (only true if undefined)
+// typeof vitro == 'undefined': true
+if (!vitro) { 
 	vitro = {};
 }
 
@@ -56,5 +60,5 @@ vitro.customFormUtils = {
 //    	}
 //    	
 //    	return foundErrors;
-    },
+    }
 }
\ No newline at end of file
diff --git a/webapp/web/js/login/loginUtils.js b/webapp/web/js/login/loginUtils.js
index 946adf807..76117467e 100644
--- a/webapp/web/js/login/loginUtils.js
+++ b/webapp/web/js/login/loginUtils.js
@@ -9,3 +9,4 @@ $(document).ready(function(){
   $('.focus').focus();
 
 });
+
diff --git a/webapp/web/siteAdmin/siteAdminScripts.jsp b/webapp/web/siteAdmin/siteAdminScripts.jsp
deleted file mode 100644
index 0c40a3f00..000000000
--- a/webapp/web/siteAdmin/siteAdminScripts.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
-<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.User" %>
-
-<script type="text/javascript" src="js/jquery.js"></script> 
-<script type="text/javascript" src="js/login/loginUtils.js"></script> 
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/login/login-form.ftl b/webapp/web/templates/freemarker/body/login/login-form.ftl
index 028d96ad9..823bd0726 100644
--- a/webapp/web/templates/freemarker/body/login/login-form.ftl
+++ b/webapp/web/templates/freemarker/body/login/login-form.ftl
@@ -2,9 +2,6 @@
 
 <#-- Log in template for accessing site admin -->
 
-
-
-${stylesheets.addFromTheme("/login.css")}
 <noscript>
 	<div id="javascriptDisableWrapper">
 		<div id="javascriptDisableContent">