litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-646 Initial setup for autocomplete field in authors form.

Browse source 
Fixed typos in TabFilteringTest class and getTabHierarchy method names.
This commit is contained in:
rjy7 2010-06-16 15:33:14 +00:00
parent 09473b4531
commit 2ba28a04a5
8 changed files with 49 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

40
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
View file

@ -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;
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/TabDao.java
View file

@ -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);

4
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/TabDaoFiltering.java
View file

@ -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 */

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/TabDaoJena.java
View file

@ -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;

4
webapp/src/edu/cornell/mannlib/vitro/webapp/view/menu/TabMenu.java
View file

@ -34,10 +34,10 @@ public class TabMenu extends MainMenu {
List<Tab> 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<Tab> primaryTabIterator = primaryTabs.iterator();
Iterator tabLevelIterator = tabLevels.iterator();
//Iterator tabLevelIterator = tabLevels.iterator();
Tab tab;
while (primaryTabIterator.hasNext()) {
tab = (Tab) primaryTabIterator.next();

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/BreadCrumbsUtil.java
View file

@ -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<chain.size(); i++){
Integer id = (Integer)chain.get(i);
if( rootId == id.intValue() ){

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/TabMenu.java
View file

@ -185,7 +185,7 @@ public class TabMenu {
List above = (List)vreq.getAttribute("tabsAboveCurrent");
if( above == null ){
int currentTab = TabWebUtil.getTabIdFromRequest(vreq);
above = vreq.getWebappDaoFactory().getTabDao().getTabHierarcy(currentTab, -1);
above = vreq.getWebappDaoFactory().getTabDao().getTabHierarchy(currentTab, -1);
vreq.setAttribute("tabsAboveCurrent", above);
}
return above;