diff --git a/home/src/main/resources/rdf/display/everytime/article_custom_fields.n3 b/home/src/main/resources/rdf/display/everytime/article_custom_fields.n3 index 3bc0bb3a..38ffd54e 100644 --- a/home/src/main/resources/rdf/display/everytime/article_custom_fields.n3 +++ b/home/src/main/resources/rdf/display/everytime/article_custom_fields.n3 @@ -1,73 +1,46 @@ @prefix : . -@prefix searchIndex: . - @prefix rdfs: . -:vivodocumentModifier_excerptsInComplexPublications +:vivodocumentModifier_excerptsInArticles a , ; - rdfs:label "Populate complex publications with excerpts" ; + rdfs:label "Elenph article excerpts" ; :hasTargetField "ALLTEXT" ; :hasSelectQuery """ PREFIX rdfs: - PREFIX ts: + PREFIX ts_: PREFIX rdf: SELECT DISTINCT ?value WHERE { - ?uri ts:hasTOC ?toc . - ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?excerpt . - VALUES ?property { ts:works ts:bibliography ts:htmlExcerpt ts:keywords } - ?excerpt ?property ?value . + ?uri rdf:type ts_:elenphArticle . + ?uri ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . + VALUES ?property { ts_:works ts_:bibliography ts_:htmlExcerpt ts_:keywords } + ?elenphExcerpt ?property ?value . } """ . - -:vivoUriFinder_excerptsInComplexPublications - a searchIndex:indexing.IndexingUriFinder , - searchIndex:indexing.SelectQueryUriFinder ; - rdfs:label "When excerpts change" ; - :hasSelectQuery """ - PREFIX ts: - SELECT ?uri - WHERE { - ?uri ts:hasTOC ?toc . - ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?subject . - } - """ . - -:vivoUriFinder_onRubricsAssign - a searchIndex:indexing.IndexingUriFinder , - searchIndex:indexing.SelectQueryUriFinder ; - rdfs:label "When rubric was assigned" ; - :hasSelectQuery """ - PREFIX ts: - SELECT ?uri - WHERE { - ?subject a ts:textExcerpt . - VALUES ?uri { ?subject } - } - """ . - -:vivodocumentModifier_PopulateTextWithHTMLContentsOfExcerpts + +:vivodocumentModifier_PopulateText a , ; rdfs:label "Html text to text field" ; :hasTargetField "text" ; :hasSelectQuery """ PREFIX rdfs: - PREFIX ts: + PREFIX ts_: PREFIX rdf: SELECT DISTINCT ?htmlExcerpt WHERE { { - ?uri rdf:type ts:textExcerpt . - ?uri ts:htmlExcerpt ?htmlExcerpt . + ?uri rdf:type ts_:textExcerpt . + ?uri ts_:htmlExcerpt ?htmlExcerpt . } UNION { - ?uri rdf:type ts:complexPublication . - ?uri ts:hasTOC ?toc . - ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?excerpt . - ?excerpt ts:htmlExcerpt ?htmlExcerpt . + ?uri rdf:type ts_:publication . + ?uri ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?artExcerpt . + ?artExcerpt ts_:htmlExcerpt ?htmlExcerpt . } } """ . @@ -79,22 +52,22 @@ :hasTargetField "rubrics" ; :hasSelectQuery """ PREFIX rdfs: - PREFIX ts: + PREFIX ts_: PREFIX rdf: PREFIX pr: SELECT DISTINCT ?rubric WHERE { { - ?uri rdf:type ts:textExcerpt . + ?uri rdf:type ts_:elenphExcerpt . ?uri pr:belongsTo ?assignedRubric . ?assignedRubric (pr:hasParent)* ?rubric . } UNION { - ?uri rdf:type ts:complexPublication . - ?uri ts:hasTOC ?toc . - ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?excerpt . - ?excerpt pr:belongsTo ?assignedRubric . + ?uri rdf:type ts_:elenphArticle . + ?uri ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?artExcerpt . + ?artExcerpt pr:belongsTo ?assignedRubric . ?assignedRubric (pr:hasParent)* ?rubric . } } @@ -122,20 +95,20 @@ :hasTargetField "keywords" ; :hasSelectQuery """ PREFIX rdfs: - PREFIX ts: + PREFIX ts_: PREFIX rdf: SELECT DISTINCT ?keywords WHERE { { - ?uri rdf:type ts:elenphArticle . - ?uri ts:hasTOC ?toc . - ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?elenphExcerpt . - ?elenphExcerpt ts:keywords ?keywords . + ?uri rdf:type ts_:elenphArticle . + ?uri ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . + ?elenphExcerpt ts_:keywords ?keywords . } UNION { - ?uri rdf:type ts:elenphExcerpt . - ?uri ts:keywords ?keywords . + ?uri rdf:type ts_:elenphExcerpt . + ?uri ts_:keywords ?keywords . } } """ . @@ -147,20 +120,20 @@ :hasTargetField "bibliography" ; :hasSelectQuery """ PREFIX rdfs: - PREFIX ts: + PREFIX ts_: PREFIX rdf: SELECT DISTINCT ?bibliography WHERE { { - ?uri rdf:type ts:elenphArticle . - ?uri ts:hasTOC ?toc . - ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?elenphExcerpt . - ?elenphExcerpt ts:bibliography ?bibliography . + ?uri rdf:type ts_:elenphArticle . + ?uri ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . + ?elenphExcerpt ts_:bibliography ?bibliography . } UNION { - ?uri rdf:type ts:elenphExcerpt . - ?uri ts:bibliography ?bibliography . + ?uri rdf:type ts_:elenphExcerpt . + ?uri ts_:bibliography ?bibliography . } } """ . diff --git a/home/src/main/resources/rdf/display/everytime/compilationDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/compilationDataGetters.n3 index eab30a54..eb0564b6 100644 --- a/home/src/main/resources/rdf/display/everytime/compilationDataGetters.n3 +++ b/home/src/main/resources/rdf/display/everytime/compilationDataGetters.n3 @@ -42,11 +42,11 @@ display:getCompilationExcerptPathsDataGetter display:saveToVar "paths"; display:query """ - PREFIX rdfs: - PREFIX rdf: - PREFIX ts_: - SELECT (GROUP_CONCAT(substr(concat("000",str(?outline)),strlen(str(?outline))); SEPARATOR = ".") AS ?path ) (COUNT(?outline) AS ?level) ?tocElement ?elenphExcerpt - WHERE { + PREFIX rdfs: + PREFIX rdf: + PREFIX ts_: + SELECT (GROUP_CONCAT(substr(concat("000",str(?outline)),strlen(str(?outline))); SEPARATOR = ".") AS ?path ) ?tocElement ?elenphExcerpt + WHERE { ?individualURI ts_:hasTOC ?toc . ?toc ts_:hasTOCItem/(ts_:pointsTo/ts_:hasTOCItem)* ?tmpTOCItem . ?tmpTOCItem rdf:type ts_:TOCItem . @@ -56,10 +56,10 @@ display:getCompilationExcerptPathsDataGetter ?tocElement ts_:hasText ?elenphExcerpt . } { - SELECT ?tocElement + SELECT ?tocElement WHERE { - ?individualURI ts_:hasTOC ?toc . - ?toc (ts_:hasTOCItem/ts_:pointsTo)+ ?tocElement . + ?individualURI ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+ ?tocElement . ?tocElement rdf:type ts_:TOCLevel . } } @@ -74,11 +74,11 @@ display:getCompilationBibliographyDataGetter PREFIX rdfs: PREFIX ts_: PREFIX rdf: - SELECT DISTINCT ?bibliography ?excerpt + SELECT DISTINCT ?bibliography ?elenphExcerpt WHERE { ?individualURI ts_:hasTOC ?toc . - ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?excerpt . - ?excerpt ts_:bibliography ?bibliography . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . + ?elenphExcerpt ts_:bibliography ?bibliography . } ORDER BY ?bibliography """ . @@ -90,11 +90,11 @@ display:getCompilationWorksDataGetter PREFIX rdfs: PREFIX ts_: PREFIX rdf: - SELECT DISTINCT ?works ?excerpt + SELECT DISTINCT ?works ?elenphExcerpt WHERE { ?individualURI ts_:hasTOC ?toc . - ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?excerpt . - ?excerpt ts_:works ?works . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . + ?elenphExcerpt ts_:works ?works . } ORDER BY ?works """ . diff --git a/home/src/main/resources/rdf/display/everytime/deleteQueries.n3 b/home/src/main/resources/rdf/display/everytime/deleteQueries.n3 index 6431a4f9..a8aebb1a 100644 --- a/home/src/main/resources/rdf/display/everytime/deleteQueries.n3 +++ b/home/src/main/resources/rdf/display/everytime/deleteQueries.n3 @@ -14,10 +14,8 @@ """ . display:hasDeleteQuery """ PREFIX ts: - PREFIX rdf: - DESCRIBE ?individualURI ?tocElement ?tocItem ?toc ?excerpt ?author ?organization + DESCRIBE ?individualURI ?tocElement ?tocItem ?toc ?excerpt WHERE { - ?individualURI rdf:type ts:elenphArticle . OPTIONAL { ?individualURI ts:hasTOC ?toc . ?toc (ts:hasTOCItem/ts:pointsTo)* ?tocElement . @@ -25,13 +23,7 @@ ?tocElement ts:hasTOCItem ?tocItem . } OPTIONAL { - ?tocElement ts:hasText ?excerpt . - OPTIONAL { - ?excerpt ts:hasAuthor ?author . - OPTIONAL { - ?author ts:affiliatedWith ?organization . - } - } + ?tocElement ts_:hasText ?excerpt . } } } @@ -43,6 +35,6 @@ WHERE { ?tocElement ts:hasText ?individualURI . - FILTER NOT EXISTS {?tocElement ts:hasTOCItem ?tocItem } + NOT EXISTS {?tocElement ts:hasTOCItem ?tocItem } } """ . diff --git a/home/src/main/resources/rdf/display/everytime/elenphArticleDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/elenphArticleDataGetters.n3 index 3c7a3977..8a801c4e 100644 --- a/home/src/main/resources/rdf/display/everytime/elenphArticleDataGetters.n3 +++ b/home/src/main/resources/rdf/display/everytime/elenphArticleDataGetters.n3 @@ -42,11 +42,11 @@ display:getArticleExcerptPathsDataGetter display:saveToVar "paths"; display:query """ - PREFIX rdfs: - PREFIX rdf: - PREFIX ts_: - SELECT (GROUP_CONCAT(substr(concat("000",str(?outline)),strlen(str(?outline))); SEPARATOR = ".") AS ?path ) (COUNT(?outline) AS ?level) ?tocElement ?elenphExcerpt - WHERE { + PREFIX rdfs: + PREFIX rdf: + PREFIX ts_: + SELECT (GROUP_CONCAT(substr(concat("000",str(?outline)),strlen(str(?outline))); SEPARATOR = ".") AS ?path ) ?tocElement ?elenphExcerpt + WHERE { ?individualURI ts_:hasTOC ?toc . ?toc ts_:hasTOCItem/(ts_:pointsTo/ts_:hasTOCItem)* ?tmpTOCItem . ?tmpTOCItem rdf:type ts_:TOCItem . @@ -56,11 +56,12 @@ display:getArticleExcerptPathsDataGetter ?tocElement ts_:hasText ?elenphExcerpt . } { - SELECT ?elenphArticle ?tocElement + SELECT ?elenphArticle ?tocElement WHERE { - ?individualURI ts_:hasTOC ?toc . - ?toc (ts_:hasTOCItem/ts_:pointsTo)+ ?tocElement . + ?individualURI ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+ ?tocElement . ?tocElement rdf:type ts_:TOCLevel . + ?individualURI rdf:type ts_:elenphArticle . } } } GROUP BY ?tocElement ?elenphExcerpt ORDER BY ?path @@ -74,11 +75,11 @@ display:getArticleBibliographyDataGetter PREFIX rdfs: PREFIX ts_: PREFIX rdf: - SELECT DISTINCT ?bibliography ?excerpt + SELECT DISTINCT ?bibliography ?elenphExcerpt WHERE { ?individualURI ts_:hasTOC ?toc . - ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?excerpt . - ?excerpt ts_:bibliography ?bibliography . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . + ?elenphExcerpt ts_:bibliography ?bibliography . } ORDER BY ?bibliography """ . @@ -90,11 +91,11 @@ display:getArticleWorksDataGetter PREFIX rdfs: PREFIX ts_: PREFIX rdf: - SELECT DISTINCT ?works ?excerpt + SELECT DISTINCT ?works ?elenphExcerpt WHERE { ?individualURI ts_:hasTOC ?toc . - ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?excerpt . - ?excerpt ts_:works ?works . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . + ?elenphExcerpt ts_:works ?works . } ORDER BY ?works """ . diff --git a/webapp/src/main/webapp/WEB-INF/resources/shortview_config.n3 b/webapp/src/main/webapp/WEB-INF/resources/shortview_config.n3 deleted file mode 100644 index c912bc22..00000000 --- a/webapp/src/main/webapp/WEB-INF/resources/shortview_config.n3 +++ /dev/null @@ -1,27 +0,0 @@ -@prefix ts_: . -@prefix display: . -@prefix mydomain: . - -ts_:elenphExcerpt display:hasCustomView mydomain:elenphExcerptShortView . - -mydomain:elenphExcerptShortView - a display:customViewForIndividual ; - display:appliesToContext "SEARCH" ; - display:hasTemplate "elenphExcerptShortView.ftl" ; - display:hasDataGetter mydomain:elenphExcerptShortViewDataGetter . - -mydomain:elenphExcerptShortViewDataGetter - a ; - display:saveToVar "excerptInfo"; - display:query - """ - PREFIX rdfs: - PREFIX vivo: - PREFIX rdf: - PREFIX ts_: - SELECT ?property ?value - WHERE { - ?individualUri ?property ?value . - ?individualUri rdf:type ts_:elenphExcerpt . - } - """ . diff --git a/webapp/src/main/webapp/favicon.ico b/webapp/src/main/webapp/favicon.ico index d6f769bc..fe936708 100644 Binary files a/webapp/src/main/webapp/favicon.ico and b/webapp/src/main/webapp/favicon.ico differ diff --git a/webapp/src/main/webapp/robots.txt b/webapp/src/main/webapp/robots.txt index 659b6c36..ed35ce7c 100644 --- a/webapp/src/main/webapp/robots.txt +++ b/webapp/src/main/webapp/robots.txt @@ -22,3 +22,4 @@ Disallow: /vis/ # VIVO addition Disallow: /visualizationAjax/ # VIVO addition Disallow: /visualizationData/ # VIVO addition Disallow: /qrcode # VIVO addition +Disallow: /individual # VIVO addition diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl deleted file mode 100644 index 5f94bcdb..00000000 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl +++ /dev/null @@ -1,49 +0,0 @@ -<#-- $This file is distributed under the terms of the license in LICENSE$ --> - -<#-- Template for browsing individuals in class groups for menupages --> - -<#import "lib-string.ftl" as str> - - - - diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl index 33db0830..be693ca2 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl @@ -4,10 +4,8 @@ <#import "lib-vivo-properties.ftl" as p> -
${individual.name} <@p.displayTitle individual />

