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

Markup cleanup, style tweaks and some refactoring of the home page for Wilma. Turns out that all requests for tabs were being routed to the new HomePageController since it had "/index.jsp" set as its url-pattern under the servlet-mapping in web.xml. This isn't going to work as it made every tab render using page-home.ftl. Restored TabController servlet mapping in web.xml temporarily and will discuss potential solutions with Rebecca. NIHVIVO-556 NIHVIVO-1234

Browse source
This commit is contained in:
nac26 2010-10-27 13:21:55 +00:00
parent 10c352dbf9
commit f7517ba34d
13 changed files with 1103 additions and 892 deletions
Download patch file Download diff file Expand all files Collapse all files

14
productMods/WEB-INF/web.xml
View file

@ -353,7 +353,7 @@
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>HomePageController</servlet-name> <servlet-name>HomePageController</servlet-name>
<url-pattern>/index.jsp</url-pattern> <url-pattern>/index.jsp?primary=1</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet> <servlet>
@ -963,6 +963,18 @@
<servlet-name>TabEntitiesController</servlet-name> <servlet-name>TabEntitiesController</servlet-name>
<url-pattern>/TabEntitiesController</url-pattern> <url-pattern>/TabEntitiesController</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- NOTICE: index.jsp is mapped to TabController so that we
can have the urls that use to be in the system still work even
though we no longer use index.jsp -->
<servlet>
<servlet-name>TabController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.TabController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>TabController</servlet-name>
<url-pattern>/index.jsp</url-pattern>
</servlet-mapping>
<!-- <servlet> <!-- <servlet>
<servlet-name>EntityPropertyListController</servlet-name> <servlet-name>EntityPropertyListController</servlet-name>

6
themes/wilma/css/individual.css
View file

@ -190,7 +190,8 @@ img.screenshot {
float: left; float: left;
display: inline; display: inline;
height: 19px; height: 19px;
line-height:19px; line-height:19px;
font-size: 0.75em;
padding: 5px 16px 0 0; padding: 5px 16px 0 0;
background: url(../images/transition/individual/grouping/h3_tab_right.gif) right top no-repeat; background: url(../images/transition/individual/grouping/h3_tab_right.gif) right top no-repeat;
color:#fff; color:#fff;
@ -257,6 +258,7 @@ img.screenshot {
#personWrap div.propsItem h4 { #personWrap div.propsItem h4 {
margin-bottom: 1.25em; margin-bottom: 1.25em;
margin-left: -16px; margin-left: -16px;
font-size: 0.8em;
} }
#personWrap ul.properties { #personWrap ul.properties {
@ -475,6 +477,8 @@ ul.keywords li {
#personWrap a.add, #personWrap a.edit, #personWrap a.delete { #personWrap a.add, #personWrap a.edit, #personWrap a.delete {
color: #209ae0; color: #209ae0;
text-decoration: underline; text-decoration: underline;
height: 0.8em;
line-height: 0.8em;
} }
#personWrap a.add:hover, #personWrap a.edit:hover, #personWrap a.delete:hover, #personWrap a.add:hover, #personWrap a.edit:hover, #personWrap a.delete:hover,

939
themes/wilma/css/layout.css
View file

File diff suppressed because it is too large Load diff

6
themes/wilma/css/screen.css
View file

