5:07 p.m.
Author: julien(a)jboss.com
Date: 2007-03-01 18:07:44 -0500 (Thu, 01 Mar 2007)
New Revision: 6488
Modified:
trunk/core-admin/src/bin/portal-admin-war/style.css
trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml
trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
Log:
improving the page layout editor
Modified: trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-03-01
18:03:53 UTC (rev 6487)
+++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-03-01
23:07:44 UTC (rev 6488)
@@ -102,14 +102,14 @@
height: 100%;
text-align: left;
width: 100%;
- min-width: 770px;
+ min-width: 770px;
/*
position: absolute;
top: 70px;
left: 0px; / * z-index: 1; * /
/ * part of below IE hack
padding: 0 350px 0 350px; * /
- padding: 0px 100px 0px 0px;
+ padding: 0px 100px 0px 0px;
*/
}
@@ -764,11 +764,6 @@
list-style: url( images/ico_listelement.gif );
}
-input {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 11px;
-}
-
SELECT {
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 11px;
@@ -844,8 +839,9 @@
* FORMS *
*********/
input {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 11px;
margin-right: 6px;
- margin-top: 3px;
}
.portlet-form-label {
Modified: trunk/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-03-01 18:03:53 UTC (rev
6487)
+++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-03-01 23:07:44 UTC (rev
6488)
@@ -77,13 +77,31 @@
}
.admin-ui select.instanceList {
- width:16em;
+ width:11em;
}
.admin-ui select.windowList {
- width:16em;
+ width:11em;
}
+.admin-ui table.form {
+ border-spacing: 10px 4px;
+ margin-left: -10px;
+ margin-right: -10px;
+ margin-top: -4px;
+ margin-bottom: -4px;
+}
+
+.admin-ui table.form td.label {
+ text-align: right;
+ vertical-align: top;
+ padding-top: 0.4em;
+}
+
+.admin-ui table.form td.widget {
+ text-align: left;
+}
+
/* Change dashed line to solid. */
.admin-ui hr {
Modified: trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-03-01
18:03:53 UTC (rev 6487)
+++ trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-03-01
23:07:44 UTC (rev 6488)
@@ -7,31 +7,41 @@
xmlns:pfc="http://www.jboss.com/portal/facelet/common"
xmlns:c="http://java.sun.com/jstl/core">
- <h:selectOneListbox
- value="#{contentURI}"
- styleClass="instanceList portlet-form-field"
- onclick="#{submitFunction}"
- size="13"
- style="">
- <f:selectItems value="#{registry.editors.portlet.instanceItems}"/>
- </h:selectOneListbox>
+ <table>
+ <tr>
+ <td>
+ <h:selectOneListbox
+ value="#{contentURI}"
+ styleClass="instanceList portlet-form-field"
+ onclick="#{submitFunction}"
+ size="13"
+ style="">
+ <f:selectItems
value="#{registry.editors.portlet.instanceItems}"/>
+ </h:selectOneListbox>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <pfc:context>
+ <ui:param name="instance"
value="#{registry.editors.portlet.instanceMap[contentURI]}"/>
+ <ui:param name="portlet"
value="#{instance.portlet}"/>
+ <c:if test="#{instance != null}">
+ <div class="portlet-font"
style="float:left">
+ <div><span
class="portlet-form-field-label">Portlet instance:</span>
#{instance.id}</div>
+ <c:choose>
+ <c:when test="#{portlet != null}">
+ <ui:include
src="/WEB-INF/jsf/common/showPortletDetails.xhtml">
+ <ui:param name="portlet"
value="#{portlet}"/>
+ </ui:include>
+ </c:when>
+ <c:otherwise>The associated portlet is not
available</c:otherwise>
+ </c:choose>
+ </div>
+ </c:if>
+ </pfc:context>
+ </td>
+ </tr>
+ </table>
- <pfc:context>
- <ui:param name="instance"
value="#{registry.editors.portlet.instanceMap[contentURI]}"/>
- <ui:param name="portlet" value="#{instance.portlet}"/>
- <c:if test="#{instance != null}">
- <div class="portlet-font">
- <div><span class="portlet-form-field-label">Portlet
instance:</span> #{instance.id}</div>
- <c:choose>
- <c:when test="#{portlet != null}">
- <ui:include
src="/WEB-INF/jsf/common/showPortletDetails.xhtml">
- <ui:param name="portlet"
value="#{portlet}"/>
- </ui:include>
- </c:when>
- <c:otherwise>The associated portlet is not
available</c:otherwise>
- </c:choose>
- </div>
- </c:if>
- </pfc:context>
</div>
\ No newline at end of file
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-01
18:03:53 UTC (rev 6487)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-03-01
23:07:44 UTC (rev 6488)
@@ -60,21 +60,23 @@
</table>
</div>
<div style="float:left">
- <table>
+ <table class="form">
<tr>
- <td>
+ <td class="label">
<h:outputLabel for="windowName">
<h:outputText value="Window Name: "
styleClass="portlet-form-field-label"/>
</h:outputLabel>
+ </td>
+ <td class="widget">
<h:inputText id="windowName"
value="#{assignWindowsAction.windowName}"
styleClass="portlet-form-input-field"/>
- <br/><h:message for="windowName"
errorClass="portlet-msg-error"/>
+ <h:message for="windowName"
errorClass="portlet-msg-error"/>
</td>
</tr>
<tr>
- <td>
- <h:outputLabel for="instanceId">
- <h:outputText value="Content type: "
styleClass="portlet-form-field-label"/>
- </h:outputLabel>
+ <td class="label">
+ <span class="portlet-form-field-label label">Content
type:</span>
+ </td>
+ <td class="widget">
<h:selectOneMenu
id="instanceId"
value="#{portalobjectmgr.selectedContentType}"
@@ -82,11 +84,14 @@
<f:selectItems
value="#{registry.availableTypes}"/>
</h:selectOneMenu>
<h:commandButton value="Update"
styleClass="portlet-form-button"/>
- <br/><h:message for="instanceId"
errorClass="portlet-msg-error"/>
+ <h:message for="instanceId"
errorClass="portlet-msg-error"/>
</td>
</tr>
<tr>
- <td>
+ <td class="label">
+ <span class="portlet-form-field-label label">Portlet
instance:</span>
+ </td>
+ <td class="widget">
<ct:content
contentType="#{portalobjectmgr.selectedContentType}"
contentURI="#{portalobjectmgr.selectedContentURI}"