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

NIHVIVO-556: page-ftl and page-homepage.ftp don't use any more a wrapper div. Also, HTML5 footer element is styling the footer of those templates. div#footer-content was styling the footer before and it has been deleted.

Browse source
This commit is contained in:
mb863 2010-10-29 15:55:41 +00:00
parent 676baeb596
commit 9338e2ca0e
7 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
themes/wilma/css/transition/holdover-vivobasic/screen.css
View file

@ -34,6 +34,8 @@ body {
background: #fff; background: #fff;
font-size: 108.33%; /* bumping up content text from 12px to 13px */ font-size: 108.33%; /* bumping up content text from 12px to 13px */
min-height:350px; min-height:350px;
width: 946px;
margin: 0 auto;
} }
#footer { #footer {

16
themes/wilma/css/wilma.css
View file

@ -20,20 +20,14 @@ body {
padding: 0; padding: 0;
height: 100%; /* needed for container min-height */ height: 100%; /* needed for container min-height */
background: #f3f3f0 url(../images/header-background.png) center 0 no-repeat; background: #f3f3f0 url(../images/header-background.png) center 0 no-repeat;
font-family: "museo-sans-1", "museo-sans-2", helvetica, sans-serif, arial; /*font-size: 62.5%;*/ font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif;
/* Consider these fonts: "Lucida Sans Unicode","Lucida Grande",Geneva,*/ ; /*font-size: 62.5%;*/
}
/* PAGE WRAPPER ------> */
#wrapper {
position: relative; /* needed for footer positioning*/
/*margin:0 auto; center, not in IE5 */
width: 970px;
height: auto !important; /* real browsers */ height: auto !important; /* real browsers */
height: 100%; /* IE6: treaded as min-height*/; height: 100%; /* IE6: treaded as min-height*/;
min-height: 100%; /* real browsers */ min-height: 100%; /* real browsers */
margin: 0 auto; margin: 0 auto;
} }
/* HEADER ------> */ /* HEADER ------> */
#branding { #branding {
position: relative; position: relative;
@ -587,7 +581,7 @@ p.publication-content span {
font-weight: normal; font-weight: normal;
} }
/* FOOTER------> */ /* FOOTER------> */
#footer-content { footer {
clear: both; clear: both;
width: 970px; width: 970px;
height: 88px; height: 88px;
@ -596,7 +590,7 @@ p.publication-content span {
color: #4e5051; color: #4e5051;
background-color: #fff; background-color: #fff;
} }
#footer-content p.copyright { footer p.copyright {
float: left; float: left;
padding-top: 55px; padding-top: 55px;
padding-left: 30px; padding-left: 30px;

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

@ -103,7 +103,6 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
<link rel="stylesheet" type="text/css" href="<c:url value="/js/jquery_plugins/thickbox/thickbox.css"/>" /> <link rel="stylesheet" type="text/css" href="<c:url value="/js/jquery_plugins/thickbox/thickbox.css"/>" />
</head> </head>
<body class="formsEdit"> <body class="formsEdit">
<div id="wrapper">
${ftl_menu} ${ftl_menu}
<div id="content"> <div id="content">
<!-- end of formPrefix.jsp --> <!-- end of formPrefix.jsp -->

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

@ -2,7 +2,6 @@
<#-- This is a temporary file and will be removed once we have completed the transition to freemarker --> <#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
<footer> <footer>
<div id="footer-content">
<#if copyright??> <#if copyright??>
<p class="copyright"><small>&copy;${copyright.year?c} <p class="copyright"><small>&copy;${copyright.year?c}
<#if copyright.url??> <#if copyright.url??>
@ -22,10 +21,9 @@
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li> <li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</ul> </ul>
</nav> </nav>
</div> <!-- #footer-content -->
</footer> </footer>
</div> <!-- #wrapper -->
${scripts.add("/js/jquery.js")} ${scripts.add("/js/jquery.js")}
${scripts.tags} ${scripts.tags}

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

@ -29,7 +29,6 @@
</head> </head>
<body> <body>
<div id="wrapper">
<header id="branding"> <header id="branding">
<h2 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2> <h2 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2>
<!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline} <!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
@ -214,7 +213,6 @@
</section> <!-- $highlights --> </section> <!-- $highlights -->
</div> <!-- #wrapper-content --> </div> <!-- #wrapper-content -->
<footer> <footer>
<div id="footer-content">
<#if copyright??> <#if copyright??>
<p class="copyright"><small>&copy;${copyright.year?c} <p class="copyright"><small>&copy;${copyright.year?c}
<#if copyright.url??> <#if copyright.url??>
@ -233,9 +231,7 @@
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li> <li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</ul> </ul>
</nav> </nav>
</div> <!-- #footer-content -->
</footer> </footer>
</div> <!-- #wrapper -->
${scripts.add("/js/jquery.js")} ${scripts.add("/js/jquery.js")}
${scripts.tags} ${scripts.tags}

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

@ -24,7 +24,6 @@
<![endif]--> <![endif]-->
</head> </head>
<body> <body>
<div id="wrapper">
<header id="branding"> <header id="branding">
<h2 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2> <h2 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2>
<!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline} <!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
@ -84,7 +83,6 @@
<#include bodyTemplate> <#include bodyTemplate>
</div> <!-- #wrapper-content --> </div> <!-- #wrapper-content -->
<footer> <footer>
<div id="footer-content">
<#if copyright??> <#if copyright??>
<p class="copyright"><small>&copy;${copyright.year?c} <p class="copyright"><small>&copy;${copyright.year?c}
<#if copyright.url??> <#if copyright.url??>
@ -103,9 +101,7 @@
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li> <li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</ul> </ul>
</nav> </nav>
</div> <!-- #footer-content -->
</footer> </footer>
</div> <!-- #wrapper -->
${scripts.add("/js/jquery.js")} ${scripts.add("/js/jquery.js")}
${scripts.tags} ${scripts.tags}

2
themes/wilma/templates/page/basicPage.jsp
View file

@ -102,7 +102,7 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
</head> </head>
<body ${requestScope.bodyAttr}> <body ${requestScope.bodyAttr}>
<div id="wrapper">
${ftl_menu} ${ftl_menu}
<div id="wrapper-content"> <div id="wrapper-content">
<c:import url="${bodyJsp}"/> <c:import url="${bodyJsp}"/>