squashed

litvinovg · Oct 18, 2024 · 3860c0f · 3860c0f
1 parent 1a25a31
commit 3860c0f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 10 deletions.
diff --git a/api/src/main/java/org/vivoweb/webapp/startup/DataGetterN3Setup.java b/api/src/main/java/org/vivoweb/webapp/startup/DataGetterN3Setup.java
@@ -1,6 +1,18 @@
 package org.vivoweb.webapp.startup;
 
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessClassGroupDataGetterN3;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessDataGetterN3Map;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessFixedHTMLN3;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessInternalClassDataGetterN3;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSearchFilterValuesDataGetterN3;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSearchIndividualsDataGetterN3;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSparqlDataGetterN3;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchFilterValuesDataGetter;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
@@ -9,12 +21,13 @@
 public class DataGetterN3Setup implements ServletContextListener {
     @Override
     public void contextInitialized(ServletContextEvent servletContextEvent) {
-        HashMap<String, String> map = new HashMap<String, String>();
-        map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSparqlDataGetterN3");
-        map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessClassGroupDataGetterN3");
-        map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessInternalClassDataGetterN3");
-        map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessFixedHTMLN3");
-        map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSearchIndividualsDataGetterN3");
+        HashMap<String, Class> map = new HashMap<String, Class>();
+        map.put(SparqlQueryDataGetter.class.getCanonicalName(), ProcessSparqlDataGetterN3.class);
+        map.put(ClassGroupPageData.class.getCanonicalName(), ProcessClassGroupDataGetterN3.class);
+		map.put(SearchFilterValuesDataGetter.class.getCanonicalName(), ProcessSearchFilterValuesDataGetterN3.class);
+        map.put(InternalClassesDataGetter.class.getCanonicalName(), ProcessInternalClassDataGetterN3.class);
+        map.put(FixedHTMLDataGetter.class.getCanonicalName(), ProcessFixedHTMLN3.class);
+        map.put(SearchIndividualsDataGetter.class.getCanonicalName(), ProcessSearchIndividualsDataGetterN3.class);
 
         ProcessDataGetterN3Map.replaceDataGetterMap(map);
     }

diff --git a/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js b/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js
@@ -8,6 +8,7 @@
 
 var processDataGetterUtils = {
 		dataGetterProcessorMap:{"browseClassGroup": processClassGroupDataGetterContent,
+								"searchFilterValues": processSearchFilterValuesDataGetterContent,
 								"sparqlQuery": processSparqlDataGetterContent,
 								"fixedHtml":processFixedHTMLDataGetterContent,
 								"internalClass":processInternalClassDataGetterContent,

diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditWebpageForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditWebpageForm.ftl
@@ -55,7 +55,7 @@
     <label for="urlType">${i18n().url_type}${requiredHint}</label>
     <#assign urlTypeOpts = editConfiguration.pageData.urlType />
     <select name="urlType" style="margin-top:-2px" >
-        <#list urlTypeOpts?keys as key>
+        <#list urlTypeOpts?keys?reverse as key>
             <option value="${key}" >
                 <#if urlTypeOpts[key] == "F1000 Link">
                     ${i18n().faculty_of_1000}

diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
@@ -12,6 +12,7 @@ scripts list.-->
       dataGetterLabelToURI:{
       		//maps labels to URIs
       		"browseClassGroup": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData",
+		"searchFilterValues": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchFilterValuesDataGetter",
       		"internalClass": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter",
       		"sparqlQuery":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter",
       		"fixedHtml":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter",

diff --git a/webapp/src/main/webapp/themes/nemo/templates/search.ftl b/webapp/src/main/webapp/themes/nemo/templates/search.ftl
@@ -6,7 +6,7 @@
     <fieldset>
         <legend>${i18n().search_form}</legend>
 
-        <form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="GET"> 
+        <form id="search-form" action="${urls.search}" autocomplete="off" name="search" role="search" accept-charset="UTF-8" method="GET"> 
             <div id="search-field">
                 <input type="text" name="querytext" id="filter_input_querytext" class="search-vivo" value="${querytext!?html}" autocapitalize="off" />
                 <input type="submit" value="${i18n().search_button}" class="search">

diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/search.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/search.ftl
@@ -6,7 +6,7 @@
     <fieldset>
         <legend>${i18n().search_form}</legend>
 
-        <form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="GET">
+        <form id="search-form" action="${urls.search}" autocomplete="off" name="search" role="search" accept-charset="UTF-8" method="GET">
             <div id="search-field">
                 <input type="text" id="filter_input_querytext" name="querytext" class="search-vivo" value="${querytext!?html}" autocapitalize="off" />
                 <input type="submit" value="${i18n().search_button}" class="search">

diff --git a/webapp/src/main/webapp/themes/wilma/templates/search.ftl b/webapp/src/main/webapp/themes/wilma/templates/search.ftl
@@ -6,7 +6,7 @@
     <fieldset>
         <legend>${i18n().search_form}</legend>
 
-        <form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="GET">
+        <form id="search-form" action="${urls.search}" autocomplete="off" name="search" role="search" accept-charset="UTF-8" method="GET">
             <div id="search-field">
                 <input type="text" id="filter_input_querytext" name="querytext" class="search-vivo" value="${querytext!?html}" autocapitalize="off" />
                 <input type="submit" value="${i18n().search_button}" class="search">