Merge commit 'a83c1e5e4f' into feature/TDBfromRDB2

webapp/languages/es_GO/i18n/all_es_GO.properties

@@ -87,7 +87,7 @@ reset_password = Restablecer contraseña
 reset_password_note = Nota: Las instrucciones para restablecer la contraseña serán enviados por correo electrónico a la dirección indicada anteriormente. La contraseña no se restablecerá hasta que el usuario sigue el enlace que aparece en este correo electrónico.
 new_password = Nueva contraseña
 confirm_password = Confirmar nueva contraseña
-minimum_password_length = Mínimo de {0} caracteres de longitud.
+minimum_password_length = Mínimo de {0} caracteres de longitud; maximo de {1}.
 leave_password_unchanged = Dejando esto en blanco significa que no se puede cambiar la contraseña.
 confirm_initial_password = Confirmar contraseña inicial
 

webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java

@@ -67,8 +67,10 @@ public class KnowledgeBaseUpdater {
         log.info("Performing any necessary data migration");
         logger.log("Started knowledge base migration");
 		
+        boolean changesPerformed = false;
+        
 		try {
-		     performUpdate(servletContext);
+		     changesPerformed = performUpdate(servletContext);
 		} catch (Exception e) {
 			 logger.logError(e.getMessage());
 			 log.error(e,e);
@@ -85,10 +87,15 @@ public class KnowledgeBaseUpdater {
 		long elapsedSecs = (System.currentTimeMillis() - startTime)/1000;		
 		log.info("Finished checking knowledge base in " + elapsedSecs + " second" + (elapsedSecs != 1 ? "s" : ""));
 		
-		return record.hasRecordedChanges();
+		// The following was removed because it forced a recompute even if only
+		// annotation values changed:
+		// return record.hasRecordedChanges();
+		
+		return changesPerformed;
 	}
 	
-	private void performUpdate(ServletContext servletContext) throws Exception {
+	// returns true if ontology changes were found
+	private boolean performUpdate(ServletContext servletContext) throws Exception {
 		
 		List<AtomicOntologyChange> rawChanges = getAtomicOntologyChanges();
 		
@@ -122,9 +129,10 @@ public class KnowledgeBaseUpdater {
             } catch (Exception e) {
                 log.error(e,e);
             }          
-            
         }
         
+        return !rawChanges.isEmpty();
+
 	}
 	
     private static final boolean ADD = true;

webapp/themes/vitro/css/ie6.css

@@ -1,5 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-/* If VITRO theme developers decide to use VITRO theme 
-   as the base for their new theme, please use this file
-   for adding fixes for IE6 browsers */

webapp/themes/vitro/css/ie7.css

@@ -1,5 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-/* If VITRO theme developers decide to use VITRO theme 
-   as the base for their new theme, please use this file
-   for adding fixes for IE7 browsers *

webapp/themes/vitro/templates/head.ftl

@@ -11,14 +11,6 @@
 
 <#include "headScripts.ftl">
 
-<!--[if lt IE 7]>
-<link rel="stylesheet" href="${urls.theme}/css/ie6.css" />
-<![endif]-->
-
-<!--[if IE 7]>
-<link rel="stylesheet" href="${urls.theme}/css/ie7.css" />
-<![endif]-->
-
 <!--[if (gte IE 6)&(lte IE 8)]>
 <script type="text/javascript" src="${urls.base}/js/selectivizr.js"></script>
 <![endif]-->

webapp/web/css/vitro.css

@@ -417,3 +417,12 @@ a.filter-search {
 		margin: 0;
 		margin-top: 13px;
 }
+/* contact form security field */
+div .realperson-challenge {
+	width: 250px;
+        margin-right: 20px;
+}
+div .realperson-text {
+	text-align: center;
+}
+

webapp/web/css/vitroIE6.css

@@ -1,257 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-/* Fix browser issues in IE6 browsers */
-
-/* Fix for homepage in IE6 browsers */
-body {
-    background-position: center, 0;
-}
-#intro h2 { 
-    margin-left: 24px; 
-}
-#intro p { 
-    margin-left: 24px; 
-}
-#search-home h3 { 
-    margin-left: 0; 
-}
-#search-field {
-    background-image: url("../images/search-interior-pages.gif");
-    height: 32px;
-    width: 330px;
-}
-#search-field input.search {
-    padding-left: 14px;
-}
-#login {
-    margin-right: 0;
-}
-ul#browse-classgroups { 
-    margin-left: 20px; 
-}
-#browse-classes { 
-    width: 620px;
-}
-ul#classes-in-classgroup.vis {
-    width: 40%;
-}
-#login-form p.submit {
-    margin-left: 15px;
-}
-ul#browse-classgroups a.selected {
-    background-position-x: 0;
-    background-position-y: 12px;
-}
-/* Fix for menupages */
-ul#vgraph-classes {
-    float: left;
-    width: 265px;
-    margin-left: 15px;
-}
-#browse-by {
-    padding-bottom: 20px;
-}
-ul#browse-classes {
-    width: 290px;
-    margin-left: 0;
-    padding-left: 10px;
-    margin-left: 15px;
-}
-#individuals-in-class { 
-    width: 450px; 
-}
-article.foaf-person {
-    width: 400px;
-    margin-left:10px;
-    margin-right: 10px;
-    padding: 0;
-    margin-bottom: 10px;
-}
-#profile-photo-display { 
-    width: 620px;
-}
-#browse-classes {
-    width: 590px;
-}
-ul#classgroup-list.vis {
-    width: 38%;
-}
-.pagination li {
-    display: block;
-    float: left;
-}
-.pagination h3 {
-    float: left;
-}
-.pagination ul {
-    display: block;
-    float: left;
-}
-/* Fix for site admin: the wonders of the IE float model...
-fix to maintain sanity in rendering sections of site admin targets IE7 and below */
-#adminDashboard .pageBodyGroup {
-  *float: none !important;
-  *display: inline !important;
-  *vertical-align: top !important;
-}
-/* Fix for individual pages */
-#individual-intro.person {
-    width: 100%;
-}
-.sparkline_text, 
-.collaboratorship-link-container {
-    width: 148px;
-}
-#individual-intro.person #individual-info {
-    width: 72%;
-}
-/* Fix for dropdown user menu */
-ul.dropdown {
-    z-index: 9999;
-}
-/* Fix for menupages */
-nav#alpha-browse-container {
-    width: 542px;
-}
-ul#alpha-browse-individuals {
-    width: 540px;
-}
-ul#alpha-browse-individuals a {
-    height: 30px;
-    margin-left: 0;
-    padding-left: 6px;
-    width: 8px;
-}
-#individuals-in-class {
-    width: 545px;
-}
-#individual-intro.person .individual-overview {
-    clear: left;
-}
-#find-by {
-    width: 445px;
-}
-/* Fix for photo upload */
-#photoUploadForm input.submit, 
-#photoUploadForm input.submit:visited,
-#cropImage input.submit,
-#cropImage input.submit:visited {
-    padding: 5px 5px 7px;
-    margin-left: -8px;
-}
-#photoUploadForm span.or,
-#cropImage span.or {
-    display: block;
-    float: left;
-    padding-top: 10px;
-}
-/* Fix position for input type submit buttons */
-input.submit, 
-input.submit:visited,
-input#submit, 
-input#submit:visited {
-    display: block;
-    float: left;
-    clear: both;
-    margin-left: 0;
-}
-/* Fix position for "Required fields" text */
-form.customForm #requiredLegend {
-    clear: both;
-}
-/* Fix for verbose mode */
-#verbose-mode {
-    float: left;
-    clear: left;
-    margin-top: -14px;
-}
-.verbose-toggle {
-    top: 12px;
-}
-#admin .uri-link {
-    padding-top: 5px;
-}
-/* Fix account management pages */
-table#account th {
-    position: relative;
-}
-.account-alpha-browse {
-    position: absolute;
-    float: none;
-    top: 7px;
-    right: 0;
-}
-#filter-roles {
-    clear: both;
-}
-#search-accounts {
-    width: 400px; 
-}
-#search-accounts input[type="text"] {
-    float: left;  
-}
-#search-accounts input[type="submit"] {
-    float: right;
-    margin-top: 0;
-}
-#add-account {
-    width: 400px;
-    margin-bottom: 20px;
-}
-#add-account span {
-    float: left;
-}
-#add-account input.add-account {
-    margin-top: 0;
-    margin-left: 5px;
-    float: right;
-}
-p.requiredHint {
-    clear: left;
-}
-#add-account span.requiredHint {
-    float: none;
-}
-input#externalAuthChkBox {
-    margin-top: 0;
-    margin-bottom: 0;
-}
-#associated {
-    display: none; 
-    float: none;
-}
-#associationOptions {
-    display: none; 
-    float: none;
-}
-#associateProfileBackgroundOne {
-    width: 443px;
-    border-bottom: none;
-}
-#associateProfileBackgroundTwo {
-    width: 435px;
-    padding-left: 8px;
-    padding-top: 8px;
-    padding-bottom: 14px;
-    border-top: none;
-}
-#associateProfileBackgroundThree {
-    width: 435px;
-    padding-left: 8px;
-    padding-top: 8px;
-    border-top: none;
-}
-#associateProfileBackgroundFour {
-    width: 435px;
-    padding-left: 8px;
-    padding-top: 4px;
-}
-/* Fix menu management main page */
-span.controls {
-    margin-top: -30px;
-    padding-right: 5px;
-}
-/* Co-author and co-investigator visualizations */
-#ego_profile {
-    min-height: 100px;
-}

