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

NIHVIVO-556: Added screen.css to theme level

Browse source
This commit is contained in:
mb863 2010-12-02 20:57:20 +00:00
parent c72e64da2e
commit 9e583a6205
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
themes/wilma/templates/edit/formPrefix.jsp
View file

@ -42,10 +42,10 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
<link rel="stylesheet" href="<%=themeDir%>css/screen.css" /> <link rel="stylesheet" href="<%=themeDir%>css/screen.css" />
<!-- 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")} --%>
<script language="javascript" type="text/javascript" src="../js/html5.js"></script> <script language="javascript" type="text/javascript" src="../js/html5.js"></script>
<c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if> <c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>
<% <%
String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false"; String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false";
if (useTinyMCE.equalsIgnoreCase("true")) { if (useTinyMCE.equalsIgnoreCase("true")) {

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

@ -13,7 +13,6 @@
<meta name="description" content="" /> <meta name="description" content="" />
<meta name="keywords" content="" /> <meta name="keywords" content="" />
<#-- ${stylesheets.addFromTheme("/css/screen.css")} -->
<#include "stylesheets.ftl"> <#include "stylesheets.ftl">
<link rel="stylesheet" href="${urls.theme}/css/screen.css" /> <link rel="stylesheet" href="${urls.theme}/css/screen.css" />
@ -40,7 +39,7 @@
<nav role="navigation"> <nav role="navigation">
<ul id="header-nav" role="list"> <ul id="header-nav" role="list">
<#if user.loggedIn> <#if user.loggedIn>
<li role="listitem"><span class="pictos-arrow-10">U</span> ${user.loginName}</li> <li role="listitem"><span class="loginIcon">U</span> ${user.loginName}</li>
<li role="listitem"><a href="${urls.logout}">Log out</a></li> <li role="listitem"><a href="${urls.logout}">Log out</a></li>
<#if user.hasSiteAdminAccess> <#if user.hasSiteAdminAccess>
<li role="listitem"><a href="${urls.siteAdmin}">Site Admin</a></li> <li role="listitem"><a href="${urls.siteAdmin}">Site Admin</a></li>
@ -255,7 +254,7 @@
<!--[if lt IE 7]> <!--[if lt IE 7]>
<script type="text/javascript" src="${urls.base}/js/jquery_plugins/supersleight.js"></script> <script type="text/javascript" src="${urls.base}/js/jquery_plugins/supersleight.js"></script>
<script type="text/javascript" src="${urls.theme}/js/utils.js"></script> <script type="text/javascript" src="${urls.base}/js/utils.js"></script>
<![endif]--> <![endif]-->
<!--[if (gte IE 6)&(lte IE 8)]> <!--[if (gte IE 6)&(lte IE 8)]>

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

@ -12,8 +12,6 @@
<title>${title}</title> <title>${title}</title>
<meta name="description" content="" /> <meta name="description" content="" />
<meta name="keywords" content="" /> <meta name="keywords" content="" />
<#-- mb863 moved css/screen.css to stylesheets.ftl, so the file is at end -->
<#-- ${stylesheets.addFromTheme("/css/screen.css")} -->
<#include "stylesheets.ftl"> <#include "stylesheets.ftl">
<link rel="stylesheet" href="${urls.theme}/css/screen.css" /> <link rel="stylesheet" href="${urls.theme}/css/screen.css" />
@ -41,7 +39,7 @@
<nav role="navigation"> <nav role="navigation">
<ul id="header-nav" role="list"> <ul id="header-nav" role="list">
<#if user.loggedIn> <#if user.loggedIn>
<li role="listitem"><span class="pictos-arrow-10">U</span> ${user.loginName}</li> <li role="listitem"><span class="loginIcon">U</span> ${user.loginName}</li>
<li role="listitem"><a href="${urls.logout}">Log out</a></li> <li role="listitem"><a href="${urls.logout}">Log out</a></li>
<#if user.hasSiteAdminAccess> <#if user.hasSiteAdminAccess>
<li role="listitem"><a href="${urls.siteAdmin}">Site Admin</a></li> <li role="listitem"><a href="${urls.siteAdmin}">Site Admin</a></li>