${individual.snippet}

-
diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl deleted file mode 100644 index 3f08f55d..00000000 --- a/webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl +++ /dev/null @@ -1,16 +0,0 @@ -<#-- $This file is distributed under the terms of the license in LICENSE$ --> - -<#-- Template for displaying search error message --> - -<#if title??> -
-

${title?html}

-
- -
-

- ${message?html} -

-
-<#include "searchSelector.ftl"> -<#include "search-help.ftl" > diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl deleted file mode 100644 index e892f96d..00000000 --- a/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl +++ /dev/null @@ -1,49 +0,0 @@ -<#-- $This file is distributed under the terms of the license in LICENSE$ --> - -<#if origination?has_content && origination == "helpLink"> -
-

Search Tips

-
- - Back to results - -<#else> -
-

Search Tips

-
- -
    -
  • Keep it simple! Use short, single terms unless your searches are returning too many results.
    • -
  • Use quotes to search for an entire phrase -- e.g., "protein folding".
    • -
  • Except for boolean operators, searches are not case-sensitive, so "Geneva" and "geneva" are equivalent
    • -
  • If you are unsure of the correct spelling, put ~ at the end of your search term -- e.g., cabage~ finds cabbage, steven~ finds Stephen and Stefan (as well as other similar names).
    • -
