NIHVIVO-1297 Undid the effects of revision 6246. This was a mistake, since including the body template from the page template rather than pregenerating the body string doesn't allow the addition of stylesheet tags to the page head.
This commit is contained in:
rjy7
parent
9338e2ca0e
commit
bc08734bbc
6 changed files with 133 additions and 190 deletions
|
|
@ -1,59 +0,0 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<#-- Page template for home page -->
|
||||
|
||||
<#include "doctype.html">
|
||||
|
||||
<#include "head.ftl">
|
||||
|
||||
<body>
|
||||
<div id="wrap" class="container">
|
||||
<div id="header">
|
||||
|
||||
<#include "identity.ftl">
|
||||
|
||||
<#-- Note to UI team: do not change this div without also making the corresponding change in menu.jsp -->
|
||||
<div id="navAndSearch" class="block">
|
||||
<#include "menu.ftl">
|
||||
<#include "search.ftl">
|
||||
</div> <!-- navAndSearch -->
|
||||
|
||||
<#include "breadcrumbs.ftl">
|
||||
</div> <!-- header -->
|
||||
|
||||
<hr class="hidden" />
|
||||
|
||||
<div id="contentwrap">
|
||||
<div id="content">
|
||||
<h2>Welcome to VIVO!</h2>
|
||||
<#-- ${body} -->
|
||||
<#include bodyTemplate>
|
||||
</div> <!-- content -->
|
||||
</div> <!-- contentwrap -->
|
||||
|
||||
<#include "footer.ftl">
|
||||
|
||||
</div> <!-- wrap -->
|
||||
|
||||
<#include "scripts.ftl">
|
||||
</body>
|
||||
</html>
|
||||
|
||||
<#--
|
||||
Three ways to add a stylesheet:
|
||||
|
||||
A. In theme directory:
|
||||
${stylesheets.addFromTheme("/css/sample.css")}
|
||||
${stylesheets.add(themeDir + "/css/sample.css")}
|
||||
|
||||
B. Any location
|
||||
${stylesheets.add("/edit/forms/css/sample.css)"}
|
||||
|
||||
To add a script:
|
||||
|
||||
A. In theme directory:
|
||||
${scripts.addFromTheme("/css/sample.js")}
|
||||
|
||||
B. Any location
|
||||
${scripts("/edit/forms/js/sample.js)"}
|
||||
-->
|
||||
|
|
@ -23,15 +23,10 @@ VIVO wilma theme: screen styles
|
|||
/* This is our holdover vivo-basic theme file used for transition to wilma theme. This is temporary and it will be removed.*/
|
||||
@import url("transition/holdover-vivobasic/screen.css");
|
||||
|
||||
|
||||
|
||||
|
||||
@import url("reset.css");
|
||||
@import url("pictos.css");
|
||||
@import url("wilma.css");
|
||||
@import url("forms.css");
|
||||
@import url("formedit.css");
|
||||
|
||||
|
||||
@import url("../../../css/login.css"); /* this is here temporarily as we transition to freemarker - something is up with adding stylesheets ever since the body template was adjusted last week*/
|
||||
@import url("../../../css/menupage/menupage.css"); /* we need to call it from the theme until freemarker controller and menupage.ftl are created */
|
||||
128
themes/wilma/templates/home.ftl
Normal file
128
themes/wilma/templates/home.ftl
Normal file
|
|
@ -0,0 +1,128 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<#-- Template for body of home page -->
|
||||
|
||||
<div id="wrapper-content">
|
||||
<section id="intro">
|
||||
<h3>What is VIVO?</h3>
|
||||
|
||||
<p>VIVO is an open source semantic web application originally developed and implemented at Cornell. When installed and populated with researcher interests, activities, and accomplishments, it enables the discovery of research and scholarship across disciplines at that institution. VIVO supports browsing and a search function which returns faceted results for rapid retrieval of desired information. Content in any local VIVO installation may be maintained manually, brought into VIVO in automated ways from local systems of record, such as HR, grants, course, and faculty activity databases, or from database providers such as publication aggregators and funding agencies. <a href="#">More<span class="pictos-arrow-14"> 4</span></a></p>
|
||||
<section id="search-home">
|
||||
<h3>Search VIVO</h3>
|
||||
|
||||
<fieldset>
|
||||
<legend>Search form</legend>
|
||||
<form id="search-home-vivo" action="${urls.search}" method="post" name="search">
|
||||
<div id="search-home-field">
|
||||
<input name="search-home-vivo" class="search-home-vivo" id="search-home-vivo" type="text" />
|
||||
<a class ="submit" href="#">Search</a>
|
||||
</div>
|
||||
</form>
|
||||
</fieldset>
|
||||
</section> <!-- #search-home -->
|
||||
</section> <!-- #intro -->
|
||||
|
||||
<#include "login.ftl">
|
||||
|
||||
<section id="browse">
|
||||
<h2>Browse</h2>
|
||||
|
||||
<ul id="browse-classGroups">
|
||||
<li><a class="selected" href="#">People<span class="count-classes"> (1,280)</span></a></li>
|
||||
<li><a href="#">Courses<span class="count-classes"> (1,300)</span></a></li>
|
||||
<li><a href="#">Activities<span class="count-classes"> (980)</span></a></li>
|
||||
<li><a href="#">Topics<span class="count-classes"> (345)</span></a></li>
|
||||
<li><a href="#">Events<span class="count-classes"> (670)</span></a></li>
|
||||
<li><a href="#">Organizations<span class="count-classes"> (440)</span></a></li>
|
||||
<li><a href="#">Publications<span class="count-classes"> (670)</span></a></li>
|
||||
<li><a href="#">Locations<span class="count-classes"> (903)</span></a></li>
|
||||
</ul>
|
||||
|
||||
<section id="browse-classes">
|
||||
<nav>
|
||||
<ul id="class-group-list">
|
||||
<li><a href="#">Faculty Member<span class="count-individuals"> (18,080)</span></a></li>
|
||||
<li><a class="selected" href="#">Graduate Student<span class="count-individuals"> (2,550)</span></a></li>
|
||||
<li><a href="#">Librarian <span class="count-individuals"> (1,280)</span></a></li>
|
||||
<li><a href="#">Non-Academic <span class="count-individuals"> (280)</span></a></li>
|
||||
<li><a href="#">Non-Faculty Academic <span class="count-individuals"> (2,380)</span></a></li>
|
||||
<li><a href="#">Person<span class="count-individuals"> (2,480)</span></a></li>
|
||||
<li><a href="#">Postdoc <span class="count-individuals"> (1,380)</span></a></li>
|
||||
<li><a href="#">Professor Emeritus<span class="count-individuals"> (680)</span></a></li>
|
||||
<li><a href="#">Undergraduate Student<span class="count-individuals"> (880)</span></a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<section id="visual-graph">
|
||||
<h4>Visual Graph</h4>
|
||||
<img src="${themeDir}/images/visual-graph.jpg" />
|
||||
</section>
|
||||
</section> <!-- #browse-classes -->
|
||||
</section> <!-- #browse -->
|
||||
|
||||
<section id="highlights">
|
||||
<h2>Highlights</h2>
|
||||
|
||||
<section id="featured-people" class="global-highlights">
|
||||
<h3>FEATURED PEOPLE</h3>
|
||||
|
||||
<!--use Hs-->
|
||||
<article class="featured-people vcard">
|
||||
<a href="#">
|
||||
<img class="individual-photo" src="${themeDir}/images/person-thumbnail-sample.jpg" width="80" height="80" />
|
||||
<p class="fn">Hayworth, Rita<span class="title">Actress, dancer</span><span class="org">Sabbatic year for ever</span></p>
|
||||
</a>
|
||||
</article>
|
||||
|
||||
<article class="featured-people vcard">
|
||||
<a href="#">
|
||||
<img class="individual-photo" src="${themeDir}/images/person-thumbnail-sample-2.jpg" width="80" height="80" />
|
||||
<p class="fn">Wiedmann, Martin <span class="title">Associate Professor</span><span class="org">Cornell faculty</span></p>
|
||||
</a>
|
||||
</article>
|
||||
</section> <!-- #featured-people -->
|
||||
|
||||
<section id="upcoming-events" class="global-highlights">
|
||||
<h3>UPCOMING EVENTS</h3>
|
||||
|
||||
<article class="vevent">
|
||||
<time class="dtstart" datetime="2010-02-13T20:00Z">21<span>Dec</span></time>
|
||||
<p class="summary">Understanding Patent Writing <time>3:30 PM</time></p>
|
||||
</article>
|
||||
|
||||
<article class="vevent">
|
||||
<time class="dtstart" datetime="2010-02-13T20:00Z">20<span>Nov</span></time>
|
||||
<p class="summary">Voters, Dictators, and Peons <time>4:30 PM</time></p>
|
||||
</article>
|
||||
|
||||
<article class="vevent">
|
||||
<time class="dtstart" datetime="2010-02-13T20:00Z">19<span>Nov</span></time>
|
||||
<p class="summary">Proton-Coupled Electron Transfer II <time>5:30 PM</time></p>
|
||||
</article>
|
||||
|
||||
<p class="view-all"><a class="view-all-style" href="#">View All <span class="pictos-arrow-10">4</span></a></p>
|
||||
</section> <!-- #upcoming-events -->
|
||||
|
||||
<section id="latest-publications" class="global-highlights">
|
||||
<h3>LATEST PUBLICATIONS</h3>
|
||||
|
||||
<article class="latest-publications-item">
|
||||
<p class="publication-content">Solar masses<span><em>Journal</em> <time datetime="2010-02-13T20:00Z"> | December 2010</time></p>
|
||||
</article>
|
||||
|
||||
<article class="latest-publications-item">
|
||||
<p class="publication-content">Link data and the Web<span><em>Article</em> <time datetime="2010-02-13T20:00Z"> | December 2010</time></p>
|
||||
</article>
|
||||
|
||||
<article class="latest-publications-item">
|
||||
<p class="publication-content">Building a community<span><em>Book</em> <time datetime="2010-02-13T20:00Z"> | November 2010</time></p>
|
||||
</article>
|
||||
|
||||
<article class="latest-publications-item">
|
||||
<p class="publication-content">Biology 101<span><em>Series</em> <time datetime="2010-02-13T20:00Z"> | November 2010</time></p>
|
||||
</article>
|
||||
|
||||
<p class="view-all"><a class="view-all-style" href="#">View All <span class="pictos-arrow-10">4</span></a></p>
|
||||
</section> <!-- #latest-publications -->
|
||||
</section> <!-- $highlights -->
|
||||
</div> <!-- #wrapper-content -->
|
||||
|
|
@ -31,4 +31,6 @@
|
|||
</div>
|
||||
</section> <!-- #log-in -->
|
||||
|
||||
${stylesheets.add("/css/login.css")}
|
||||
|
||||
</#if>
|
||||
|
|
|
|||
|
|
@ -88,130 +88,8 @@
|
|||
</ul>
|
||||
</nav>
|
||||
|
||||
<div id="wrapper-content">
|
||||
<section id="intro">
|
||||
<h3>What is VIVO?</h3>
|
||||
${body}
|
||||
|
||||
<p>VIVO is an open source semantic web application originally developed and implemented at Cornell. When installed and populated with researcher interests, activities, and accomplishments, it enables the discovery of research and scholarship across disciplines at that institution. VIVO supports browsing and a search function which returns faceted results for rapid retrieval of desired information. Content in any local VIVO installation may be maintained manually, brought into VIVO in automated ways from local systems of record, such as HR, grants, course, and faculty activity databases, or from database providers such as publication aggregators and funding agencies. <a href="#">More<span class="pictos-arrow-14"> 4</span></a></p>
|
||||
<section id="search-home">
|
||||
<h3>Search VIVO</h3>
|
||||
|
||||
<fieldset>
|
||||
<legend>Search form</legend>
|
||||
<form id="search-home-vivo" action="${urls.search}" method="post" name="search">
|
||||
<div id="search-home-field">
|
||||
<input name="search-home-vivo" class="search-home-vivo" id="search-home-vivo" type="text" />
|
||||
<a class ="submit" href="#">Search</a>
|
||||
</div>
|
||||
</form>
|
||||
</fieldset>
|
||||
</section> <!-- #search-home -->
|
||||
</section> <!-- #intro -->
|
||||
|
||||
<#include "login.ftl">
|
||||
|
||||
<section id="browse">
|
||||
<h2>Browse</h2>
|
||||
|
||||
<ul id="browse-classGroups">
|
||||
<li><a class="selected" href="#">People<span class="count-classes"> (1,280)</span></a></li>
|
||||
<li><a href="#">Courses<span class="count-classes"> (1,300)</span></a></li>
|
||||
<li><a href="#">Activities<span class="count-classes"> (980)</span></a></li>
|
||||
<li><a href="#">Topics<span class="count-classes"> (345)</span></a></li>
|
||||
<li><a href="#">Events<span class="count-classes"> (670)</span></a></li>
|
||||
<li><a href="#">Organizations<span class="count-classes"> (440)</span></a></li>
|
||||
<li><a href="#">Publications<span class="count-classes"> (670)</span></a></li>
|
||||
<li><a href="#">Locations<span class="count-classes"> (903)</span></a></li>
|
||||
</ul>
|
||||
|
||||
<section id="browse-classes">
|
||||
<nav>
|
||||
<ul id="class-group-list">
|
||||
<li><a href="#">Faculty Member<span class="count-individuals"> (18,080)</span></a></li>
|
||||
<li><a class="selected" href="#">Graduate Student<span class="count-individuals"> (2,550)</span></a></li>
|
||||
<li><a href="#">Librarian <span class="count-individuals"> (1,280)</span></a></li>
|
||||
<li><a href="#">Non-Academic <span class="count-individuals"> (280)</span></a></li>
|
||||
<li><a href="#">Non-Faculty Academic <span class="count-individuals"> (2,380)</span></a></li>
|
||||
<li><a href="#">Person<span class="count-individuals"> (2,480)</span></a></li>
|
||||
<li><a href="#">Postdoc <span class="count-individuals"> (1,380)</span></a></li>
|
||||
<li><a href="#">Professor Emeritus<span class="count-individuals"> (680)</span></a></li>
|
||||
<li><a href="#">Undergraduate Student<span class="count-individuals"> (880)</span></a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<section id="visual-graph">
|
||||
<h4>Visual Graph</h4>
|
||||
<img src="${themeDir}/images/visual-graph.jpg" />
|
||||
</section>
|
||||
</section> <!-- #browse-classes -->
|
||||
</section> <!-- #browse -->
|
||||
|
||||
<section id="highlights">
|
||||
<h2>Highlights</h2>
|
||||
|
||||
<section id="featured-people" class="global-highlights">
|
||||
<h3>FEATURED PEOPLE</h3>
|
||||
|
||||
<!--use Hs-->
|
||||
<article class="featured-people vcard">
|
||||
<a href="#">
|
||||
<img class="individual-photo" src="${themeDir}/images/person-thumbnail-sample.jpg" width="80" height="80" />
|
||||
<p class="fn">Hayworth, Rita<span class="title">Actress, dancer</span><span class="org">Sabbatic year for ever</span></p>
|
||||
</a>
|
||||
</article>
|
||||
|
||||
<article class="featured-people vcard">
|
||||
<a href="#">
|
||||
<img class="individual-photo" src="${themeDir}/images/person-thumbnail-sample-2.jpg" width="80" height="80" />
|
||||
<p class="fn">Wiedmann, Martin <span class="title">Associate Professor</span><span class="org">Cornell faculty</span></p>
|
||||
</a>
|
||||
</article>
|
||||
</section> <!-- #featured-people -->
|
||||
|
||||
<section id="upcoming-events" class="global-highlights">
|
||||
<h3>UPCOMING EVENTS</h3>
|
||||
|
||||
<article class="vevent">
|
||||
<time class="dtstart" datetime="2010-02-13T20:00Z">21<span>Dec</span></time>
|
||||
<p class="summary">Understanding Patent Writing <time>3:30 PM</time></p>
|
||||
</article>
|
||||
|
||||
<article class="vevent">
|
||||
<time class="dtstart" datetime="2010-02-13T20:00Z">20<span>Nov</span></time>
|
||||
<p class="summary">Voters, Dictators, and Peons <time>4:30 PM</time></p>
|
||||
</article>
|
||||
|
||||
<article class="vevent">
|
||||
<time class="dtstart" datetime="2010-02-13T20:00Z">19<span>Nov</span></time>
|
||||
<p class="summary">Proton-Coupled Electron Transfer II <time>5:30 PM</time></p>
|
||||
</article>
|
||||
|
||||
<p class="view-all"><a class="view-all-style" href="#">View All <span class="pictos-arrow-10">4</span></a></p>
|
||||
</section> <!-- #upcoming-events -->
|
||||
|
||||
<section id="latest-publications" class="global-highlights">
|
||||
<h3>LATEST PUBLICATIONS</h3>
|
||||
|
||||
<article class="latest-publications-item">
|
||||
<p class="publication-content">Solar masses<span><em>Journal</em> <time datetime="2010-02-13T20:00Z"> | December 2010</time></p>
|
||||
</article>
|
||||
|
||||
<article class="latest-publications-item">
|
||||
<p class="publication-content">Link data and the Web<span><em>Article</em> <time datetime="2010-02-13T20:00Z"> | December 2010</time></p>
|
||||
</article>
|
||||
|
||||
<article class="latest-publications-item">
|
||||
<p class="publication-content">Building a community<span><em>Book</em> <time datetime="2010-02-13T20:00Z"> | November 2010</time></p>
|
||||
</article>
|
||||
|
||||
<article class="latest-publications-item">
|
||||
<p class="publication-content">Biology 101<span><em>Series</em> <time datetime="2010-02-13T20:00Z"> | November 2010</time></p>
|
||||
</article>
|
||||
|
||||
<p class="view-all"><a class="view-all-style" href="#">View All <span class="pictos-arrow-10">4</span></a></p>
|
||||
</section> <!-- #latest-publications -->
|
||||
</section> <!-- $highlights -->
|
||||
</div> <!-- #wrapper-content -->
|
||||
<footer>
|
||||
<#if copyright??>
|
||||
<p class="copyright"><small>©${copyright.year?c}
|
||||
|
|
|
|||
|
|
@ -79,8 +79,7 @@
|
|||
</ul>
|
||||
</nav>
|
||||
<div id="wrapper-content">
|
||||
<#-- ${body} -->
|
||||
<#include bodyTemplate>
|
||||
${body}
|
||||
</div> <!-- #wrapper-content -->
|
||||
<footer>
|
||||
<#if copyright??>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue