Author: chris.laprun(a)jboss.com Date: 2008-05-29 08:00:17 -0400 (Thu, 29 May 2008) New Revision: 10840 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml Log: - Fixed obvious issue with i18n. There are more, trickier ones. 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 2008-05-29 11:20:23 UTC (rev 10839) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2008-05-29 12:00:17 UTC (rev 10840) @@ -1,14 +1,14 @@ <div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:fn="http://java.sun.com/jsp/jstl/functions" - xmlns:pfc="http://www.jboss.com/portal/facelet/common" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:fn="http://java.sun.com/jsp/jstl/functions" + xmlns:pfc="http://www.jboss.com/portal/facelet/common" + xmlns:c="http://java.sun.com/jstl/core"> -<f:loadBundle basename="Resource" var="bundle" /> +<f:loadBundle basename="Resource" var="bundle"/> <h:form> <c:if test="#{not empty portalobjectmgr.selectedObject.portals}"> @@ -42,7 +42,7 @@ #{bundle.THEME} </h:commandLink> <h:panelGroup - rendered="#{(object.name != 'admin') and (object.name != 'template')}"> + rendered="#{(object.name != 'admin') and (object.name != 'template')}"> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> <h:outputText value="#{bundle.RENAME}"/> @@ -50,13 +50,13 @@ </h:commandLink> </h:panelGroup> <h:panelGroup - rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}"> - | <h:commandLink action="confirm" styleClass="actionDelete" - actionListener="#{portalobjectmgr.selectDeletingObject}"> - <f:param name="id" value="#{object.id}"/> - #{bundle.COMMON_DELETE} - </h:commandLink> - </h:panelGroup> + rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}"> + | <h:commandLink action="confirm" styleClass="actionDelete" + 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}"> <f:param name="id" value="#{object.id}"/> @@ -128,7 +128,8 @@ </c:if> <c:if test="#{not empty portalobjectmgr.selectedObject.windows}"> - <h3 class="sectionTitle">#{bundle.Manage windows within} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + <h3 class="sectionTitle">#{bundle.MANAGE_WINDOWS_WITHIN} <span + class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> <ui:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/> @@ -143,18 +144,18 @@ </f:facet> <h:graphicImage - title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '#{bundle.THIS_MINIMIZED_STATE}.' : '#{bundle.THIS_NORMAL_STATE}.'}" - rendered="#{!maximizedStateExists}" - value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }" - styleClass="windowStateIcon" - alt=""/> + title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '#{bundle.THIS_MINIMIZED_STATE}.' : '#{bundle.THIS_NORMAL_STATE}.'}" + rendered="#{!maximizedStateExists}" + value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }" + styleClass="windowStateIcon" + alt=""/> <h:graphicImage - title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '#{bundle.THIS_MAXIMIZED_STATE}.' : '#{bundle.THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED}.'}" - rendered="#{maximizedStateExists}" - value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}" - styleClass="windowStateIcon" - alt=""/> + title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '#{bundle.THIS_MAXIMIZED_STATE}.' : '#{bundle.THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED}.'}" + rendered="#{maximizedStateExists}" + value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}" + styleClass="windowStateIcon" + alt=""/> <!-- disable edit window for content type widget until JBPORTAL-1561 is fixed -->