- - - - -${stylesheets.add('')} - diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl deleted file mode 100644 index 83c45e9f..00000000 --- a/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl +++ /dev/null @@ -1,252 +0,0 @@ -<#-- $This file is distributed under the terms of the license in LICENSE$ --> - -<#-- Template for displaying paged search results --> - -

- -<#include "searchSelector.ftl"> - -<#escape x as x?html> -
${i18n().search_results_for} '${querytext}'
-
<#if classGroupName?has_content>${i18n().limited_to_type} '${classGroupName}'
-
<#if typeName?has_content>${i18n().limited_to_type} '${typeName}'
- - - - ${i18n().download_results} -<#-- --> -

- -${i18n().not_expected_results} -
- - <#-- Refinement links --> - <#if classGroupLinks?has_content && classGroupLinks?size gt 1> -
-

${i18n().display_only}

-
    - <#list classGroupLinks as link> -
  • ${link.text}(${link.count})
    • - -
-
- - - <#if classLinks?has_content && classLinks?size gt 1 > -
- <#if classGroupName?has_content> -

${i18n().limit} ${classGroupName} ${i18n().to}

- <#else> -

${i18n().limit_to}

- -
    - <#list classLinks as link> -
  • ${link.text}(${link.count})
    • - -
-
- - - -
- - <#if user.loggedIn> - - -
- - - - <#-- Search results --> -
    - <#list individuals as individual> -
  • - <@shortView uri=individual.uri viewContext="search" /> -
    • - -
