From c48b7d3d0556606700f62508559c14e231fc0ade Mon Sep 17 00:00:00 2001 From: rjy7 Date: Fri, 29 Oct 2010 19:12:42 +0000 Subject: [PATCH] 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. --- themes/wilma/templates/home.ftl | 128 ------------- themes/wilma/templates/login.ftl | 36 ---- themes/wilma/templates/page-home.ftl | 269 +++++++++++++++++++-------- 3 files changed, 196 insertions(+), 237 deletions(-) delete mode 100644 themes/wilma/templates/home.ftl delete mode 100644 themes/wilma/templates/login.ftl diff --git a/themes/wilma/templates/home.ftl b/themes/wilma/templates/home.ftl deleted file mode 100644 index 7a311ac8..00000000 --- a/themes/wilma/templates/home.ftl +++ /dev/null @@ -1,128 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#-- Template for body of home page --> - -
-
-

What is VIVO?

- -

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. More 4

-
-

Search VIVO

- -
- Search form -
-
- - Search -
-
-
-
-
- - <#include "login.ftl"> - -
-

Browse

- - - -
- - -
-

Visual Graph

- -
-
-
- -
-

Highlights

- - - -
-

UPCOMING EVENTS

- -
- -

Understanding Patent Writing

-
- -
- -

Voters, Dictators, and Peons

-
- -
- -

Proton-Coupled Electron Transfer II

-
- -

View All 4

-
- -
-

LATEST PUBLICATIONS

- -
-

Solar massesJournal

-
- -
-

Link data and the WebArticle

-
- -
-

Building a communityBook

-
- -
-

Biology 101Series

-
- -

View All 4

-
-
-
\ No newline at end of file diff --git a/themes/wilma/templates/login.ftl b/themes/wilma/templates/login.ftl deleted file mode 100644 index 4c472d07..00000000 --- a/themes/wilma/templates/login.ftl +++ /dev/null @@ -1,36 +0,0 @@ -<#-- $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??> - -
-

Log in

- -
- -
- -
- -
- -
-
- -
- - -
-
-

Forgot your password?

-
- - -
- -${stylesheets.add("/css/login.css")} - - diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl index 6dd2e59b..8795b2a9 100644 --- a/themes/wilma/templates/page-home.ftl +++ b/themes/wilma/templates/page-home.ftl @@ -1,13 +1,15 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#import "lib-list.ftl" as l> +<#import "widget-login.ftl" as login> ${title} - + <@login.styles /> + ${stylesheets.addFromTheme("/css/screen.css")} ${stylesheets.tags} ${headScripts.add("/js/html5.js")} @@ -29,91 +31,212 @@ -
- - +
+ + - - - - -
- + + +
- ${body} + - + ${scripts.add("/js/jquery.js")} ${scripts.tags} - + <#include "googleAnalytics.ftl">