[portal-commits] JBoss Portal SVN: r9219 - in branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf: common and 1 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Fri Nov 30 09:31:17 EST 2007
Author: emuckenhuber
Date: 2007-11-30 09:31:17 -0500 (Fri, 30 Nov 2007)
New Revision: 9219
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
Log:
- some spacing issues
- adapted styles for wizard
- removed display names for portals
- removed delete button for default portal
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -4,9 +4,6 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
-
-<div class="property-container">
-
<p class="portlet-area-header">Page Error Handling</p>
<div class="portlet-area-body">
@@ -146,6 +143,4 @@
</table>
</div>
-
-</div>
</ui:composition>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -5,8 +5,6 @@
xmlns:c="http://java.sun.com/jstl/core">
-<div class="property-container">
-
<p class="portlet-area-header">Portal Error Handling</p>
<div class="portlet-area-body">
@@ -147,6 +145,4 @@
</table>
</div>
-
-</div>
</ui:composition>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -4,9 +4,6 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
-
-<div class="property-container">
-
<div class="portlet-area-header">Properties</div>
<div class="portlet-area-body">
@@ -150,5 +147,4 @@
</div>
-</div>
</ui:composition>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -34,6 +34,7 @@
</c:forEach>
</tbody>
</table>
+ <br />
<div>
<h:commandButton value="Update" action="#{auth.submit}" styleClass="portlet-form-button"/>
<h:commandButton value="Cancel" action="#{auth.cancel}" styleClass="portlet-form-button" immediate="true"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -40,6 +40,7 @@
</tr>
</tbody>
</table>
+ <br />
<ui:insert name="form_submit"/>
</h:form>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -8,7 +8,6 @@
<ui:composition template="objectTemplate.xhtml">
<ui:define name="content">
- <div class="property-container ">
<h3 class="sectionTitle tenpx-top-bottom">
Manage  
<c:choose>
@@ -46,7 +45,6 @@
<!-- Navigation -->
<ui:include src="objectNavigation.xhtml"/>
- </div>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -8,7 +8,6 @@
<ui:composition template="objectTemplate.xhtml">
<ui:define name="content">
- <div class="property-container">
<h3 class="sectionTitle tenpx-top-bottom">Manage <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
#{portalobjectmgr.selectedObject.typeName}</h3>
@@ -31,22 +30,28 @@
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
Theme
- </h:commandLink> | <h:panelGroup
- rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink
+ </h:commandLink><h:panelGroup
+ rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}">
+ | <h:commandLink
action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
Rename
- </h:commandLink> | </h:panelGroup>
+ </h:commandLink></h:panelGroup>
<h:panelGroup
- rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink
+ rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}">
+ | <h:commandLink
action="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}" />
Display Names
- </h:commandLink> | </h:panelGroup><h:commandLink action="confirm" styleClass="actionDelete"
+ </h:commandLink></h:panelGroup>
+ <h:panelGroup
+ rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}">
+ | <h:commandLink action="confirm" styleClass="actionDelete"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
Delete
</h:commandLink>
+ </h:panelGroup>
</h:form>
<h3 class="sectionTitle">Manage sub-pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
@@ -64,7 +69,6 @@
<!-- Navigation -->
<ui:include src="objectNavigation.xhtml"/>
- </div>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -11,7 +11,7 @@
<ui:define name="content">
<br/>
- <div class="property-container tenpx-top-bottom">
+ <div class="tenpx-top-bottom">
<p class="portlet-area-header">Event Listener Binding</p>
<div class="portlet-area-body tenpx-top-bottom">
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -46,20 +46,14 @@
<h:outputText value="Rename"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
- </h:panelGroup>
- <h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}">
- | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}"
- actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename">
- <h:outputText value="Display Names"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- </h:panelGroup>
+ </h:panelGroup>
+ <h:panelGroup rendered="#{(object.name != 'admin') and (object.name != 'default')}">
| <h:commandLink action="confirm" styleClass="actionDelete"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id" value="#{object.id}"/>
Delete
- </h:commandLink>
+ </h:commandLink>
+ </h:panelGroup>
<h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault"
action="#{portalobjectmgr.makeObjectDefault}">
<f:param name="id" value="#{object.id}"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -50,7 +50,9 @@
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<!-- Content -->
- <ui:insert name="content">Content</ui:insert>
+ <div class="property-container">
+ <ui:insert name="content">Content</ui:insert>
+ </div>
</ui:define>
</ui:decorate>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -9,10 +9,11 @@
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="wizard-tab-container">
-<h3 class="sectionTitle">
- Adding a new Portlet
-</h3>
+<ul class="objectpath">
+ <li class="selected">Adding a new Portlet</li>
+</ul>
+<div class="property-container">
<c:choose>
<c:when test="#{newWindowWizard.currentStep == 0}">
<div class="wizardStepBox" id="selected">
@@ -179,7 +180,8 @@
<!-- Content -->
<div class="wizardContent">
- <ui:insert name="content">Content</ui:insert>
+
+ <ui:insert name="content">Content</ui:insert>
</div>
<div class="wizardButtonBox">
@@ -197,3 +199,5 @@
</h:form>
</div>
</div>
+
+</div>
\ No newline at end of file
More information about the portal-commits
mailing list