From 4386a22da0790773aa59ddc8ac80f27889b8ed93 Mon Sep 17 00:00:00 2001 From: nac26 Date: Thu, 28 Oct 2010 16:45:05 +0000 Subject: [PATCH] NIHVIVO-556 removed temporary homeBody.jsp used to render the home page while the controllers were being worked out. Also including login block (login.ftl) on page-home.ftl now. First stab at making this widget like. Would like to remove login.ftl from theme and place in vitro core. --- themes/wilma/css/screen.css | 14 +- themes/wilma/templates/body/homeBody.jsp | 157 ----------------------- themes/wilma/templates/page-home.ftl | 27 +--- 3 files changed, 11 insertions(+), 187 deletions(-) delete mode 100644 themes/wilma/templates/body/homeBody.jsp diff --git a/themes/wilma/css/screen.css b/themes/wilma/css/screen.css index fb04a810..9729d144 100644 --- a/themes/wilma/css/screen.css +++ b/themes/wilma/css/screen.css @@ -2,15 +2,21 @@ /**************************************** **************************************** -. .._.. ..__. -\ / | \ /| | - \/ _|_ \/ |__| + __ __ __ __ __ ___ + /\ \/\ \\/\ \/\ \/\ \ / __`\ + \ \ \_/ |\ \ \ \ \_/ |/\ \L\ \ + \ \___/ \ \_\ \___/ \ \____/ + \/__/ \/_/\/__/ \/___/ + -VIVO theme: screen styles +VIVO wilma theme: screen styles Original version 2010-09-04 UI team + Last updated + 2010-10-28 + ***************************************** *****************************************/ diff --git a/themes/wilma/templates/body/homeBody.jsp b/themes/wilma/templates/body/homeBody.jsp deleted file mode 100644 index 1cc71c59..00000000 --- a/themes/wilma/templates/body/homeBody.jsp +++ /dev/null @@ -1,157 +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 --%> - -<%@ 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; -%> - - - - - - - - -
-

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 -
-
-
-
-
- -<%-- Couldn't get the login to work on the home page after refactoring in JSP/FTL mashup world, so disabling for now --%> -<%-- ${ftl_login} --%> - -
-

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/page-home.ftl b/themes/wilma/templates/page-home.ftl index c8acc4ff..99d57f8e 100644 --- a/themes/wilma/templates/page-home.ftl +++ b/themes/wilma/templates/page-home.ftl @@ -106,32 +106,7 @@ -
-

Log in

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

Forgot your password?

-
- - -
+ <#include "login.ftl">

Browse