Author: julien(a)jboss.com Date: 2007-02-27 03:01:44 -0500 (Tue, 27 Feb 2007) New Revision: 6416 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml Log: Simplify actions links available per portal objects Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-26 23:54:28 UTC (rev 6415) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 08:01:44 UTC (rev 6416) @@ -22,29 +22,21 @@ <h:column> <f:facet name="header"><h:outputText value="Actions"/></f:facet> <h:commandLink action="windows" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/window.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit windows"/> - <f:param name="id" value="#{page.id}"/> - </h:commandLink> - <br/> - <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/security.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit page security access"/> - <f:param name="id" value="#{page.id}"/> - </h:commandLink> - </h:column> - <h:column> + <h:outputText value="Edit"/> + <f:param name="id" value="#{page.id}"/> + </h:commandLink> | + <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{page.id}"/> + </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/theme.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit page theme"/> - <f:param name="id" value="#{page.id}"/> - </h:commandLink> - <br/> - <h:commandLink action="pages" actionListener="#{portalobjectmgr.destroyObject}"> - <h:graphicImage value="/images/management/delete.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Destroy page"/> - <f:param name="id" value="#{page.id}"/> - </h:commandLink> + <h:outputText value="Theme"/> + <f:param name="id" value="#{page.id}"/> + </h:commandLink> | + <h:commandLink action="pages" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{page.id}"/> + </h:commandLink> </h:column> </h:dataTable> </h:form> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-26 23:54:28 UTC (rev 6415) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-27 08:01:44 UTC (rev 6416) @@ -9,36 +9,28 @@ <h:column> <f:facet name="header"><h:outputText value="Portal Name"/></f:facet> <h:commandLink action="pages" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{portal.name}"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> + <h:outputText value="#{portal.name}"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> </h:column> <h:column> <f:facet name="header"><h:outputText value="Actions"/></f:facet> <h:commandLink action="editPortalPreferences" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/manage.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit portal parameters"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> - <br/> + <h:outputText value="Edit"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> | <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/security.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit portal security access"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> - </h:column> - <h:column> + <h:outputText value="Security"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> | <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/theme.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit portal theme"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> - <br/> - <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}"> - <h:graphicImage value="/images/management/delete.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Destroy portal"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> + <h:outputText value="Theme"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> | + <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> </h:column> </h:dataTable> </h:form> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-26 23:54:28 UTC (rev 6415) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-27 08:01:44 UTC (rev 6416) @@ -13,29 +13,21 @@ <h:column> <f:facet name="header"><h:outputText value="Actions"/></f:facet> <h:commandLink action="editWindowPreferences" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/manage.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit window parameters"/> - <f:param name="id" value="#{window.id}"/> - </h:commandLink> - <br/> + <h:outputText value="Edit"/> + <f:param name="id" value="#{window.id}"/> + </h:commandLink> | <h:commandLink action="editWindowSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/security.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit window security access"/> - <f:param name="id" value="#{window.id}"/> - </h:commandLink> - </h:column> - <h:column> + <h:outputText value="Security"/> + <f:param name="id" value="#{window.id}"/> + </h:commandLink> | <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/theme.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit window theme"/> - <f:param name="id" value="#{window.id}"/> - </h:commandLink> - <br/> - <h:commandLink action="windows" actionListener="#{portalobjectmgr.destroyObject}"> - <h:graphicImage value="/images/management/delete.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Destroy window"/> - <f:param name="id" value="#{window.id}"/> - </h:commandLink> + <h:outputText value="Theme"/> + <f:param name="id" value="#{window.id}"/> + </h:commandLink> | + <h:commandLink action="windows" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{window.id}"/> + </h:commandLink> </h:column> </h:dataTable> </h:form>