From 1777aec82c656ca2828e96bca3b5f4caee8ad0b8 Mon Sep 17 00:00:00 2001 From: cappadona Date: Fri, 27 May 2011 19:35:46 +0000 Subject: [PATCH] NIHVIVO-2306 Changed default theme to vitro and updated default label to "vitro". --- .../vitro/webapp/servlet/setup/DefaultThemeSetup.java | 7 ++----- .../vitro/webapp/utils/jena/InitialJenaModelUtils.java | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/DefaultThemeSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/DefaultThemeSetup.java index 48cea30ca..dc953a0b6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/DefaultThemeSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/DefaultThemeSetup.java @@ -26,11 +26,8 @@ public class DefaultThemeSetup implements ServletContextListener { ArrayList themeNames = ThemeUtils.getThemes(sc, doSort); String defaultTheme; - if (themeNames.contains("enhanced")) { - defaultTheme = "enhanced"; - } - else if (themeNames.contains("default")) { - defaultTheme = "default"; + if (themeNames.contains("vitro")) { + defaultTheme = "vitro"; } else { defaultTheme = themeNames.get(0); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/InitialJenaModelUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/InitialJenaModelUtils.java index 137d43349..f3d02a743 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/InitialJenaModelUtils.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/InitialJenaModelUtils.java @@ -88,7 +88,7 @@ public class InitialJenaModelUtils { throw new RuntimeException("No default theme has been set; unable to create default portal."); } portal1.setPropertyValue(themeDirProperty,ResourceFactory.createPlainLiteral(defaultThemeStr)); - portal1.setLabel("New Vitro Portal", null); + portal1.setLabel("Vitro", null); return essentialInterfaceData; }