diff --git a/themes/vivo-basic/templates/page-home.ftl b/themes/vivo-basic/templates/page-home.ftl deleted file mode 100644 index 3208bab2..00000000 --- a/themes/vivo-basic/templates/page-home.ftl +++ /dev/null @@ -1,59 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#-- Page template for home page --> - -<#include "doctype.html"> - -<#include "head.ftl"> - - -
- - - - -
-
-

Welcome to VIVO!

- <#-- ${body} --> - <#include bodyTemplate> -
-
- - <#include "footer.ftl"> - -
- - <#include "scripts.ftl"> - - - -<#-- -Three ways to add a stylesheet: - -A. In theme directory: -${stylesheets.addFromTheme("/css/sample.css")} -${stylesheets.add(themeDir + "/css/sample.css")} - -B. Any location -${stylesheets.add("/edit/forms/css/sample.css)"} - -To add a script: - -A. In theme directory: -${scripts.addFromTheme("/css/sample.js")} - -B. Any location -${scripts("/edit/forms/js/sample.js)"} ---> \ No newline at end of file diff --git a/themes/wilma/css/screen.css b/themes/wilma/css/screen.css index 9729d144..2b18b951 100644 --- a/themes/wilma/css/screen.css +++ b/themes/wilma/css/screen.css @@ -23,15 +23,10 @@ VIVO wilma theme: screen styles /* This is our holdover vivo-basic theme file used for transition to wilma theme. This is temporary and it will be removed.*/ @import url("transition/holdover-vivobasic/screen.css"); - - - @import url("reset.css"); @import url("pictos.css"); @import url("wilma.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*/ @import url("../../../css/menupage/menupage.css"); /* we need to call it from the theme until freemarker controller and menupage.ftl are created */ \ No newline at end of file diff --git a/themes/wilma/templates/home.ftl b/themes/wilma/templates/home.ftl new file mode 100644 index 00000000..7a311ac8 --- /dev/null +++ b/themes/wilma/templates/home.ftl @@ -0,0 +1,128 @@ +<#-- $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 index 68a74443..4c472d07 100644 --- a/themes/wilma/templates/login.ftl +++ b/themes/wilma/templates/login.ftl @@ -31,4 +31,6 @@ +${stylesheets.add("/css/login.css")} + diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl index abc1f247..6dd2e59b 100644 --- a/themes/wilma/templates/page-home.ftl +++ b/themes/wilma/templates/page-home.ftl @@ -88,130 +88,8 @@ -
-
-

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

-
-
-
+ ${body} +