diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java index 68eed2dde..d307fef1f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java @@ -32,8 +32,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route; import edu.cornell.mannlib.vitro.webapp.utils.StringUtils; import edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil; import edu.cornell.mannlib.vitro.webapp.web.PortalWebUtil; -import edu.cornell.mannlib.vitro.webapp.web.templatemodels.filelist.ScriptList; -import edu.cornell.mannlib.vitro.webapp.web.templatemodels.filelist.StylesheetList; +import edu.cornell.mannlib.vitro.webapp.web.templatemodels.files.Scripts; +import edu.cornell.mannlib.vitro.webapp.web.templatemodels.files.Stylesheets; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.menu.TabMenu; import freemarker.cache.ClassTemplateLoader; import freemarker.cache.FileTemplateLoader; @@ -259,7 +259,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { BeansWrapper wrapper = new DefaultObjectWrapper(); try { // Here themeDir SHOULD NOT have the context path already added to it. - return wrapper.wrap(new StylesheetList(themeDir)); + return wrapper.wrap(new Stylesheets(themeDir)); } catch (TemplateModelException e) { log.error("Error creating stylesheet TemplateModel"); return null; @@ -273,7 +273,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { // add stylesheets and scripts to the lists by calling their add() methods. BeansWrapper wrapper = new DefaultObjectWrapper(); try { - return wrapper.wrap(new ScriptList(themeDir)); + return wrapper.wrap(new Scripts(themeDir)); } catch (TemplateModelException e) { log.error("Error creating script TemplateModel"); return null; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java index 06a40cb75..0aaddb2d1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.Map; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHelper; -import edu.cornell.mannlib.vitro.webapp.web.templatemodels.filelist.StylesheetList; +import edu.cornell.mannlib.vitro.webapp.web.templatemodels.files.Stylesheets; import freemarker.core.Environment; import freemarker.template.Configuration; import freemarker.template.SimpleDate; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/filelist/FileList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Files.java similarity index 77% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/filelist/FileList.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Files.java index 800f3fb9d..7d47887c8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/filelist/FileList.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Files.java @@ -1,28 +1,26 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.web.templatemodels.filelist; +package edu.cornell.mannlib.vitro.webapp.web.templatemodels.files; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import java.util.LinkedHashSet; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel; -public abstract class FileList extends BaseTemplateModel { +public abstract class Files extends BaseTemplateModel { - protected List list = null; + protected LinkedHashSet list = null; private String themeDir = null; - public FileList() { - this.list = new ArrayList(); + public Files() { + this.list = new LinkedHashSet(); } - public FileList(String themeDir) { + public Files(String themeDir) { this(); this.themeDir = themeDir; } - public FileList(List list) { + public Files(LinkedHashSet list) { this.list = list; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/filelist/ScriptList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Scripts.java similarity index 79% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/filelist/ScriptList.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Scripts.java index 082ee5458..d6436e585 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/filelist/ScriptList.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Scripts.java @@ -1,14 +1,14 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.web.templatemodels.filelist; +package edu.cornell.mannlib.vitro.webapp.web.templatemodels.files; -public class ScriptList extends FileList { +public class Scripts extends Files { protected static final String THEME_SUBDIR = "/js"; - public ScriptList() { } + public Scripts() { } - public ScriptList(String themeDir) { + public Scripts(String themeDir) { super(themeDir); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/filelist/StylesheetList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Stylesheets.java similarity index 77% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/filelist/StylesheetList.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Stylesheets.java index 0b42b5ef1..24f0b3892 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/filelist/StylesheetList.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Stylesheets.java @@ -1,14 +1,14 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.web.templatemodels.filelist; +package edu.cornell.mannlib.vitro.webapp.web.templatemodels.files; -public class StylesheetList extends FileList { +public class Stylesheets extends Files { protected static final String THEME_SUBDIR = "/css"; - public StylesheetList() { } + public Stylesheets() { } - public StylesheetList(String themeDir) { + public Stylesheets(String themeDir) { super(themeDir); } diff --git a/webapp/web/css/dump.css b/webapp/web/css/dump.css index 3204e889f..8f68fafcc 100644 --- a/webapp/web/css/dump.css +++ b/webapp/web/css/dump.css @@ -4,7 +4,7 @@ .dump { border-top: 1px solid #ccc; - border-bottom: 1px solid #ccc; + border-bottom: 2px solid #ccc; padding: 1em 0; margin: 1em 0; }