- - - <#-- Paging controls --> - <#if (pagingLinks?size > 0)> -
- ${i18n().pages}: - <#if prevPage??> - <#list pagingLinks as link> - <#if link.url??> - ${link.text} - <#else> - ${link.text} <#-- no link if current page --> - - - <#if nextPage??> -
- -
- - <#-- VIVO OpenSocial Extension by UCSF --> - <#if openSocial??> - <#if openSocial.visible> -

OpenSocial

- - - - - - -
- - - -${stylesheets.add('', - '', - '')} - -${headScripts.add('', - '', - '' - )} - -${scripts.add('')} diff --git a/webapp/src/main/webapp/themes/iph/templates/compilation.ftl b/webapp/src/main/webapp/templates/freemarker/compilation.ftl similarity index 62% rename from webapp/src/main/webapp/themes/iph/templates/compilation.ftl rename to webapp/src/main/webapp/templates/freemarker/compilation.ftl index 73e9704b..b5078d91 100644 --- a/webapp/src/main/webapp/themes/iph/templates/compilation.ftl +++ b/webapp/src/main/webapp/templates/freemarker/compilation.ftl @@ -8,8 +8,6 @@ ${scripts.add('')} ${scripts.add('')} ${scripts.add('')} -${scripts.add('')} -${scripts.add('')} <#import "individual-qrCodeGenerator.ftl" as qr> <#import "lib-vivo-properties.ftl" as vp> <#include "text-lib.ftl"> @@ -34,8 +32,6 @@ ${scripts.add(' <#-- <@dumpAll /> --> <#assign selectedTemplate = "individual--foaf-person-2column.ftl" > @@ -184,6 +277,24 @@ ${scripts.add('')} ${scripts.add('')} ${scripts.add('')} -${scripts.add('')} -${scripts.add('')} <#import "individual-qrCodeGenerator.ftl" as qr> <#import "lib-vivo-properties.ftl" as vp> -<#include "text-lib.ftl"> - <#--Number of labels present--> <#if !labelCount??> <#assign labelCount = 0 > @@ -34,18 +30,13 @@ ${scripts.add(' + <#-- <@dumpAll /> --> + + <#assign selectedTemplate = "individual--foaf-person-2column.ftl" > <#if profilePageTypesEnabled > <#assign profilePageType = profileType > @@ -160,6 +276,24 @@ ${scripts.add('')} -${scripts.add('')} -${scripts.add('')} -${scripts.add('')} -${scripts.add('')} - - +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Individual profile page template for foaf:Person individuals --> - <#-- <#include "individual-setup.ftl"> --> <#import "individual-qrCodeGenerator.ftl" as qr> <#import "lib-vivo-properties.ftl" as vp> -<#include "text-lib.ftl"> - <#--Number of labels present--> <#if !labelCount??> <#assign labelCount = 0 > @@ -38,8 +27,6 @@ ${scripts.add('')} +${scripts.add('')} + +<#assign selectedTemplate = "elenphExcerpt-internal.ftl" > + +<#if profilePageTypesEnabled > + <#assign profilePageType = profileType > + + <#-- targetedView takes precedence over the profilePageType. --> + + <#if targetedView?has_content> + <#if targetedView != "standardView"> + <#assign selectedTemplate = "individual--foaf-person-quickview.ftl" > + + <#elseif profilePageType == "quickView" > + <#assign selectedTemplate = "individual--foaf-person-quickview.ftl" > + + +<#include selectedTemplate > diff --git a/webapp/src/main/webapp/themes/iph/templates/elenphExcerptShortView.ftl b/webapp/src/main/webapp/templates/freemarker/elenphExcerptShortView.ftl similarity index 85% rename from webapp/src/main/webapp/themes/iph/templates/elenphExcerptShortView.ftl rename to webapp/src/main/webapp/templates/freemarker/elenphExcerptShortView.ftl index bae63143..ce2c0616 100644 --- a/webapp/src/main/webapp/themes/iph/templates/elenphExcerptShortView.ftl +++ b/webapp/src/main/webapp/templates/freemarker/elenphExcerptShortView.ftl @@ -4,6 +4,7 @@ <#import "lib-vivo-properties.ftl" as p> <#-- <@dumpAll /> --> + -
+
${individual.name} <@p.displayTitle individual />

