litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
vivo/themes/wilma/templates/page-home.ftl

126 lines
6.5 KiB
Text
Raw Normal View History

NIHVIVO-555, NIHVIVO-559. Introducing new default VIVO theme. Work in progress.
2010-10-06 14:16:12 +00:00
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
NIHVIVO-1293 Corrected typo in variable name to show classgroup limitation on search results. Also added search.css from vivo-basic, as a temporary measure to format search results.
2010-10-28 20:16:17 +00:00
NIHVIVO-592 Updated allClassGroups macro so Brian Caruso can review needed improvements to facilitate browse on home page (work in progress)
2011-01-12 15:46:44 +00:00
<@widget name="login" include="assets" />
Combine addition of scripts and stylesheets into a single macro in the login widget
2010-11-03 02:30:34 +00:00
Further development of Wilma theme, still include a lot of temporary files and directories. There are duplicated files, wrong file image location, still a work in progress.
2010-10-25 18:43:26 +00:00
<!DOCTYPE html>
<html lang="en">
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
2010-10-27 13:21:55 +00:00
<head>
NIHVIVO-1389 NIHVIVO-1407 NIHVIVO-1437 Significant refactoring of templates both in vitro core and vivo themes to ensure consistent markup with 3 different base templates at play (page.ftl, basicPage.jsp and formPrefix/formSuffix.jsp) Resulted in creating smaller component freemarker templates that could be included by all of the base templates, whether ftl or jsp. This is a temporary compromise while we continue our conversion to Freemarker. The goal was to keep jsp files outside of the theme and working behind the scenes.
2010-12-08 14:04:45 +00:00
<#include "head.ftl">
NIHVIVO-1495: Integrated initial prototype of visual graph using Raphael library in page-home.ftl
2010-12-09 19:04:27 +00:00
<script type="text/javascript" src="${themeDir}/js/jquery_plugins/raphael/raphael.js"></script>
<script type="text/javascript" src="${themeDir}/js/jquery_plugins/raphael/pie.js"></script>
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
2010-10-27 13:21:55 +00:00
</head>
<body>
NIHVIVO-1389 NIHVIVO-1407 NIHVIVO-1437 Significant refactoring of templates both in vitro core and vivo themes to ensure consistent markup with 3 different base templates at play (page.ftl, basicPage.jsp and formPrefix/formSuffix.jsp) Resulted in creating smaller component freemarker templates that could be included by all of the base templates, whether ftl or jsp. This is a temporary compromise while we continue our conversion to Freemarker. The goal was to keep jsp files outside of the theme and working behind the scenes.
2010-12-08 14:04:45 +00:00
<#include "identity.ftl">
A new approach to widgets, that will allow them to be invoked directly from a page template, rather than a body template, but still add files to the template stylesheets and scripts objects.
2010-10-29 19:12:42 +00:00
NIHVIVO-1389 NIHVIVO-1407 NIHVIVO-1437 Significant refactoring of templates both in vitro core and vivo themes to ensure consistent markup with 3 different base templates at play (page.ftl, basicPage.jsp and formPrefix/formSuffix.jsp) Resulted in creating smaller component freemarker templates that could be included by all of the base templates, whether ftl or jsp. This is a temporary compromise while we continue our conversion to Freemarker. The goal was to keep jsp files outside of the theme and working behind the scenes.
2010-12-08 14:04:45 +00:00
<#include "menu.ftl">
NIHVIVO-151. Display the DisplayMessage on the next page loaded. Clear the message from the session. Added sample display markup to page templates.
2010-11-16 19:09:05 +00:00
NIHVIVO-556: Added aria roles for accessibility
2010-11-17 15:34:38 +00:00
<section id="intro" role="region">
New heading and text on the home page
2011-01-14 16:35:54 +00:00
<h2>Welcome to VIVO</h2>
<p>VIVO is a research-focused discovery tool that enables collaboration among scientists across all disciplines.
<br /><br />Browse or search information on people, departments, courses, grants, and publications.</p>
NIHVIVO-556: Added aria roles for accessibility
2010-11-17 15:34:38 +00:00
<section id="search-home" role="region">
NIHVIVO-556: put code back to r-1581
2010-11-12 18:52:40 +00:00
<h3>Search VIVO</h3>
<fieldset>
<legend>Search form</legend>
NIHVIVO-1361: Added style alert message for Log out users, alert message for users trying to edit VIVO content without having javaScript enable, made more prominent icon profile for when user logins in top header navigation bar, cleaned up widget-login.ftl semantic markup and css on VITRO and Willma theme.
2010-11-29 18:31:10 +00:00
<form id="search-home-vivo" action="${urls.search}" method="post" name="search-home" role="search">
NIHVIVO-1433: Fixed search for interior pages.
2010-11-24 20:05:03 +00:00
<#if user.showFlag1SearchField>
NIHVIVO-1439: Fixed search in home page. Cleaned the javascript calls to trigger the search forms in home and interior pages.
2010-11-29 16:35:01 +00:00
<select id="search-form-modifier" name="flag1" class="form-item" >
NIHVIVO-1433: Fixed search for interior pages.
2010-11-24 20:05:03 +00:00
<option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
<option value="${portalId}">${siteTagline!}</option>
</select>
<#else>
NIHVIVO-1439: Fixed search in home page. Cleaned the javascript calls to trigger the search forms in home and interior pages.
2010-11-29 16:35:01 +00:00
<input type="hidden" name="flag1" value="${portalId}" />
NIHVIVO-1433: Fixed search for interior pages.
2010-11-24 20:05:03 +00:00
</#if>
NIHVIVO-556: put code back to r-1581
2010-11-12 18:52:40 +00:00
<div id="search-home-field">
NIHVIVO-1439: Fixed search in home page. Cleaned the javascript calls to trigger the search forms in home and interior pages.
2010-11-29 16:35:01 +00:00
<input type="text" name="querytext" class="search-home-vivo" value="${querytext!}" />
<input type="submit" value="Search" class="submit">
NIHVIVO-556: put code back to r-1581
2010-11-12 18:52:40 +00:00
</div>
</form>
</fieldset>
</section> <!-- #search-home -->
</section> <!-- #intro -->
Use login widget on login page (committing files that got skipped in r6451). Add help() method to WidgetDirective.
2010-11-16 15:10:12 +00:00
NIHVIVO-556: Making name selectors and markup consistent (using dash in between words VS camel notation), adding more aria roles, shortening selector names, just continuing cleaning markup for templates and optimizing css files.
2010-11-24 18:26:04 +00:00
<@widget name="login" />
NIHVIVO-592 Updated allClassGroups macro so Brian Caruso can review needed improvements to facilitate browse on home page (work in progress)
2011-01-12 15:46:44 +00:00
<@widget name="browse" />
NIHVIVO-556: Making name selectors and markup consistent (using dash in between words VS camel notation), adding more aria roles, shortening selector names, just continuing cleaning markup for templates and optimizing css files.
2010-11-24 18:26:04 +00:00
NIHVIVO-556: Added aria roles for accessibility
2010-11-17 15:34:38 +00:00
<section id="browse" role="region">
NIHVIVO-556. Organized and clean up html header elements and used HEX colors for the all the Wilma css files.
2010-11-08 18:08:10 +00:00
<h4>Browse</h4>
A new approach to widgets, that will allow them to be invoked directly from a page template, rather than a body template, but still add files to the template stylesheets and scripts objects.
2010-10-29 19:12:42 +00:00
NIHVIVO-556: Making name selectors and markup consistent (using dash in between words VS camel notation), adding more aria roles, shortening selector names, just continuing cleaning markup for templates and optimizing css files.
2010-11-24 18:26:04 +00:00
<ul id="browse-classgroups" role="list">
<li role="listitem"><a class="selected" href="#">People<span class="count-classes"> (1,280)</span></a></li>
<li role="listitem"><a href="#">Courses<span class="count-classes"> (1,300)</span></a></li>
<li role="listitem"><a href="#">Activities<span class="count-classes"> (980)</span></a></li>
<li role="listitem"><a href="#">Topics<span class="count-classes"> (345)</span></a></li>
<li role="listitem"><a href="#">Events<span class="count-classes"> (670)</span></a></li>
<li role="listitem"><a href="#">Organizations<span class="count-classes"> (440)</span></a></li>
<li role="listitem"><a href="#">Publications<span class="count-classes"> (670)</span></a></li>
<li role="listitem"><a href="#">Locations<span class="count-classes"> (903)</span></a></li>
A new approach to widgets, that will allow them to be invoked directly from a page template, rather than a body template, but still add files to the template stylesheets and scripts objects.
2010-10-29 19:12:42 +00:00
</ul>
NIHVIVO-556: Added aria roles for accessibility
2010-11-17 15:34:38 +00:00
<section id="browse-classes" role="navigation">
A new approach to widgets, that will allow them to be invoked directly from a page template, rather than a body template, but still add files to the template stylesheets and scripts objects.
2010-10-29 19:12:42 +00:00
<nav>
NIHVIVO-1361: Added style alert message for Log out users, alert message for users trying to edit VIVO content without having javaScript enable, made more prominent icon profile for when user logins in top header navigation bar, cleaned up widget-login.ftl semantic markup and css on VITRO and Willma theme.
2010-11-29 18:31:10 +00:00
<ul id="classgroup-list" role="list">
NIHVIVO-1495: Matched amount of individuals with pie chart data
2010-12-10 20:28:41 +00:00
<li role="listitem"><a href="#">Faculty Member<span class="count-individuals"> (4,611)</span></a></li>
<li role="listitem"><a href="#">Graduate Student<span class="count-individuals"> (2,550)</span></a></li>
<li role="listitem"><a href="#">Librarian <span class="count-individuals"> (425)</span></a></li>
<li role="listitem"><a href="#">Non-Academic <span class="count-individuals"> (580)</span></a></li>
NIHVIVO-556: Making name selectors and markup consistent (using dash in between words VS camel notation), adding more aria roles, shortening selector names, just continuing cleaning markup for templates and optimizing css files.
2010-11-24 18:26:04 +00:00
<li role="listitem"><a href="#">Non-Faculty Academic <span class="count-individuals"> (2,380)</span></a></li>
NIHVIVO-1495: Matched amount of individuals with pie chart data
2010-12-10 20:28:41 +00:00
<li role="listitem"><a href="#">Postdoc <span class="count-individuals"> (923)</span></a></li>
<li role="listitem"><a href="#">Professor Emeritus<span class="count-individuals"> (430)</span></a></li>
<li role="listitem"><a class="selected" href="#">Undergraduate Student<span class="count-individuals"> (12,356)</span></a></li>
A new approach to widgets, that will allow them to be invoked directly from a page template, rather than a body template, but still add files to the template stylesheets and scripts objects.
2010-10-29 19:12:42 +00:00
</ul>
</nav>
NIHVIVO-556: Added aria roles for accessibility
2010-11-17 15:34:38 +00:00
<section id="visual-graph" role="region">
A new approach to widgets, that will allow them to be invoked directly from a page template, rather than a body template, but still add files to the template stylesheets and scripts objects.
2010-10-29 19:12:42 +00:00
<h4>Visual Graph</h4>
NIHVIVO-1495: Integrated initial prototype of visual graph using Raphael library in page-home.ftl
2010-12-09 19:04:27 +00:00
<table>
<tr>
<th>Faculty Member</th>
<td>19%</td>
</tr>
<tr>
<th>Graduate Student</th>
<td>10%</td>
</tr>
<tr>
<th>Librarian</th>
<td>2%</td>
</tr>
<tr>
<th>Non-Academic</th>
<td>3%</td>
</tr>
<tr>
<th>Non-Faculty Academic</th>
<td>9%</td>
</tr>
<tr>
<th>Postdoc</th>
<td>4%</td>
</tr>
<tr>
<th>Professor Emeritus</th>
<td>2%</td>
</tr>
<tr>
<th>Undergraduate Student</th>
<td>51%</td>
</tr>
</table>
<section id="pieViz" role="region"></section>
A new approach to widgets, that will allow them to be invoked directly from a page template, rather than a body template, but still add files to the template stylesheets and scripts objects.
2010-10-29 19:12:42 +00:00
</section>
</section> <!-- #browse-classes -->
</section> <!-- #browse -->
NIHVIVO-556: Added aria roles for accessibility
2010-11-17 15:34:38 +00:00
NIHVIVO-1389 NIHVIVO-1407 NIHVIVO-1437 Significant refactoring of templates both in vitro core and vivo themes to ensure consistent markup with 3 different base templates at play (page.ftl, basicPage.jsp and formPrefix/formSuffix.jsp) Resulted in creating smaller component freemarker templates that could be included by all of the base templates, whether ftl or jsp. This is a temporary compromise while we continue our conversion to Freemarker. The goal was to keep jsp files outside of the theme and working behind the scenes.
2010-12-08 14:04:45 +00:00
<#include "footer.ftl">
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
2010-10-27 13:21:55 +00:00
</body>
Further development of Wilma theme, still include a lot of temporary files and directories. There are duplicated files, wrong file image location, still a work in progress.
2010-10-25 18:43:26 +00:00
</html>
Reference in a new issue Copy permalink