webapp/web/css/vitroIE7.css

@@ -1,212 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-/* Fix browser issues in IE7 browsers */
-
-/* Fix for homepage */
-#search-field input.search {
-    padding-left: 14px;
-}
-#login-form p.submit {
-    margin-left: 20px;
-}
-/* Fix for site admin */
-/* the wonders of the IE float model...fix to maintain sanity in rendering sections of site admin */
-/* targets IE7 and below */
-#adminDashboard .pageBodyGroup {
-  *float: none !important;
-  *display: inline !important;
-  *vertical-align: top !important;
-}
-/* Fix for dropdown user menu */
-ul.dropdown {
-    z-index: 9999;
-}
-/* Fix for photo upload */
-#photoUploadForm input.submit, 
-#photoUploadForm input.submit:visited,
-#cropImage input.submit,
-#cropImage input.submit:visited {
-    padding: 5px 5px 7px;
-    margin-left: -8px;
-}
-#photoUploadForm span.or,
-#cropImage span.or {
-    display: block;
-    float: left;
-    padding-top: 10px;
-}
-/* Fix position for input type submit buttons */
-input.submit, 
-input.submit:visited,
-input#submit, 
-input#submit:visited {
-    display: block;
-    float: left;
-    margin-left: 0;
-}
-/* Fix for individual pages */
-#individual-intro.person {
-    width: 100%;
-}
-.sparkline_text, 
-.collaboratorship-link-container {
-    width: 148px;
-}
-#individual-intro.person #individual-info {
-    width: 72%;
-}
-#individual-intro .individual-overview {
-    clear: left;
-}
-/* Miscellaneous */
-input#submit, input#submit:visited {
-    margin-left: 0;
-}
-/* Fix for menupages */
-.pagination li {
-    display: block;
-    float: left;
-}
-.pagination h3 {
-    float: left;
-}
-.pagination ul {
-    display: block;
-    float: left;
-}
-#find-by {
-    width: 445px;
-}
-/* Fix for Visualization: Co-author and Co-investigator network pages */
-#sparkline-container {
-    clear: both;
-    float: none;
-    margin-left: 0;
-    width: 100%;
-}
-.easy-deselect-label a.temporal-vis-url {
-    margin-top: -15px;
-}
-#grant-count-sparkline-include {
-    width: 48%;
-}
-#coinvestigator-count-sparkline-include {
-    width: 48%;
-    clear: left;
-}
-#publication-count-sparkline-include {
-    width: 48%;
-}
-#coauthor-count-sparkline-include {
-    width: 48%;
-    clear: left;
-}
-/* Fix for verbose mode */
-#verbose-mode {
-    float: left;
-    clear: left;
-    margin-top: -14px;
-}
-.verbose-toggle {
-    top: 12px;
-}
-#admin .uri-link {
-    padding-top: 5px;
-}
-/* Fix account management pages */
-table#account th {
-    position: relative;
-}
-.account-alpha-browse {
-    position: absolute;
-    float: none;
-    top: 7px;
-    right: 0;
-}
-#filter-roles {
-    clear: both;
-}
-#search-accounts {
-    width: 400px; 
-}
-#search-accounts input[type="text"] {
-    float: left;  
-}
-#search-accounts input[type="submit"] {
-    float: right;
-    margin-top: 0;
-}
-#add-account {
-    width: 500px;
-    margin-bottom: 20px;
-}
-#add-account span {
-    float: left;
-}
-#add-account input.add-account {
-    float: left;
-    margin-top: 0;
-    margin-left: 5px;
-}
-#add-account span.requiredHint {
-    float: none;
-}
-p.requiredHint {
-    clear: left;
-}
-input#externalAuthChkBox {
-    margin-top: 0;
-    margin-bottom: 0;
-}
-#associated {
-    display: none; 
-    float: none;
-}
-#associationOptions {
-    display: none; 
-    float: none;
-}
-#associateProfileBackgroundOne {
-    width: 443px;
-    border-bottom: none;
-}
-#associateProfileBackgroundTwo {
-    width: 435px;
-    padding-left: 8px;
-    padding-top: 8px;
-    padding-bottom: 14px;
-    border-top: none;
-}
-#associateProfileBackgroundThree {
-    width: 435px;
-    padding-left: 8px;
-    padding-top: 8px;
-    border-top: none;
-}
-#associateProfileBackgroundFour {
-    width: 435px;
-    padding-left: 8px;
-    padding-top: 4px;
-}
-/* Fix menu management main page */
-span.controls {
-    margin-top: -30px;
-    padding-right: 5px;
-}
-/* Fix meny proxy page */    
-#search-proxy input {
-    float: left;
-}
-#search-proxy input:last-child {
-    margin-left: 10px;
-    margin-top: -2px;
-}
-#search-proxy {
-    padding-bottom: 20px;
-}
-select[name="roleActivityType"],
-input[name="startField-year"],
-input[name="endField-year"],
-input[name="dateTimeField-year"] {
-    vertical-align: middle;
-}

