diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java index 47f81f33f..3aa224d4b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java @@ -60,6 +60,46 @@ public class UrlBuilder { } } + public enum Css { + CUSTOM_FORM("/edit/forms/css/customForm.css"), + JQUERY_UI("/js/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css"); + + private final String path; + + Css(String path) { + this.path = path; + } + + public String path() { + return path; + } + + public String toString() { + return path; + } + } + + public enum JavaScript { + CUSTOM_FORM_UTILS("/js/customFormUtils.js"), + JQUERY("/js/jquery.js"), + JQUERY_UI("/js/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"), + UTILS("/js/utils.js"); + + private final String path; + + JavaScript(String path) { + this.path = path; + } + + public String path() { + return path; + } + + public String toString() { + return path; + } + } + public UrlBuilder(Portal portal) { this.portal = portal; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/TabDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/TabDao.java index 697fbe256..af315b01d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/TabDao.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/TabDao.java @@ -76,7 +76,7 @@ public interface TabDao { String getNameForTabId(int tabId); - List getTabHierarcy(int tabId, int rootTab); + List getTabHierarchy(int tabId, int rootTab); int getRootTabId(int portalId); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/TabDaoFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/TabDaoFiltering.java index 66aa3b2b1..35b0750f1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/TabDaoFiltering.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/TabDaoFiltering.java @@ -139,8 +139,8 @@ public class TabDaoFiltering extends BaseFiltering implements TabDao{ /** note not currently filtered */ - public List getTabHierarcy(int tabId, int rootTab) { - return innerDao.getTabHierarcy(tabId, rootTab); + public List getTabHierarchy(int tabId, int rootTab) { + return innerDao.getTabHierarchy(tabId, rootTab); } /** note not currently filtered */ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/TabDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/TabDaoJena.java index 8adde441f..bc3eb62e6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/TabDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/TabDaoJena.java @@ -461,7 +461,7 @@ public class TabDaoJena extends JenaBaseDao implements TabDao { * @param rootTab if > 0 prepend as root * @return List of Integer objects */ - public List getTabHierarcy(int tabId, int rootTab){ + public List getTabHierarchy(int tabId, int rootTab){ List hier = new LinkedList(); hier.add(0,new Integer(tabId)); int current = tabId; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/view/menu/TabMenu.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/view/menu/TabMenu.java index d3be7f761..3f710b86f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/view/menu/TabMenu.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/view/menu/TabMenu.java @@ -34,10 +34,10 @@ public class TabMenu extends MainMenu { List primaryTabs = vreq.getWebappDaoFactory().getTabDao().getPrimaryTabs(portalId); int tabId = TabWebUtil.getTabIdFromRequest(vreq); int rootId = TabWebUtil.getRootTabId(vreq); - List tabLevels = vreq.getWebappDaoFactory().getTabDao().getTabHierarcy(tabId,rootId); + List tabLevels = vreq.getWebappDaoFactory().getTabDao().getTabHierarchy(tabId,rootId); vreq.setAttribute("tabLevels", tabLevels); Iterator primaryTabIterator = primaryTabs.iterator(); - Iterator tabLevelIterator = tabLevels.iterator(); + //Iterator tabLevelIterator = tabLevels.iterator(); Tab tab; while (primaryTabIterator.hasNext()) { tab = (Tab) primaryTabIterator.next(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/BreadCrumbsUtil.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/BreadCrumbsUtil.java index e33a3cf16..635f802aa 100755 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/BreadCrumbsUtil.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/BreadCrumbsUtil.java @@ -51,7 +51,7 @@ public class BreadCrumbsUtil { //get the "RootBreadCrumb" if there is one ret += getRootBreadCrumb(vreq, separator, portal); - List chain = vreq.getWebappDaoFactory().getTabDao().getTabHierarcy(tabId,rootId); + List chain = vreq.getWebappDaoFactory().getTabDao().getTabHierarchy(tabId,rootId); for(int i=0; i