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-mapping>
<servlet-name>HomePageController</servlet-name>
<url-pattern>/index.jsp</url-pattern>
<url-pattern>/index.jsp?primary=1</url-pattern>
</servlet-mapping>
<servlet>
@ -964,6 +964,18 @@
<url-pattern>/TabEntitiesController</url-pattern>
</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-name>EntityPropertyListController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityPropertyListController</servlet-class>

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

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

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

@ -6,13 +6,20 @@
/* Tell the browser to render HTML 5 elements as block */
header, hgroup, section, nav, article, aside, footer {
header,
hgroup,
section,
nav,
article,
aside,
footer {
display:block;
}
time {
font-weight:normal;
}
html, body {
html,
body {
margin:0;
padding:0;
height:100%; /* needed for container min-height */
@ -20,8 +27,8 @@ html, body {
font-family: "museo-sans-1", "museo-sans-2", helvetica, sans-serif, arial;/*font-size: 62.5%;*/
/* Consider these fonts: "Lucida Sans Unicode","Lucida Grande",Geneva,*/
}
/* PAGE WRAPPER ------> */
/* PAGE WRAPPER ------> */
#wrapper {
position:relative; /* needed for footer positioning*/
/*margin:0 auto; center, not in IE5 */
@ -31,16 +38,16 @@ html, body {
min-height:100%; /* real browsers */
margin:0 auto;
}
/* HEADER ------> */
/* HEADER ------> */
#branding {
position:relative;
width:970px;
height:114px;
margin:0 auto;
}
/* BRANDING ------> */
/* BRANDING ------> */
h2.vivo-logo {
position:absolute;
width:386px;
@ -54,17 +61,14 @@ h2.vivo-logo a {
width:386px;
height:59px;
}
/* <------ BRANDING */
/* HEADER NAV------> */
ul#header-nav {
float:right;
list-style:none;
height:30px;
padding-top:10px;
margin-right:13px;
}
ul#header-nav li {
float:left;
@ -85,16 +89,15 @@ ul#header-nav li:last-child {
ul#header-nav a{
color:white;
}
ul#header-nav a:link, ul#header-nav a:visited {
ul#header-nav a:link,
ul#header-nav a:visited {
text-decoration:none;
}
ul#header-nav a:hover, ul#header-nav a:active {
ul#header-nav a:hover,
ul#header-nav a:active {
text-decoration:none;
color:#999;
}
/* <------ HEADER NAV*/
/* <------ HEADER */
/* MAIN NAVIGATION------> */
ul#main-nav {
@ -114,7 +117,6 @@ ul#main-nav {
background:url(../images/separator-main-nav.jpg) right -2px no-repeat;
}
#main-nav li a {
padding-left:16px;
padding-right:16px;
display:block;
@ -122,7 +124,8 @@ ul#main-nav {
text-decoration:none;
}
#main-nav li a:hover {
color:#002b44;/*background:url(../images/selected-main-nav.jpg) left -3px no-repeat;
color:#002b44;
/*background:url(../images/selected-main-nav.jpg) left -3px no-repeat;
margin-left:21px;*/
}
#main-nav li a.selected {
@ -130,8 +133,8 @@ ul#main-nav {
background:url(../images/selected-main-nav.jpg) left -1px no-repeat;
margin-left:18px;
}
/* <------ MAIN NAVIGATION */
/* WRAPPER CONTENT------> */
#wrapper-content {
clear:both;
width:930px;
@ -140,8 +143,8 @@ ul#main-nav {
min-height:450px;
padding:20px;
}
/* INTRO ------> */
/* INTRO ------> */
#intro {
float:left;
width:570px;
@ -167,10 +170,8 @@ ul#main-nav {
font-size:14px;
color:#b2d15a;
}
/* <------ INTRO */
/* LOG IN------> */
#log-in {
float:right;
width:314px;
@ -188,6 +189,9 @@ ul#main-nav {
padding-top:18px;
border-bottom:none;
}
form#log-in-form {
padding-bottom:0;
}
#log-in label {
display:block;
font-size: 14px;
@ -208,16 +212,19 @@ div.input-field {
-webkit-border-radius:5px;
}
#log-in input {
width:214px;
height:13px;
/* Manolo: is the width and height necessary here? commenting out for now to get the login block functional on the home page */
/* width:214px;*/
/* height:13px;*/
margin-left:7px;
margin-top:7px;
border:0;
font-size:14px;
}
#log-in input.login {
margin: 7px 4px 10px 0;
}
#wrapper-submit-remember-me {
width:270px;
height:40px;
margin-left:38px;
margin-top:20px;
}
@ -263,10 +270,8 @@ p.forgot-password a {
padding-top:15px;
border-top:1px solid #e8ece9;
}
/* <------ LOG IN */
/* SEARCH ------> */
#search-home {
float:left;
width:533px;
@ -302,10 +307,8 @@ input.search-home-vivo {
padding-top:10px;
padding-left:30px;
}
/* <------ SEARCH */
/* BROWSE ------> */
#browse {
clear:both;
width:920px;
@ -315,18 +318,21 @@ input.search-home-vivo {
overflow:hidden;
padding-bottom:30px;
}
#browse h2 {
background:#5e6363;
width:102px;
#browse h2,
#highlights h2 {
width:10%;
height:44px;
line-height:44px;
font-soze:22px;
padding-left:15px;
color:#fff;
margin-bottom:27px;
}
/* BROWSE CLASS GROUPS ------> */
padding-left:15px;
font-size:1.0em;
font-weight: normal;
line-height:44px;
color:#fff;
background:#5e6363;
}
/* BROWSE CLASS GROUPS ------> */
ul#browse-classGroups {
float:left;
width:200px;
@ -368,11 +374,8 @@ ul#browse-classGroups a.selected {
ul#browse-classGroups .count-classes {
font-size:14px;
}
/* <------ BROWSE CLASS GROUPS */
/* BROWSE CLASSES IN CLASS GROUP ------> */
#browse-classes {
float:left;
width:610px;
@ -419,10 +422,8 @@ ul#class-group-list a.selected {
ul#class-group-list .count-individuals {
font-size:12px;
}
/* <------ BROWSE CLASSES IN CLASS GROUP */
/* VISUALIZATION ------> */
#visual-graph {
float:right;
width:270px;
@ -435,11 +436,8 @@ ul#class-group-list .count-individuals {
font-weight:normal;
background:url(../images/bullet-visual-graph.png) 120px 25px no-repeat;
}
/* <------ VISUALIZATION */
/* <------ BROWSE */
/* HIGHLIGHTS ------> */
#highlights {
clear:both;
width:920px;
@ -451,14 +449,7 @@ ul#class-group-list .count-individuals {
padding-bottom:30px;
}
#highlights h2 {
background:#5e6363;
width:102px;
height:44px;
line-height:44px;
font-soze:22px;
padding-left:15px;
color:#fff;
margin-bottom:27px;
width:14%;
}
#highlights h3 {
color:#91b039;
@ -472,8 +463,9 @@ ul#class-group-list .count-individuals {
width:235px;
padding:24px;
}
/* FEAUTERED PEOPLE ------> */
#fearuted-people {
#featured-people {
margin-left:20px;
margin-right:15px;
}
@ -516,12 +508,11 @@ a.view-all-style {
}
.pictos-arrow-10 {
font-family:'Pictos';
font-size:10px;
font-size:1.0em;
line-height:1.0em;
}
/* <------ FEAUTERED PEOPLE */
/* UPCOMING EVENTS------> */
#upcoming-events {
margin-right:15px;
}
@ -558,11 +549,8 @@ p.summary time {
padding-top:0;
font-weight:normal;
}
/* <------ UPCOMING EVENTS */
/* LATEST PUBLICATIONS ------> */
article.latest-publications-item {
width:232px;
height:35px;
@ -580,12 +568,8 @@ p.publication-content span {
display:block;
font-weight:normal;
}
/* <------ LATEST PUBLICATIONS */
/* <------ HIGHLIGHTS */
/* FOOTER------> */
#footer-content {
clear:both;
width:970px;
@ -644,21 +628,16 @@ a.powered-by-vivo:hover {
color:#4e5051;
text-decoration:none;
}
/* <------ FOOTER*/
/* <------ PAGE WRAPPER */
/* MISCELLANEOUS------> */
.displace {
position:absolute;
left:-9999px;
}
/* <------ MISCELLANEOUS */
/* STYLED BUTTONS ------> */
.button, .button:visited {
.button,
.button:visited {
background:#222 url(../images/alert-overlay.png) repeat-x;
display:inline-block;
padding:7px 22px 8px;
@ -672,7 +651,8 @@ a.powered-by-vivo:hover {
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.25);
border-bottom: 1px solid rgba(0, 0, 0, 0.25);*/
border-bottom: 1px solid rgba(0, 0, 0, 0.25);
*/
position:relative;
cursor:pointer;
}
@ -683,28 +663,27 @@ a.powered-by-vivo:hover {
.button:active {
top:1px;
}
.small.button, .small.button:visited {
.small.button,
.small.button:visited {
font-size:11px;
padding:;
}
.button, .button:visited {
.button,
.button:visited {
font-size:16px;
font-weight:normal;
line-height:1;/*text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.25);*/
}
.green.button, .green.button:visited {
.green.button,
.green.button:visited {
background-color:#749a02;
}
.green.button:hover {
background-color:#b2d15a;
}
.blue.button, .blue.button:visited {
.blue.button,
.blue.button:visited {
background-color:#398aac;
}
.blue.button:hover {
background-color:#58a2c1;
}
/* <------ STYLED BUTTONS */

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

@ -231,6 +231,7 @@ div#labelAndMoniker { margin-bottom: 1.5em; }
#label h3 {
display: inline;
padding-right: 6px;
font-size: 1.7em;
}
em.moniker {
@ -268,7 +269,7 @@ div.description { margin-bottom: 1.5em; }
.propertyName,
.propsItem h4 {
font-size: 1em;
font-size: 0.8em;
line-height: 1em;
color: #666;
background: #ebebeb;
@ -655,6 +656,7 @@ div.datatypePropertyValue,
ul.properties li,
ul.datatypePropertyValue li {
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("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*/

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 -->

26
themes/wilma/templates/footer.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 -->
<footer>
<div id="footer-content">
<#if copyright??>
@ -9,6 +12,7 @@
</#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>
@ -18,30 +22,12 @@
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</ul>
</nav>
</div>
</div> <!-- #footer-content -->
</footer>
</div>
</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.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">

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.
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">
<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}

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

@ -24,6 +24,7 @@ ${headScripts.tags}
<script type="text/javascript" src="${themeDir}/js/selectivizr.js"></script>
<![endif]-->
</head>
<body>
<div id="wrapper">
<header id="branding">
@ -33,8 +34,10 @@ ${headScripts.tags}
<em>${siteTagline}</em>
</#if>-->
<#import "lib-list.ftl" as l>
<nav>
<ul id="header-nav">
<#if loginName??>
<li><span class="pictos-arrow-10">U</span> ${loginName}</li>
<li><a href="${urls.logout}">Log out</a></li>
@ -51,9 +54,11 @@ ${headScripts.tags}
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</ul>
</nav>
<section id="search">
<fieldset>
<legend>Search form</legend>
<form id="searchForm" action="${urls.search}" name="searchForm">
<#if showFlag1SearchField??>
<select id="search-form-modifier" name="flag1" class="form-item" >
@ -65,54 +70,56 @@ ${headScripts.tags}
</#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>
<a class ="submit" href="javascript:document.searchForm.submit();">Search</a>
<!-- <input class ="submit" name="submit" type="submit" value="Search" /> -->
</div>
</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>
<li><a href="${item.url}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
</#list>
</ul>
</nav>
<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="#" method="post" name="search">
<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>
<a class ="submit" href="#">Search</a>
</div>
</form>
</fieldset>
</section>
</section>
<!-- #intro -->
</section> <!-- #search-home -->
</section> <!-- #intro -->
<section id="log-in">
<h3>Log in</h3>
<form id="log-in-form" action="#" method="post" name="log-in-form" />
<label for="email">Email</label>
<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="email" id="email" type="text" required />
<input name="loginName" id="loginName" type="text" required />
</div>
<label for="password">Password</label>
<label for="loginPassword">Password</label>
<div class="input-field">
<input name="password" id="password" type="password" required />
<input name="loginPassword" id="loginPassword" type="password" required />
</div>
<div id="wrapper-submit-remember-me"> <a class="green button" href="#">Log in</a>
<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>
@ -120,10 +127,15 @@ ${headScripts.tags}
</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>
<div id="request-account">
<a class="blue button" href="#">Request an account</a>
</div>
</section> <!-- #log-in -->
<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>
@ -134,6 +146,7 @@ ${headScripts.tags}
<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">
@ -148,74 +161,80 @@ ${headScripts.tags}
<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>
<img src="${themeDir}/images/visual-graph.jpg" />
</section>
</section><!-- Browse -->
</section> <!-- #browse-classes -->
</section> <!-- #browse -->
<section id="highlights">
<h2>Highlights</h2>
<section id="fearuted-people" class="global-highlights">
<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" />
<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" />
</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 -->
</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>
<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>
<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>
<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> <!-- #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>
<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>
<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>
<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>
<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>
</div>
</section> <!-- #latest-publications -->
</section> <!-- $highlights -->
</div> <!-- #wrapper-content -->
<footer>
<div id="footer-content">
<#if copyright??>
@ -236,9 +255,9 @@ ${headScripts.tags}
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</ul>
</nav>
</div>
</div> <!-- #footer-content -->
</footer>
</div>
</div> <!-- #wrapper -->
${scripts.add("/js/jquery.js")}
${scripts.tags}

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

@ -53,6 +53,7 @@ ${headScripts.tags}
<section id="search">
<fieldset>
<legend>Search form</legend>
<form id="searchForm" action="${urls.search}" name="searchForm">
<#if showFlag1SearchField??>
<select id="search-form-modifier" name="flag1" class="form-item" >
@ -64,7 +65,8 @@ ${headScripts.tags}
</#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>
<a class ="submit" href="javascript:document.searchForm.submit();">Search</a>
</div>
<!-- <input class ="submit" name="submit" type="submit" value="Search" /> -->
</form>
</fieldset>
@ -73,18 +75,14 @@ ${headScripts.tags}
<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>
<li><a href="${item.url}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
</#list>
</ul>
</nav>
<div id="wrapper-content">
<#-- ${body} -->
<#include bodyTemplate>
</div>
</div> <!-- #wrapper-content -->
<footer>
<div id="footer-content">
<#if copyright??>
@ -105,13 +103,13 @@ ${headScripts.tags}
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</ul>
</nav>
</div>
</div> <!-- #footer-content -->
</footer>
</div>
<!--<script type="text/javascript" src="http://use.typekit.com/chp2uea.js"></script>
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>-->
</div> <!-- #wrapper -->
${scripts.add("/js/jquery.js")}
${scripts.tags}
<#include "googleAnalytics.ftl">
</body>
</html>

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

@ -51,9 +51,6 @@
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.
%>
@ -88,13 +85,29 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
<!-- script for enabling new HTML5 semantic markup in IE browsers-->
<%-- ${headScripts.add("/js/html5.js")} --%>
<c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>
<!--[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>
<body ${requestScope.bodyAttr}>
<div id="wrapper">
${ftl_menu}
<div id="wrapper-content">
<c:import url="${bodyJsp}"/>
</div>
${ftl_footer}
</body>