webapp/web/i18n/all.properties

@@ -90,7 +90,7 @@ be emailed to the address entered above. The password will not \
 be reset until the user follows the link provided in this email.
 new_password = New password
 confirm_password = Confirm new password
-minimum_password_length = Minimum of {0} characters in length.
+minimum_password_length = Minimum of {0} characters in length; maximum of {1}.
 leave_password_unchanged = Leaving this blank means that the password will not be changed.
 confirm_initial_password = Confirm initial password
 

webapp/web/templates/edit/specific/renameResource_retry.jsp

@@ -11,7 +11,7 @@
 <tr class="editformcell">
     <td>
         <br/>
-        <b>New URI</b>&nbsp;<span class="note"> (must begin with http:// or htts://)</span>
+        <b>New URI</b>&nbsp;<span class="note"> (must begin with http:// or https://)</span>
         <br/>
         <span class="warning"><strong>${epo.attributeMap['errorMsg']}</strong></span>
         <input type="text" size="95%" name="newURI" value='<%=request.getParameter("oldURI")%>'/>

webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl

@@ -31,7 +31,7 @@
         <label for="new-password">${strings.new_password}<span class="requiredHint"> *</span></label>
         <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
         
-        <p class="note">${strings.minimum_password_length(minimumLength)}</p>
+        <p class="note">${strings.minimum_password_length(minimumLength, maximumLength)}</p>
 
         <label for="confirm-password">${strings.confirm_password}<span class="requiredHint"> *</span></label>
         <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />

webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl

@@ -30,7 +30,7 @@
         <textarea name="s34gfd88p9x1" rows="10" cols="90">${comments!}</textarea>
         
        
-    	<p><label class="realpersonLabel">${i18n().enter_in_security_field}:</label>
+    	<p><label class="realpersonLabel">${i18n().enter_in_security_field}:<span class="requiredHint"> *</span></label>
 
     		<input type="text" id="defaultReal" name="defaultReal"></p>
         

webapp/web/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl

@@ -19,7 +19,7 @@
                         	<#assign groupnameHtmlId = p.createPropertyGroupHtmlId(groupname) >
                             <#-- capitalize will capitalize each word in the name; cap_first only the first. We may need a custom
                             function to capitalize all except function words. -->
-                            <li role="listitem"><a href="#${groupnameHtmlId}" title="${i18n().group_name}">${groupname?capitalize}</a></li>
+                            <li role="listitem"><a href="#${groupnameHtmlId?replace("/","-")}" title="${i18n().group_name}">${groupname?capitalize}</a></li>
                         </#if>
                       </#if>
                     </#list>
@@ -44,7 +44,7 @@
         <#if groupName?has_content>
     		<#--the function replaces spaces in the name with underscores, also called for the property group menu-->
         	<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
-            <h2 id="${groupNameHtmlId}">${groupName?capitalize}</h2>
+            <h2 id="${groupNameHtmlId?replace("/","-")}">${groupName?capitalize}</h2>
         <#else>
             <h2 id="properties">${i18n().properties_capitalized}</h2>
         </#if>

webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl

@@ -20,11 +20,11 @@
     	    <#assign groupNameHtmlId = "${i18n().properties}" >
         </#if>
         <#if tabCount = 1 >
-            <li class="selectedGroupTab clickable" groupName="${groupNameHtmlId}">${groupName?capitalize}</li>
+            <li class="selectedGroupTab clickable" groupName="${groupNameHtmlId?replace("/","-")}">${groupName?capitalize}</li>
             <li class="groupTabSpacer">&nbsp;</li>
             <#assign tabCount = 2>
         <#else>
-            <li class="nonSelectedGroupTab clickable" groupName="${groupNameHtmlId}">${groupName?capitalize}</li>
+            <li class="nonSelectedGroupTab clickable" groupName="${groupNameHtmlId?replace("/","-")}">${groupName?capitalize}</li>
             <li class="groupTabSpacer">&nbsp;</li>
         </#if>
     </#if>
@@ -39,7 +39,7 @@
         <#assign groupName = group.getName(nameForOtherGroup)>
         <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
         <#assign verbose = (verbosePropertySwitch.currentValue)!false>
-        <section id="${groupNameHtmlId}" class="property-group" role="region" style="<#if (sectionCount > 1) >display:none<#else>display:block</#if>">
+        <section id="${groupNameHtmlId?replace("/","-")}" class="property-group" role="region" style="<#if (sectionCount > 1) >display:none<#else>display:block</#if>">
         <nav id="scroller" class="scroll-up hidden" role="navigation">
             <a href="#branding" title="${i18n().scroll_to_menus}" >
                 <img src="${urls.images}/individual/scroll-up.gif" alt="${i18n().scroll_to_menus}" />
@@ -50,11 +50,11 @@
         <#if groupName?has_content>
 		    <#--the function replaces spaces in the name with underscores, also called for the property group menu-->
     	    <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
-            <h2 id="${groupNameHtmlId}" pgroup="tabs" class="hidden">${groupName?capitalize}</h2>
+            <h2 id="${groupNameHtmlId?replace("/","-")}" pgroup="tabs" class="hidden">${groupName?capitalize}</h2>
         <#else>
             <h2 id="properties" pgroup="tabs" class="hidden">${i18n().properties_capitalized}</h2>
         </#if>
-        <div id="${groupNameHtmlId}Group" >
+        <div id="${groupNameHtmlId?replace("/","-")}Group" >
             <#-- List the properties in the group   -->
             <#include "individual-properties.ftl">
         </div>

webapp/web/templates/freemarker/page/partials/headScripts.ftl

@@ -15,15 +15,3 @@ var i18nStrings = {
 <![endif]-->
 
 ${headScripts.list()} 
-
-<!--[if lt IE 7]>
-<script type="text/javascript" src="${urls.base}/js/jquery_plugins/supersleight.js"></script>
-<![endif]-->
-
-<!--[if lt IE 7]>
-<link rel="stylesheet" href="${urls.base}/css/vitroIE6.css" />
-<![endif]-->
-
-<!--[if IE 7]>
-<link rel="stylesheet" href="${urls.base}/css/vitroIE7.css" />
-<![endif]-->