Author: chris.laprun(a)jboss.com
Date: 2007-03-17 21:30:33 -0400 (Sat, 17 Mar 2007)
New Revision: 6729
Modified:
trunk/core-admin/src/bin/portal-admin-war/style.css
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml
Log:
- Fixed off by one error in pagination.
- Display "Unnamed" if no name was provided for the portlet in the wizard (this
is the case with Oracle's public producer...).
- Add portlet description as title in td for the portlet selection (hovering above the
link will display it).
- Improved highlighting of selected in pagination.
Modified: trunk/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-03-18 00:50:12 UTC (rev
6728)
+++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-03-18 01:30:33 UTC (rev
6729)
@@ -33,6 +33,9 @@
.admin-ui ul.pagination li.selected {
font-weight: bold;
+ background-color: #eef;
+ border: 1px solid black;
+ border-bottom: 3px solid black;
}
.pagination a, .pagination a:visited, .pagination a:hover {
@@ -59,11 +62,11 @@
margin-left: 5px;
border: 1px solid #777;
border-bottom: none;
- background-color: #EEEEFF;
+ background-color: #eef;
}
.admin-ui ul.topnav li a:hover {
- background-color: #CCCCFF;
+ background-color: #ccf;
}
.admin-ui ul.topnav li#currentTab a {
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-03-18
00:50:12 UTC (rev 6728)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-03-18
01:30:33 UTC (rev 6729)
@@ -8,103 +8,106 @@
<ui:composition template="instancesTemplate.xhtml">
- <ui:define name="content">
+ <ui:define name="content">
- <h:form>
+ <h:form>
- <table id="instancesTable2" width="100%">
- <thead class="portlet-section-header">
- <tr>
- <th>Id</th>
- <th>Actions</th>
- </tr>
- </thead>
- <tbody>
- <c:forEach items="#{instancemgr.selectedInstances}"
var="instance" varStatus="status">
- <tr class="#{instance.id == instancemgr.selectedId ?
'portlet-section-selected' : (status.index % 2 == 0 ?
'portlet-section-body' : 'portlet-section-alternate')}">
- <td>
- <h:commandLink
action="#{instancemgr.selectInstance}">
- <h:outputText value="#{instance.id}"/>
- <f:param name="id"
value="#{instance.id}"/>
- <f:param name="plugin" value="info"/>
- </h:commandLink>
- </td>
- <td>
- <h:commandLink
action="#{instancemgr.selectInstance}">
- <h:outputText value="Preferences"/>
- <f:param name="id"
value="#{instance.id}"/>
- <f:param name="plugin"
value="preferences"/>
- </h:commandLink> | <h:commandLink
action="#{instancemgr.selectInstance}">
- <h:outputText value="Security"/>
- <f:param name="id"
value="#{instance.id}"/>
- <f:param name="plugin"
value="security"/>
- </h:commandLink> | <h:commandLink
action="#{instancemgr.deleteInstance}">
- <h:outputText value="Destroy"/>
- <f:param name="id"
value="#{instance.id}"/>
- </h:commandLink>
- </td>
- </tr>
- </c:forEach>
- </tbody>
- </table>
- <ul class="pagination">
- <c:forEach begin="0" end="#{instancemgr.instanceCount}"
step="#{instancemgr.paginationSize}" var="index">
- <li class="#{index == instancemgr.selectedFrom ? 'selected' :
''}">
- <h:commandLink
action="#{instancemgr.selectFrom}"><f:param name="from"
value="#{index}"/><h:outputText
value="#{index}"/></h:commandLink>
- </li>
- </c:forEach>
- </ul>
+ <table id="instancesTable2" width="100%">
+ <thead class="portlet-section-header">
+ <tr>
+ <th>Id</th>
+ <th>Actions</th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach items="#{instancemgr.selectedInstances}"
var="instance" varStatus="status">
+ <tr
+ class="#{instance.id == instancemgr.selectedId ?
'portlet-section-selected' : (status.index % 2 == 0 ?
'portlet-section-body' : 'portlet-section-alternate')}">
+ <td>
+ <h:commandLink
action="#{instancemgr.selectInstance}">
+ <h:outputText value="#{instance.id}"/>
+ <f:param name="id"
value="#{instance.id}"/>
+ <f:param name="plugin"
value="info"/>
+ </h:commandLink>
+ </td>
+ <td>
+ <h:commandLink
action="#{instancemgr.selectInstance}">
+ <h:outputText value="Preferences"/>
+ <f:param name="id"
value="#{instance.id}"/>
+ <f:param name="plugin"
value="preferences"/>
+ </h:commandLink> | <h:commandLink
action="#{instancemgr.selectInstance}">
+ <h:outputText value="Security"/>
+ <f:param name="id"
value="#{instance.id}"/>
+ <f:param name="plugin"
value="security"/>
+ </h:commandLink> | <h:commandLink
action="#{instancemgr.deleteInstance}">
+ <h:outputText value="Destroy"/>
+ <f:param name="id"
value="#{instance.id}"/>
+ </h:commandLink>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+ <ul class="pagination">
+ <c:forEach begin="0" end="#{instancemgr.instanceCount -
1}" step="#{instancemgr.paginationSize}"
+ var="index">
+ <li class="#{index == instancemgr.selectedFrom ?
'selected' : ''}">
+ <h:commandLink
action="#{instancemgr.selectFrom}"><f:param name="from"
value="#{index}"/><h:outputText
+ value="#{index}"/></h:commandLink>
+ </li>
+ </c:forEach>
+ </ul>
- </h:form>
+ </h:form>
- <c:if test="#{instancemgr.selectedPlugin != null}">
-
- <hr/>
+ <c:if test="#{instancemgr.selectedPlugin != null}">
- <c:if test="#{instancemgr.selectedPlugin == 'info'}">
- <c:choose>
- <c:when test="#{instancemgr.selectedInstance.portlet !=
null}">
- <h3>Portlet details
- </h3>
- <h:form>
- <h:commandLink
- action="#{portletmgr.selectPortlet}">
- <f:param name="id"
value="#{instancemgr.selectedInstance.portlet.context.id}"/>
- <f:param name="plugin" value="manager"/>
- Show
- </h:commandLink> the associated portlet
- </h:form>
- <ui:include src="common/showPortletDetails.xhtml">
- <ui:param name="portlet"
value="#{instancemgr.selectedInstance.portlet}"/>
- </ui:include>
- </c:when>
- <c:otherwise>
- <h3>Portlet details</h3>
- The associated portlet is not available
- </c:otherwise>
- </c:choose>
- </c:if>
+ <hr/>
- <c:if test="#{instancemgr.selectedPlugin ==
'preferences'}">
- <h3>Editing preferences of #{instancemgr.selectedInstance.id}: </h3>
- <ui:include src="common/editPreferences.xhtml">
- <ui:param name="prefs"
value="#{instancemgr.selectedPrefs}"/>
- </ui:include>
- <h:form style="text-align:center;padding: 1em 0 1em 0">
- <h:commandButton value="Save"
action="#{instancemgr.updatePrefs}"
styleClass="portlet-form-button"/>
- <h:commandButton value="Cancel"
action="#{instancemgr.cancelPrefs}"
styleClass="portlet-form-button"/>
- </h:form>
- </c:if>
-
- <c:if test="#{instancemgr.selectedPlugin == 'security'}">
- <h3>Editing security of #{instancemgr.selectedInstance.id}: </h3>
- <ui:include src="common/editSecurity.xhtml">
- <ui:param name="auth" value="#{instancemgr.auth}"/>
- </ui:include>
- </c:if>
+ <c:if test="#{instancemgr.selectedPlugin == 'info'}">
+ <c:choose>
+ <c:when test="#{instancemgr.selectedInstance.portlet !=
null}">
+ <h3>Portlet details
+ </h3>
+ <h:form>
+ <h:commandLink
+ action="#{portletmgr.selectPortlet}">
+ <f:param name="id"
value="#{instancemgr.selectedInstance.portlet.context.id}"/>
+ <f:param name="plugin"
value="manager"/>
+ Show
+ </h:commandLink> the associated portlet
+ </h:form>
+ <ui:include src="common/showPortletDetails.xhtml">
+ <ui:param name="portlet"
value="#{instancemgr.selectedInstance.portlet}"/>
+ </ui:include>
+ </c:when>
+ <c:otherwise>
+ <h3>Portlet details</h3>
+ The associated portlet is not available
+ </c:otherwise>
+ </c:choose>
+ </c:if>
- </c:if>
+ <c:if test="#{instancemgr.selectedPlugin ==
'preferences'}">
+ <h3>Editing preferences of #{instancemgr.selectedInstance.id}:
</h3>
+ <ui:include src="common/editPreferences.xhtml">
+ <ui:param name="prefs"
value="#{instancemgr.selectedPrefs}"/>
+ </ui:include>
+ <h:form style="text-align:center;padding: 1em 0 1em 0">
+ <h:commandButton value="Save"
action="#{instancemgr.updatePrefs}"
styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel"
action="#{instancemgr.cancelPrefs}"
styleClass="portlet-form-button"/>
+ </h:form>
+ </c:if>
-</ui:define>
+ <c:if test="#{instancemgr.selectedPlugin ==
'security'}">
+ <h3>Editing security of #{instancemgr.selectedInstance.id}:
</h3>
+ <ui:include src="common/editSecurity.xhtml">
+ <ui:param name="auth"
value="#{instancemgr.auth}"/>
+ </ui:include>
+ </c:if>
+
+ </c:if>
+
+ </ui:define>
</ui:composition>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-03-18
00:50:12 UTC (rev 6728)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-03-18
01:30:33 UTC (rev 6729)
@@ -1,90 +1,94 @@
<div
-
xmlns="http://www.w3.org/1999/xhtml"
-
xmlns:ui="http://java.sun.com/jsf/facelets"
-
xmlns:h="http://java.sun.com/jsf/html"
-
xmlns:f="http://java.sun.com/jsf/core"
-
xmlns:jbp="http://www.jboss.com/portal"
-
xmlns:c="http://java.sun.com/jstl/core"
-
xmlns:pfc="http://www.jboss.com/portal/facelet/common">
+
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:jbp="http://www.jboss.com/portal"
+
xmlns:c="http://java.sun.com/jstl/core"
+
xmlns:pfc="http://www.jboss.com/portal/facelet/common">
-<ui:composition template="portletsTemplate.xhtml">
+ <ui:composition template="portletsTemplate.xhtml">
- <ui:define name="content">
-
- <h:form>
- <h:outputLabel for="menu">
- <h:outputText value="Portlet provider: "
styleClass="portlet-form-field-label"/>
- </h:outputLabel>
- <h:selectOneMenu id="menu" styleClass="portlet-form-field"
value="#{portletmgr.selectedPortletInvokerId}">
- <f:selectItems value="#{portletmgr.portletInvokerItems}"/>
- </h:selectOneMenu>
- <h:commandButton value="Change"
styleClass="portlet-form-button"/>
- </h:form>
+ <ui:define name="content">
- <h:form>
- <table width="100%">
- <thead class="portlet-section-header">
- <tr>
- <th>Id</th>
- <th>Name</th>
- <th>Remote</th>
- <th>Remotable</th>
- <th>Actions</th>
- </tr>
- </thead>
- <tbody>
- <c:forEach items="#{portletmgr.selectedPortlets}"
var="portlet" varStatus="status">
- <tr class="#{portlet.context.id ==
portletmgr.selectedPortlet.context.id ? 'portlet-section-selected' : (status.index
% 2 == 0 ? 'portlet-section-body' :
'portlet-section-alternate')}">
- <td>
- <h:commandLink
- action="#{portletmgr.selectPortlet}">
- <f:param name="id"
value="#{portlet.context.id}"/>
- <f:param name="plugin"
value="manager"/>
- #{portlet.context.id}
- </h:commandLink>
- </td>
- <td>#{portlet.name.value}</td>
- <td><h:selectBooleanCheckbox disabled="true"
value="#{portlet.remote}"/></td>
- <td><h:selectBooleanCheckbox disabled="true"
value="#{portlet.remotable}"/></td>
- <td>
- <h:commandLink
action="#{portletmgr.selectPortlet}">
- <f:param name="id"
value="#{portlet.context.id}"/>
- <f:param name="plugin"
value="manager"/>
- Info
- </h:commandLink> | <h:commandLink
action="#{portletmgr.selectPortlet}">
- <f:param name="id"
value="#{portlet.context.id}"/>
- <f:param name="plugin"
value="preferences"/>
- Preferences
- </h:commandLink>
- </td>
- </tr>
- </c:forEach>
- </tbody>
- </table>
- <ul class="pagination">
- <c:forEach begin="0" end="#{portletmgr.portletCount}"
step="#{portletmgr.paginationSize}" var="index">
- <li class="#{index == portletmgr.selectedFrom ? 'selected'
: ''}">
- <h:commandLink
action="#{portletmgr.selectFrom}"><f:param name="from"
value="#{index}"/><h:outputText
value="#{index}"/></h:commandLink>
- </li>
- </c:forEach>
- </ul>
- </h:form>
+ <h:form>
+ <h:outputLabel for="menu">
+ <h:outputText value="Portlet provider: "
styleClass="portlet-form-field-label"/>
+ </h:outputLabel>
+ <h:selectOneMenu id="menu"
styleClass="portlet-form-field"
value="#{portletmgr.selectedPortletInvokerId}">
+ <f:selectItems
value="#{portletmgr.portletInvokerItems}"/>
+ </h:selectOneMenu>
+ <h:commandButton value="Change"
styleClass="portlet-form-button"/>
+ </h:form>
- <c:if test="#{portletmgr.selectedPortlet != null}">
- <c:if test="#{portletmgr.selectedPlugin == 'manager'}">
- <hr/>
- <h3>Portlet details</h3>
- <ui:include src="showPortletInfo.xhtml"/>
- </c:if>
- <c:if test="#{portletmgr.selectedPlugin ==
'preferences'}">
- <hr/>
- <h3>Portlet preferences</h3>
- <ui:include src="common/editPreferences.xhtml">
- <ui:param name="prefs"
value="#{portletmgr.selectedPreferences}"/>
- </ui:include>
- </c:if>
- </c:if>
+ <h:form>
+ <table width="100%">
+ <thead class="portlet-section-header">
+ <tr>
+ <th>Id</th>
+ <th>Name</th>
+ <th>Remote</th>
+ <th>Remotable</th>
+ <th>Actions</th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach items="#{portletmgr.selectedPortlets}"
var="portlet" varStatus="status">
+ <tr
+ class="#{portlet.context.id ==
portletmgr.selectedPortlet.context.id ? 'portlet-section-selected' : (status.index
% 2 == 0 ? 'portlet-section-body' :
'portlet-section-alternate')}">
+ <td>
+ <h:commandLink
+ action="#{portletmgr.selectPortlet}">
+ <f:param name="id"
value="#{portlet.context.id}"/>
+ <f:param name="plugin"
value="manager"/>
+ #{portlet.context.id}
+ </h:commandLink>
+ </td>
+ <td>#{portlet.name.value}</td>
+ <td><h:selectBooleanCheckbox disabled="true"
value="#{portlet.remote}"/></td>
+ <td><h:selectBooleanCheckbox disabled="true"
value="#{portlet.remotable}"/></td>
+ <td>
+ <h:commandLink
action="#{portletmgr.selectPortlet}">
+ <f:param name="id"
value="#{portlet.context.id}"/>
+ <f:param name="plugin"
value="manager"/>
+ Info
+ </h:commandLink> | <h:commandLink
action="#{portletmgr.selectPortlet}">
+ <f:param name="id"
value="#{portlet.context.id}"/>
+ <f:param name="plugin"
value="preferences"/>
+ Preferences
+ </h:commandLink>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+ <ul class="pagination">
+ <c:forEach begin="0" end="#{portletmgr.portletCount -
1}" step="#{portletmgr.paginationSize}"
+ var="index">
+ <li class="#{index == portletmgr.selectedFrom ?
'selected' : ''}">
+ <h:commandLink
action="#{portletmgr.selectFrom}"><f:param name="from"
+
value="#{index}"/><h:outputText
+ value="#{index}"/></h:commandLink>
+ </li>
+ </c:forEach>
+ </ul>
+ </h:form>
- </ui:define>
-</ui:composition>
+ <c:if test="#{portletmgr.selectedPortlet != null}">
+ <c:if test="#{portletmgr.selectedPlugin ==
'manager'}">
+ <hr/>
+ <h3>Portlet details</h3>
+ <ui:include src="showPortletInfo.xhtml"/>
+ </c:if>
+ <c:if test="#{portletmgr.selectedPlugin ==
'preferences'}">
+ <hr/>
+ <h3>Portlet preferences</h3>
+ <ui:include src="common/editPreferences.xhtml">
+ <ui:param name="prefs"
value="#{portletmgr.selectedPreferences}"/>
+ </ui:include>
+ </c:if>
+ </c:if>
+
+ </ui:define>
+ </ui:composition>
</div>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2007-03-18
00:50:12 UTC (rev 6728)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2007-03-18
01:30:33 UTC (rev 6729)
@@ -4,46 +4,52 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
- <ui:composition template="newWindowTpl.xhtml">
+ <ui:composition template="newWindowTpl.xhtml">
<ui:define name="content">
- <h:form>
- <h:outputLabel for="menu">
- <h:outputText value="Portlet provider: "
styleClass="portlet-form-field-label"/>
- </h:outputLabel>
- <h:selectOneMenu id="menu" styleClass="portlet-form-field"
value="#{portletmgr.selectedPortletInvokerId}">
- <f:selectItems value="#{portletmgr.portletInvokerItems}"/>
- </h:selectOneMenu>
- <h:commandButton value="Change"
styleClass="portlet-form-button"/>
- </h:form>
+ <h:form>
+ <h:outputLabel for="menu">
+ <h:outputText value="Portlet provider: "
styleClass="portlet-form-field-label"/>
+ </h:outputLabel>
+ <h:selectOneMenu id="menu"
styleClass="portlet-form-field"
value="#{portletmgr.selectedPortletInvokerId}">
+ <f:selectItems
value="#{portletmgr.portletInvokerItems}"/>
+ </h:selectOneMenu>
+ <h:commandButton value="Change"
styleClass="portlet-form-button"/>
+ </h:form>
- <h:form>
- <table width="100%">
- <thead class="portlet-section-header">
- <tr>
- <th>Name</th>
- </tr>
- </thead>
- <tbody>
- <c:forEach items="#{portletmgr.selectedPortlets}"
var="portlet" varStatus="status">
- <tr class="#{portlet.context.id ==
newWindowWizard.selectedPortletId ? 'portlet-section-selected' : (status.index % 2
== 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
- <td><h:commandLink
action="#{newWindowWizard.selectPortlet}">
- <h:outputText>#{portlet.name.value}</h:outputText>
- <f:param name="id"
value="#{portlet.context.id}"/>
- <f:param name="portletInvokerId"
value="#{portletmgr.selectedPortletInvokerId}"/>
- </h:commandLink></td>
- </tr>
- </c:forEach>
- </tbody>
- </table>
- <ul class="pagination">
- <c:forEach begin="0" end="#{portletmgr.portletCount}"
step="#{portletmgr.paginationSize}" var="index">
- <li class="#{index == portletmgr.selectedFrom ? 'selected'
: ''}">
- <h:commandLink
action="#{portletmgr.selectFrom}"><f:param name="from"
value="#{index}"/><h:outputText
value="#{index}"/></h:commandLink>
- </li>
- </c:forEach>
- </ul>
- </h:form>
+ <h:form>
+ <table width="100%">
+ <thead class="portlet-section-header">
+ <tr>
+ <th>Name</th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach items="#{portletmgr.selectedPortlets}"
var="portlet" varStatus="status">
+ <tr
+ class="#{portlet.context.id ==
newWindowWizard.selectedPortletId ? 'portlet-section-selected' : (status.index % 2
== 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
+ <td title="#{portlet.description.value}">
+ <h:commandLink
action="#{newWindowWizard.selectPortlet}">
+ <h:outputText>#{!empty portlet.name.value ?
portlet.name.value : "Unnamed"}</h:outputText>
+ <f:param name="id"
value="#{portlet.context.id}"/>
+ <f:param name="portletInvokerId"
value="#{portletmgr.selectedPortletInvokerId}"/>
+ </h:commandLink></td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+ <ul class="pagination">
+ <c:forEach begin="0" end="#{portletmgr.portletCount -
1}" step="#{portletmgr.paginationSize}"
+ var="index">
+ <li class="#{index == portletmgr.selectedFrom ?
'selected' : ''}">
+ <h:commandLink action="#{portletmgr.selectFrom}">
+ <f:param name="from"
value="#{index}"/>
+ <h:outputText value="#{index}"/>
+ </h:commandLink>
+ </li>
+ </c:forEach>
+ </ul>
+ </h:form>
</ui:define>
- </ui:composition>
+ </ui:composition>
</div>
\ No newline at end of file