Author: chris.laprun(a)jboss.com Date: 2008-08-26 12:07:31 -0400 (Tue, 26 Aug 2008) New Revision: 11738 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml Log: - No need to load bundle when not needed. - Added space to deletion confirmation screen. Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml 2008-08-26 11:18:46 UTC (rev 11737) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml 2008-08-26 16:07:31 UTC (rev 11738) @@ -7,7 +7,6 @@ xmlns:c="http://java.sun.com/jstl/core" class="admin-ui"> - <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="../objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.COMMON_DELETE}"/> @@ -23,7 +22,7 @@ <div class="portlet-msg"> <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> <div class="portlet-msg-body"> - <h3>#{bundle.COMMON_DELETE} <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> + <h3>#{bundle.COMMON_DELETE} &#160;<h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> <p class="portlet-msg-alert"> #{bundle.COMMON_DELETING} Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml 2008-08-26 11:18:46 UTC (rev 11737) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml 2008-08-26 16:07:31 UTC (rev 11738) @@ -4,7 +4,6 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> -<f:loadBundle basename="Resource" var="bundle" /> <p class="portlet-area-header">#{bundle.COMMON_ERROR_HANDLING}</p> <div class="portlet-area-body"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2008-08-26 11:18:46 UTC (rev 11737) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2008-08-26 16:07:31 UTC (rev 11738) @@ -5,7 +5,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:jbp="http://www.jboss.org/portal" xmlns:c="http://java.sun.com/jstl/core"> -<f:loadBundle basename="Resource" var="bundle" /> + <br/> <table width="100%"> <tr> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml 2008-08-26 11:18:46 UTC (rev 11737) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml 2008-08-26 16:07:31 UTC (rev 11738) @@ -4,8 +4,6 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> - -<f:loadBundle basename="Resource" var="bundle" /> <p class="portlet-area-header">#{bundle.COMMON_PORTAL_ERROR_HANDLING}</p> <div class="portlet-area-body"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml 2008-08-26 11:18:46 UTC (rev 11737) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml 2008-08-26 16:07:31 UTC (rev 11738) @@ -5,7 +5,6 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> -<f:loadBundle basename="Resource" var="bundle" /> <c:choose> <c:when test="#{not empty prefs.entries}"> <h:form> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2008-08-26 11:18:46 UTC (rev 11737) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2008-08-26 16:07:31 UTC (rev 11738) @@ -4,8 +4,6 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> -<f:loadBundle basename="Resource" var="bundle"/> - <div class="portlet-area-header">#{bundle.COMMON_PROPERTIES}</div> <div class="portlet-area-body"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml 2008-08-26 11:18:46 UTC (rev 11737) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml 2008-08-26 16:07:31 UTC (rev 11738) @@ -5,7 +5,6 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> - <f:loadBundle basename="Resource" var="bundle" /> <h:form> <table class="datatable full-width"> <thead class="portlet-section-header"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2008-08-26 11:18:46 UTC (rev 11737) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2008-08-26 16:07:31 UTC (rev 11738) @@ -1,7 +1,6 @@ <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"> - <f:loadBundle basename="Resource" var="bundle" /> <h:form> <table class="full-width datatable"> <thead class="portlet-section-header"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml 2008-08-26 11:18:46 UTC (rev 11737) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml 2008-08-26 16:07:31 UTC (rev 11738) @@ -4,7 +4,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <f:loadBundle basename="Resource" var="bundle" /> <h:form> <table class="full-width datatable"> <thead class="portlet-section-header"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-08-26 11:18:46 UTC (rev 11737) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-08-26 16:07:31 UTC (rev 11738) @@ -13,8 +13,6 @@ <br/> <img src="#{portlet.smallIconLocation}" alt="" style="margin: 0 5px 0 5px;" class="float-left"/> - <f:loadBundle basename="Resource" var="bundle" /> - <h:commandLink action="#{portletmgr.selectPortlet}"> <f:param name="id" value="#{portlet.context.id}"/>