From a5f0734c4386d26d78fa081ea073b44f01a6e560 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Sat, 23 Sep 2023 15:53:44 +0200 Subject: [PATCH] base alignment --- checkstyle-suppressions.xml | 5 +- .../WEB-INF/resources/shortview_config.n3 | 13 -- webapp/src/main/webapp/favicon.ico | Bin 1150 -> 1150 bytes webapp/src/main/webapp/robots.txt | 41 +++--- .../partials/menupage/menupage-browse.ftl | 49 ------- .../shortview/view-search-default.ftl | 6 +- .../freemarker/body/search/search-error.ftl | 12 -- .../body/search/search-pagedResults.ftl | 120 ------------------ 8 files changed, 31 insertions(+), 215 deletions(-) delete mode 100644 webapp/src/main/webapp/WEB-INF/resources/shortview_config.n3 delete mode 100644 webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl delete mode 100644 webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl delete mode 100644 webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml index 9cbcfecd2..f44eee730 100644 --- a/checkstyle-suppressions.xml +++ b/checkstyle-suppressions.xml @@ -1295,4 +1295,7 @@ - \ No newline at end of file + + + + 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 6442acf06..000000000 --- a/webapp/src/main/webapp/WEB-INF/resources/shortview_config.n3 +++ /dev/null @@ -1,13 +0,0 @@ -# $This file is distributed under the terms of the license in LICENSE$ - -# -# Short View configuration -# -# This file allows a Vitro administrator to configure short view templates and data getters -# for individuals of particular classes in particular contexts. This is a transitional -# implementation, and should be replaced when the work on the Application and Display -# Ontology is complete. -# -# Find out how to use this file at -# https://wiki.lyrasis.org/display/VIVODOC112x/Creating+short+views+of+individuals -# diff --git a/webapp/src/main/webapp/favicon.ico b/webapp/src/main/webapp/favicon.ico index 6e38bd98badb2c914758dddb12f5e7ec51e3bffd..fe9367085fba2445bb14c45cdabdcd6d1ee7a96e 100644 GIT binary patch literal 1150 zcmbtU@k>)-6um)zz>rD`BS{hiAt)S4Vkk*yr8%jPAe2H91VfrSHde#gtTo&8StLed zRAX3k|KaJL`+cuB>&MP`@4okq@4R!*x$lXb&|fSjdhV9zCq>SPNS_|Mq$_S+i-`XB zH$J7WV|RT3mDQ^#tz5yo<$e^F`jB6|gxtbKyn1>8>G|_WJvoQ9$DMdNdkQO$Ilh?4_rekxl z*K}l6M`pfDb({q`lC!66e|2LN(CFo@h9e@kVfgQtwbE7cF$ahAT?l>*%H)2cw$bF4_w{Jy1`XtO&bo29T%@(<_FC2Jru8xf szM033Y>4)lV3U10Ys@bycuqaD0G06&W3d>1^~1gooHIS+1&V{H~(ngHiVz{wBb zNFSI+=L_)u5d6F^juP0|29GwtgB7r}1a8fPt21D39Lx-X6a8WTeRr5$9pJYk@J<}p zdqGECI%?}dM=>WIbKr_}7&C)m4!#MqrxW~f0)7?8Z58|^9T(COd9emoq{Ar43nMEX zY1oU$df@m{i*=M^FQmhWbY#POdyyFqUJT2N{vPmG18km2$8qrD#yZ4dFN}TpSzP>g z-`p5DD;?wVV(2aS`#gMy=Badu;XQki zpeiq-Or@g`XF4Y@rj%*2Zyk@)@m+ozH_Fs#?10D4)H+g`F2zzoau%$ody@=h4+nQI*(>5Q}@DNB>j%OP&b`ve)8$Qbr{wWW$J!A59x^d zZ7-}tUbx@Mebdt%5B4I?)cwA)j@S!lT2iK)>UVn2_w})#_9DsjUYRESK1=m`S6(F7 ZKbhM9>xH`M-)U>V%j!kz|H1zr{{hki{5}8x diff --git a/webapp/src/main/webapp/robots.txt b/webapp/src/main/webapp/robots.txt index 6b2a8a6a2..ed35ce7c4 100644 --- a/webapp/src/main/webapp/robots.txt +++ b/webapp/src/main/webapp/robots.txt @@ -1,18 +1,25 @@ User-agent: * -Disallow: /admin/ -Disallow: /help/ -Disallow: /images/ -Disallow: /js/ -Disallow: /quickedits/ -Disallow: /site_icons/ -Disallow: /src/ -Disallow: /templates/ -Disallow: /themes/ -Disallow: /WEB-INF/ -Disallow: /xsl/ -Disallow: /search/ -Disallow: /coauthors/ -Disallow: /pubsbyorg/ -Disallow: /fedsearch/ -Disallow: /comments.jsp -Disallow: /dataservice/ +Disallow: /admin/ # Vitro +Disallow: /help/ # Vitro +Disallow: /images/ # Vitro +Disallow: /js/ # Vitro +Disallow: /quickedits/ # Vitro +Disallow: /site_icons/ # Vitro +Disallow: /src/ # Vitro +Disallow: /templates/ # Vitro +Disallow: /themes/ # Vitro +Disallow: /xsl/ # Vitro +Disallow: /search/ # Vitro +Disallow: /coauthors/ # Vitro +Disallow: /pubsbyorg/ # Vitro +Disallow: /fedsearch/ # Vitro +Disallow: /comments.jsp # Vitro +Disallow: /dataservice/ # Vitro +Disallow: /listrdf/ # Vitro +Disallow: /visualizationfm/ # VIVO addition +Disallow: /visualization/ # VIVO addition +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 bf9882b19..000000000 --- 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 5606236dd..be693ca26 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 @@ -2,10 +2,10 @@ <#-- Default individual search view --> -<#import "lib-properties.ftl" as p> +<#import "lib-vivo-properties.ftl" as p> -${individual.name} +${individual.name} -<@p.mostSpecificTypes individual /> +<@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 711a2bafe..000000000 --- a/webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl +++ /dev/null @@ -1,12 +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 "search-help.ftl" > 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 5d8f0f244..000000000 --- a/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl +++ /dev/null @@ -1,120 +0,0 @@ -<#-- $This file is distributed under the terms of the license in LICENSE$ --> - -<#-- Template for displaying paged search results --> - -

-<#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> -
-

${i18n().display_only}

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

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

- <#else> -

${i18n().limit_to}

- -
    - <#list classLinks as link> -
  • ${link.text}(${link.count})
    • - -
-
- - - <#-- 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('')}