From b0fc727218c2bd0bbc82cb9870caed0aaddc076c Mon Sep 17 00:00:00 2001 From: tworrall Date: Wed, 30 Nov 2011 21:25:07 +0000 Subject: [PATCH] NIHVIVO-2595 adding title attribute to anchor tags --- webapp/themes/vitro/templates/footer.ftl | 12 ++++++------ webapp/themes/vitro/templates/identity.ftl | 10 +++++----- webapp/themes/vitro/templates/menu.ftl | 2 +- .../accounts/userAccounts-acctCreatedEmail.ftl | 2 +- .../freemarker/body/accounts/userAccounts-add.ftl | 4 ++-- .../userAccounts-associateProfilePanel.ftl | 4 ++-- .../freemarker/body/accounts/userAccounts-edit.ftl | 4 ++-- .../accounts/userAccounts-firstTimeExternal.ftl | 2 +- .../freemarker/body/accounts/userAccounts-list.ftl | 10 +++++----- .../body/accounts/userAccounts-myAccount.ftl | 2 +- .../body/accounts/userAccounts-myProxiesPanel.ftl | 2 +- .../body/admin/startupStatus-displayRaw.ftl | 2 +- .../web/templates/freemarker/body/classGroups.ftl | 2 +- .../body/contactForm/contactForm-error.ftl | 2 +- .../freemarker/body/error/error-display.ftl | 2 +- .../freemarker/body/error/error-standard.ftl | 2 +- .../body/imageUpload/imageUpload-cropImage.ftl | 2 +- .../body/imageUpload/imageUpload-newImage.ftl | 2 +- .../body/imageUpload/imageUpload-replaceImage.ftl | 2 +- .../body/individual/individual-vitro.ftl | 2 +- .../templates/freemarker/body/individualList.ftl | 2 +- .../body/manageproxies/manageProxies-list.ftl | 14 +++++++------- .../web/templates/freemarker/body/menuN3Edit.ftl | 2 +- .../partials/account/userAccounts-accountsNav.ftl | 4 ++-- .../class/view/search/view-search-default.ftl | 2 +- .../partials/individual/individual-adminPanel.ftl | 6 +++--- .../partials/individual/individual-properties.ftl | 2 +- .../individual/individual-propertyGroupMenu.ftl | 2 +- .../partials/individual/propStatement-default.ftl | 2 +- .../partials/individual/propStatement-simple.ftl | 2 +- .../freemarker/body/partials/listedIndividual.ftl | 2 +- .../body/partials/menupage/menupage-browse.ftl | 2 +- .../freemarker/body/search/search-pagedResults.ftl | 10 +++++----- .../body/siteAdmin/siteAdmin-advancedDataTools.ftl | 10 +++++----- .../body/siteAdmin/siteAdmin-indexCacheRebuild.ftl | 8 ++++---- .../body/siteAdmin/siteAdmin-ontologyEditor.ftl | 12 ++++++------ .../body/siteAdmin/siteAdmin-siteConfiguration.ftl | 12 ++++++------ .../web/templates/freemarker/body/termsOfUse.ftl | 4 ++-- .../templates/freemarker/body/unrecognizedUser.ftl | 2 +- .../edit/forms/autoCompleteDatapropForm.ftl | 2 +- .../edit/forms/menuManagement-remove.ftl | 2 +- .../freemarker/edit/forms/menuManagement.ftl | 4 ++-- .../freemarker/edit/forms/newIndividualForm.ftl | 2 +- .../freemarker/edit/forms/rdfsLabelForm.ftl | 2 +- .../templates/freemarker/lib/lib-properties.ftl | 4 ++-- .../freemarker/page/partials/copyright.ftl | 2 +- .../templates/freemarker/page/partials/footer.ftl | 2 +- .../freemarker/page/partials/identity.ftl | 2 +- .../templates/freemarker/page/partials/menu.ftl | 2 +- .../freemarker/page/partials/subMenuLinks.ftl | 4 ++-- .../templates/freemarker/page/partials/version.ftl | 2 +- .../templates/freemarker/widgets/widget-browse.ftl | 6 +++--- .../templates/freemarker/widgets/widget-login.ftl | 10 +++++----- 53 files changed, 109 insertions(+), 109 deletions(-) diff --git a/webapp/themes/vitro/templates/footer.ftl b/webapp/themes/vitro/templates/footer.ftl index fc258004a..29e054ead 100644 --- a/webapp/themes/vitro/templates/footer.ftl +++ b/webapp/themes/vitro/templates/footer.ftl @@ -7,25 +7,25 @@ <#if copyright??> ©${copyright.year?c} <#if copyright.url??> - ${copyright.text} + ${copyright.text} <#else> ${copyright.text} - | Terms of Use | + | Terms of Use | Powered by Vitro <#if user.hasRevisionInfoAccess> - | Version ${version.label} + | Version ${version.label}

