Author: thomas.heute(a)jboss.com
Date: 2007-03-12 11:31:14 -0400 (Mon, 12 Mar 2007)
New Revision: 6641
Modified:
trunk/core-admin/src/bin/portal-admin-war/style.css
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/tabTemplate.xhtml
Log:
* Tabulations
* unknown region -> unassigned windows
Modified: trunk/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-03-12 15:15:29 UTC (rev
6640)
+++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-03-12 15:31:14 UTC (rev
6641)
@@ -42,16 +42,38 @@
/* Top nav. */
.admin-ui ul.topnav {
- margin: 0;
- padding: 5px 0px 5px 0px;
+ margin-left: 0;
+ padding: 3px 0;
+ border-bottom:1px solid;
}
.admin-ui ul.topnav li {
list-style-type: none;
display: inline;
- margin-right: 10px;
+ margin: 0;
}
+.admin-ui ul.topnav li a {
+ padding: 3px 0.5em;
+ display: inline;
+ margin-left: 5px;
+ border: 1px solid #777;
+ border-bottom: none;
+ background-color: #EEEEFF;
+}
+
+.admin-ui ul.topnav li a:hover {
+ background-color: #CCCCFF;
+}
+
+.admin-ui ul.topnav li#currentTab a {
+ background-color: white;
+ border-bottom: 1px solid white;
+}
+
+.admin-ui ul.topnav li#currentTab a:hover {
+}
+
/* Object path. */
.admin-ui ul.objectpath {
@@ -103,3 +125,37 @@
.admin-ui hr {
border-top-style: solid;
}
+
+
+.admin-ui .wizardStepBox {
+ display: inline;
+ float: left;
+ border: 1pt;
+ height: 70px;
+ width: 80px;
+ background-color: #CCCCFF;
+ margin:5px;
+}
+
+.admin-ui .wizardButtonBox {
+ margin:10px;
+}
+
+.admin-ui .wizardContent {
+ clear: both;
+}
+
+.admin-ui #selected.wizardStepBox {
+ background-color: #AAAAFF;
+}
+
+.admin-ui .stepNumber {
+ font-size: 2em;
+ text-align: center;
+ margin-top: 5px;
+ margin-bottom: 0px;
+}
+
+.admin-ui .stepText {
+ text-align: center;
+}
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-12
15:15:29 UTC (rev 6640)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-12
15:31:14 UTC (rev 6641)
@@ -590,6 +590,7 @@
//
List regions = new ArrayList(windows.keySet());
+ regions.remove("unknown");
Collections.sort(regions);
//
@@ -603,13 +604,14 @@
return Collections.EMPTY_LIST;
}
}
-
+
public List getRegionItems()
{
try
{
Map windows = getWindows((Page)getSelectedObject());
-
+ windows.remove("unknown");
+
//
ArrayList regions = new ArrayList(windows.keySet());
Collections.sort(regions);
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-03-12
15:15:29 UTC (rev 6640)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-03-12
15:31:14 UTC (rev 6641)
@@ -13,48 +13,71 @@
<h3>You are editing the page layout</h3>
- <div style="float:left;padding:0 2em 0 2em">
+ <div style="float:left; padding:0 2em 0 2em">
<h:form id="layoutForm">
- <table>
- <c:forEach items="#{portalobjectmgr.regionNames}"
var="regionName" varStatus="status">
- <tbody>
- <c:choose>
- <c:when test="#{status.index > 0}">
- <tr>
- <td colspan="2"
class="portlet-form-field-label" style="border-width:0px;border-top:1px
dashed #d5d5d5">#{regionName} Region</td>
- </tr>
- </c:when>
- <c:otherwise>
- <tr>
- <td colspan="2"
class="portlet-form-field-label">#{regionName} Region</td>
- </tr>
- </c:otherwise>
- </c:choose>
- <tr>
- <td>
- <div>
- <h:commandButton value="Up"
id="u_#{regionName}" actionListener="#{assignWindowsAction.execute}"
styleClass="portlet-form-button"/>
- </div>
- <div>
- <h:commandButton value="Down"
id="d_#{regionName}" actionListener="#{assignWindowsAction.execute}"
styleClass="portlet-form-button"/>
- </div>
- <div style="margin-top: 1em">
- <h:commandButton value="Delete"
id="l_#{regionName}" actionListener="#{assignWindowsAction.execute}"
styleClass="portlet-form-button"/>
- </div>
- </td>
- <td>
- <h:selectManyListbox
-
value="#{assignWindowsAction.assignedWindows[regionName]}"
- size="7"
- styleClass="windowList portlet-form-field">
- <f:selectItems
value="#{portalobjectmgr.windowItemsMap[regionName]}"/>
- </h:selectManyListbox>
- </td>
- </tr>
- </tbody>
- </c:forEach>
- </table>
- </h:form>
+ <table>
+ <c:forEach items="#{portalobjectmgr.regionNames}"
var="regionName"
+ varStatus="status">
+ <tbody>
+ <c:choose>
+ <c:when test="#{status.index > 0}">
+ <tr>
+ <td colspan="2" class="portlet-form-field-label"
+ style="border-width:0px;border-top:1px dashed
#d5d5d5">#{regionName}
+ Region</td>
+ </tr>
+ </c:when>
+ <c:otherwise>
+ <tr>
+ <td colspan="2"
class="portlet-form-field-label">#{regionName}
+ Region</td>
+ </tr>
+ </c:otherwise>
+ </c:choose>
+ <tr>
+ <td>
+ <div><h:commandButton value="Up"
id="u_#{regionName}"
+ actionListener="#{assignWindowsAction.execute}"
+ styleClass="portlet-form-button" /></div>
+ <div><h:commandButton value="Down"
id="d_#{regionName}"
+ actionListener="#{assignWindowsAction.execute}"
+ styleClass="portlet-form-button" /></div>
+ <div style="margin-top: 1em"><h:commandButton
+ value="Delete" id="l_#{regionName}"
+ actionListener="#{assignWindowsAction.execute}"
+ styleClass="portlet-form-button" /></div>
+ </td>
+ <td><h:selectManyListbox
+ value="#{assignWindowsAction.assignedWindows[regionName]}"
+ size="7" styleClass="windowList portlet-form-field">
+ <f:selectItems
+ value="#{portalobjectmgr.windowItemsMap[regionName]}" />
+ </h:selectManyListbox></td>
+ </tr>
+ </tbody>
+ </c:forEach>
+ <tbody>
+ <tr>
+ <td colspan="2" class="portlet-form-field-label"
+ style="border-width:0px;border-top:1px dashed #d5d5d5">Unassigned
+ windows</td>
+ </tr>
+ <tr>
+ <td>
+ <div style="margin-top: 1em"><h:commandButton
value="Delete"
+ id="l_unknown"
actionListener="#{assignWindowsAction.execute}"
+ styleClass="portlet-form-button" /></div>
+ </td>
+ <td><h:selectManyListbox
+ value="#{assignWindowsAction.assignedWindows['unknown']}"
+ size="7" styleClass="windowList portlet-form-field">
+ <f:selectItems
+ value="#{portalobjectmgr.windowItemsMap['unknown']}" />
+ </h:selectManyListbox></td>
+ </tr>
+ </tbody>
+ </table>
+ </h:form>
</div>
<div style="float:left">
<table class="form">
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2007-03-12
15:15:29 UTC (rev 6640)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2007-03-12
15:31:14 UTC (rev 6641)
@@ -5,10 +5,19 @@
class="admin-ui">
<!-- Common nav -->
- <ui:include src="tabTemplate.xhtml"/>
-
- <!-- -->
- <hr/>
+ <h:form>
+ <ul class="topnav">
+ <li>
+ <h:commandLink value="Portal Objects" action="objects"
actionListener="#{portalobjectmgr.selectRootObject}"/>
+ </li>
+ <li id="currentTab">
+ <h:commandLink value="Portlet Instances"
action="instances"/>
+ </li>
+ <li>
+ <h:commandLink value="Portlet Definitions"
action="portlets"/>
+ </li>
+ </ul>
+ </h:form>
<!-- Status message -->
<h:message id="status" for="status"/>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-03-12
15:15:29 UTC (rev 6640)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-03-12
15:31:14 UTC (rev 6641)
@@ -7,11 +7,20 @@
class="admin-ui">
<!-- Common nav -->
- <ui:include src="tabTemplate.xhtml"/>
+ <h:form>
+ <ul class="topnav">
+ <li id="currentTab">
+ <h:commandLink value="Portal Objects" action="objects"
actionListener="#{portalobjectmgr.selectRootObject}"/>
+ </li>
+ <li>
+ <h:commandLink value="Portlet Instances"
action="instances"/>
+ </li>
+ <li>
+ <h:commandLink value="Portlet Definitions"
action="portlets"/>
+ </li>
+ </ul>
+ </h:form>
- <!-- -->
- <hr/>
-
<!-- Path nav -->
<h:form>
<ul class="objectpath">
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml 2007-03-12
15:15:29 UTC (rev 6640)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml 2007-03-12
15:31:14 UTC (rev 6641)
@@ -5,10 +5,19 @@
class="admin-ui">
<!-- Common nav -->
- <ui:include src="tabTemplate.xhtml"/>
-
- <!-- -->
- <hr/>
+ <h:form>
+ <ul class="topnav">
+ <li>
+ <h:commandLink value="Portal Objects" action="objects"
actionListener="#{portalobjectmgr.selectRootObject}"/>
+ </li>
+ <li>
+ <h:commandLink value="Portlet Instances"
action="instances"/>
+ </li>
+ <li id="currentTab">
+ <h:commandLink value="Portlet Definitions"
action="portlets"/>
+ </li>
+ </ul>
+ </h:form>
<!-- Status message -->
<h:message id="status" for="status"/>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/tabTemplate.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/tabTemplate.xhtml 2007-03-12
15:15:29 UTC (rev 6640)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/tabTemplate.xhtml 2007-03-12
15:31:14 UTC (rev 6641)
@@ -7,7 +7,7 @@
<li>
<h:commandLink value="Portal Objects" action="objects"
actionListener="#{portalobjectmgr.selectRootObject}"/>
</li>
- <li>
+ <li id="currentTab">
<h:commandLink value="Portlet Instances"
action="instances"/>
</li>
<li>