litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[VIVO-1237] Add ability to generate meta tags

Browse source
This commit is contained in:
Graham Triggs 2016-07-05 17:52:03 +01:00
parent f61d3b1a1a
commit 61f90dd1e6
4 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
View file

@ -464,6 +464,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
map.put("stylesheets", new Tags().wrap()); map.put("stylesheets", new Tags().wrap());
map.put("scripts", new Tags().wrap()); map.put("scripts", new Tags().wrap());
map.put("headScripts", new Tags().wrap()); map.put("headScripts", new Tags().wrap());
map.put("metaTags", new Tags().wrap());
return map; return map;
} }

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/Widget.java
View file

@ -12,6 +12,7 @@ import java.util.Map;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.Tags;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -46,6 +47,7 @@ public abstract class Widget {
map.put("stylesheets", dataModel.get("stylesheets")); map.put("stylesheets", dataModel.get("stylesheets"));
map.put("scripts", dataModel.get("scripts")); map.put("scripts", dataModel.get("scripts"));
map.put("headScripts", dataModel.get("headScripts")); map.put("headScripts", dataModel.get("headScripts"));
map.put("metaTags", new Tags().wrap());
map.put("urls", dataModel.get("urls")); map.put("urls", dataModel.get("urls"));
} catch (TemplateModelException e) { } catch (TemplateModelException e) {
log.error("Error getting asset values from data model."); log.error("Error getting asset values from data model.");

4
webapp/src/main/webapp/templates/freemarker/page/partials/head.ftl
View file

@ -10,6 +10,10 @@
<#include "headScripts.ftl"> <#include "headScripts.ftl">
<#if metaTags??>
${metaTags.list()}
</#if>
<#-- Inject head content specified in the controller. Currently this is used only to generate an rdf link on <#-- Inject head content specified in the controller. Currently this is used only to generate an rdf link on
an individual profile page. --> an individual profile page. -->
${headContent!} ${headContent!}

4
webapp/src/main/webapp/themes/vitro/templates/head.ftl
View file

@ -15,6 +15,10 @@
<script type="text/javascript" src="${urls.base}/js/selectivizr.js"></script> <script type="text/javascript" src="${urls.base}/js/selectivizr.js"></script>
<![endif]--> <![endif]-->
<#if metaTags??>
${metaTags.list()}
</#if>
<#-- Inject head content specified in the controller. Currently this is used only to generate an rdf link on <#-- Inject head content specified in the controller. Currently this is used only to generate an rdf link on
an individual profile page. --> an individual profile page. -->
${headContent!} ${headContent!}