Author: woonsan
Date: Wed Feb 17 11:01:02 2010
New Revision: 910913
URL: http://svn.apache.org/viewvc?rev=910913&view=rev
Log:
JS2-1057: Fixing styling in page navigator
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp?rev=910913&r1=910912&r2=910913&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
Wed Feb 17 11:01:02 2010
@@ -87,7 +87,9 @@
out.write("</ul>");
out.write("\n");
- }
+ }
+
+ out.write("</li>");
}
else if (MenuElement.OPTION_ELEMENT_TYPE.equals(type))
{
@@ -116,71 +118,61 @@
%>
<form id='jsPages' method="POST" action='<portlet:actionURL/>'>
-<table>
- <tr>
- <td class="portlet-section-body"><b><fmt:message
key="spaces.pages.label.space.title"><fmt:param
value="${space.title}"/></fmt:message></b></td>
- </tr>
- <tr>
- <td class="portlet-section-body">
- <ul id="<portlet:namespace/>pageNavMenu" class="navmenu">
+ <div class="portlet-section-text">
+ <h3><a href="#"><fmt:message
key="spaces.pages.label.space.title"><fmt:param
value="${space.title}"/></fmt:message></a></h3>
+ <ul id="<portlet:namespace/>pageNavMenu" class="navmenu">
<%
for (MenuElement element : menuElements)
{
printMenuItem(element, 0, out, renderRequest, renderResponse, rc, space,
pageNavigator);
}
%>
- </ul>
- </td>
- </tr>
+ </ul>
<%
if (!linkElements.isEmpty())
{
%>
- <tr>
- <th class="portlet-section-header" colspan="1"></th>
- </tr>
- <tr>
- <td class="portlet-section-body">
- <ul id="<portlet:namespace/>pageNavLinks" class="navmenu">
+ <ul id="<portlet:namespace/>pageNavLinks" class="navmenu">
<%
for (MenuElement element : linkElements)
{
printMenuItem(element, 0, out, renderRequest, renderResponse, rc,
space, pageNavigator);
}
%>
- </ul>
- </td>
- </tr>
+ </ul>
<%
}
%>
- <tr>
- <th class="portlet-section-header" colspan="1"></th>
- </tr>
-
+ </div>
<%
-Object princ2 = renderRequest.getUserPrincipal();
-if (princ2 != null) {
+if (renderRequest.getUserPrincipal() != null) {
%>
+ <table style="border-collapse: collapse; width: 100%; margin-top: 0px;
margin-bottom: 0px; float: left;">
<tr>
- <td class="portlet-section-subheader">
- <input type="text" name="addPage" size="15" value="" ><input
type="submit" value="<fmt:message key='spaces.pages.label.add'/>" />
+ <th class="portlet-section-header"></th>
+ </tr>
+ <tr>
+ <td class="portlet-section-body">
+ <input type="text" name="addPage" class="portlet-form-input-field"
size="15" value="" ><input type="submit" value="<fmt:message
key='spaces.pages.label.add'/>" />
</td>
</tr>
<tr>
- <td class="portlet-section-subheader">
- <fmt:message key="spaces.pages.label.template"/>:
- <select name="templatePage">
- <c:forEach items="${templatePages}" var="templatePage">
- <option
value="${templatePage.path}">${templatePage.title}</option>
- </c:forEach>
- </select>
+ <td class="portlet-section-body">
+ <fmt:message key="spaces.pages.label.template"/>:
+ <select name="templatePage" class="portlet-form-field">
+ <c:forEach items="${templatePages}" var="templatePage">
+ <option value="${templatePage.path}">${templatePage.title}</option>
+ </c:forEach>
+ </select>
</td>
</tr>
+ <tr>
+ <th class="portlet-section-header"></th>
+ </tr>
+ </table>
<%
}
%>
-</table>
</form>
<script language="javascript">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