${individual.snippet}

diff --git a/webapp/src/main/webapp/themes/iph/templates/elenph_issue.ftl b/webapp/src/main/webapp/templates/freemarker/elenph_issue.ftl similarity index 72% rename from webapp/src/main/webapp/themes/iph/templates/elenph_issue.ftl rename to webapp/src/main/webapp/templates/freemarker/elenph_issue.ftl index 5f1ed9eb..a8158d42 100644 --- a/webapp/src/main/webapp/themes/iph/templates/elenph_issue.ftl +++ b/webapp/src/main/webapp/templates/freemarker/elenph_issue.ftl @@ -5,16 +5,16 @@ <#if !issueName??> <#assign issueName = article.issue> <#assign divOpened = true > - -
+ +

${article.name}

<#elseif issueName == article.issue>

${article.name}

<#else> <#assign issueName = article.issue>
- -
+ +

${article.name}

@@ -38,8 +38,4 @@ for (i = 0; i < coll.length; i++) { } }); } -var issueContents = document.getElementsByClassName("issue"); -for (i = 0; i < issueContents.length; i++) { - issueContents[i].style.display = "none"; -} diff --git a/webapp/src/main/webapp/themes/iph/templates/rubric.ftl b/webapp/src/main/webapp/templates/freemarker/rubric.ftl similarity index 70% rename from webapp/src/main/webapp/themes/iph/templates/rubric.ftl rename to webapp/src/main/webapp/templates/freemarker/rubric.ftl index cddbd8b1..f2330967 100644 --- a/webapp/src/main/webapp/themes/iph/templates/rubric.ftl +++ b/webapp/src/main/webapp/templates/freemarker/rubric.ftl @@ -1,20 +1,16 @@ <#import "lib-vivo-properties.ftl" as vp> <#include "individual-setup.ftl"> -${scripts.add('')} -${scripts.add('')} -
<#include "individual-adminPanel.ftl">
-
<#if relatedSubject??>

