diff --git a/webapp/languages/es_GO/i18n/all_es_GO.properties b/webapp/languages/es_GO/i18n/all_es_GO.properties index 9f9b3ca3b..241a38e43 100644 --- a/webapp/languages/es_GO/i18n/all_es_GO.properties +++ b/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 diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java index de9837b16..22ad594d1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java +++ b/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 rawChanges = getAtomicOntologyChanges(); @@ -121,9 +128,10 @@ public class KnowledgeBaseUpdater { updateTBoxAnnotations(); } catch (Exception e) { log.error(e,e); - } - + } } + + return !rawChanges.isEmpty(); } diff --git a/webapp/themes/vitro/css/ie6.css b/webapp/themes/vitro/css/ie6.css deleted file mode 100644 index 9134a0e96..000000000 --- a/webapp/themes/vitro/css/ie6.css +++ /dev/null @@ -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 */ diff --git a/webapp/themes/vitro/css/ie7.css b/webapp/themes/vitro/css/ie7.css deleted file mode 100644 index d7b7e0c3d..000000000 --- a/webapp/themes/vitro/css/ie7.css +++ /dev/null @@ -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 * diff --git a/webapp/themes/vitro/templates/head.ftl b/webapp/themes/vitro/templates/head.ftl index 6ba28703a..06abc594c 100644 --- a/webapp/themes/vitro/templates/head.ftl +++ b/webapp/themes/vitro/templates/head.ftl @@ -11,14 +11,6 @@ <#include "headScripts.ftl"> - - - - diff --git a/webapp/web/css/vitro.css b/webapp/web/css/vitro.css index b90e88002..e37c1de45 100644 --- a/webapp/web/css/vitro.css +++ b/webapp/web/css/vitro.css @@ -416,4 +416,13 @@ a.filter-search { text-align: center; margin: 0; margin-top: 13px; -} \ No newline at end of file +} +/* contact form security field */ +div .realperson-challenge { + width: 250px; + margin-right: 20px; +} +div .realperson-text { + text-align: center; +} + diff --git a/webapp/web/css/vitroIE6.css b/webapp/web/css/vitroIE6.css deleted file mode 100644 index 2810e3231..000000000 --- a/webapp/web/css/vitroIE6.css +++ /dev/null @@ -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; -} \ No newline at end of file diff --git a/webapp/web/css/vitroIE7.css b/webapp/web/css/vitroIE7.css deleted file mode 100644 index 630d77f26..000000000 --- a/webapp/web/css/vitroIE7.css +++ /dev/null @@ -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; -} \ No newline at end of file diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties index 347a26c81..10ffb706f 100644 --- a/webapp/web/i18n/all.properties +++ b/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 diff --git a/webapp/web/templates/edit/specific/renameResource_retry.jsp b/webapp/web/templates/edit/specific/renameResource_retry.jsp index 4928e1584..9b55d347d 100644 --- a/webapp/web/templates/edit/specific/renameResource_retry.jsp +++ b/webapp/web/templates/edit/specific/renameResource_retry.jsp @@ -11,7 +11,7 @@
- New URI  (must begin with http:// or htts://) + New URI  (must begin with http:// or https://)
${epo.attributeMap['errorMsg']} diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl index 0a80aa63c..7cf83ee61 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl @@ -31,7 +31,7 @@ -

${strings.minimum_password_length(minimumLength)}

+

${strings.minimum_password_length(minimumLength, maximumLength)}

diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl index 914bc58bc..b53adb7ae 100644 --- a/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl +++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl @@ -30,7 +30,7 @@ -

+

diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl index df68bbd06..fc794ab72 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl +++ b/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. --> -
  • ${groupname?capitalize}
    • +
  • ${groupname?capitalize}
    • @@ -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) > -

    ${groupName?capitalize}

    +

    ${groupName?capitalize}

    <#else>

    ${i18n().properties_capitalized}

    diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl index 2c8d83e27..3f14ee526 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl @@ -20,11 +20,11 @@ <#assign groupNameHtmlId = "${i18n().properties}" > <#if tabCount = 1 > -
  • ${groupName?capitalize}
    • +
  • ${groupName?capitalize}
  •  
    • <#assign tabCount = 2> <#else> -
  • ${groupName?capitalize}
    • +
  • ${groupName?capitalize}
  •  
    • @@ -39,7 +39,7 @@ <#assign groupName = group.getName(nameForOtherGroup)> <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) > <#assign verbose = (verbosePropertySwitch.currentValue)!false> -
    +