From d72472824ae73877fce8a00093a23f978742a366 Mon Sep 17 00:00:00 2001 From: Brian Lowe Date: Wed, 21 Apr 2021 17:19:44 +0300 Subject: [PATCH 1/2] Replace hardcoded en locale with current locale in lang attributes --- .../main/webapp/themes/tenderfoot/templates/page/page-home.ftl | 2 +- .../src/main/webapp/themes/tenderfoot/templates/page/page.ftl | 2 +- webapp/src/main/webapp/themes/wilma/templates/page-home.ftl | 2 +- webapp/src/main/webapp/themes/wilma/templates/page.ftl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl index e2aa1b1c..d23c704d 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl @@ -15,7 +15,7 @@ <#import "lib-home-page.ftl" as lh> - + <#include "head.ftl"> <#if geoFocusMapsEnabled > diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl index 648b7bf2..92897492 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl @@ -3,7 +3,7 @@ <#import "lib-list.ftl" as l> - + <#include "head.ftl"> diff --git a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl index 8db75bb7..a9783906 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl @@ -15,7 +15,7 @@ <#import "lib-home-page.ftl" as lh> - + <#include "head.ftl"> <#if geoFocusMapsEnabled > diff --git a/webapp/src/main/webapp/themes/wilma/templates/page.ftl b/webapp/src/main/webapp/themes/wilma/templates/page.ftl index f1a2d5b2..7ab1fc89 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/page.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/page.ftl @@ -3,7 +3,7 @@ <#import "lib-list.ftl" as l> - + <#include "head.ftl"> From 49eedfe0a00fb2907eda321df338eb1072553d80 Mon Sep 17 00:00:00 2001 From: Brian Lowe Date: Thu, 3 Jun 2021 19:40:07 +0300 Subject: [PATCH 2/2] Retain language tags in manage publication query results to allow for language filtering --- .../freemarker/ManagePublicationsForIndividualController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java index d1e6ff1c..dd836679 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java @@ -69,7 +69,7 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer + "PREFIX core: \n" + "PREFIX rdfs: \n" + "PREFIX vitro: \n" - + "SELECT DISTINCT ?subclass ?authorship (str(?label) as ?title) ?pub ?hideThis WHERE { \n" + + "SELECT DISTINCT ?subclass ?authorship (?label as ?title) ?pub ?hideThis WHERE { \n" + " ?subject core:relatedBy ?authorship . \n" + " ?authorship a core:Authorship . \n" + " OPTIONAL { \n "