[portal-commits] JBoss Portal SVN: r11942 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/jsf and 1 other directory.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Sat Sep 20 21:59:05 EDT 2008
Author: wesleyhales
Date: 2008-09-20 21:59:04 -0400 (Sat, 20 Sep 2008)
New Revision: 11942
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml
Log:
fix icon alignment in safari and make column layout fluid
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-19 20:58:41 UTC (rev 11941)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-21 01:59:04 UTC (rev 11942)
@@ -299,162 +299,180 @@
}
.admin-ui .actionDetails {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/settings.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 15px;
+ line-height: 18px;
padding-left: 18px;
white-space: nowrap;
}
.admin-ui .actionLayout {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/layout.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 15px;
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionSecurity {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/security.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 14px;
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionProperties {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/settings.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
- height: 22px;
+ /*height: 22px;*/
}
.admin-ui .actionTheme {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/theme.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionRename {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/rename.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 15px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionDelete {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/delete2.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 15px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionMakeDefault {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/make_default.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 17px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 22px;
white-space: nowrap;
}
.admin-ui .actionDefault {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/default.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 17px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 22px;
white-space: nowrap;
}
.admin-ui .actionPreferences {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/settings.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 15px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionCreateInstance {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/window_add.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 16px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 21px;
white-space: nowrap;
}
.admin-ui .actionDeleteInstance {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/window_remove.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 16px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 21px;
white-space: nowrap;
}
.admin-ui .actionDisplayNames {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/display_names.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 16px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 23px;
white-space: nowrap;
}
.admin-ui .actionCoordination {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/coordination.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 15px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionSelectPortal {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/generic_icon.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 16px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ height: 18px;
padding-left: 25px;
white-space: nowrap;
+ display:block;
+ line-height:16px;
}
.admin-ui .portlet-content-center {
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-09-19 20:58:41 UTC (rev 11941)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-09-21 01:59:04 UTC (rev 11942)
@@ -83,50 +83,54 @@
<f:facet name="header">
<h:outputText value="#{bundle.ACTIONS}"/>
</f:facet>
- <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0">
+
<h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"
- styleClass="actionLayout">
+ styleClass="actionLayout float-left">
<f:param name="id" value="#{object.id}"/>
#{bundle.PAGE_LAYOUT}
- </h:commandLink> <h:commandLink action="editPageSecurity" styleClass="actionSecurity"
+ </h:commandLink>
+ <h:commandLink action="editPageSecurity" styleClass="actionSecurity float-left"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>#{bundle.SECURITY}
- </h:commandLink> <h:commandLink action="editProperties" styleClass="actionProperties"
+ </h:commandLink>
+ <h:commandLink action="editProperties" styleClass="actionProperties float-left"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>#{bundle.COMMON_PROPERTIES}
- </h:commandLink> <h:commandLink action="editPageTheme" styleClass="actionTheme"
+ </h:commandLink>
+ <h:commandLink action="editPageTheme" styleClass="actionTheme float-left"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.THEME}
- </h:commandLink> <h:commandLink action="renameObject" styleClass="actionRename"
+ </h:commandLink>
+ <h:commandLink action="renameObject" styleClass="actionRename float-left"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.RENAME}
- </h:commandLink> <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" styleClass="actionDisplayNames"
+ </h:commandLink>
+ <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" styleClass="actionDisplayNames float-left"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.DISPLAY_NAMES}
- </h:commandLink> <h:commandLink action="#{coordinationManager.editCoordination}" styleClass="actionCoordination"
+ </h:commandLink>
+ <h:commandLink action="#{coordinationManager.editCoordination}" styleClass="actionCoordination float-left"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.COORDINATION_COORDINATION}
</h:commandLink>
- <h:panelGroup
- rendered="#{not object.default}"> <h:commandLink action="confirm" styleClass="actionDelete"
+ <h:commandLink rendered="#{not object.default}" action="confirm" styleClass="actionDelete float-left"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.COMMON_DELETE}
</h:commandLink>
- </h:panelGroup>
- <h:panelGroup rendered="#{not object.default}"> <h:commandLink styleClass="actionMakeDefault"
- action="#{portalobjectmgr.makeObjectDefault}">
+ <h:commandLink styleClass="actionMakeDefault float-left" rendered="#{not object.default}"
+ action="#{portalobjectmgr.makeObjectDefault}">
<f:param name="id" value="#{object.id}"/>
#{bundle.MAKE_DEFAULT}
</h:commandLink>
- </h:panelGroup>
- <h:panelGroup rendered="#{object.default}"> <h:outputText styleClass="actionDefault"
- value="#{bundle.DEFAULT}"/></h:panelGroup>
- </h:panelGrid>
+
+ <h:outputText styleClass="actionDefault float-left" rendered="#{object.default}"
+ value="#{bundle.DEFAULT}"/>
+
</h:column>
</h:dataTable>
</c:if>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml 2008-09-19 20:58:41 UTC (rev 11941)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml 2008-09-21 01:59:04 UTC (rev 11942)
@@ -32,7 +32,7 @@
<c:if test="#{node.type != PortalObject.TYPE_CONTEXT}">
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
</c:if>
- <li class="#{node.id == portalobjectmgr.selectedObject.id ? 'selected' : 'pathItem'}">
+ <li class="#{node.id == portalobjectmgr.selectedObject.id ? 'selected' : 'pathItem'}" style="#{node.typeName == 'portal' ? 'padding-top:3px' : ''}">
<c:choose>
<c:when test="#{fn:startsWith(node.declaredProperties['portal.windowContentType'], 'widget/')}">
<!-- If window is of contentType widget -->
More information about the portal-commits
mailing list