${relatedSubject.relatingPredicateDomainPublic} ${i18n().for} ${relatedSubject.name}

← ${i18n().return_to(relatedSubject.name)}

<#else> -

style="width:100%;border-right:1px solid #A6B1B0;"> +

style="float:left;width:100%;border-right:1px solid #A6B1B0;"> <@p.label individual editable labelCount localesCount/>

@@ -22,7 +18,6 @@ ${scripts.add(' + + diff --git a/webapp/src/main/webapp/themes/iph/templates/rubrics.ftl b/webapp/src/main/webapp/templates/freemarker/rubrics.ftl similarity index 66% rename from webapp/src/main/webapp/themes/iph/templates/rubrics.ftl rename to webapp/src/main/webapp/templates/freemarker/rubrics.ftl index 16f4c88b..ae08ad5a 100644 --- a/webapp/src/main/webapp/themes/iph/templates/rubrics.ftl +++ b/webapp/src/main/webapp/templates/freemarker/rubrics.ftl @@ -1,15 +1,8 @@ -${scripts.add('')} -${scripts.add('')} - <#list rubrics as rubric> <#if !rubric.parentUri??> <#assign childs = rubric.childs?number> + <@openButton childs=childs/>${rubric.name} diff --git a/webapp/src/main/webapp/themes/iph/templates/head.ftl b/webapp/src/main/webapp/themes/iph/templates/head.ftl index b67f8456..06af8d7a 100644 --- a/webapp/src/main/webapp/themes/iph/templates/head.ftl +++ b/webapp/src/main/webapp/themes/iph/templates/head.ftl @@ -36,4 +36,3 @@ an individual profile page. --> ${headContent!} -<#include "statistic_counters.ftl"> diff --git a/webapp/src/main/webapp/themes/iph/templates/identity.ftl b/webapp/src/main/webapp/themes/iph/templates/identity.ftl index 45017254..0027ad68 100644 --- a/webapp/src/main/webapp/themes/iph/templates/identity.ftl +++ b/webapp/src/main/webapp/themes/iph/templates/identity.ftl @@ -1,7 +1,7 @@ <#-- $This file is distributed under the terms of the license in LICENSE$ --> +
\ No newline at end of file diff --git a/webapp/src/main/webapp/themes/iph/templates/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/iph/templates/individual--foaf-person.ftl index 1abe11bb..b115ab55 100644 --- a/webapp/src/main/webapp/themes/iph/templates/individual--foaf-person.ftl +++ b/webapp/src/main/webapp/themes/iph/templates/individual--foaf-person.ftl @@ -44,7 +44,7 @@
- ${i18n().uri_icon} + ${i18n().uri_icon} <#if checkNamesResult?has_content > ${i18n().qr_icon}