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

NIHVIVO-1234. Added <link> elements to the head.

Browse source
This commit is contained in:
mb863 2010-10-26 23:49:40 +00:00
parent f8cd744daa
commit d342ae5b5b
2 changed files with 27 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
themes/wilma/templates/page-home.ftl
View file

@ -9,6 +9,20 @@ ${stylesheets.tags}
<!-- script for enabling new HTML5 semantic markup in IE browsers--> <!-- script for enabling new HTML5 semantic markup in IE browsers-->
${headScripts.add("/js/html5.js")} ${headScripts.add("/js/html5.js")}
${headScripts.tags} ${headScripts.tags}
<!--[if lt IE 7]>
<script type="text/javascript" src="${themeDir}/js/jquery_plugins/supersleight.js"></script>
<script type="text/javascript" src="${themeDir}/js/utils.js"></script>
<link rel="stylesheet" href="css/ie6.css" />
<![endif]-->
<!--[if IE 7]>
<link rel="stylesheet" href="css/ie7.css" />
<![endif]-->
<!--[if (gte IE 6)&(lte IE 8)]>
<script type="text/javascript" src="${themeDir}/js/selectivizr.js"></script>
<![endif]-->
</head> </head>
<body> <body>
<div id="wrapper"> <div id="wrapper">
@ -228,21 +242,6 @@ ${headScripts.tags}
${scripts.add("/js/jquery.js")} ${scripts.add("/js/jquery.js")}
${scripts.tags} ${scripts.tags}
<!--[if lt IE 7]>
<script type="text/javascript" src="${themeDir}/js/jquery_plugins/supersleight.js"></script>
<script type="text/javascript" src="${themeDir}/js/utils.js"></script>
<link rel="stylesheet" href="css/ie6.css" />
<![endif]-->
<!--[if IE 7]>
<link rel="stylesheet" href="css/ie7.css" />
<![endif]-->
<!--[if (gte IE 6)&(lte IE 8)]>
<script type="text/javascript" src="${themeDir}/js/selectivizr.js"></script>
<![endif]-->
<#include "googleAnalytics.ftl"> <#include "googleAnalytics.ftl">
</body> </body>
</html> </html>

29
themes/wilma/templates/page.ftl
View file

@ -9,6 +9,19 @@ ${stylesheets.tags}
<!-- script for enabling new HTML5 semantic markup in IE browsers--> <!-- script for enabling new HTML5 semantic markup in IE browsers-->
${headScripts.add("/js/html5.js")} ${headScripts.add("/js/html5.js")}
${headScripts.tags} ${headScripts.tags}
<!--[if lt IE 7]>
<script type="text/javascript" src="${themeDir}/js/jquery_plugins/supersleight.js"></script>
<script type="text/javascript" src="${themeDir}/js/utils.js"></script>
<link rel="stylesheet" href="css/ie6.css" />
<![endif]-->
<!--[if IE 7]>
<link rel="stylesheet" href="css/ie7.css" />
<![endif]-->
<!--[if (gte IE 6)&(lte IE 8)]>
<script type="text/javascript" src="${themeDir}/js/selectivizr.js"></script>
<![endif]-->
</head> </head>
<body> <body>
<div id="wrapper"> <div id="wrapper">
@ -98,22 +111,6 @@ ${headScripts.tags}
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>--> <script type="text/javascript">try{Typekit.load();}catch(e){}</script>-->
${scripts.add("/js/jquery.js")} ${scripts.add("/js/jquery.js")}
${scripts.tags} ${scripts.tags}
<!--[if lt IE 7]>
<script type="text/javascript" src="${themeDir}/js/jquery_plugins/supersleight.js"></script>
<script type="text/javascript" src="${themeDir}/js/utils.js"></script>
<link rel="stylesheet" href="css/ie6.css" />
<![endif]-->
<!--[if IE 7]>
<link rel="stylesheet" href="css/ie7.css" />
<![endif]-->
<!--[if (gte IE 6)&(lte IE 8)]>
<script type="text/javascript" src="${themeDir}/js/selectivizr.js"></script>
<![endif]-->
<#include "googleAnalytics.ftl"> <#include "googleAnalytics.ftl">
</body> </body>
</html> </html>