From 3ee550d0cd018cb347d561d959b54d2bdb20e274 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Tue, 10 May 2011 20:15:55 +0000 Subject: [PATCH] NIHVIVO-2403 Remove tabs from code --- .../WEB-INF/init-data/initialSiteConfig.rdf | 18 +++--------------- productMods/WEB-INF/web.xml | 8 -------- .../siteAdmin/siteAdmin-siteConfiguration.ftl | 4 ---- themes/vivo-basic/templates/menu.ftl | 13 ++----------- 4 files changed, 5 insertions(+), 38 deletions(-) diff --git a/productMods/WEB-INF/init-data/initialSiteConfig.rdf b/productMods/WEB-INF/init-data/initialSiteConfig.rdf index 1c82c6fa..83d5cba2 100644 --- a/productMods/WEB-INF/init-data/initialSiteConfig.rdf +++ b/productMods/WEB-INF/init-data/initialSiteConfig.rdf @@ -4,18 +4,7 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema#" xmlns:j.0="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > - - - - - -1 - <h3>Welcome! You have successfully installed VIVO!</h3> - -<p>Your next step is to <a href="siteAdmin?home=1&login=block">log in</a> and change your password. You can find the login link in the header on the right above.</p> - -<p>Please see the <a href="http://vivoweb.org/support/" target="_blank">support section</a> of the VIVO project web site for help with site administration, manual data input, and data ingest. There is information about the VIVO Ontology, as well as an FAQ and glossary. </p> - Home - + VIVO enabling national networking of scientists @@ -38,6 +27,5 @@ <p>See more information on the <a href="http://vivoweb.org">VIVO Project</a>.</p> themes/wilma/ - - - \ No newline at end of file + + diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml index d8d7f257..8d2fee9e 100644 --- a/productMods/WEB-INF/web.xml +++ b/productMods/WEB-INF/web.xml @@ -1083,14 +1083,6 @@ - - TabController - edu.cornell.mannlib.vitro.webapp.controller.TabController - - - TabController - /index.jsp - HomePageController diff --git a/productMods/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl b/productMods/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl index b8f58a36..a514fd3b 100644 --- a/productMods/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl +++ b/productMods/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl @@ -18,10 +18,6 @@ - <#if currentTheme != "wilma"> <#-- wilma doesn't support tabs --> -
  • Tab management
    • - - <#-- TODO This goes away when the UserAccounts are fully implemented - jblake --> <#if siteConfig.urls.users??>
  • User accounts
    • diff --git a/themes/vivo-basic/templates/menu.ftl b/themes/vivo-basic/templates/menu.ftl index b665f0e2..9db161e2 100644 --- a/themes/vivo-basic/templates/menu.ftl +++ b/themes/vivo-basic/templates/menu.ftl @@ -3,17 +3,8 @@ <#-- Note to UI team: do not change this div without also making the corresponding change in menu.jsp -->