diff --git a/productMods/themes/vivo-basic/jsp/identity.jsp b/productMods/themes/vivo-basic/jsp/identity.jsp index aaeb6d85..224932f8 100644 --- a/productMods/themes/vivo-basic/jsp/identity.jsp +++ b/productMods/themes/vivo-basic/jsp/identity.jsp @@ -4,6 +4,7 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet" %> <% + // If the request was for a jsp rather than a servlet, we didn't get these yet. String identity = (String) request.getAttribute("ftl_identity"); if (identity == null) { diff --git a/themes/vivo-basic/css/blueprint/typography.css b/themes/vivo-basic/css/blueprint/typography.css index 02284799..6d6efb06 100644 --- a/themes/vivo-basic/css/blueprint/typography.css +++ b/themes/vivo-basic/css/blueprint/typography.css @@ -114,3 +114,5 @@ caption { background: #eee; } .last { margin-right:0; padding-right:0; } .top { margin-top:0; padding-top:0; } .bottom { margin-bottom:0; padding-bottom:0; } + +.bold { font-weight: bold; } \ No newline at end of file diff --git a/themes/vivo-basic/ftl/components/footer.ftl b/themes/vivo-basic/ftl/components/footer.ftl index 46651438..489f5ede 100644 --- a/themes/vivo-basic/ftl/components/footer.ftl +++ b/themes/vivo-basic/ftl/components/footer.ftl @@ -25,5 +25,3 @@ -<#-- SCRIPT TAGS SHOULD GO HERE --> -<#include "googleAnalytics.ftl"> \ No newline at end of file diff --git a/themes/vivo-basic/ftl/components/googleAnalytics.ftl b/themes/vivo-basic/ftl/components/googleAnalytics.ftl index a5f2272a..cbcdad57 100644 --- a/themes/vivo-basic/ftl/components/googleAnalytics.ftl +++ b/themes/vivo-basic/ftl/components/googleAnalytics.ftl @@ -18,4 +18,4 @@ rollupTracker._trackPageview(location.host+location.pathname); } catch(err) {} ---> \ No newline at end of file +--> diff --git a/themes/vivo-basic/ftl/page/default.ftl b/themes/vivo-basic/ftl/page/default.ftl index c5ba3b02..40d815c9 100644 --- a/themes/vivo-basic/ftl/page/default.ftl +++ b/themes/vivo-basic/ftl/page/default.ftl @@ -22,7 +22,7 @@
-
class="${contentClass}" > +
<#-- We don't do title here because some pages don't get a title, or it may not be the same as the text. <h2>${title}</h2> --> ${body} @@ -32,5 +32,7 @@ <#include "/components/footer.ftl"> </div> <!-- wrap --> + + <#include "/components/scripts.ftl"> </body> </html>