From 547cc14fb04dd8c8d52beaea3bc919c9a579fc53 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 10 Jan 2011 21:13:06 +0000
Subject: [PATCH] NIHVIVO-1380 On individual page, add rdf link tag for
 discoverable rdf

---
 themes/vivo-basic/templates/head.ftl | 20 +++++-----
 themes/wilma/templates/head.ftl      | 56 +++++++++++++++-------------
 2 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/themes/vivo-basic/templates/head.ftl b/themes/vivo-basic/templates/head.ftl
index 4b7db3b3..c5b27a21 100644
--- a/themes/vivo-basic/templates/head.ftl
+++ b/themes/vivo-basic/templates/head.ftl
@@ -1,11 +1,13 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-    <meta charset="utf-8" />
-    
-    <title>${title}</title>
-     
-    <#include "stylesheets.ftl">
-    <link rel="stylesheet" href="${urls.theme}/css/screen.css" media="screen" />
-    <link rel="stylesheet" href="${urls.theme}/css/print.css" media="print" />
-    
-    <#include "headScripts.ftl">
\ No newline at end of file
+<meta charset="utf-8" />
+
+<title>${title}</title>
+ 
+<#include "stylesheets.ftl">
+<link rel="stylesheet" href="${urls.theme}/css/screen.css" media="screen" />
+<link rel="stylesheet" href="${urls.theme}/css/print.css" media="print" />
+
+<#include "headScripts.ftl">
+
+${headContent!}
\ No newline at end of file
diff --git a/themes/wilma/templates/head.ftl b/themes/wilma/templates/head.ftl
index c781046b..b597cbaa 100644
--- a/themes/wilma/templates/head.ftl
+++ b/themes/wilma/templates/head.ftl
@@ -1,29 +1,33 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-    <meta charset="utf-8" />
-    <!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer-->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    
-    <title>${title}</title>
-    <meta name="description" content="" />
-    <meta name="keywords" content="" />
-    
-   <link href='http://fonts.googleapis.com/css?family=Arimo:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css'>
-     
-    <#include "stylesheets.ftl">
-    <link rel="stylesheet" href="${urls.theme}/css/screen.css" />
-    
-    <#include "headScripts.ftl">
-    
-    <!--[if lt IE 7]>
-    <link rel="stylesheet" href="${urls.theme}/css/ie6.css" />
-    <script type="text/javascript" src="${urls.base}/js/jquery_plugins/supersleight.js"></script>
-    <![endif]-->
+<meta charset="utf-8" />
+<!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer-->
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-    <!--[if IE 7]>
-    <link rel="stylesheet" href="${urls.theme}/css/ie7.css" />
-    <![endif]-->
-    
-    <!--[if (gte IE 6)&(lte IE 8)]>
-    <script type="text/javascript" src="${urls.home}/js/selectivizr.js"></script>
-    <![endif]-->
\ No newline at end of file
+<title>${title}</title>
+<meta name="description" content="" />
+<meta name="keywords" content="" />
+
+<#include "stylesheets.ftl">
+<link rel="stylesheet" href="${urls.theme}/css/screen.css" />
+<link href="http://fonts.googleapis.com/css?family=Arimo:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css">
+ 
+<#include "stylesheets.ftl">
+<link rel="stylesheet" href="${urls.theme}/css/screen.css" />
+
+<#include "headScripts.ftl">
+
+<!--[if lt IE 7]>
+<link rel="stylesheet" href="${urls.theme}/css/ie6.css" />
+<script type="text/javascript" src="${urls.base}/js/jquery_plugins/supersleight.js"></script>
+<![endif]-->
+
+<!--[if IE 7]>
+<link rel="stylesheet" href="${urls.theme}/css/ie7.css" />
+<![endif]-->
+
+<!--[if (gte IE 6)&(lte IE 8)]>
+<script type="text/javascript" src="${urls.home}/js/selectivizr.js"></script>
+<![endif]-->
+
+${headContent!}
\ No newline at end of file