@ -231,6 +231,7 @@ div#labelAndMoniker { margin-bottom: 1.5em; }
#label h3 { #label h3 {
display: inline; display: inline;
padding-right: 6px; padding-right: 6px;
font-size: 1.7em;
} }
em.moniker { em.moniker {
@ -268,7 +269,7 @@ div.description { margin-bottom: 1.5em; }
.propertyName, .propertyName,
.propsItem h4 { .propsItem h4 {
font-size: 1em; font-size: 0.8em;
line-height: 1em; line-height: 1em;
color: #666; color: #666;
background: #ebebeb; background: #ebebeb;
@ -654,7 +655,8 @@ ul.properties li {
div.datatypePropertyValue, div.datatypePropertyValue,
ul.properties li, ul.properties li,
ul.datatypePropertyValue li { ul.datatypePropertyValue li {
position: relative; position: relative;
font-size: 0.7em;
} }

1
themes/wilma/css/style.css
View file

@ -22,3 +22,4 @@ VIVO theme: screen styles
@import url("individual.css"); @import url("individual.css");
@import url("forms.css"); @import url("forms.css");
@import url("formedit.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*/

156
themes/wilma/templates/body/homeBody.jsp Normal file
View file

@ -0,0 +1,156 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%-- This is a temporary file and will be removed once we have completed the transition to freemarker --%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.*" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<%@ page errorPage="/error.jsp"%>
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
<%
FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
%>
<%
VitroRequest vreq = new VitroRequest(request);
Portal portal = vreq.getPortal();
String contextRoot = vreq.getContextPath();
String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT;
themeDir = contextRoot + '/' + themeDir;
%>
<c:set var="portal" value="${requestScope.portalBean}"/>
<c:set var="themeDir"><c:out value="${themeDir}" /></c:set>
<c:set var="bodyJsp"><c:out value="${requestScope.bodyJsp}" default="/debug.jsp"/></c:set>
<c:set var="title"><c:out value="${requestScope.title}" /></c:set>
<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="<%=contextRoot%>/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 -->
${ftl_login}
<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 -->

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

@ -1,47 +1,33 @@
<footer> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<div id="footer-content"> <#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
<#if copyright??>
<p class="copyright"><small>&copy;${copyright.year?c}
<#if copyright.url??>
<a href="${copyright.url}">${copyright.text}</a>
<#else>
${copyright.text}
</#if>
All Rights Reserved | <a class="terms" href="${urls.termsOfUse}">Terms of Use</a></small> | Powered by <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank"><strong>VIVO</strong></a></p>
</#if>
<nav>
<ul id="footer-nav">
<li><a href="${urls.about}">About</a></li>
<#if urls.contact??>
<li><a href="${urls.contact}">Contact Us</a></li>
</#if>
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</ul>
</nav>
</div>
</footer>
</div>
<footer>
<div id="footer-content">
<#if copyright??>
<p class="copyright"><small>&copy;${copyright.year?c}
<#if copyright.url??>
<a href="${copyright.url}">${copyright.text}</a>
<#else>
${copyright.text}
</#if>
All Rights Reserved | <a class="terms" href="${urls.termsOfUse}">Terms of Use</a></small> | Powered by <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank"><strong>VIVO</strong></a></p>
</#if>
<nav>
<ul id="footer-nav">
<li><a href="${urls.about}">About</a></li>
<#if urls.contact??>
<li><a href="${urls.contact}">Contact Us</a></li>
</#if>
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</ul>
</nav>
</div> <!-- #footer-content -->
</footer>
</div> <!-- #wrapper -->
<script type="text/javascript" src="http://use.typekit.com/chp2uea.js"></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">

2
themes/wilma/templates/googleAnalytics.ftl
View file

@ -1,3 +1,5 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- NOTICE: This is SAMPLE Google Analytics code. You must replace it with your institution's code. <#-- NOTICE: This is SAMPLE Google Analytics code. You must replace it with your institution's code.
Please see documentation at https://confluence.cornell.edu/display/ennsrd/Google+Analytics+for+UI. --> Please see documentation at https://confluence.cornell.edu/display/ennsrd/Google+Analytics+for+UI. -->

36
themes/wilma/templates/login.ftl Normal file
View file

@ -0,0 +1,36 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
<#if loginName??>
<#-- nothing to see here -->
<#else>
<section id="log-in">
<h3>Log in</h3>
<form id="log-in-form" action="${urls.home}/authenticate?login=block" method="post" name="log-in-form" />
<label for="loginName">Email</label>
<div class="input-field">
<input name="loginName" id="loginName" type="text" required />
</div>
<label for="loginPassword">Password</label>
<div class="input-field">
<input name="loginPassword" id="loginPassword" type="password" required />
</div>
<div id="wrapper-submit-remember-me">
<input name="loginForm" type="submit" class="login green button" value="Log in"/>
<div id="remember-me">
<input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />
<label class="label-remember-me"for="remember-me">Remember me</label>
</div>
</div>
<p class="forgot-password"><a href="#">Forgot your password?</a></p>
</form>
<div id="request-account">
<a class="blue button" href="#">Request an account</a>
</div>
</section> <!-- #log-in -->
</#if>

3
themes/wilma/templates/menu.ftl
View file

@ -1,3 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
<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}

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

@ -1,248 +1,267 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<link rel="stylesheet" href="${themeDir}/css/style.css" /> <link rel="stylesheet" href="${themeDir}/css/style.css" />
${stylesheets.tags} ${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]> <!--[if lt IE 7]>
<script type="text/javascript" src="${themeDir}/js/jquery_plugins/supersleight.js"></script> <script type="text/javascript" src="${themeDir}/js/jquery_plugins/supersleight.js"></script>
<script type="text/javascript" src="${themeDir}/js/utils.js"></script> <script type="text/javascript" src="${themeDir}/js/utils.js"></script>
<link rel="stylesheet" href="css/ie6.css" /> <link rel="stylesheet" href="css/ie6.css" />
<![endif]--> <![endif]-->
<!--[if IE 7]> <!--[if IE 7]>
<link rel="stylesheet" href="css/ie7.css" /> <link rel="stylesheet" href="css/ie7.css" />
<![endif]--> <![endif]-->
<!--[if (gte IE 6)&(lte IE 8)]> <!--[if (gte IE 6)&(lte IE 8)]>
<script type="text/javascript" src="${themeDir}/js/selectivizr.js"></script> <script type="text/javascript" src="${themeDir}/js/selectivizr.js"></script>
<![endif]--> <![endif]-->
</head> </head>
<body>
<div id="wrapper"> <body>
<header id="branding"> <div id="wrapper">
<h2 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2> <header id="branding">
<!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline} <h2 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2>
<#if siteTagline?has_content> <!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
<em>${siteTagline}</em> <#if siteTagline?has_content>
</#if>--> <em>${siteTagline}</em>
<#import "lib-list.ftl" as l> </#if>-->
<nav> <#import "lib-list.ftl" as l>
<ul id="header-nav">
<#if loginName??> <nav>
<li><span class="pictos-arrow-10">U</span> ${loginName}</li> <ul id="header-nav">
<li><a href="${urls.logout}">Log out</a></li>
<li><a href="${urls.siteAdmin}">Site Admin</a></li> <#if loginName??>
<#else> <li><span class="pictos-arrow-10">U</span> ${loginName}</li>
<li><a title="log in to manage this site" href="${urls.login}">Log in</a></li> <li><a href="${urls.logout}">Log out</a></li>
</#if> <li><a href="${urls.siteAdmin}">Site Admin</a></li>
<#-- List of links that appear in submenus, like the header and footer. --> <#else>
<li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
</#if>
<#-- List of links that appear in submenus, like the header and footer. -->
<li><a href="${urls.about}">About</a></li> <li><a href="${urls.about}">About</a></li>
<#if urls.contact??> <#if urls.contact??>
<li><a href="${urls.contact}">Contact Us</a></li> <li><a href="${urls.contact}">Contact Us</a></li>
</#if> </#if>
<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>
<section id="search">
<fieldset> <section id="search">
<legend>Search form</legend> <fieldset>
<form id="searchForm" action="${urls.search}" name="searchForm"> <legend>Search form</legend>
<#if showFlag1SearchField??>
<select id="search-form-modifier" name="flag1" class="form-item" >
<option value="nofiltering" selected="selected">entire database (${loginName})</option>
<option value="${portalId}">${siteTagline!}</option>
</select>
<#else>
<input type="hidden" name="flag1" value="${portalId}" />
</#if>
<div id="search-field">
<input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
<a class ="submit" href="javascript:document.searchForm.submit();">Search</a> </div>
<!-- <input class ="submit" name="submit" type="submit" value="Search" /> -->
</form>
</fieldset>
</section>
</header>
<nav>
<ul id="main-nav">
<#list tabMenu.items as item>
<li>
<a href="${item.url}" <#if item.active> class="selected" </#if>>
${item.linkText}
</a>
</li>
</#list>
</ul>
</nav>
<div id="wrapper-content">
<form id="searchForm" action="${urls.search}" name="searchForm">
<section id="intro"> <#if showFlag1SearchField??>
<h3>What is VIVO?</h3> <select id="search-form-modifier" name="flag1" class="form-item" >
<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> <option value="nofiltering" selected="selected">entire database (${loginName})</option>
<section id="search-home"> <option value="${portalId}">${siteTagline!}</option>
<h3>Search VIVO</h3> </select>
<fieldset> <#else>
<legend>Search form</legend> <input type="hidden" name="flag1" value="${portalId}" />
<form id="search-home-vivo" action="#" method="post" name="search"> </#if>
<div id="search-home-field"> <div id="search-field">
<input name="search-home-vivo" class="search-home-vivo" id="search-home-vivo" type="text" /> <input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
<a class ="submit" href="#">Search</a> </div> <a class ="submit" href="javascript:document.searchForm.submit();">Search</a>
</form> <!-- <input class ="submit" name="submit" type="submit" value="Search" /> -->
</fieldset> </div>
</section> </form>
</section> </fieldset>
<!-- #intro --> </section>
<section id="log-in"> </header>
<h3>Log in</h3>
<form id="log-in-form" action="#" method="post" name="log-in-form" /> <nav>
<label for="email">Email</label> <ul id="main-nav">
<div class="input-field"> <#list tabMenu.items as item>
<input name="email" id="email" type="text" required /> <li><a href="${item.url}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
</div> </#list>
<label for="password">Password</label> </ul>
<div class="input-field"> </nav>
<input name="password" id="password" type="password" required />
</div> <div id="wrapper-content">
<div id="wrapper-submit-remember-me"> <a class="green button" href="#">Log in</a> <section id="intro">
<div id="remember-me"> <h3>What is VIVO?</h3>
<input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />
<label class="label-remember-me"for="remember-me">Remember me</label> <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>
</div> <section id="search-home">
</div> <h3>Search VIVO</h3>
<p class="forgot-password"><a href="#">Forgot your password?</a></p>
</form> <fieldset>
<div id="request-account"> <a class="blue button" href="#">Request an account</a> </div> <legend>Search form</legend>
</section><!-- #log-in --> <form id="search-home-vivo" action="${urls.search}" method="post" name="search">
<section id="browse"> <div id="search-home-field">
<h2>Browse</h2> <input name="search-home-vivo" class="search-home-vivo" id="search-home-vivo" type="text" />
<ul id="browse-classGroups"> <a class ="submit" href="#">Search</a>
<li><a class="selected" href="#">People<span class="count-classes"> (1,280)</span></a></li> </div>
<li><a href="#">Courses<span class="count-classes"> (1,300)</span></a></li> </form>
<li><a href="#">Activities<span class="count-classes"> (980)</span></a></li> </fieldset>
<li><a href="#">Topics<span class="count-classes"> (345)</span></a></li> </section> <!-- #search-home -->
<li><a href="#">Events<span class="count-classes"> (670)</span></a></li> </section> <!-- #intro -->
<li><a href="#">Organizations<span class="count-classes"> (440)</span></a></li>
<li><a href="#">Publications<span class="count-classes"> (670)</span></a></li> <section id="log-in">
<li><a href="#">Locations<span class="count-classes"> (903)</span></a></li> <h3>Log in</h3>
</ul>
<section id="browse-classes"> <form id="log-in-form" action="${urls.home}/authenticate?login=block" method="post" name="log-in-form" />
<nav> <label for="loginName">Email</label>
<ul id="class-group-list"> <div class="input-field">
<li><a href="#">Faculty Member<span class="count-individuals"> (18,080)</span></a></li> <input name="loginName" id="loginName" type="text" required />
<li><a class="selected" href="#">Graduate Student<span class="count-individuals"> (2,550)</span></a></li> </div>
<li><a href="#">Librarian <span class="count-individuals"> (1,280)</span></a></li> <label for="loginPassword">Password</label>
<li><a href="#">Non-Academic <span class="count-individuals"> (280)</span></a></li> <div class="input-field">
<li><a href="#">Non-Faculty Academic <span class="count-individuals"> (2,380)</span></a></li> <input name="loginPassword" id="loginPassword" type="password" required />
<li><a href="#">Person<span class="count-individuals"> (2,480)</span></a></li> </div>
<li><a href="#">Postdoc <span class="count-individuals"> (1,380)</span></a></li> <div id="wrapper-submit-remember-me">
<li><a href="#">Professor Emeritus<span class="count-individuals"> (680)</span></a></li> <input name="loginForm" type="submit" class="login green button" value="Log in"/>
<li><a href="#">Undergraduate Student<span class="count-individuals"> (880)</span></a></li> <div id="remember-me">
</ul> <input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />
</nav> <label class="label-remember-me"for="remember-me">Remember me</label>
<section id="visual-graph"> </div>
<h4>Visual Graph</h4> </div>
<img src="${themeDir}/images/visual-graph.jpg" /> </section> <p class="forgot-password"><a href="#">Forgot your password?</a></p>
</section> </form>
</section><!-- Browse -->
<section id="highlights"> <div id="request-account">
<h2>Highlights</h2> <a class="blue button" href="#">Request an account</a>
<section id="fearuted-people" class="global-highlights"> </div>
<h3>FEATURED PEOPLE</h3> </section> <!-- #log-in -->
<!--use Hs-->
<article class="featured-people vcard"><a href="#"><img class="individual-photo" src="${themeDir}/images/person-thumbnail-sample.jpg" width="80" height="80" /> <section id="browse">
<p class="fn">Hayworth, Rita<span class="title">Actress, dancer</span><span class="org">Sabbatic year for ever</span></p> <h2>Browse</h2>
</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" /> <ul id="browse-classGroups">
<p class="fn">Wiedmann, Martin <span class="title">Associate Professor</span><span class="org">Cornell faculty</span></p> <li><a class="selected" href="#">People<span class="count-classes"> (1,280)</span></a></li>
</a> </article> <li><a href="#">Courses<span class="count-classes"> (1,300)</span></a></li>
</section> <li><a href="#">Activities<span class="count-classes"> (980)</span></a></li>
<!-- featured-people --> <li><a href="#">Topics<span class="count-classes"> (345)</span></a></li>
<section id="upcoming-events" class="global-highlights"> <li><a href="#">Events<span class="count-classes"> (670)</span></a></li>
<h3>UPCOMING EVENTS</h3> <li><a href="#">Organizations<span class="count-classes"> (440)</span></a></li>
<article class="vevent"> <li><a href="#">Publications<span class="count-classes"> (670)</span></a></li>
<time class="dtstart" datetime="2010-02-13T20:00Z">21<span>Dec</span></time> <li><a href="#">Locations<span class="count-classes"> (903)</span></a></li>
<p class="summary">Understanding Patent Writing </ul>
<time>3:30 PM</time>
</p> <section id="browse-classes">
</article> <nav>
<article class="vevent"> <ul id="class-group-list">
<time class="dtstart" datetime="2010-02-13T20:00Z">20<span>Nov</span></time> <li><a href="#">Faculty Member<span class="count-individuals"> (18,080)</span></a></li>
<p class="summary">Voters, Dictators, and Peons <li><a class="selected" href="#">Graduate Student<span class="count-individuals"> (2,550)</span></a></li>
<time>4:30 PM</time> <li><a href="#">Librarian <span class="count-individuals"> (1,280)</span></a></li>
</p> <li><a href="#">Non-Academic <span class="count-individuals"> (280)</span></a></li>
</article> <li><a href="#">Non-Faculty Academic <span class="count-individuals"> (2,380)</span></a></li>
<article class="vevent"> <li><a href="#">Person<span class="count-individuals"> (2,480)</span></a></li>
<time class="dtstart" datetime="2010-02-13T20:00Z">19<span>Nov</span></time> <li><a href="#">Postdoc <span class="count-individuals"> (1,380)</span></a></li>
<p class="summary">Proton-Coupled Electron Transfer II <li><a href="#">Professor Emeritus<span class="count-individuals"> (680)</span></a></li>
<time>5:30 PM</time> <li><a href="#">Undergraduate Student<span class="count-individuals"> (880)</span></a></li>
</p> </ul>
</article> </nav>
<p class="view-all"><a class="view-all-style" href="#">View All <span class="pictos-arrow-10">4</span></a></p>
</section> <section id="visual-graph">
<!-- upcoming-events --> <h4>Visual Graph</h4>
<section id="latest-publications" class="global-highlights"> <img src="${themeDir}/images/visual-graph.jpg" />
<h3>LATEST PUBLICATIONS</h3> </section>
<article class="latest-publications-item"> </section> <!-- #browse-classes -->
<p class="publication-content">Solar masses<span><em>Journal</em> </section> <!-- #browse -->
<time datetime="2010-02-13T20:00Z"> | December 2010</time>
</p> <section id="highlights">
</article> <h2>Highlights</h2>
<article class="latest-publications-item">
<p class="publication-content">Link data and the Web<span><em>Article</em> <section id="featured-people" class="global-highlights">
<time datetime="2010-02-13T20:00Z"> | December 2010</time> <h3>FEATURED PEOPLE</h3>
</p>
</article> <!--use Hs-->
<article class="latest-publications-item"> <article class="featured-people vcard">
<p class="publication-content">Building a community<span><em>Book</em> <a href="#">
<time datetime="2010-02-13T20:00Z"> | November 2010</time> <img class="individual-photo" src="${themeDir}/images/person-thumbnail-sample.jpg" width="80" height="80" />
</p> <p class="fn">Hayworth, Rita<span class="title">Actress, dancer</span><span class="org">Sabbatic year for ever</span></p>
</article> </a>
<article class="latest-publications-item"> </article>
<p class="publication-content">Biology 101<span><em>Series</em>
<time datetime="2010-02-13T20:00Z"> | November 2010</time> <article class="featured-people vcard">
</p> <a href="#">
</article> <img class="individual-photo" src="${themeDir}/images/person-thumbnail-sample-2.jpg" width="80" height="80" />
<p class="view-all"><a class="view-all-style" href="#">View All <span class="pictos-arrow-10">4</span></a></p> <p class="fn">Wiedmann, Martin <span class="title">Associate Professor</span><span class="org">Cornell faculty</span></p>
</section> </a>
<!-- latest-publications --> </article>
</section> </section> <!-- #featured-people -->
</div>
<footer> <section id="upcoming-events" class="global-highlights">
<div id="footer-content"> <h3>UPCOMING EVENTS</h3>
<#if copyright??>
<p class="copyright"><small>&copy;${copyright.year?c} <article class="vevent">
<#if copyright.url??> <time class="dtstart" datetime="2010-02-13T20:00Z">21<span>Dec</span></time>
<a href="${copyright.url}">${copyright.text}</a> <p class="summary">Understanding Patent Writing <time>3:30 PM</time></p>
<#else> </article>
${copyright.text}
</#if> <article class="vevent">
All Rights Reserved | <a class="terms" href="${urls.termsOfUse}">Terms of Use</a></small> | Powered by <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank"><strong>VIVO</strong></a></p> <time class="dtstart" datetime="2010-02-13T20:00Z">20<span>Nov</span></time>
</#if> <p class="summary">Voters, Dictators, and Peons <time>4:30 PM</time></p>
<nav> </article>
<ul id="footer-nav">
<li><a href="${urls.about}">About</a></li> <article class="vevent">
<#if urls.contact??> <time class="dtstart" datetime="2010-02-13T20:00Z">19<span>Nov</span></time>
<li><a href="${urls.contact}">Contact Us</a></li> <p class="summary">Proton-Coupled Electron Transfer II <time>5:30 PM</time></p>
</#if> </article>
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</ul> <p class="view-all"><a class="view-all-style" href="#">View All <span class="pictos-arrow-10">4</span></a></p>
</nav> </section> <!-- #upcoming-events -->
</div>
</footer> <section id="latest-publications" class="global-highlights">
</div> <h3>LATEST PUBLICATIONS</h3>
${scripts.add("/js/jquery.js")} <article class="latest-publications-item">
${scripts.tags} <p class="publication-content">Solar masses<span><em>Journal</em> <time datetime="2010-02-13T20:00Z"> | December 2010</time></p>
</article>
<#include "googleAnalytics.ftl">
</body> <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>
<div id="footer-content">
<#if copyright??>
<p class="copyright"><small>&copy;${copyright.year?c}
<#if copyright.url??>
<a href="${copyright.url}">${copyright.text}</a>
<#else>
${copyright.text}
</#if>
All Rights Reserved | <a class="terms" href="${urls.termsOfUse}">Terms of Use</a></small> | Powered by <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank"><strong>VIVO</strong></a></p>
</#if>
<nav>
<ul id="footer-nav">
<li><a href="${urls.about}">About</a></li>
<#if urls.contact??>
<li><a href="${urls.contact}">Contact Us</a></li>
</#if>
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</ul>
</nav>
</div> <!-- #footer-content -->
</footer>
</div> <!-- #wrapper -->
${scripts.add("/js/jquery.js")}
${scripts.tags}
<#include "googleAnalytics.ftl">
</body>
</html> </html>

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

@ -1,117 +1,115 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<link rel="stylesheet" href="${themeDir}/css/style.css" /> <link rel="stylesheet" href="${themeDir}/css/style.css" />
${stylesheets.tags} ${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]> <!--[if lt IE 7]>
<script type="text/javascript" src="${themeDir}/js/jquery_plugins/supersleight.js"></script> <script type="text/javascript" src="${themeDir}/js/jquery_plugins/supersleight.js"></script>
<script type="text/javascript" src="${themeDir}/js/utils.js"></script> <script type="text/javascript" src="${themeDir}/js/utils.js"></script>
<link rel="stylesheet" href="css/ie6.css" /> <link rel="stylesheet" href="css/ie6.css" />
<![endif]--> <![endif]-->
<!--[if IE 7]> <!--[if IE 7]>
<link rel="stylesheet" href="css/ie7.css" /> <link rel="stylesheet" href="css/ie7.css" />
<![endif]--> <![endif]-->
<!--[if (gte IE 6)&(lte IE 8)]> <!--[if (gte IE 6)&(lte IE 8)]>
<script type="text/javascript" src="${themeDir}/js/selectivizr.js"></script> <script type="text/javascript" src="${themeDir}/js/selectivizr.js"></script>
<![endif]--> <![endif]-->
</head> </head>
<body> <body>
<div id="wrapper"> <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}
<#if siteTagline?has_content> <#if siteTagline?has_content>
<em>${siteTagline}</em> <em>${siteTagline}</em>
</#if>--> </#if>-->
<#import "lib-list.ftl" as l> <#import "lib-list.ftl" as l>
<nav> <nav>
<ul id="header-nav"> <ul id="header-nav">
<#if loginName??> <#if loginName??>
<li><span class="pictos-arrow-10">U</span> ${loginName}</li> <li><span class="pictos-arrow-10">U</span> ${loginName}</li>
<li><a href="${urls.logout}">Log out</a></li> <li><a href="${urls.logout}">Log out</a></li>
<li><a href="${urls.siteAdmin}">Site Admin</a></li> <li><a href="${urls.siteAdmin}">Site Admin</a></li>
<#else> <#else>
<li><a title="log in to manage this site" href="${urls.login}">Log in</a></li> <li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
</#if> </#if>
<#-- List of links that appear in submenus, like the header and footer. --> <#-- List of links that appear in submenus, like the header and footer. -->
<li><a href="${urls.about}">About</a></li> <li><a href="${urls.about}">About</a></li>
<#if urls.contact??> <#if urls.contact??>
<li><a href="${urls.contact}">Contact Us</a></li> <li><a href="${urls.contact}">Contact Us</a></li>
</#if> </#if>
<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>
<section id="search"> <section id="search">
<fieldset> <fieldset>
<legend>Search form</legend> <legend>Search form</legend>
<form id="searchForm" action="${urls.search}" name="searchForm">
<#if showFlag1SearchField??> <form id="searchForm" action="${urls.search}" name="searchForm">
<select id="search-form-modifier" name="flag1" class="form-item" > <#if showFlag1SearchField??>
<option value="nofiltering" selected="selected">entire database (${loginName})</option> <select id="search-form-modifier" name="flag1" class="form-item" >
<option value="${portalId}">${siteTagline!}</option> <option value="nofiltering" selected="selected">entire database (${loginName})</option>
</select> <option value="${portalId}">${siteTagline!}</option>
<#else> </select>
<input type="hidden" name="flag1" value="${portalId}" /> <#else>
</#if> <input type="hidden" name="flag1" value="${portalId}" />
<div id="search-field"> </#if>
<input type="text" name="querytext" class="search-vivo" value="${querytext!}" /> <div id="search-field">
<a class ="submit" href="javascript:document.searchForm.submit();">Search</a> </div> <input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
<!-- <input class ="submit" name="submit" type="submit" value="Search" /> --> <a class ="submit" href="javascript:document.searchForm.submit();">Search</a>
</form> </div>
</fieldset> <!-- <input class ="submit" name="submit" type="submit" value="Search" /> -->
</section> </form>
</header> </fieldset>
<nav> </section>
<ul id="main-nav"> </header>
<#list tabMenu.items as item> <nav>
<li> <ul id="main-nav">
<a href="${item.url}" <#if item.active> class="selected" </#if>> <#list tabMenu.items as item>
${item.linkText} <li><a href="${item.url}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
</a> </#list>
</li> </ul>
</#list> </nav>
</ul> <div id="wrapper-content">
</nav> <#-- ${body} -->
<div id="wrapper-content"> <#include bodyTemplate>
<#-- ${body} --> </div> <!-- #wrapper-content -->
<#include bodyTemplate> <footer>
</div> <div id="footer-content">
<footer> <#if copyright??>
<div id="footer-content"> <p class="copyright"><small>&copy;${copyright.year?c}
<#if copyright??> <#if copyright.url??>
<p class="copyright"><small>&copy;${copyright.year?c} <a href="${copyright.url}">${copyright.text}</a>
<#if copyright.url??> <#else>
<a href="${copyright.url}">${copyright.text}</a> ${copyright.text}
<#else> </#if>
${copyright.text} All Rights Reserved | <a class="terms" href="${urls.termsOfUse}">Terms of Use</a></small> | Powered by <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank"><strong>VIVO</strong></a></p>
</#if> </#if>
All Rights Reserved | <a class="terms" href="${urls.termsOfUse}">Terms of Use</a></small> | Powered by <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank"><strong>VIVO</strong></a></p> <nav>
</#if> <ul id="footer-nav">
<nav> <li><a href="${urls.about}">About</a></li>
<ul id="footer-nav"> <#if urls.contact??>
<li><a href="${urls.about}">About</a></li> <li><a href="${urls.contact}">Contact Us</a></li>
<#if urls.contact??> </#if>
<li><a href="${urls.contact}">Contact Us</a></li> <li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</#if> </ul>
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li> </nav>
</ul> </div> <!-- #footer-content -->
</nav> </footer>
</div> </div> <!-- #wrapper -->
</footer>
</div> ${scripts.add("/js/jquery.js")}
<!--<script type="text/javascript" src="http://use.typekit.com/chp2uea.js"></script> ${scripts.tags}
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>-->
${scripts.add("/js/jquery.js")} <#include "googleAnalytics.ftl">
${scripts.tags} </body>
<#include "googleAnalytics.ftl">
</body>
</html> </html>

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

@ -51,9 +51,6 @@
throw new JspException(e); throw new JspException(e);
} }
*/ */
// This is here as a safety net. We should have gotten the values in identity.jsp,
// since it's the first jsp we hit.
%> %>
@ -80,22 +77,38 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<link rel="stylesheet" href="<%=themeDir%>css/style.css" /> <link rel="stylesheet" href="<%=themeDir%>css/style.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")} --%> <%-- ${headScripts.add("/js/html5.js")} --%>
<c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if> <c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>
</head>
<body ${requestScope.bodyAttr}> <!--[if lt IE 7]>
<div id="wrapper"> <script type="text/javascript" src="<%=themeDir%>js/jquery_plugins/supersleight.js"></script>
${ftl_menu} <script type="text/javascript" src="<%=themeDir%>js/utils.js"></script>
<div id="wrapper-content"> <link rel="stylesheet" href="css/ie6.css" />
<c:import url="${bodyJsp}"/> <![endif]-->
</div>
${ftl_footer}
</body> <!--[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>
<body ${requestScope.bodyAttr}>
<div id="wrapper">
${ftl_menu}
<div id="wrapper-content">
<c:import url="${bodyJsp}"/>
</div>
${ftl_footer}
</body>
</html> </html>