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

Merge r5431 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-22 21:33:32 +00:00
parent 4f3664b905
commit 7758eca11b
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabController.java
View file

@ -52,8 +52,10 @@ public class TabController extends VitroHttpServlet {
Portal portal = vreq.getPortal(); Portal portal = vreq.getPortal();
if (leadingTab.getTabId()==portal.getRootTabId()) if (leadingTab.getTabId()==portal.getRootTabId()) {
request.setAttribute("title",portal.getAppName()); request.setAttribute("homePageRequested", "true");
request.setAttribute("title",portal.getAppName());
}
else else
request.setAttribute("title",leadingTab.getTitle()); request.setAttribute("title",leadingTab.getTitle());

8
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/TabMenu.java
View file

@ -8,6 +8,7 @@ import java.util.List;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.beans.Tab; import edu.cornell.mannlib.vitro.webapp.beans.Tab;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
@ -60,7 +61,12 @@ public class TabMenu extends MainMenu {
private boolean isActiveItem(Tab tab) { private boolean isActiveItem(Tab tab) {
String requestedTabId = vreq.getParameter(TAB_PARAM); String requestedTabId = vreq.getParameter(TAB_PARAM);
return requestedTabId != null && Integer.parseInt(requestedTabId) == tab.getTabId(); int tabId = tab.getTabId();
if (requestedTabId == null) {
return tabId == vreq.getPortal().getRootTabId() && "true".equals(vreq.getAttribute("homePageRequested"));
} else {
return Integer.parseInt(requestedTabId) == tabId;
}
} }
} }