Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

GTNPORTAL-2845: fix issue where submenu's were always being displayed…

…, caused by a bad auto formatting.
  • Loading branch information...
commit 0aa56a5422a78c13e6da1428c52d870e5ff4d993 1 parent fd86ca3
@mwringe mwringe authored bdaw committed
View
7 mobile-integration/portlets/navigation/src/main/webapp/css/ResponsiveStylesheet.css
@@ -43,8 +43,9 @@
display: block;
}
-.gtnResponsiveNavigationPortlet .menuitem.collapsed .submenu,.gtnResponsiveNavigationPortlet .collapsibleRow.collapsed>.collapsibleContent:not
- (.display ),.gtnResponsiveNavigationPortlet .menuitem.close>.submenu {
+.gtnResponsiveNavigationPortlet .menuitem.collapsed .submenu,
+.gtnResponsiveNavigationPortlet .collapsibleRow.collapsed>.collapsibleContent:not(.display),
+.gtnResponsiveNavigationPortlet .menuitem.close>.submenu {
display: none;
}
@@ -202,7 +203,7 @@
margin-left: 0;
}
- .gtnResponsiveNavigationPortlet .topmenu>.multilevel>.submenu:not(.inverse)) {
+ .gtnResponsiveNavigationPortlet .topmenu>.multilevel>.submenu:not(.inverse) {
right: 0;
left: auto;
}
View
3  mobile-integration/portlets/navigation/src/main/webapp/jsp/navigation.jsp
@@ -9,8 +9,7 @@
<c:set var="resourceBundle" value="${portletConfig.getResourceBundle(renderRequest.locale)}" />
<div id="id<portlet:namespace/>_gtnResponsiveNavigationPortlet" class="gtnResponsiveNavigationPortlet ">
<%-- Button opening the navigation for small screen devices or very long navigation--%>
- <a class="collapsibleToggle" href="#"><span class="show">${resourceBundle.getString("label.show")}</span><span
- class="hide">${resourceBundle.getString("label.hide")}</span></a>
+ <a class="collapsibleToggle" href="#"><span class="show">${resourceBundle.getString("label.show")}</span><span class="hide">${resourceBundle.getString("label.hide")}</span></a>
<%-- Render the main menu, if nodes are available --%>
<c:if test="${fn:length(navigationRootNode.children) > 0}">
<c:set var="parentNode" value="${navigationRootNode}" scope="request" />
View
14 mobile-integration/portlets/navigation/src/main/webapp/jsp/node.jsp
@@ -8,13 +8,10 @@
<c:set var="resourceBundle" value="${portletConfig.getResourceBundle(renderRequest.locale)}" />
<%-- Using the comment tag hack to get rid of the whitespace --%>
-<ol class="${menuType} collapsibleContent">
- <!--
+<ol class="${menuType} collapsibleContent"><!--
<c:forEach var="child" items="${parentNode.children}">
<c:if test="${(child.page || child.menuCategory) && !child.system}">
- -->
- <li
- class="menuitem close <c:if test='${child.active}'>active</c:if> <c:if test='${(child.menuCategory) && (child.page)}'> multilevel</c:if>">
+ --><li class="menuitem close <c:if test='${child.active}'>active</c:if> <c:if test='${(child.menuCategory) && (child.page)}'> multilevel</c:if>">
<c:choose>
<%-- Node is a clickable page and contains children nodes --%>
<c:when test="${child.page && child.menuCategory}">
@@ -33,13 +30,14 @@
<c:otherwise>
</c:otherwise>
- </c:choose> <%-- Render a submenu if available --%> <c:if test='${child.menuCategory}'>
+ </c:choose>
+ <%-- Render a submenu if available --%>
+ <c:if test='${child.menuCategory}'>
<c:set var="parentNode" value="${child}" scope="request" />
<c:set var="menuType" value="submenu" scope="request" />
<jsp:include page="node.jsp" />
</c:if>
- </li>
- <!--
+ </li><!--
</c:if>
</c:forEach>
-->
Please sign in to comment.
Something went wrong with that request. Please try again.