diff --git a/webapp/themes/vitro/templates/identity.ftl b/webapp/themes/vitro/templates/identity.ftl index 59c666041..f102bd740 100644 --- a/webapp/themes/vitro/templates/identity.ftl +++ b/webapp/themes/vitro/templates/identity.ftl @@ -9,19 +9,19 @@ diff --git a/webapp/web/templates/freemarker/body/partials/class/view/search/view-search-default.ftl b/webapp/web/templates/freemarker/body/partials/class/view/search/view-search-default.ftl index e74adaab9..05273515e 100644 --- a/webapp/web/templates/freemarker/body/partials/class/view/search/view-search-default.ftl +++ b/webapp/web/templates/freemarker/body/partials/class/view/search/view-search-default.ftl @@ -4,7 +4,7 @@ <#import "lib-properties.ftl" as p> -${individual.name} +${individual.name} <@p.mostSpecificTypes individual /> diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-adminPanel.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-adminPanel.ftl index f68ad9ba6..175269b54 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/individual-adminPanel.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/individual-adminPanel.ftl @@ -6,7 +6,7 @@ <#if individual.showAdminPanel>
-

Admin Panel

Edit this individual +

Admin Panel

Edit this individual
<#if verbosePropertySwitch?has_content> @@ -14,10 +14,10 @@ <#assign currentValue = verbosePropertySwitch.currentValue?string("on", "off")> <#assign newValue = verbosePropertySwitch.currentValue?string("off", "on")> Verbose property display is ${currentValue} | - Turn ${newValue} + Turn ${newValue}
- +
\ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl index b7c3be07e..fc322ab25 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl @@ -9,7 +9,7 @@
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl index 58cc4a81a..04fec93b7 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl @@ -16,7 +16,7 @@ <#if groupname?has_content> <#-- 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}
  • diff --git a/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl b/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl index dee213299..b06146531 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl @@ -6,4 +6,4 @@ is also used to generate the property statement during a deletion. --> -${statement.label!statement.localName!} +${statement.label!statement.localName!} diff --git a/webapp/web/templates/freemarker/body/partials/individual/propStatement-simple.ftl b/webapp/web/templates/freemarker/body/partials/individual/propStatement-simple.ftl index 1c870b613..1419ce359 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/propStatement-simple.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/propStatement-simple.ftl @@ -2,4 +2,4 @@ <#-- Simple object property statement template --> -${statement.name!} +${statement.name!} diff --git a/webapp/web/templates/freemarker/body/partials/listedIndividual.ftl b/webapp/web/templates/freemarker/body/partials/listedIndividual.ftl index 725bed092..e732f00ab 100644 --- a/webapp/web/templates/freemarker/body/partials/listedIndividual.ftl +++ b/webapp/web/templates/freemarker/body/partials/listedIndividual.ftl @@ -4,6 +4,6 @@ <#import "lib-properties.ftl" as p> -${individual.name} +${individual.name} <@p.mostSpecificTypes individual /> \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl index c90253b1b..9a8c254aa 100644 --- a/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl +++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl @@ -24,7 +24,7 @@

    <#assign alphabet = ["A", "B", "C", "D", "E", "F", "G" "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] />
    \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl index 8bd127812..97d72da42 100644 --- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl +++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl @@ -8,19 +8,19 @@ diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl index e6e891992..db61bdd30 100644 --- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl +++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl @@ -18,19 +18,19 @@

    Class Management

    Property Management

    -

    Ontology list

    +

    Ontology list

    \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl index ec170fa24..cb2ce4f2e 100644 --- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl +++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl @@ -8,24 +8,24 @@ diff --git a/webapp/web/templates/freemarker/body/termsOfUse.ftl b/webapp/web/templates/freemarker/body/termsOfUse.ftl index f9859d97e..855397a53 100644 --- a/webapp/web/templates/freemarker/body/termsOfUse.ftl +++ b/webapp/web/templates/freemarker/body/termsOfUse.ftl @@ -9,10 +9,10 @@ third parties, both individuals and organizations, commercial and otherwise. To the extent copyrightable, the information presented on the VIVO website and available as Resource Description Framework (RDF) data from VIVO at ${termsOfUse.siteHost} is intended for public use and is freely distributed under the terms of the - Creative Commons CC-BY 3.0 license which allows you + Creative Commons CC-BY 3.0 license which allows you to copy, distribute, display and make derivatives of this information provided you give credit to ${termsOfUse.siteHost}. Any non-copyrightable information is available to you under a - CC0 waiver. However, source documents, + CC0 waiver. However, source documents, images or web pages attached to or linked from VIVO may contain copyrighted information and should only be used or distributed under terms included with each source or in accordance with the principles of fair use.

    diff --git a/webapp/web/templates/freemarker/body/unrecognizedUser.ftl b/webapp/web/templates/freemarker/body/unrecognizedUser.ftl index 105f5e199..8ff7a735e 100644 --- a/webapp/web/templates/freemarker/body/unrecognizedUser.ftl +++ b/webapp/web/templates/freemarker/body/unrecognizedUser.ftl @@ -11,5 +11,5 @@


    - Continue + Continue diff --git a/webapp/web/templates/freemarker/edit/forms/autoCompleteDatapropForm.ftl b/webapp/web/templates/freemarker/edit/forms/autoCompleteDatapropForm.ftl index 62a77e00d..acf118276 100644 --- a/webapp/web/templates/freemarker/edit/forms/autoCompleteDatapropForm.ftl +++ b/webapp/web/templates/freemarker/edit/forms/autoCompleteDatapropForm.ftl @@ -63,7 +63,7 @@ $(document).ready(function() {

    - or Cancel + or Cancel

    diff --git a/webapp/web/templates/freemarker/edit/forms/menuManagement-remove.ftl b/webapp/web/templates/freemarker/edit/forms/menuManagement-remove.ftl index 4f965bb5a..05e46f78e 100644 --- a/webapp/web/templates/freemarker/edit/forms/menuManagement-remove.ftl +++ b/webapp/web/templates/freemarker/edit/forms/menuManagement-remove.ftl @@ -12,7 +12,7 @@

    Are you sure you want to remove ${menuName} menu item?

    - or Cancel + or Cancel diff --git a/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl index ef7c8c363..e1aaec66f 100644 --- a/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl +++ b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl @@ -46,7 +46,7 @@

    Selected content type for the associated page

    ${associatedPage} - Change content type + Change content type

    @@ -92,7 +92,7 @@ - or Cancel + or Cancel

    * required fields

    diff --git a/webapp/web/templates/freemarker/edit/forms/newIndividualForm.ftl b/webapp/web/templates/freemarker/edit/forms/newIndividualForm.ftl index fc1b6746c..0606ae1fc 100644 --- a/webapp/web/templates/freemarker/edit/forms/newIndividualForm.ftl +++ b/webapp/web/templates/freemarker/edit/forms/newIndividualForm.ftl @@ -32,7 +32,7 @@

    - or Cancel + or Cancel

    * required fields

    diff --git a/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl b/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl index afd183a44..5779649ce 100644 --- a/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl +++ b/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl @@ -17,7 +17,7 @@

    - or Cancel + or Cancel

    diff --git a/webapp/web/templates/freemarker/lib/lib-properties.ftl b/webapp/web/templates/freemarker/lib/lib-properties.ftl index b5a8ceaed..90ad6bea2 100644 --- a/webapp/web/templates/freemarker/lib/lib-properties.ftl +++ b/webapp/web/templates/freemarker/lib/lib-properties.ftl @@ -171,7 +171,7 @@ name will be used as the label. --> <#local verboseDisplay = property.verboseDisplay!> <#if verboseDisplay?has_content>
    - ${verboseDisplay.localName} + ${verboseDisplay.localName} (${property.type?lower_case} property); order in group: ${verboseDisplay.displayRank}; display level: ${verboseDisplay.displayLevel}; @@ -200,7 +200,7 @@ name will be used as the label. --> <#-- Don't assume that if the mainImage property is populated, there is a thumbnail image (though that is the general case). If there's a mainImage statement but no thumbnail image, treat it as if there is no image. --> <#if (mainImage.statements)?has_content && thumbUrl?has_content> - ${individual.name} + ${individual.name} <@editingLinks "${mainImage.localName}" mainImage.first() editable extraParams /> <#else> <#local imageLabel><@addLinkWithLabel mainImage editable "Photo" extraParams /> diff --git a/webapp/web/templates/freemarker/page/partials/copyright.ftl b/webapp/web/templates/freemarker/page/partials/copyright.ftl index 059479118..b0ca8758f 100644 --- a/webapp/web/templates/freemarker/page/partials/copyright.ftl +++ b/webapp/web/templates/freemarker/page/partials/copyright.ftl @@ -4,7 +4,7 @@ diff --git a/webapp/web/templates/freemarker/page/partials/identity.ftl b/webapp/web/templates/freemarker/page/partials/identity.ftl index fa20599f6..de755edf3 100644 --- a/webapp/web/templates/freemarker/page/partials/identity.ftl +++ b/webapp/web/templates/freemarker/page/partials/identity.ftl @@ -1,7 +1,7 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
    diff --git a/webapp/web/templates/freemarker/widgets/widget-login.ftl b/webapp/web/templates/freemarker/widgets/widget-login.ftl index 34dd80d25..a9d3fcbc7 100644 --- a/webapp/web/templates/freemarker/widgets/widget-login.ftl +++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl @@ -20,7 +20,7 @@ @@ -40,7 +40,7 @@
    <#if externalAuthUrl??> -

    ${externalAuthName}

    +

    ${externalAuthName}

    or

    Log in using your ${siteName} account

    @@ -57,8 +57,8 @@ --> <#-- mb863: forgot password and request an account won't be part of VIVO r1.2 -

    Forgot your password?

    - --> +

    Forgot your password?

    + -->
    @@ -83,7 +83,7 @@ -

    or Cancel

    +

    or Cancel