[portal-commits] JBoss Portal SVN: r10833 - in branches/JBoss_Portal_Branch_2_7: core/src/bin/portal-core-war/layouts/3columns and 15 other directories.

Author: thomas.heute(a)jboss.com Date: 2008-05-29 05:32:44 -0400 (Thu, 29 May 2008) New Revision: 10833 Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties Removed: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 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 branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboardsTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml 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 branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/1column/index.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/3columns/index.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/index.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/maximized.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/login/error.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/nodesk/index.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/phalanx/index.jsp branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp Log: - i18n based on Luca's work Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/1column/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/1column/index.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/1column/index.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,5 +1,7 @@ <%@ page import="org.jboss.portal.server.PortalConstants" %> +<%@page import="java.util.ResourceBundle"%> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<% ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -51,7 +53,7 @@ </div> <!-- TODO: Fix the auto jump in this tag --> -<div id="footer-container" class="portal-copyright">Powered by +<div id="footer-container" class="portal-copyright"><%= rb.getString("POWERED_BY") %> <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/> </div> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/3columns/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,5 +1,7 @@ <%@ page import="org.jboss.portal.server.PortalConstants" %> +<%@page import="java.util.ResourceBundle"%> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<% ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -58,7 +60,7 @@ </div> <!-- TODO: Fix the auto jump in this tag --> -<div id="footer-container" class="portal-copyright">Powered by +<div id="footer-container" class="portal-copyright"><%= rb.getString("POWERED_BY") %> <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/> </div> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/index.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/index.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,5 +1,7 @@ <%@ page import="org.jboss.portal.server.PortalConstants" %> +<%@page import="java.util.ResourceBundle"%> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<% ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -46,7 +48,7 @@ </div> </div> -<div id="footer-container" class="portal-copyright">Powered by +<div id="footer-container" class="portal-copyright"><%= rb.getString("POWERED_BY") %> <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/> </div> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/maximized.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,5 +1,7 @@ <%@ page import="org.jboss.portal.server.PortalConstants" %> +<%@page import="java.util.ResourceBundle"%> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<% ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -38,7 +40,7 @@ <p:region regionName='maximized' regionID='regionMaximized'/> <hr class="cleaner"/> - <div id="footer-container" class="portal-copyright">Powered by + <div id="footer-container" class="portal-copyright"><%= rb.getString("POWERED_BY") %> <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br> <span id="ThemeBy"></span> </div> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/login/error.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/login/error.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/login/error.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,6 +1,7 @@ +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <html> <head></head> <body> -bad login +${n:i18n("BAD_LOGIN")} </body> </html> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/nodesk/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/nodesk/index.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/nodesk/index.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -21,6 +21,7 @@ %> <%@ taglib uri="/WEB-INF/theme-basic-lib.tld" prefix="basic" %> +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page import="java.util.Iterator, java.io.Writer, @@ -261,8 +262,8 @@ <% } %> <tr> - <td class="portal-copyright" height="10" colspan="<%= nbCol %>" align="center" valign="top">Powered by <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br> - Theme by <a class="portal-copyright" href="http://www.nodesk.org">Nodesk</a> + <td class="portal-copyright" height="10" colspan="<%= nbCol %>" align="center" valign="top">${n:i18n("POWERED_BY")} <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br> + ${n:i18n("THEME_BY")} <a class="portal-copyright" href="http://www.nodesk.org">Nodesk</a> </td> </tr> </table> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/phalanx/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/phalanx/index.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/phalanx/index.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,4 +1,5 @@ <%@ taglib uri="/WEB-INF/theme-basic-lib.tld" prefix="basic" %> +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page import="org.jboss.portal.server.PortalConstants" %> <%@ page import="java.util.ResourceBundle"%> @@ -125,7 +126,7 @@ <tr> <td align="left"><div class="portlet-font-dim" style="font-size:10px"> Copyright 2005, JBoss Inc.<br> - Powered by <a href="http://www.jboss.com/products/jbossportal" target="_blank">JBoss Portal</a> + ${n:i18n("POWERED_BY")} <a href="http://www.jboss.com/products/jbossportal" target="_blank">JBoss Portal</a> </div></td> </tr> </table> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -29,4 +29,4 @@ LOGIN_USERNAME=Username LOGIN_PASSWORD=Password LOGIN_CANCEL=Cancel -LOGIN_SUBMIT=Submit \ No newline at end of file +LOGIN_SUBMIT=Submit Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -29,4 +29,4 @@ LOGIN_USERNAME=Nome utente LOGIN_PASSWORD=Password LOGIN_CANCEL=Annulla -LOGIN_SUBMIT=Invia \ No newline at end of file +LOGIN_SUBMIT=Invia Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -321,4 +321,17 @@ PERMISSION_DOMAIN_MOD=Modify Domain PERMISSION_DEFINEDROLES=Defined roles PERMISSION_IMPLIEDROLES=Implied roles - \ No newline at end of file + +POWERED_BY=Powered by +BAD_LOGIN=bad login +THEME_BY=Theme by +PORTLET_INSTANCE_ASSOCIATED=Portlet instance associated to this window +PORTLET_NAME=Portlet name +PORTLET_DESCRIPTION=Portlet description +DASHBOARD=Dashboard +CONFIGURE_DASHBOARD=Configure dashboard +COPY_TO_DASHBOARD=Copy to my dashboard +PORTAL=Portal +ADMIN=Admin +MEMBERS=Members +LOGGED=Logged in as \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -130,7 +130,7 @@ Delete=Cancella Edit=Modifica Ok=Ok -Cancel=Cancella +Cancel=Annulla AreYouSureToDeleteUser=Sei sicuro di voler cancellare l' utente? UserDeleted=Utente cancellato con successo ReturnToMemberList=Ritorna alla lista dei membri @@ -245,7 +245,7 @@ REGISTER_ADMIN_SEARCH=Visualizza/edita gli utenti -MENU_LOGOUT=Logout +MENU_LOGOUT=Uscita MENU_EDITPROFILE=Modifica il tuo profilo MENU_LISTUSERS=Lista di tutti gli utenti @@ -321,4 +321,17 @@ PERMISSION_DOMAIN_MOD=Modifica Dominio PERMISSION_DEFINEDROLES=Ruoli definiti PERMISSION_IMPLIEDROLES=Ruoli impliciti - \ No newline at end of file + +POWERED_BY=Sviluppato da +BAD_LOGIN=login sbagliato +THEME_BY=Tema di +PORTLET_INSTANCE_ASSOCIATED=Istanza di Portlet associata a questa finestra +PORTLET_NAME=Nome della Portlet +PORTLET_DESCRIPTION=Descrizione della Portlet +DASHBOARD=Dashboard +CONFIGURE_DASHBOARD=Configura la dashboard +COPY_TO_DASHBOARD=Copia nella mia dashboard +PORTAL=Portale +ADMIN=Amministrazione +MEMBERS=Membri +LOGGED=Benvenuto \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -17,6 +17,7 @@ <%@page import="org.jboss.portal.portlet.info.PortletInfo" %> <%@ page import="java.util.Collection" %> <%@ page import="java.util.Locale" %> +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <portlet:defineObjects/> <script type='text/javascript' src='/portal-admin/js/domLib.js'></script> <script type="text/javascript" src="/portal-admin/js/fadomatic.js"></script> @@ -62,7 +63,7 @@ <table style="width:500px;"> <tr> - <td><h3 class="sectionTitle tenpx-top-bottom">Portlet instance associated to this window:</h3></td> + <td><h3 class="sectionTitle tenpx-top-bottom">${n:i18n("PORTLET_INSTANCE_ASSOCIATED")}:</h3></td> </tr> <% Locale locale = renderRequest.getLocale(); @@ -94,14 +95,13 @@ <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/> <span><%= displayName %></span> - <div> - <span class="portlet-form-field-label">Portlet name:</span><%= displayName %> - </div> - <div> - <span class="portlet-form-field-label">Portlet description:</span> - <%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %> - </div> - + <div> + <span class="portlet-form-field-label">${n:i18n("PORTLET_NAME")}:</span><%= displayName %> + </div> + <div> + <span class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span> + <%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %> + </div> </td> </tr> <% @@ -151,7 +151,6 @@ </div> </div> </div> - <tr class="<%= rowClass %>"> <td> <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/> @@ -199,4 +198,4 @@ return value; } -%> \ No newline at end of file +%> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,7 +1,9 @@ <%@ page import="org.jboss.portal.api.PortalURL" %> <%@ page import="org.jboss.portal.identity.User" %> +<%@page import="java.util.ResourceBundle"%> <% + ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); User user = (User)request.getAttribute("org.jboss.portal.header.USER"); PortalURL dashboardURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DASHBOARD_URL"); PortalURL loginURL = (PortalURL)request.getAttribute("org.jboss.portal.header.LOGIN_URL"); @@ -32,10 +34,10 @@ </script> <noscript> - <a href="<%= loginURL %>">Login</a> + <a href="<%= loginURL %>"><%= rb.getString("LOGIN") %></a> </noscript> <%}else{%> -<a href="<%= loginURL %>">Login</a> +<a href="<%= loginURL %>"><%= rb.getString("LOGIN") %></a> <%}%> @@ -50,34 +52,34 @@ document.getElementById('loginIframe').src = ''; /* ]]> */ </script> -Logged in as: <%= user.getUserName() %><br/><br/> +<%= rb.getString("LOGGED") %>: <%= user.getUserName() %><br/><br/> <% if (dashboardURL != null) { -%>&nbsp;&nbsp;<a href="<%= dashboardURL %>">Dashboard</a>&nbsp;&nbsp;|<% +%>&nbsp;&nbsp;<a href="<%= dashboardURL %>"><%= rb.getString("DASHBOARD") %></a>&nbsp;&nbsp;|<% } if (defaultPortalURL != null) { -%>&nbsp;&nbsp;<a href="<%= defaultPortalURL %>">Portal</a>&nbsp;&nbsp;|<% +%>&nbsp;&nbsp;<a href="<%= defaultPortalURL %>"><%= rb.getString("PORTAL") %></a>&nbsp;&nbsp;|<% } if (adminPortalURL != null) { -%>&nbsp;&nbsp;<a href="<%= adminPortalURL %>">Admin</a>&nbsp;&nbsp;|<% +%>&nbsp;&nbsp;<a href="<%= adminPortalURL %>"><%= rb.getString("ADMIN") %></a>&nbsp;&nbsp;|<% } if (editDashboardURL != null) { -%>&nbsp;&nbsp;<a href="<%= editDashboardURL %>">Configure dashboard</a>&nbsp;&nbsp;|<% +%>&nbsp;&nbsp;<a href="<%= editDashboardURL %>"><%= rb.getString("CONFIGURE_DASHBOARD") %></a>&nbsp;&nbsp;|<% } if (copyToDashboardURL != null) { -%>&nbsp;&nbsp;<a href="<%= copyToDashboardURL %>">Copy to my dashboard</a>&nbsp;&nbsp;|<% +%>&nbsp;&nbsp;<a href="<%= copyToDashboardURL %>"><%= rb.getString("COPY_TO_DASHBOARD") %></a>&nbsp;&nbsp;|<% } -%>&nbsp;&nbsp;<a href="<%= signOutURL %>">Logout</a> +%>&nbsp;&nbsp;<a href="<%= signOutURL %>"><%= rb.getString("MENU_LOGOUT") %></a> <% } %> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -21,6 +21,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%> <%@ page pageEncoding="utf-8" %> +<%@page import="java.util.ResourceBundle"%> + +<% + ResourceBundle rb = ResourceBundle.getBundle("conf.bundles.Resource", request.getLocale()); +%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <%@page import="org.jboss.portal.identity.UserStatus"%> @@ -63,7 +68,7 @@ <div class="login-header"> - <h2><%= rb.getString("LOGIN_TITLE") %></h2> + <h2><%= rb.getString("LOGIN_TITLE") %></h2> </div> <div class="login-content"> @@ -88,11 +93,11 @@ <form method="post" action="<%= response.encodeURL("j_security_check") %>" name="loginform" id="loginForm" target="_parent"> <div class="form-field"> - <label for="j_username"><%= rb.getString("LOGIN_USERNAME") %>:</label> + <label for="j_username"><%= rb.getString("LOGIN_USERNAME") %></label> <input type="text" name="j_username" id="j_username" value=""/> </div> <div class="form-field bottom-field"> - <label for="j_password"><%= rb.getString("LOGIN_PASSWORD") %>:</label> + <label for="j_password"><%= rb.getString("LOGIN_PASSWORD") %></label> <input type="password" name="j_password" id="j_password" value=""/> </div> <input style="<%=(request.getParameter("loginheight") != null ? "" : "display:none")%>;" type="button" name="cancel" value="<%= rb.getString("LOGIN_CANCEL") %>" class="cancel-button" onclick="window.parent.hideContentModal('login-modal');"/> Copied: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes (from rev 10830, branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes) Deleted: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-05-28 23:07:49 UTC (rev 10830) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,201 +0,0 @@ -################################################################################ -# JBoss, a division of Red Hat # -# Copyright 2006, Red Hat Middleware, LLC, and individual # -# contributors as indicated by the @authors tag. See the # -# copyright.txt in the distribution for a full listing of # -# individual contributors. # -# # -# This is free software; you can redistribute it and/or modify it # -# under the terms of the GNU Lesser General Public License as # -# published by the Free Software Foundation; either version 2.1 of # -# the License, or (at your option) any later version. # -# # -# This software is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # -# Lesser General Public License for more details. # -# # -# You should have received a copy of the GNU Lesser General Public # -# License along with this software; if not, write to the Free # -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -################################################################################ - -PORTLET_INSTANCES=Portlet Instances -INSTANCE_DELETE=instance Delete -PORTLET_CAUSING_REFERENCING_NOT_ABLE=portlet instance causing windows referencing it to not be able to display their content anymore -ARE_YOU_SURE_DELETE=Are you sure you want to delete this portlet instance -DASHBOARD_THEME_PROPERTIES=Dashboard theme properties -CONFIGURE_DASHBOARD_SETTINGS=Configure dashboards settings -DASHBOARDS=Dashboards -ADD_DISPLAY_NAMES=Add Display Names -CURRENT_DISPLAY_NAMES=Current Display Names -MANAGE=Manage -PORTALS=portals -PORTAL=portal -SUB_PORTALS=sub-portals -PAGES_WITHIN=pages within -CREATE_PORTAL_NAMED=Create a portal named -PAGE_LAYOUT=Page layout -SECURITY=Security -THEME=Theme -RENAME=Rename -DISPLAY_NAMES=Display Names -MANAGE_SUB_PAGES_WITHIN=Manage sub-pages within -CREATE_PAGE_NAMED=Create a page named -SET_PAGE_PERMISSIONS=Please set the page permissions -PAGE_THEME_PROPERTIES=Page theme properties -SET_PORTAL_PERMISSIONS=Please set the portal permissions -PORTAL_THEME_PROPERTIES=Portal theme properties -SETTINGS_ARE_INHERITED_BY_ALL_PAGES=These settings are inherited by all the pages and windows of this portal. You may override these settings by selecting the appropriate value on the respective Theme settings pages -EVENT_LISTENER_BINDING=Event Listener Binding -CHOOSE_ID_PORTALEVENTLISTENER=Choose the id of the PortalEventListener to bind to this -SET_PERMISSIONS_FOR=Please set the permissions for the -WINDOW=window -WINDOW_THEME_PROPERTIES=Window theme properties -INSTANCE_ID=Instance id -INSTANCE_NAME=Instance name -ACTIONS=Actions -PREFERENCES=Preferences -PORTLET_DETAILS=portlet details -ASSOCIATED_PORTLET_NOT_AVAILABLE=The associated portlet is not available -PREFERENCES=preferences -SECURITY_SETTINGS=security settings -MAKE_DEFAULT=Make Default -MANAGE_WINDOWS_WITHIN=Manage windows within -PORTAL_OBJECTS=Portal Objects -PORTALS=Portals -PORTLET_NAME=Portlet name -DESCRIPTION=Description -REMOTE=Remote -REMOTABLE=Remotable -ACTIONS=Actions -CREATE_INSTANCE=Create instance -PORTLET_DEFINITIONS=Portlet Definitions -DETAILS=details -INSTANCE_CREATION=instance creation -CREATE_INSTANCE_NAMED=Create an instance named -RENAME_THE=Rename the -TO=to -THIS_MINIMIZED_STATE=This window is set to a minimized state -THIS_NORMAL_STATE=This window defaults to a normal state -THIS_MAXIMIZED_STATE=This window is set to a maximized state -THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=This window defaults to a minimized state because one window within this page is set to maximized -SWITCH_TO_WIZARD_MODE=Switch to wizard mode -CREATE_PORTAL=Create portal -CREATE_PAGE=Create page -DEFAULT=Default -WINDOW=Window -VIEW_PORTLETS_PROVIDED_BY=View portlets provided by the portlet provider named -VIEW_PORTLETS=View portlets - -COMMON_INCONSISTENT_STATE=Inconsistent state -COMMON_DELETE=Delete -COMMON_DELETING=WARNING! You are about to delete the -COMMON_FROM=from the -COMMON_SURE_DELETE=Are you sure you want to delete this -COMMON_ERROR_HANDLING=Page Error Handling -COMMON_CONFIGURE_ERRORS=Configure how the system handles errors on page level -COMMON_CASE=Case -COMMON_INHERITANCE=Inheritance -COMMON_ACTION=Action -COMMON_INHERIT_ACTION=inherit action from parent -COMMON_CONTENT_DEFINITION=Content Definition -COMMON_DEFINE_NAME_WINDOW=Define a name for the window of content (optional) -COMMON_WINDOW_NAME=Window Name -COMMON_SELECT_TYPE_CONTENT=Select the type of content that will be added to the page -COMMON_CONTENT_TYPE=Content Type -COMMON_SELECT_CONTENT=Select content that will be added to the page -COMMON_PAGE_LAYOUT=Page Layout -COMMON_REGION=Region -COMMON_UNASSIGNED_WINDOW=Unassigned windows -COMMON_PORTAL_ERROR_HANDLING=Portal Error Handling -COMMON_PORTAL_CONFIGURE_ERRORS=Configure how the system handles errors on portal level -COMMON_KEY=Key -COMMON_NAME=Name -COMMON_READONLY=ReadOnly -COMMON_VALUE=Value -COMMON_NO_DEFINED_PREFERENCES=No defined preferences for this portlet -COMMON_EDIT_EXISTING_VALUES=Edit existing values -COMMON_APPEND_VALUE=Append a value -COMMON_PROPERTIES=Properties -COMMON_ADD_PROPERTY=Add a property -COMMON_SELECT_PREDEFINED_PROPERTY=Select predefined property -COMMON_OR=or -COMMON_ENTER_PROPERTY_NAME=Enter property name -COMMON_MANAGE_PROPERTIES=Manage currently defined properties -COMMON_DESCRIPTION=Description -COMMON_INHERITED=Inherited -COMMON_YES=Yes -COMMON_NO=No -COMMON_ROLES=Roles -COMMON_PERMISSIONS=Permissions -COMMON_ROLE=Role -COMMON_SETTING=Setting -COMMON_LAYOUT=Layout -COMMON_NAME_LAYOUT_IMPLEMENTATION=Name of the layout implementation used to arrange portlet windows in pages -COMMON_THEME=Theme -COMMON_NAME_LOOK_AND_FEEL=Name of the look and feel to use -COMMON_RENDERSET=RenderSet -COMMON_NAME_RENDER_ENGINE_PAGES=Name of the render engine to use to render pages -COMMON_WINDOW_RENDERER=Window Renderer -COMMON_NAME_RENDER_ENGINE_WINDOWS=Name of the render engine to use to render windows -COMMON_DECORATION_RENDERER=Decoration Renderer -COMMON_NAME_RENDER_ENGINE_DECORATIONS=Name of the render engine to use to render window decorations -COMMON_PORTLET_RENDERER=Portlet Renderer -COMMON_NAME_RENDER_ENGINE_PORTLETS=Name of the render engine to use to render portlets -COMMON_PORTLET_INSTANCE_INFORMATION=Portlet Instance Information -COMMON_PORTLET_NAME=Portlet name -COMMON_PORTLET_DESCRIPTION=Portlet description -COMMON_PORTLET_TITLE=Portlet title -COMMON_PORTLET_KEYWORDS=Portlet keywords -COMMON_PORTLET_LOCALES=Portlet locales -COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Portlet Instance Display Names -COMMON_ADD_INSTANCE_DISPLAY_NAMES=Add Instance Display Names -COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Current Instance Display Names -COMMON_CANCEL=Cancel -COMMON_UPDATE=Update -COMMON_ADD=Add -COMMON_ADD_PROPERTY=Add Property -COMMON_UP=Up -COMMON_DOWN=Down -COMMON_NEW_VALUE=New value -COMMON_APPEND=Append -COMMON_LOCALE=Locale -COMMON_DISPLAY_NAME=Display Name - -DASHBOARD_PERSONAL_EDITOR=Personal Dashboard Editor -DASHBOARD_CREATE_NEW_PAGE=Create a New Page -DASHBOARD_CREATE_PAGE=Page name -DASHBOARD_RENAME_THIS_PAGE=Rename this Page -DASHBOARD_NEW_PAGE_NAME=New page name -DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Use this page to manage the content and appearance of your dashboard pages -DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=You can control the page titles, column layouts, page themes,and add,order, or remove portlets -DASHBOARD_CURRENTLY_EDITING_PAGE=Currently editing page -DASHBOARD_THEME_AND_LAYOUT=Theme and Layout -DASHBOARD_APPLY_THEME=Apply a theme to your dashboard, or select the number of columns for the layout -DASHBOARD_CHOOSE_LAYOUT=Choose a layout -DASHBOARD_CHOOSE_THEME=Choose a theme -DASHBOARD_CANNOT_UNDO_ACTION=You cannot undo this action -DASHBOARD_DELETE_THIS_PAGE=Delete this Page -DASHBOARD_SAVE=Save -DASHBOARD_SELECT=Select - -WIZARD_ADDING_NEW_PORTLET=Adding a new Portlet -WIZARD_STEP=Step -WIZARD_SELECT_PORTLET=Select Portlet -WIZARD_SELECT_PORTAL=Select Portal -WIZARD_SELECT_PAGE=Select Page -WIZARD_SELECT_REGION=Select Region -WIZARD_CONFIRM=Confirm -WIZARD_CONTENT=Content -WIZARD_SWITCH_ADVANCED_MODE=Switch to advanced mode -WIZARD_PORTLET=Portlet -WIZARD_PORTAL=Portal -WIZARD_PAGE=Page -WIZARD_REGION=Region -WIZARD_PREVIOUS=Previous -WIZARD_NEXT=Next -WIZARD_SUB_PAGES=Sub-Pages -WIZARD_PORTLET_PROVIDER=Portlet provider -WIZARD_CHANGE=Change \ No newline at end of file Copied: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties (from rev 10830, branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties) =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -0,0 +1,208 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, Red Hat Middleware, LLC, and individual # +# contributors as indicated by the @authors tag. See the # +# copyright.txt in the distribution for a full listing of # +# individual contributors. # +# # +# This is free software; you can redistribute it and/or modify it # +# under the terms of the GNU Lesser General Public License as # +# published by the Free Software Foundation; either version 2.1 of # +# the License, or (at your option) any later version. # +# # +# This software is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # +# Lesser General Public License for more details. # +# # +# You should have received a copy of the GNU Lesser General Public # +# License along with this software; if not, write to the Free # +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. # +################################################################################ + +PORTLET_INSTANCES=Portlet Instances +INSTANCE_DELETE=instance Delete +PORTLET_CAUSING_REFERENCING_NOT_ABLE=portlet instance causing windows referencing it to not be able to display their content anymore +ARE_YOU_SURE_DELETE=Are you sure you want to delete this portlet instance +DASHBOARD_THEME_PROPERTIES=Dashboard theme properties +CONFIGURE_DASHBOARD_SETTINGS=Configure dashboards settings +DASHBOARDS=Dashboards +ADD_DISPLAY_NAMES=Add Display Names +CURRENT_DISPLAY_NAMES=Current Display Names +MANAGE=Manage +PORTALS=portals +PORTAL=portal +SUB_PORTALS=sub-portals +PAGES_WITHIN=pages within +CREATE_PORTAL_NAMED=Create a portal named +PAGE_LAYOUT=Page layout +SECURITY=Security +THEME=Theme +RENAME=Rename +DISPLAY_NAMES=Display Names +MANAGE_SUB_PAGES_WITHIN=Manage sub-pages within +CREATE_PAGE_NAMED=Create a page named +SET_PAGE_PERMISSIONS=Please set the page permissions +PAGE_THEME_PROPERTIES=Page theme properties +SET_PORTAL_PERMISSIONS=Please set the portal permissions +PORTAL_THEME_PROPERTIES=Portal theme properties +SETTINGS_ARE_INHERITED_BY_ALL_PAGES=These settings are inherited by all the pages and windows of this portal. You may override these settings by selecting the appropriate value on the respective Theme settings pages +EVENT_LISTENER_BINDING=Event Listener Binding +CHOOSE_ID_PORTALEVENTLISTENER=Choose the id of the PortalEventListener to bind to this +SET_PERMISSIONS_FOR=Please set the permissions for the +WINDOW=window +WINDOW_THEME_PROPERTIES=Window theme properties +INSTANCE_ID=Instance id +INSTANCE_NAME=Instance name +ACTIONS=Actions +PREFERENCES=Preferences +PORTLET_DETAILS=portlet details +ASSOCIATED_PORTLET_NOT_AVAILABLE=The associated portlet is not available +PREFERENCES=preferences +SECURITY_SETTINGS=security settings +MAKE_DEFAULT=Make Default +MANAGE_WINDOWS_WITHIN=Manage windows within +PORTAL_OBJECTS=Portal Objects +PORTALS=Portals +PORTLET_NAME=Portlet name +DESCRIPTION=Description +REMOTE=Remote +REMOTABLE=Remotable +ACTIONS=Actions +CREATE_INSTANCE=Create instance +PORTLET_DEFINITIONS=Portlet Definitions +DETAILS=details +INSTANCE_CREATION=instance creation +CREATE_INSTANCE_NAMED=Create an instance named +RENAME_THE=Rename the +TO=to +THIS_MINIMIZED_STATE=This window is set to a minimized state +THIS_NORMAL_STATE=This window defaults to a normal state +THIS_MAXIMIZED_STATE=This window is set to a maximized state +THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=This window defaults to a minimized state because one window within this page is set to maximized +SWITCH_TO_WIZARD_MODE=Switch to wizard mode +CREATE_PORTAL=Create portal +CREATE_PAGE=Create page +DEFAULT=Default +WINDOW=Window +VIEW_PORTLETS_PROVIDED_BY=View portlets provided by the portlet provider named +VIEW_PORTLETS=View portlets + +COMMON_INCONSISTENT_STATE=Inconsistent state +COMMON_DELETE=Delete +COMMON_DELETING=WARNING! You are about to delete the +COMMON_FROM=from the +COMMON_SURE_DELETE=Are you sure you want to delete this +COMMON_ERROR_HANDLING=Page Error Handling +COMMON_CONFIGURE_ERRORS=Configure how the system handles errors on page level +COMMON_CASE=Case +COMMON_INHERITANCE=Inheritance +COMMON_ACTION=Action +COMMON_INHERIT_ACTION=inherit action from parent +COMMON_CONTENT_DEFINITION=Content Definition +COMMON_DEFINE_NAME_WINDOW=Define a name for the window of content (optional) +COMMON_WINDOW_NAME=Window Name +COMMON_SELECT_TYPE_CONTENT=Select the type of content that will be added to the page +COMMON_CONTENT_TYPE=Content Type +COMMON_SELECT_CONTENT=Select content that will be added to the page +COMMON_PAGE_LAYOUT=Page Layout +COMMON_REGION=Region +COMMON_UNASSIGNED_WINDOW=Unassigned windows +COMMON_PORTAL_ERROR_HANDLING=Portal Error Handling +COMMON_PORTAL_CONFIGURE_ERRORS=Configure how the system handles errors on portal level +COMMON_KEY=Key +COMMON_NAME=Name +COMMON_READONLY=ReadOnly +COMMON_VALUE=Value +COMMON_NO_DEFINED_PREFERENCES=No defined preferences for this portlet +COMMON_EDIT_EXISTING_VALUES=Edit existing values +COMMON_APPEND_VALUE=Append a value +COMMON_PROPERTIES=Properties +COMMON_ADD_PROPERTY=Add a property +COMMON_SELECT_PREDEFINED_PROPERTY=Select predefined property +COMMON_OR=or +COMMON_ENTER_PROPERTY_NAME=Enter property name +COMMON_MANAGE_PROPERTIES=Manage currently defined properties +COMMON_DESCRIPTION=Description +COMMON_INHERITED=Inherited +COMMON_YES=Yes +COMMON_NO=No +COMMON_ROLES=Roles +COMMON_PERMISSIONS=Permissions +COMMON_ROLE=Role +COMMON_SETTING=Setting +COMMON_LAYOUT=Layout +COMMON_NAME_LAYOUT_IMPLEMENTATION=Name of the layout implementation used to arrange portlet windows in pages +COMMON_THEME=Theme +COMMON_NAME_LOOK_AND_FEEL=Name of the look and feel to use +COMMON_RENDERSET=RenderSet +COMMON_NAME_RENDER_ENGINE_PAGES=Name of the render engine to use to render pages +COMMON_WINDOW_RENDERER=Window Renderer +COMMON_NAME_RENDER_ENGINE_WINDOWS=Name of the render engine to use to render windows +COMMON_DECORATION_RENDERER=Decoration Renderer +COMMON_NAME_RENDER_ENGINE_DECORATIONS=Name of the render engine to use to render window decorations +COMMON_PORTLET_RENDERER=Portlet Renderer +COMMON_NAME_RENDER_ENGINE_PORTLETS=Name of the render engine to use to render portlets +COMMON_PORTLET_INSTANCE_INFORMATION=Portlet Instance Information +COMMON_PORTLET_NAME=Portlet name +COMMON_PORTLET_DESCRIPTION=Portlet description +COMMON_PORTLET_TITLE=Portlet title +COMMON_PORTLET_KEYWORDS=Portlet keywords +COMMON_PORTLET_LOCALES=Portlet locales +COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Portlet Instance Display Names +COMMON_ADD_INSTANCE_DISPLAY_NAMES=Add Instance Display Names +COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Current Instance Display Names +COMMON_CANCEL=Cancel +COMMON_UPDATE=Update +COMMON_ADD=Add +COMMON_ADD_PROPERTY=Add Property +COMMON_UP=Up +COMMON_DOWN=Down +COMMON_NEW_VALUE=New value +COMMON_APPEND=Append +COMMON_LOCALE=Locale +COMMON_DISPLAY_NAME=Display Name +COMMON_MEDIA_TYPES=Media Types +COMMON_WINDOW_STATES=Window States +COMMON_PORTLET_MODES=Portlet Modes +COMMON_PREFERENCES=Preferences +COMMON_PUBLIC_RENDER_PARAMETERS=Public Render Parameters +COMMON_ID=Id + + +DASHBOARD_PERSONAL_EDITOR=Personal Dashboard Editor +DASHBOARD_CREATE_NEW_PAGE=Create a New Page +DASHBOARD_CREATE_PAGE=Page name +DASHBOARD_RENAME_THIS_PAGE=Rename this Page +DASHBOARD_NEW_PAGE_NAME=New page name +DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Use this page to manage the content and appearance of your dashboard pages +DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=You can control the page titles, column layouts, page themes,and add,order, or remove portlets +DASHBOARD_CURRENTLY_EDITING_PAGE=Currently editing page +DASHBOARD_THEME_AND_LAYOUT=Theme and Layout +DASHBOARD_APPLY_THEME=Apply a theme to your dashboard, or select the number of columns for the layout +DASHBOARD_CHOOSE_LAYOUT=Choose a layout +DASHBOARD_CHOOSE_THEME=Choose a theme +DASHBOARD_CANNOT_UNDO_ACTION=You cannot undo this action +DASHBOARD_DELETE_THIS_PAGE=Delete this Page +DASHBOARD_SAVE=Save +DASHBOARD_SELECT=Select + +WIZARD_ADDING_NEW_PORTLET=Adding a new Portlet +WIZARD_STEP=Step +WIZARD_SELECT_PORTLET=Select Portlet +WIZARD_SELECT_PORTAL=Select Portal +WIZARD_SELECT_PAGE=Select Page +WIZARD_SELECT_REGION=Select Region +WIZARD_CONFIRM=Confirm +WIZARD_CONTENT=Content +WIZARD_SWITCH_ADVANCED_MODE=Switch to advanced mode +WIZARD_PORTLET=Portlet +WIZARD_PORTAL=Portal +WIZARD_PAGE=Page +WIZARD_REGION=Region +WIZARD_PREVIOUS=Previous +WIZARD_NEXT=Next +WIZARD_SUB_PAGES=Sub-Pages +WIZARD_PORTLET_PROVIDER=Portlet provider +WIZARD_CHANGE=Change \ No newline at end of file Deleted: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-28 23:07:49 UTC (rev 10830) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,199 +0,0 @@ -################################################################################ -# JBoss, a division of Red Hat # -# Copyright 2006, Red Hat Middleware, LLC, and individual # -# contributors as indicated by the @authors tag. See the # -# copyright.txt in the distribution for a full listing of # -# individual contributors. # -# # -# This is free software; you can redistribute it and/or modify it # -# under the terms of the GNU Lesser General Public License as # -# published by the Free Software Foundation; either version 2.1 of # -# the License, or (at your option) any later version. # -# # -# This software is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # -# Lesser General Public License for more details. # -# # -# You should have received a copy of the GNU Lesser General Public # -# License along with this software; if not, write to the Free # -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -################################################################################ - -PORTLET_INSTANCES=Istanze di Portlet -INSTANCE_DELETE=Cancella Istanza -PORTLET_CAUSING_REFERENCING_NOT_ABLE=L'istanza di Portlet fa in modo che le finistre che la referenziano non siano pi\u00F9 abilitate a visualizzarne il contenuto -ARE_YOU_SURE_DELETE=Sei sicuro di voler cancellare quest\'istanza di Portlet -DASHBOARD_THEME_PROPERTIES=Propriet\u00e0 del tema della Dashboard -CONFIGURE_DASHBOARD_SETTINGS=Configurazione della Dashboard -DASHBOARDS=Dashboard -ADD_DISPLAY_NAMES=Aggiungi i nomi da visualizzare -CURRENT_DISPLAY_NAMES=Nomi attualmente visualizzati -MANAGE=Gestisci -PORTALS=portali -PORTAL=portale -SUB_PORTALS=sotto-portali -PAGES_WITHIN=pagine dentro -CREATE_PORTAL_NAMED=Crea un portale chiamato -PAGE_LAYOUT=Layout della pagina -SECURITY=Sicurezza -THEME=Tema -RENAME=Rinomina -DISPLAY_NAMES=Nomi visualizzati -DELETE=Cancella -MANAGE_SUB_PAGES_WITHIN=Gestisci le sotto-pagine dentro -CREATE_PAGE_NAMED=Crea una pagina chiamata -SET_PAGE_PERMISSIONS=Configura i permessi per la pagina -PAGE_THEME_PROPERTIES=Propriet\u00e0 del tema della Pagina -SET_PORTAL_PERMISSIONS=Configura i permessi per il portale -PORTAL_THEME_PROPERTIES=Propriet\u00e0 del tema del Portale -SETTINGS_ARE_INHERITED_BY_ALL_PAGES=Queste configurazioni saranno ereditate da tutte le pagine e finestre del portale. Puoi sovrascrivere queste configurazioni selezionando il valore appropriato nella configurazione del tema delle pagine -EVENT_LISTENER_BINDING=Ascoltatore di eventi -CHOOSE_ID_PORTALEVENTLISTENER=Scegli l\'id del PortalEventListener per agganciarti a questo -SET_PERMISSIONS_FOR=Configura i permessi per -WINDOW=finestra -WINDOW_THEME_PROPERTIES=Propriet\u00e0 del tema della Finestra -INSTANCE_ID=Id di Istanza -INSTANCE_NAME=Nome Istanza -ACTIONS=Azioni -PREFERENCES_MAX=Preferenze -PORTLET_DETAILS=dettagli della portlet -ASSOCIATED_PORTLET_NOT_AVAILABLE=La portlet associata non \u00e8 disponibile -PREFERENCES_MIN=preferenze -SECURITY_SETTINGS=configurazione della sicurezza -MAKE_DEFAULT=Rendi Default -MANAGE_WINDOWS_WITHIN=Gestisci le finestre dentro -PORTAL_OBJECTS=Oggetti del Portale -PORTALS=Portali -PORTLET_NAME=Nome della portlet -DESCRIPTION=Descrizione -REMOTE=Remoto -REMOTABLE=Remotabile -CREATE_INSTANCE=Crea istanza -PORTLET_DEFINITIONS=Definizioni di Portlet -DETAILS=dettagli -INSTANCE_CREATION=creazione dell\'istanza -CREATE_INSTANCE_NAMED=Crea un\'istanza chiamata -RENAME_THE=Rinomina il -TO=a -THIS_MINIMIZED_STATE=Questa finestra ha uno stato minimizzato -THIS_NORMAL_STATE=Questa finestra ha uno stato normale -THIS_MAXIMIZED_STATE=Questa finestra ha uno stato massimizzato -THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=Questa finestra ha uno stato minimizzato perch\u00e8 una finestra in questa pagina ha uno stato massimizzato -SWITCH_TO_WIZARD_MODE=Vai alla modalit\u00e0 wizard -CREATE_PORTAL=Crea portale -CREATE_PAGE=Crea pagina -DEFAULT=Default -WINDOW=Finestra -VIEW_PORTLETS_PROVIDED_BY=Visualizza le portlet fornite dal provider chiamato -VIEW_PORTLETS=Visualizza le portlet - -COMMON_INCONSISTENT_STATE=Stato non consistente -COMMON_DELETE=Cancella -COMMON_DELETING=ATTENZIONE! Stai per cancellare il -COMMON_FROM=dal -COMMON_SURE_DELETE=Sei sicuro di volerlo cancellare -COMMON_ERROR_HANDLING=Gestione degli errori della Pagina -COMMON_CONFIGURE_ERRORS=Configura la gestione degli errori a livello di pagina -COMMON_CASE=Caso -COMMON_INHERITANCE=Ereditariet\u00e0 -COMMON_ACTION=Azione -COMMON_INHERIT_ACTION=eredita l\'azione dal genitore -COMMON_CONTENT_DEFINITION=Definizione del Contenuto -COMMON_DEFINE_NAME_WINDOW=Dai un nome alla finestra dei contenuti (opzionale) -COMMON_WINDOW_NAME=Nome Finestra -COMMON_SELECT_TYPE_CONTENT=Seleziona il tipo di contenuto che sar\u00e0 aggiunto alla pagina -COMMON_CONTENT_TYPE=Tipo del Contenuto -COMMON_SELECT_CONTENT=Seleziona il contenuto che sar\u00e0 aggiunto alla pagina -COMMON_PAGE_LAYOUT=Layout della Pagina -COMMON_REGION=Regione -COMMON_UNASSIGNED_WINDOW=Finestre non assegnate -COMMON_PORTAL_ERROR_HANDLING=Gestione degli errori del Portale -COMMON_PORTAL_CONFIGURE_ERRORS=Configura la gestione degli errori a livello di portale -COMMON_KEY=Chiave -COMMON_NAME=Nome -COMMON_READONLY=Sola lettura -COMMON_VALUE=Valore -COMMON_NO_DEFINED_PREFERENCES=Non ci sono preferenze per questa portlet -COMMON_EDIT_EXISTING_VALUES=Modifica i valori esistenti -COMMON_APPEND_VALUE=Appendi un valore -COMMON_PROPERTIES=Propriet\u00e0 -COMMON_ADD_PROPERTY=Aggiungi una propriet\u00e0 -COMMON_SELECT_PREDEFINED_PROPERTY=Seleziona la propriet\u00e0 predefinita -COMMON_OR=o -COMMON_ENTER_PROPERTY_NAME=Inserisci il nome della propriet\u00e0 -COMMON_MANAGE_PROPERTIES=Gestisci le propriet\u00e0 attualmente definite -COMMON_INHERITED=Ereditato -COMMON_YES=Si -COMMON_NO=No -COMMON_ROLES=Ruoli -COMMON_PERMISSIONS=Permessi -COMMON_ROLE=Ruolo -COMMON_SETTING=Configurazione -COMMON_LAYOUT=Layout -COMMON_NAME_LAYOUT_IMPLEMENTATION=Nome dell\'implementazione del layout usato per le finestre della portlet nelle pagine -COMMON_NAME_LOOK_AND_FEEL=Nome del look and feel da usare -COMMON_RENDERSET=RenderSet -COMMON_NAME_RENDER_ENGINE_PAGES=Nome del motore di Render da usare per creare le pagine -COMMON_WINDOW_RENDERER=Renderer della Finestra -COMMON_NAME_RENDER_ENGINE_WINDOWS=Nome del motore di Render da usare per creare le finestre -COMMON_DECORATION_RENDERER=Renderer della Decorazione -COMMON_NAME_RENDER_ENGINE_DECORATIONS=Nome del motore di Render da usare per creare le decorazioni delle finestre -COMMON_PORTLET_RENDERER=Renderer della Portlet -COMMON_NAME_RENDER_ENGINE_PORTLETS=Nome del motore di Render da usare per creare le portlet -COMMON_PORTLET_INSTANCE_INFORMATION=Informazione sull\'Istanza della Portlet -COMMON_PORTLET_NAME=Nome Portlet -COMMON_PORTLET_DESCRIPTION=Descrizione della Portlet -COMMON_PORTLET_TITLE=Titolo della Portlet -COMMON_PORTLET_KEYWORDS=Parole chiave della Portlet -COMMON_PORTLET_LOCALES=Localizzazione della Portlet -COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Elenco dei nomi delle istanze di Portlet -COMMON_ADD_INSTANCE_DISPLAY_NAMES=Aggiungi i nomi delle istanze di Portlet -COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Nomi attuali delle istanze di Portlet -COMMON_CANCEL=Annulla -COMMON_UPDATE=Aggiorna -COMMON_ADD=Aggiungi -COMMON_ADD_PROPERTY=Aggiungi Propriet\u00e0 -COMMON_UP=Su -COMMON_DOWN=Giu -COMMON_NEW_VALUE=Nuovo valore -COMMON_APPEND=Aggiungi -COMMON_LOCALE=Nazionalit\u00e0 -COMMON_DISPLAY_NAME=Visualizza Nome - -DASHBOARD_PERSONAL_EDITOR=Editor personale della Dashboard -DASHBOARD_CREATE_NEW_PAGE=Crea una nuova pagina -DASHBOARD_CREATE_PAGE=Nome pagina -DASHBOARD_RENAME_THIS_PAGE=Rinomina la pagina -DASHBOARD_NEW_PAGE_NAME=Nuovo nome per la pagina -DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Usa questa pagina per gestire i contenuti e la grafica delle pagine della tua Dashboard -DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=Puoi controllare i titoli delle pagine, i layout di colonna, i temi della pagina,e aggiungere,ordinare, o rimuovere portlet -DASHBOARD_CURRENTLY_EDITING_PAGE=Pagina attualmente da editare -DASHBOARD_THEME_AND_LAYOUT=Tema e Layout -DASHBOARD_APPLY_THEME=Applica un tema alla tua dashboard, o seleziona il numero di colonne per il layout -DASHBOARD_CHOOSE_LAYOUT=Scegli un layout -DASHBOARD_CHOOSE_THEME=Scegli un tema -DASHBOARD_CANNOT_UNDO_ACTION=Non puoi annullare l\'azione -DASHBOARD_DELETE_THIS_PAGE=Cancella questa Pagina -DASHBOARD_SAVE=Salva -DASHBOARD_SELECT=Seleziona - -WIZARD_ADDING_NEW_PORTLET=Aggiungere una nuova portlet -WIZARD_STEP=Step -WIZARD_SELECT_PORTLET=Seleziona la Portlet -WIZARD_SELECT_PORTAL=Seleziona il Portale -WIZARD_SELECT_PAGE=Seleziona la Pagina -WIZARD_SELECT_REGION=Seleziona la Regione -WIZARD_CONFIRM=Conferma -WIZARD_CONTENT=Contenuto -WIZARD_SWITCH_ADVANCED_MODE=Vai alla modalit\u00e0 avanzata -WIZARD_PORTLET=Portlet -WIZARD_PORTAL=Portale -WIZARD_PAGE=Pagina -WIZARD_REGION=Regione -WIZARD_PREVIOUS=Indietro -WIZARD_NEXT=Avanti -WIZARD_SUB_PAGES=Sotto-Pagine -WIZARD_PORTLET_PROVIDER=Fornitore di Portlet -WIZARD_CHANGE=Cambia \ No newline at end of file Copied: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties (from rev 10830, branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties) =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -0,0 +1,199 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, Red Hat Middleware, LLC, and individual # +# contributors as indicated by the @authors tag. See the # +# copyright.txt in the distribution for a full listing of # +# individual contributors. # +# # +# This is free software; you can redistribute it and/or modify it # +# under the terms of the GNU Lesser General Public License as # +# published by the Free Software Foundation; either version 2.1 of # +# the License, or (at your option) any later version. # +# # +# This software is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # +# Lesser General Public License for more details. # +# # +# You should have received a copy of the GNU Lesser General Public # +# License along with this software; if not, write to the Free # +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. # +################################################################################ + +PORTLET_INSTANCES=Istanze di Portlet +INSTANCE_DELETE=Cancella Istanza +PORTLET_CAUSING_REFERENCING_NOT_ABLE=L'istanza di Portlet fa in modo che le finistre che la referenziano non siano pi\u00F9 abilitate a visualizzarne il contenuto +ARE_YOU_SURE_DELETE=Sei sicuro di voler cancellare quest\'istanza di Portlet +DASHBOARD_THEME_PROPERTIES=Propriet\u00e0 del tema della Dashboard +CONFIGURE_DASHBOARD_SETTINGS=Configurazione della Dashboard +DASHBOARDS=Dashboard +ADD_DISPLAY_NAMES=Aggiungi i nomi da visualizzare +CURRENT_DISPLAY_NAMES=Nomi attualmente visualizzati +MANAGE=Gestisci +PORTALS=portali +PORTAL=portale +SUB_PORTALS=sotto-portali +PAGES_WITHIN=pagine dentro +CREATE_PORTAL_NAMED=Crea un portale chiamato +PAGE_LAYOUT=Layout della pagina +SECURITY=Sicurezza +THEME=Tema +RENAME=Rinomina +DISPLAY_NAMES=Nomi visualizzati +DELETE=Cancella +MANAGE_SUB_PAGES_WITHIN=Gestisci le sotto-pagine dentro +CREATE_PAGE_NAMED=Crea una pagina chiamata +SET_PAGE_PERMISSIONS=Configura i permessi per la pagina +PAGE_THEME_PROPERTIES=Propriet\u00e0 del tema della Pagina +SET_PORTAL_PERMISSIONS=Configura i permessi per il portale +PORTAL_THEME_PROPERTIES=Propriet\u00e0 del tema del Portale +SETTINGS_ARE_INHERITED_BY_ALL_PAGES=Queste configurazioni saranno ereditate da tutte le pagine e finestre del portale. Puoi sovrascrivere queste configurazioni selezionando il valore appropriato nella configurazione del tema delle pagine +EVENT_LISTENER_BINDING=Ascoltatore di eventi +CHOOSE_ID_PORTALEVENTLISTENER=Scegli l\'id del PortalEventListener per agganciarti a questo +SET_PERMISSIONS_FOR=Configura i permessi per +WINDOW=finestra +WINDOW_THEME_PROPERTIES=Propriet\u00e0 del tema della Finestra +INSTANCE_ID=Id di Istanza +INSTANCE_NAME=Nome Istanza +ACTIONS=Azioni +PREFERENCES_MAX=Preferenze +PORTLET_DETAILS=dettagli della portlet +ASSOCIATED_PORTLET_NOT_AVAILABLE=La portlet associata non \u00e8 disponibile +PREFERENCES_MIN=preferenze +SECURITY_SETTINGS=configurazione della sicurezza +MAKE_DEFAULT=Rendi Default +MANAGE_WINDOWS_WITHIN=Gestisci le finestre dentro +PORTAL_OBJECTS=Oggetti del Portale +PORTALS=Portali +PORTLET_NAME=Nome della portlet +DESCRIPTION=Descrizione +REMOTE=Remoto +REMOTABLE=Remotabile +CREATE_INSTANCE=Crea istanza +PORTLET_DEFINITIONS=Definizioni di Portlet +DETAILS=dettagli +INSTANCE_CREATION=creazione dell\'istanza +CREATE_INSTANCE_NAMED=Crea un\'istanza chiamata +RENAME_THE=Rinomina il +TO=a +THIS_MINIMIZED_STATE=Questa finestra ha uno stato minimizzato +THIS_NORMAL_STATE=Questa finestra ha uno stato normale +THIS_MAXIMIZED_STATE=Questa finestra ha uno stato massimizzato +THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=Questa finestra ha uno stato minimizzato perch\u00e8 una finestra in questa pagina ha uno stato massimizzato +SWITCH_TO_WIZARD_MODE=Vai alla modalit\u00e0 wizard +CREATE_PORTAL=Crea portale +CREATE_PAGE=Crea pagina +DEFAULT=Default +WINDOW=Finestra +VIEW_PORTLETS_PROVIDED_BY=Visualizza le portlet fornite dal provider chiamato +VIEW_PORTLETS=Visualizza le portlet + +COMMON_INCONSISTENT_STATE=Stato non consistente +COMMON_DELETE=Cancella +COMMON_DELETING=ATTENZIONE! Stai per cancellare il +COMMON_FROM=dal +COMMON_SURE_DELETE=Sei sicuro di volerlo cancellare +COMMON_ERROR_HANDLING=Gestione degli errori della Pagina +COMMON_CONFIGURE_ERRORS=Configura la gestione degli errori a livello di pagina +COMMON_CASE=Caso +COMMON_INHERITANCE=Ereditariet\u00e0 +COMMON_ACTION=Azione +COMMON_INHERIT_ACTION=eredita l\'azione dal genitore +COMMON_CONTENT_DEFINITION=Definizione del Contenuto +COMMON_DEFINE_NAME_WINDOW=Dai un nome alla finestra dei contenuti (opzionale) +COMMON_WINDOW_NAME=Nome Finestra +COMMON_SELECT_TYPE_CONTENT=Seleziona il tipo di contenuto che sar\u00e0 aggiunto alla pagina +COMMON_CONTENT_TYPE=Tipo del Contenuto +COMMON_SELECT_CONTENT=Seleziona il contenuto che sar\u00e0 aggiunto alla pagina +COMMON_PAGE_LAYOUT=Layout della Pagina +COMMON_REGION=Regione +COMMON_UNASSIGNED_WINDOW=Finestre non assegnate +COMMON_PORTAL_ERROR_HANDLING=Gestione degli errori del Portale +COMMON_PORTAL_CONFIGURE_ERRORS=Configura la gestione degli errori a livello di portale +COMMON_KEY=Chiave +COMMON_NAME=Nome +COMMON_READONLY=Sola lettura +COMMON_VALUE=Valore +COMMON_NO_DEFINED_PREFERENCES=Non ci sono preferenze per questa portlet +COMMON_EDIT_EXISTING_VALUES=Modifica i valori esistenti +COMMON_APPEND_VALUE=Appendi un valore +COMMON_PROPERTIES=Propriet\u00e0 +COMMON_ADD_PROPERTY=Aggiungi una propriet\u00e0 +COMMON_SELECT_PREDEFINED_PROPERTY=Seleziona la propriet\u00e0 predefinita +COMMON_OR=o +COMMON_ENTER_PROPERTY_NAME=Inserisci il nome della propriet\u00e0 +COMMON_MANAGE_PROPERTIES=Gestisci le propriet\u00e0 attualmente definite +COMMON_INHERITED=Ereditato +COMMON_YES=Si +COMMON_NO=No +COMMON_ROLES=Ruoli +COMMON_PERMISSIONS=Permessi +COMMON_ROLE=Ruolo +COMMON_SETTING=Configurazione +COMMON_LAYOUT=Layout +COMMON_NAME_LAYOUT_IMPLEMENTATION=Nome dell\'implementazione del layout usato per le finestre della portlet nelle pagine +COMMON_NAME_LOOK_AND_FEEL=Nome del look and feel da usare +COMMON_RENDERSET=RenderSet +COMMON_NAME_RENDER_ENGINE_PAGES=Nome del motore di Render da usare per creare le pagine +COMMON_WINDOW_RENDERER=Renderer della Finestra +COMMON_NAME_RENDER_ENGINE_WINDOWS=Nome del motore di Render da usare per creare le finestre +COMMON_DECORATION_RENDERER=Renderer della Decorazione +COMMON_NAME_RENDER_ENGINE_DECORATIONS=Nome del motore di Render da usare per creare le decorazioni delle finestre +COMMON_PORTLET_RENDERER=Renderer della Portlet +COMMON_NAME_RENDER_ENGINE_PORTLETS=Nome del motore di Render da usare per creare le portlet +COMMON_PORTLET_INSTANCE_INFORMATION=Informazione sull\'Istanza della Portlet +COMMON_PORTLET_NAME=Nome Portlet +COMMON_PORTLET_DESCRIPTION=Descrizione della Portlet +COMMON_PORTLET_TITLE=Titolo della Portlet +COMMON_PORTLET_KEYWORDS=Parole chiave della Portlet +COMMON_PORTLET_LOCALES=Localizzazione della Portlet +COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Elenco dei nomi delle istanze di Portlet +COMMON_ADD_INSTANCE_DISPLAY_NAMES=Aggiungi i nomi delle istanze di Portlet +COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Nomi attuali delle istanze di Portlet +COMMON_CANCEL=Annulla +COMMON_UPDATE=Aggiorna +COMMON_ADD=Aggiungi +COMMON_ADD_PROPERTY=Aggiungi Propriet\u00e0 +COMMON_UP=Su +COMMON_DOWN=Giu +COMMON_NEW_VALUE=Nuovo valore +COMMON_APPEND=Aggiungi +COMMON_LOCALE=Nazionalit\u00e0 +COMMON_DISPLAY_NAME=Visualizza Nome + +DASHBOARD_PERSONAL_EDITOR=Editor personale della Dashboard +DASHBOARD_CREATE_NEW_PAGE=Crea una nuova pagina +DASHBOARD_CREATE_PAGE=Nome pagina +DASHBOARD_RENAME_THIS_PAGE=Rinomina la pagina +DASHBOARD_NEW_PAGE_NAME=Nuovo nome per la pagina +DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Usa questa pagina per gestire i contenuti e la grafica delle pagine della tua Dashboard +DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=Puoi controllare i titoli delle pagine, i layout di colonna, i temi della pagina,e aggiungere,ordinare, o rimuovere portlet +DASHBOARD_CURRENTLY_EDITING_PAGE=Pagina attualmente da editare +DASHBOARD_THEME_AND_LAYOUT=Tema e Layout +DASHBOARD_APPLY_THEME=Applica un tema alla tua dashboard, o seleziona il numero di colonne per il layout +DASHBOARD_CHOOSE_LAYOUT=Scegli un layout +DASHBOARD_CHOOSE_THEME=Scegli un tema +DASHBOARD_CANNOT_UNDO_ACTION=Non puoi annullare l\'azione +DASHBOARD_DELETE_THIS_PAGE=Cancella questa Pagina +DASHBOARD_SAVE=Salva +DASHBOARD_SELECT=Seleziona + +WIZARD_ADDING_NEW_PORTLET=Aggiungere una nuova portlet +WIZARD_STEP=Step +WIZARD_SELECT_PORTLET=Seleziona la Portlet +WIZARD_SELECT_PORTAL=Seleziona il Portale +WIZARD_SELECT_PAGE=Seleziona la Pagina +WIZARD_SELECT_REGION=Seleziona la Regione +WIZARD_CONFIRM=Conferma +WIZARD_CONTENT=Contenuto +WIZARD_SWITCH_ADVANCED_MODE=Vai alla modalit\u00e0 avanzata +WIZARD_PORTLET=Portlet +WIZARD_PORTAL=Portale +WIZARD_PAGE=Pagina +WIZARD_REGION=Regione +WIZARD_PREVIOUS=Indietro +WIZARD_NEXT=Avanti +WIZARD_SUB_PAGES=Sotto-Pagine +WIZARD_PORTLET_PROVIDER=Fornitore di Portlet +WIZARD_CHANGE=Cambia \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-05-29 09:32:44 UTC (rev 10833) @@ -31,6 +31,7 @@ <view-handler> org.jboss.portletbridge.application.PortletViewHandler </view-handler> + <message-bundle>Resource</message-bundle> <property-resolver>org.jboss.portal.core.admin.ui.AdminPropertyResolver</property-resolver> </application> <factory> 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-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -7,13 +7,14 @@ 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="Delete"/> + <ui:param name="portalObjectScreen" value="#{bundle.COMMON_DELETE}"/> <ui:define name="content"> <f:subview rendered="#{empty portalobjectmgr.selectedDeletingObject}"> - <p class="portlet-msg-error">Inconsistent state</p> + <p class="portlet-msg-error">#{bundle.COMMON_INCONSISTENT_STATE}</p> </f:subview> <f:subview rendered="#{not empty portalobjectmgr.selectedDeletingObject}"> @@ -22,26 +23,26 @@ <div class="portlet-msg"> <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> <div class="portlet-msg-body"> - <h3>Delete <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> + <h3>#{bundle.COMMON_DELETE} <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> <p class="portlet-msg-alert"> - WARNING! You are about to delete the + #{bundle.COMMON_DELETING} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> - #{portalobjectmgr.selectedObject.typeName} from the + #{portalobjectmgr.selectedObject.typeName} #{bundle.COMMON_FROM} <c:if test="#{not empty portalobjectmgr.selectedObjectParent.name}"> <span class="objectName">#{portalobjectmgr.selectedObjectParent.name}</span> </c:if> #{portalobjectmgr.selectedObjectParent.typeName}! </p> - <p class="portlet-class">Are you sure you want to delete this #{portalobjectmgr.selectedObjectType}?</p> + <p class="portlet-class">#{bundle.COMMON_SURE_DELETE} #{portalobjectmgr.selectedObjectType}?</p> <h:form> - <h:commandButton value="Delete" action="objects" actionListener="#{portalobjectmgr.destroyObject}" + <h:commandButton value="#{bundle.COMMON_DELETE}" action="objects" actionListener="#{portalobjectmgr.destroyObject}" styleClass="portlet-form-button portlet-section-buttonrow"> <f:attribute name="objectId" value="#{portalobjectmgr.selectedDeletingObject.id}"/> </h:commandButton> - <h:commandButton value="Cancel" action="objects" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="objects" actionListener="#{portalobjectmgr.selectParentObject}" styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> 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-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -4,13 +4,14 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> -<p class="portlet-area-header">Page Error Handling</p> +<f:loadBundle basename="Resource" var="bundle" /> +<p class="portlet-area-header">#{bundle.COMMON_ERROR_HANDLING}</p> <div class="portlet-area-body"> <!-- defines error handeling section --> <table cellpadding="0" cellspacing="0" width="100%"> <tr> - <th class="portlet-section-title">Configure how the system handles errors on page level.</th> + <th class="portlet-section-title">#{bundle.COMMON_CONFIGURE_ERRORS}.</th> </tr> <tr> <td valign="top" class="portlet-section-body"> @@ -20,9 +21,9 @@ <table class="datatable full-width"> <thead class="portlet-section-header"> <tr> - <th>Case</th> - <th>Inheritance</th> - <th>Action</th> + <th>#{bundle.COMMON_CASE}</th> + <th>#{bundle.COMMON_INHERITANCE}</th> + <th>#{bundle.COMMON_ACTION}</th> </tr> </thead> <tbody> @@ -34,8 +35,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlAccessDenied.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlAccessDenied.inherit}" - value="#{properties.pageControlAccessDenied.inherited}"/>inherit action - from parent + value="#{properties.pageControlAccessDenied.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlAccessDenied.value}" @@ -52,8 +52,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlUnavailable.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlUnavailable.inherit}" - value="#{properties.pageControlUnavailable.inherited}"/>inherit action - from parent + value="#{properties.pageControlUnavailable.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlUnavailable.value}" @@ -70,8 +69,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlError.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlError.inherit}" - value="#{properties.pageControlError.inherited}"/>inherit action from - parent + value="#{properties.pageControlError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlError.value}" @@ -88,8 +86,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlInternalError.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlInternalError.inherit}" - value="#{properties.pageControlInternalError.inherited}"/>inherit action - from parent + value="#{properties.pageControlInternalError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlInternalError.value}" @@ -106,8 +103,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlNotFound.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlNotFound.inherit}" - value="#{properties.pageControlNotFound.inherited}"/>inherit action from - parent + value="#{properties.pageControlNotFound.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlNotFound.value}" @@ -124,8 +120,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlResourceURI.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlResourceURI.inherit}" - value="#{properties.pageControlResourceURI.inherited}"/>inherit action - from parent + value="#{properties.pageControlResourceURI.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:inputText value="#{properties.pageControlResourceURI.value}" size="60" @@ -134,7 +129,7 @@ </tr> </tbody> </table> -<h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/> +<h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> 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-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,24 +5,25 @@ 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> <td valign="top" width="50%"> - <p class="portlet-area-header">Content Definition</p> + <p class="portlet-area-header">#{bundle.COMMON_CONTENT_DEFINITION}</p> <div class="portlet-area-body"> <table> <tr> - <td colspan="2">Define a name for the window of content (optional): + <td colspan="2">#{bundle.COMMON_DEFINE_NAME_WINDOW}: </td> </tr> <tr> <td colspan="2"> <h:form id="windowForm"> <label for="windowName"> - <span class="portlet-form-field-label admin-label">Window Name:</span> + <span class="portlet-form-field-label admin-label">#{bundle.COMMON_WINDOW_NAME}:</span> <h:inputText id="windowName" value="#{pageManager.windowName}" styleClass="portlet-form-input-field id-window-name"/> </label> @@ -33,14 +34,14 @@ <tr> <td colspan="2"> <hr/> - Select the type of content that will be added to the page: + #{bundle.COMMON_SELECT_TYPE_CONTENT}: </td> </tr> <tr> <td> <h:form id="contentTypesForm"> <label for="instanceId" class="portlet-form-field-label-container"> - <span class="portlet-form-field-label admin-label">Content Type:</span> + <span class="portlet-form-field-label admin-label">#{bundle.COMMON_CONTENT_TYPE}:</span> <h:inputHidden id="windowNameCopy" value="#{pageManager.windowName}"/> <h:selectOneMenu id="instanceId" @@ -58,7 +59,7 @@ <tr> <td colspan="2"> <hr/> - Select content that will be added to the page: + #{bundle.COMMON_SELECT_CONTENT}: </td> </tr> <tr> @@ -83,7 +84,7 @@ </td> <td valign="top" width="50%"> - <p class="portlet-area-header">Page Layout</p> + <p class="portlet-area-header">#{bundle.COMMON_PAGE_LAYOUT}</p> <div class="portlet-area-body"> @@ -96,14 +97,14 @@ <tr> <td colspan="3" class="portlet-form-field-label"> <hr/> - #{regionName} Region + #{regionName} #{bundle.COMMON_REGION} </td> </tr> <tr> <td valign="top"> <h:commandButton onclick="document.getElementById('blah').value=document.getElementById('#{pageManager.namespace}:windowForm:windowName').value" - value="Add" id="a_#{regionName}" + value="#{bundle.COMMON_ADD}" id="a_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/> </td> @@ -117,16 +118,16 @@ </td> <td valign="top" width="250"> <h:commandButton - value="Up" id="u_#{regionName}" + value="#{bundle.COMMON_UP}" id="u_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/><br/> <h:commandButton - value="Down" id="d_#{regionName}" + value="#{bundle.COMMON_DOWN}" id="d_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/> <hr/> <h:commandButton - value="Delete" id="l_#{regionName}" + value="#{bundle.COMMON_DELETE}" id="l_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/> </td> @@ -137,14 +138,13 @@ <tbody> <tr> <td colspan="2" class="portlet-form-field-label" - style="border-width:0px;border-top:1px dashed #d5d5d5">Unassigned - windows + style="border-width:0px;border-top:1px dashed #d5d5d5">#{bundle.COMMON_UNASSIGNED_WINDOW} </td> </tr> <tr> <td> <div style="margin-top: 1em"> - <h:commandButton value="Delete" + <h:commandButton value="#{bundle.COMMON_DELETE}" id="l_unknown" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button"/> </div> 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-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,14 +5,15 @@ xmlns:c="http://java.sun.com/jstl/core"> -<p class="portlet-area-header">Portal Error Handling</p> +<f:loadBundle basename="Resource" var="bundle" /> +<p class="portlet-area-header">#{bundle.COMMON_PORTAL_ERROR_HANDLING}</p> <div class="portlet-area-body"> <!-- defines error handeling section --> <table class="full-width"> <tr> - <th class="portlet-section-title">Configure how the system handles errors on portal level.</th> + <th class="portlet-section-title">#{bundle.COMMON_PORTAL_CONFIGURE_ERRORS}.</th> </tr> <tr> <td valign="top" class="portlet-section-body"> @@ -21,9 +22,9 @@ <table class="datatable full-width"> <thead class="portlet-section-header"> <tr> - <th>Case</th> - <th>Inheritance</th> - <th>Action</th> + <th>#{bundle.COMMON_CASE}</th> + <th>#{bundle.COMMON_INHERITANCE}</th> + <th>#{bundle.COMMON_ACTION}</th> </tr> </thead> <tbody> @@ -35,8 +36,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlAccessDenied.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlAccessDenied.inherit}" - value="#{properties.portalControlAccessDenied.inherited}"/>inherit - action from parent + value="#{properties.portalControlAccessDenied.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlAccessDenied.value}" @@ -54,8 +54,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlUnavailable.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlUnavailable.inherit}" - value="#{properties.portalControlUnavailable.inherited}"/>inherit - action from parent + value="#{properties.portalControlUnavailable.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlUnavailable.value}" @@ -73,8 +72,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlError.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlError.inherit}" - value="#{properties.portalControlError.inherited}"/>inherit action from - parent + value="#{properties.portalControlError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlError.value}" @@ -91,8 +89,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlInternalError.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlInternalError.inherit}" - value="#{properties.portalControlInternalError.inherited}"/>inherit - action from parent + value="#{properties.portalControlInternalError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlInternalError.value}" @@ -110,8 +107,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlNotFound.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlNotFound.inherit}" - value="#{properties.portalControlNotFound.inherited}"/>inherit action - from parent + value="#{properties.portalControlNotFound.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlNotFound.value}" @@ -128,8 +124,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlResourceURI.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlResourceURI.inherit}" - value="#{properties.portalControlResourceURI.inherited}"/>inherit - action from parent + value="#{properties.portalControlResourceURI.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:inputText value="#{properties.portalControlResourceURI.value}" size="60" @@ -138,7 +133,7 @@ </tr> </tbody> </table> -<h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/> +<h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> </td> </tr> 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-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,17 +5,18 @@ 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> <table class="full-width datatable"> <thead class="portlet-section-header" style="text-align:left;"> <tr> - <th>Key</th> - <th>Name</th> - <th>ReadOnly</th> + <th>#{bundle.COMMON_KEY}</th> + <th>#{bundle.COMMON_NAME}</th> + <th>#{bundle.COMMON_READONLY}</th> <c:if test="#{prefs.mutable}"> - <th>Value</th> + <th>#{bundle.COMMON_VALUE}</th> </c:if> </tr> </thead> @@ -50,21 +51,21 @@ </h:form> </c:when> <c:otherwise> - <p>No defined preferences for this portlet.</p> + <p>#{bundle.COMMON_NO_DEFINED_PREFERENCES}.</p> </c:otherwise> </c:choose> <c:if test="#{prefs.selectedEntry != null}"> <h:form style="padding: 1em 0 1em 0"> <fieldset style="border: 1px solid;"> - <legend>Edit existing values</legend> + <legend>#{bundle.COMMON_EDIT_EXISTING_VALUES}</legend> <table> <tbody> <c:forEach items="#{prefs.selectedEntry.indices}" var="index" varStatus="status"> <tr> <td> <h:outputLabel for="row_#{status.index}"> - <h:outputText value="Value #{status.index}: " styleClass="portlet-form-field-label"/> + <h:outputText value="#{bundle.COMMON_VALUE} #{status.index}: " styleClass="portlet-form-field-label"/> </h:outputLabel> </td> <td> @@ -74,14 +75,14 @@ <h:commandButton id="row_#{status.index}" actionListener="#{prefs.selectedEntry.deleteLine}" - value="Delete" + value="#{bundle.COMMON_DELETE}" styleClass="portlet-form-button"/> </td> </tr> </c:forEach> <tr> <td colspan="3"> - <h:commandButton value="Update" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button"/> </td> </tr> </tbody> @@ -91,12 +92,12 @@ <h:form> <fieldset style="border: 1px solid;"> - <legend>Append a value</legend> + <legend>#{bundle.COMMON_APPEND_VALUE}</legend> <h:outputLabel for="new_value"> - <h:outputText value="New value: " styleClass="portlet-form-field-label"/> + <h:outputText value="#{bundle.COMMON_NEW_VALUE}: " styleClass="portlet-form-field-label"/> </h:outputLabel> <h:inputText id="new_value" value="#{prefs.selectedEntry.line}" styleClass="portlet-form-input-field"/> - <h:commandButton action="#{prefs.selectedEntry.appendLine}" value="Append" + <h:commandButton action="#{prefs.selectedEntry.appendLine}" value="#{bundle.COMMON_APPEND}" styleClass="portlet-form-button"/> </fieldset> </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-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -4,7 +4,8 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> -<div class="portlet-area-header">Properties</div> +<f:loadBundle basename="Resource" var="bundle" /> +<div class="portlet-area-header">#{bundle.COMMON_PROPERTIES}</div> <div class="portlet-area-body"> <!-- divide the area body into two panes --> @@ -15,7 +16,7 @@ <!-- defines property creation section --> <table class="full-width"> <tr> - <th class="portlet-section-title">Add a property.</th> + <th class="portlet-section-title">#{bundle.COMMON_ADD_PROPERTY}.</th> </tr> <tr> <td class="dotted-blue-vert-rt"> @@ -27,8 +28,7 @@ <f:subview id="predefined-properties" rendered="#{not empty properties.propertyItems}"> <tr> <td class="portlet-form-field-label"> - <h:outputLabel for="predefinedProperty" styleClass="portlet-form-field-label">Select - predefined property:</h:outputLabel> + <h:outputLabel for="predefinedProperty" styleClass="portlet-form-field-label">#{bundle.COMMON_SELECT_PREDEFINED_PROPERTY}:</h:outputLabel> </td> </tr> <tr> @@ -39,13 +39,13 @@ </td> </tr> <tr> - <td align="center">or</td> + <td align="center">#{bundle.COMMON_OR}</td> </tr> </f:subview> <tr> <td class="portlet-form-field-label"> - <h:outputLabel for="property" styleClass="portlet-form-field-label">Enter property - name:</h:outputLabel> + <h:outputLabel for="property" styleClass="portlet-form-field-label"> + #{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:outputLabel> </td> </tr> <tr> @@ -57,7 +57,7 @@ </tbody> </table> <!-- ends layout of property form --> - <h:commandButton value="Add Property" styleClass="portlet-form-button portlet-section-buttonrow" + <h:commandButton value="#{bundle.COMMON_ADD_PROPERTY}" styleClass="portlet-form-button portlet-section-buttonrow" action="#{properties.action.updateProperty}"/></h:form> </td> @@ -73,7 +73,7 @@ <c:if test="#{properties.size != 0}"> <table class="full-width"> <tr> - <th class="portlet-section-title">Manage currently defined properties.</th> + <th class="portlet-section-title">#{bundle.COMMON_MANAGE_PROPERTIES}.</th> </tr> <tr> <td class="portlet-section-body" valign="top"> @@ -83,19 +83,19 @@ <h:dataTable value="#{properties.entries}" width="100%" headerClass="portlet-section-header" styleClass="datatable full-width" rowClasses="portlet-section-body, portlet-section-alternate" var="prop"> <h:column> - <f:facet name="header">Name</f:facet> + <f:facet name="header">#{bundle.COMMON_NAME}</f:facet> <h:outputText title="#{prop.type}" value="#{prop.displayName}"/> </h:column> <h:column> - <f:facet name="header">Description</f:facet> + <f:facet name="header">#{bundle.COMMON_DESCRIPTION}</f:facet> <h:outputText>#{prop.description}</h:outputText> </h:column> <h:column> - <f:facet name="header">Inherited</f:facet> - <h:outputText>#{prop.inherited ? 'Yes' : 'No'}</h:outputText> + <f:facet name="header">#{bundle.COMMON_INHERITED}</f:facet> + <h:outputText>#{prop.inherited ? '#{bundle.COMMON_YES}' : '#{bundle.COMMON_NO}'}</h:outputText> </h:column> <h:column> - <f:facet name="header">Value</f:facet> + <f:facet name="header">#{bundle.COMMON_VALUE}</f:facet> <h:selectBooleanCheckbox value="#{prop.value}" readonly="#{prop.readOnly}" rendered="#{prop.type == 'java.lang.Boolean'}"/> @@ -122,17 +122,17 @@ </h:column> <h:column> - <f:facet name="header">Delete</f:facet> + <f:facet name="header">#{bundle.COMMON_DELETE}</f:facet> <h:commandLink action="#{properties.action.removeProperty}" rendered="#{!prop.inherited}"> - <h:outputText styleClass="actionDelete" value="Delete"/> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> <f:param name="name" value="#{prop.name}"/> </h:commandLink> </h:column> </h:dataTable> <!-- ends property list --> - <h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/></h:form> + <h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button portlet-section-buttonrow"/></h:form> </td> </tr> 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-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,12 +5,13 @@ 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"> <tr> - <th>Roles</th> - <th>Permissions</th> + <th>#{bundle.COMMON_ROLES}</th> + <th>#{bundle.COMMON_PERMISSIONS}</th> </tr> </thead> <tbody> @@ -18,7 +19,7 @@ <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> <td> <h:outputLabel for="cars_#{status.index}"> - Role + #{bundle.COMMON_ROLE} #{role == '__unchecked__' ? 'Unchecked' : (auth.roleDisplayNameMap[role] != null ? auth.roleDisplayNameMap[role] : role)}: </h:outputLabel> </td> @@ -36,8 +37,8 @@ </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"/> + <h:commandButton value="#{bundle.COMMON_UPDATE}" action="#{auth.submit}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{auth.cancel}" styleClass="portlet-form-button" immediate="true"/> </div> </h:form> 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-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,19 +1,20 @@ <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"> <tr> - <th>Name</th> - <th>Description</th> - <th>Setting</th> + <th>#{bundle.COMMON_NAME}</th> + <th>#{bundle.COMMON_DESCRIPTION}</th> + <th>#{bundle.COMMON_SETTING}</th> </tr> </thead> <tbody> <tr class="portlet-section-body"> - <td>Layout</td> - <td>Name of the layout implementation used to arrange portlet windows in pages</td> + <td>#{bundle.COMMON_LAYOUT}</td> + <td>#{bundle.COMMON_NAME_LAYOUT_IMPLEMENTATION}</td> <td> <h:selectOneMenu id="layout" value="#{theme.layoutName}"> <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> @@ -21,8 +22,8 @@ </td> </tr> <tr class="portlet-section-alternate"> - <td>Theme</td> - <td>Name of the look and feel to use</td> + <td>#{bundle.COMMON_THEME}</td> + <td>#{bundle.COMMON_NAME_LOOK_AND_FEEL}</td> <td> <h:selectOneMenu id="theme" value="#{theme.themeName}"> <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> @@ -30,8 +31,8 @@ </td> </tr> <tr class="portlet-section-body"> - <td>RenderSet</td> - <td>Name of the render engine to use to render pages</td> + <td>#{bundle.COMMON_RENDERSET}</td> + <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PAGES}</td> <td> <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> 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-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -4,19 +4,20 @@ 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"> <tr> - <th>Name</th> - <th>Description</th> - <th>Setting</th> + <th>#{bundle.COMMON_NAME}</th> + <th>#{bundle.COMMON_DESCRIPTION}</th> + <th>#{bundle.COMMON_SETTING}</th> </tr> </thead> <tbody> <tr class="portlet-section-body"> - <td>Window Renderer</td> - <td>Name of the render engine to use to render windows</td> + <td>#{bundle.COMMON_WINDOW_RENDERER}</td> + <td>#{bundle.COMMON_NAME_RENDER_ENGINE_WINDOWS}</td> <td> <h:selectOneMenu id="windowRenderer" value="#{theme.windowRendererName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> @@ -24,8 +25,8 @@ </td> </tr> <tr class="portlet-section-alternate"> - <td>Decoration Renderer</td> - <td>Name of the render engine to use to render window decorations</td> + <td>#{bundle.COMMON_DECORATION_RENDERER}</td> + <td>#{bundle.COMMON_NAME_RENDER_ENGINE_DECORATIONS}</td> <td> <h:selectOneMenu id="decorationRenderer" value="#{theme.decorationRendererName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> @@ -33,8 +34,8 @@ </td> </tr> <tr> - <td>Portlet Renderer</td> - <td>Name of the render engine to use to render portlets</td> + <td>#{bundle.COMMON_PORTLET_RENDERER}</td> + <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PORTLETS}</td> <td> <h:selectOneMenu id="portletRenderer" value="#{theme.portletRendererName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> 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-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -12,6 +12,8 @@ <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}"/> @@ -53,21 +55,20 @@ <div class="half-width float-left details-left-col"> <portal:box class="whiteWithLtGreyHeader meta-box"> - <h3>Media Types</h3> + <h3>#{bundle.COMMON_MEDIA_TYPES}</h3> <dl> <c:forEach var="mediaType" items="#{portlet.info.capabilities.mediaTypes}"> <dt> #{mediaType.value} </dt> <dd> - <span><label>Name: </label>#{mediaType.type.name}</span> + <span><label>#{bundle.COMMON_NAME}: </label>#{mediaType.type.name}</span> </dd> </c:forEach> </dl> </portal:box> <portal:box class="whiteWithLtGreyHeader meta-box"> - - <h3>Modes</h3> + <h3>#{bundle.COMMON_PORTLET_MODES}</h3> <dl> <c:forEach var="mode" items="#{portlet.info.capabilities.allModes}"> <dt> @@ -80,7 +81,7 @@ </dl> </portal:box> <portal:box class="whiteWithLtGreyHeader meta-box"> - <h3>Window States</h3> + <h3>#{bundle.COMMON_WINDOW_STATES}</h3> <dl> <c:forEach var="windowState" items="#{portlet.info.capabilities.allWindowStates}"> <dt> @@ -93,35 +94,33 @@ </dl> </portal:box> <portal:box class="whiteWithLtGreyHeader meta-box"> - <h3>Preferences</h3> + <h3>#{bundle.COMMON_WINDOW_STATES}</h3> <dl> <c:forEach var="preferenceKey" items="#{portlet.info.preferences.keys}"> <dt> #{preferenceKey} </dt> <dd> - <span><label>Value: </label></span> + <span><label>#{bundle.COMMON_VALUE}: </label></span> </dd> </c:forEach> </dl> </portal:box> <portal:box class="whiteWithLtGreyHeader meta-box"> - <h3>Public Navigation Parameters</h3> + <h3>#{bundle.COMMON_PUBLIC_RENDER_PARAMETERS}</h3> <dl> <c:forEach var="publicParam" items="#{portlet.info.navigation.publicParameters}"> <dt> #{publicParam.name} </dt> <dd> - <span><label>Id: </label>#{publicParam.id}</span>&#160;<span><label>Description: </label>#{publicParam.description}</span> + <span><label>#{bundle.COMMON_ID}: </label>#{publicParam.id}</span>&#160;<span><label>#{bundle.COMMON_DESCRIPTION}: </label>#{publicParam.description}</span> </dd> </c:forEach> </dl> </portal:box> <br class="clear"/> - - </div> <div class="half-width float-right details-right-col"> @@ -134,7 +133,7 @@ <div class="displayNames"> <div> <h:form style="background-color:transparent;"> - <h3 style="background-color:transparent;">Add Instance Display Names</h3> + <h3 style="background-color:transparent;">#{bundle.COMMON_ADD_INSTANCE_DISPLAY_NAMES}</h3> <div style="background-color:transparent;"> <h:inputText id="newName" value="#{instanceDisplayNameAction.newText}" required="true"/> @@ -150,7 +149,7 @@ <br/> <div> <h:form > - <h3>Current Instance Display Names</h3> + <h3>#{bundle.COMMON_CURRENT_INSTANCE_DISPLAY_NAMES}</h3> <div > @@ -208,7 +207,7 @@ <portal:box class="whiteWithLtGreyHeader meta-box"> - <h3>Produced Events</h3> + <h3>#{bundle.COMMON_PRODUCED_EVENTS}</h3> <dl> <c:forEach var="producedEvent" items="#{portlet.info.eventing.producedEvents}"> <dt> @@ -221,7 +220,7 @@ </dl> </portal:box> <portal:box class="whiteWithLtGreyHeader meta-box"> - <h3>Consumed Events</h3> + <h3>#{bundle.COMMON_CONSUMEED_EVENTS}</h3> <dl> <c:forEach var="consumedEvent" items="#{portlet.info.eventing.consumedEvents}"> <dt> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -7,17 +7,18 @@ xmlns:c="http://java.sun.com/jstl/core" class="admin-ui"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="instancesTemplate.xhtml"> <ui:define name="content"> <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="instances">Portlet Instances</h:commandLink> + <h:commandLink action="instances">#{bundle.PORTLET_INSTANCES}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> instance Delete + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.INSTANCE_DELETE} </li> </ul> </h:form> @@ -29,19 +30,18 @@ <h3>Delete <span class="objectName">#{instancemgr.selectedInstance.id}</span></h3> <p class="portlet-msg-alert"> - WARNING! You are about to delete the - <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet instance causing windows - referencing it to not be able to display their content anymore. + #{bundle.COMMON_DELETING} + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PORTLET_CAUSING_REFERENCING_NOT_ABLE}. </p> - <p class="portlet-class">Are you sure you want to delete this portlet instance?</p> + <p class="portlet-class">#{bundle.ARE_YOU_SURE_DELETE}?</p> <h:form> - <h:commandButton value="Delete" action="instances" actionListener="#{instancemgr.deleteInstance}" + <h:commandButton value="#{bundle.COMMON_DELETE}" action="instances" actionListener="#{instancemgr.deleteInstance}" styleClass="portlet-form-button portlet-section-buttonrow"> <f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/> </h:commandButton> - <h:commandButton value="Cancel" action="instances" actionListener="objects" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="instances" actionListener="objects" styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -6,13 +6,14 @@ xmlns:c="http://java.sun.com/jstl/core"> +<f:loadBundle basename="Resource" var="bundle" /> <div align="center"> <h:message id="error" for="error" errorClass="portlet-msg-error"/> </div> <table class="full-width datatable"> <tr> - <th class="portlet-section-header" align="center">Personal Dashboard Editor</th> + <th class="portlet-section-header" align="center">#{bundle.DASHBOARD_PERSONAL_EDITOR}</th> </tr> <tr> <td class="portlet-section-body" align="center"> @@ -21,11 +22,11 @@ <td width="250"> <table class="bottombuttonbar"> <tr> - <td align="left" valign="top"><b>Create a New Page:</b><br/>Page name:&#160; + <td align="left" valign="top"><b>#{bundle.DASHBOARD_CREATE_NEW_PAGE}:</b><br/>#{bundle.DASHBOARD_CREATE_PAGE}:&#160; <h:form style="padding:0;margin:0"> <h:inputText id="pageName" value="#{addDashboardPageAction.pageName}" styleClass="portlet-form-input-field"/> - <h:commandButton value="Save" + <h:commandButton value="#{bundle.SAVE}" action="#{addDashboardPageAction.execute}" styleClass="portlet-form-button"/> </h:form> @@ -33,12 +34,12 @@ </tr> <c:if test="#{dashboard.selectedPage.name != 'default'}"> <tr> - <td align="left" valign="top"><b>Rename this Page:</b><br/>New page name:&#160; + <td align="left" valign="top"><b>#{bundle.DASHBOARD_RENAME_THIS_PAGE}:</b><br/>#{bundle.DASHBOARD_NEW_PAGE_NAME}:&#160; <h:form id="renameForm" style="padding:0;margin:0"> <h:message for="newName"/> <h:inputText id="newName" value="#{renameDashboardPageAction.newName}" styleClass="portlet-form-input-field"/> - <h:commandButton value="Rename" + <h:commandButton value="#{bundle.RENAME}" action="#{renameDashboardPageAction.execute}" styleClass="portlet-form-button"/> </h:form> @@ -48,17 +49,15 @@ </table> </td> <td align="left" valign="top"> - Use this page to manage the content and appearance of your dashboard pages. <br/> - You can control the page titles, column layouts, page themes, - and add, - order, or remove portlets. + #{bundle.DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE}. <br/> + #{bundle.DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES}. </td> </tr> </table> </td> </tr> <tr> - <td class="portlet-section-header" align="center">Currently editing page #{dashboard.selectedPage.name}</td> + <td class="portlet-section-header" align="center">#{bundle.DASHBOARD_CURRENTLY_EDITING_PAGE} #{dashboard.selectedPage.name}</td> </tr> <tr> <td class="portlet-section-body" align="center"> @@ -83,23 +82,23 @@ <table class="bottombuttonbar"> <tr> <td valign="top"> - <b>Theme and Layout</b> + <b>#{bundle.DASHBOARD_THEME_AND_LAYOUT}</b> <br/> - Apply a theme to your dashboard, or select the number of columns for the layout. + #{bundle.DASHBOARD_APPLY_THEME}. <hr/> </td> </tr> <tr> <td> <h:form> - Choose a layout:<br/> + #{bundle.DASHBOARD_CHOOSE_LAYOUT}:<br/> <h:selectOneMenu id="layoutSelector" value="#{dashboard.selectedPageLayout}" styleClass="portlet-form-field"> <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> </h:selectOneMenu> - <h:commandButton value="Select" styleClass="portlet-form-button" + <h:commandButton value="#{bundle.DASHBOARD_SELECT}" styleClass="portlet-form-button" action="#{dashboard.updateLayout}"/> </h:form> </td> @@ -110,14 +109,14 @@ <tr> <td> <h:form> - Choose a theme:<br/> + #{bundle.DASHBOARD_CHOOSE_THEME}:<br/> <h:selectOneMenu id="themeSelector" value="#{dashboard.selectedPageTheme}" styleClass="portlet-form-field"> <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> </h:selectOneMenu> - <h:commandButton value="Select" styleClass="portlet-form-button" + <h:commandButton value="#{bundle.DASHBOARD_SELECT}" styleClass="portlet-form-button" action="#{dashboard.updateTheme}"/> </h:form> </td> @@ -151,10 +150,10 @@ <tr> <td align="left"> <h:form style="padding:0;margin:0"> - <h:commandButton value="Delete this Page" styleClass="portlet-form-button" + <h:commandButton value="#{bundle.DASHBOARD_DELETE_THIS_PAGE}" styleClass="portlet-form-button" action="#{dashboard.destroyPage}"/> <br/> - <font color="red">You cannot undo this action!</font> + <font color="red">#{bundle.DASHBOARD_CANNOT_UNDO_ACTION}!</font> </h:form> </td> </tr> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,7 +5,7 @@ xmlns:c="http://java.sun.com/jstl/core" template="dashboardsTemplate.xhtml"> - + <f:loadBundle basename="Resource" var="bundle" /> <ui:define name="content"> <!-- --> @@ -35,19 +35,19 @@ <br/> <div class="property-container"> - <p class="portlet-area-header">Dashboard theme properties</p> + <p class="portlet-area-header">#{bundle.DASHBOARD_THEME_PROPERTIES}</p> <div class="portlet-area-body"> <table cellpadding="0" cellspacing="0" width="100%"> <tr> - <th class="portlet-section-title">Configure dashboards settings.</th> + <th class="portlet-section-title">#{bundle.CONFIGURE_DASHBOARD_SETTINGS}.</th> </tr> <tr> <td valign="top" class="portlet-section-body"> <ui:decorate template="common/editTheme.xhtml"> <ui:param name="theme" value="#{dashboardmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" + <h:commandButton value="#{bundle.COMMON_UPDATE}" actionListener="#{dashboardmgr.theme.execute}" styleClass="portlet-form-button portlet-section-buttonrow"/> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboardsTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboardsTemplate.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboardsTemplate.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -7,19 +7,20 @@ class="admin-ui"> <!-- Common nav --> + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <ul class="topnav"> <li> - <h:commandLink value="Portal Objects" action="objects" + <h:commandLink value="#{bundle.PORTAL_OBJECTS}" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/> </li> <li> - <h:commandLink value="Portlet Instances" action="instances"/> + <h:commandLink value="#{bundle.PORTLET_INSTANCES}" action="instances"/> </li> <li> - <h:commandLink value="Portlet Definitions" action="#{portletmgr.selectPortlet}"/> + <h:commandLink value="#{bundle.PORTLET_DEFINITIONS}" action="#{portletmgr.selectPortlet}"/> </li> - <li id="currentTab">Dashboards</li> + <li id="currentTab">#{bundle.DASHBOARDS}</li> </ul> </h:form> <ui:decorate template="common/tabContainer.xhtml"> @@ -29,7 +30,7 @@ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <!-- Content --> - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </ui:define> </ui:decorate> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -4,14 +4,15 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="/jsf/objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Display Names"/> + <ui:param name="portalObjectScreen" value="#{bundle.DISPLAY_NAMES}"/> <ui:define name="content"> <br/><br/> <div class="float-left third-width-pad5"> <h:form id="displayNameForm"> - <h3 class="sectionTitle zero">Add Display Names</h3> + <h3 class="sectionTitle zero">#{bundle.ADD_DISPLAY_NAMES}</h3> <div class="portlet-area-body"> <h:inputText id="newName" value="#{addDisplayNameAction.newText}" required="true"/> @@ -26,7 +27,7 @@ <div class="float-left two-third-width-pad5"> <h:form> - <h3 class="sectionTitle zero">Current Display Names</h3> + <h3 class="sectionTitle zero">#{bundle.CURRENT_DISPLAY_NAMES}</h3> <div class="portlet-area-body"> @@ -36,34 +37,34 @@ headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h:outputText value="Locale"/> + <h:outputText value="#{bundle.COMMON_LOCALE}"/> </f:facet> #{value.localeDisplayName} </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Display Name"/> + <h:outputText value="#{bundle.COMMON_DISPLAY_NAME}"/> </f:facet> #{value.text} </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Delete"/> + <h:outputText value="#{bundle.COMMON_DELETE}"/> </f:facet> <div style="width:150px"><h:commandLink action="#{addDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionDelete" value="Delete"/> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> <f:param name="locale" value="#{value.locale}"/> <f:param name="editAction" value="delete"/> </h:commandLink></div> </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Rename"/> + <h:outputText value="#{bundle.RENAME}"/> </f:facet> <div style="width:150px"><h:commandLink action="#{addDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionRename" value="Rename"/> + <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> <f:param name="locale" value="#{value.locale}"/> <f:param name="editAction" value="rename"/> </h:commandLink></div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,39 +5,40 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:define name="content"> <h3 class="sectionTitle tenpx-top-bottom"> - Manage &#160; + #{bundle.MANAGE} &#160; <c:choose> - <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">portals</c:when> - <c:otherwise><span class="objectName">#{portalobjectmgr.selectedObject.name}</span> portal</c:otherwise> + <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">#{bundle.PORTALS}</c:when> + <c:otherwise><span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{bundle.PORTAL}</c:otherwise> </c:choose> </h3> <h:form> <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionProperties"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> </h:form> <h3 class="sectionTitle"> - Manage &#160; + #{bundle.MANAGE} &#160; <c:choose> - <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">sub-portals</c:when> - <c:otherwise>pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> - portal</c:otherwise> + <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">#{bundle.SUB_PORTALS}</c:when> + <c:otherwise>#{bundle.PAGES_WITHIN} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{bundle.PORTAL}</c:otherwise> </c:choose> </h3> <!-- Portal addition --> <div class="tenpx-top-bottom"> <h:form> - <span class="portlet-font">Create a portal named: </span> + <span class="portlet-font">#{bundle.CREATE_PORTAL_NAMED}: </span> <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/> - <h:commandButton action="#{portalAction.addPortal}" value="Create portal" styleClass="portlet-form-button"/> + <h:commandButton action="#{portalAction.addPortal}" value="#{bundle.CREATE_PORTAL}" styleClass="portlet-form-button"/> <h:message for="name" errorClass="portlet-msg-error"/> </h:form> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,10 +5,11 @@ xmlns:c="http://java.sun.com/jstl/core" xmlns:h="http://java.sun.com/jsf/html"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:define name="content"> - <h3 class="sectionTitle tenpx-top-bottom">Manage <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.MANAGE} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> @@ -17,52 +18,52 @@ <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"><h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionLayout"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Page layout + #{bundle.PAGE_LAYOUT} </h:commandLink> | </h:panelGroup><h:commandLink action="editPageSecurity" styleClass="actionSecurity" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Security + #{bundle.SECURITY} </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> | <h:commandLink action="editPageTheme" styleClass="actionTheme" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Theme + #{bundle.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 action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Rename + #{bundle.RENAME} </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="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}" /> - Display Names + #{bundle.DISPLAY_NAMES} </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 + #{bundle.COMMON_DELETE} </h:commandLink> </h:panelGroup> </h:form> - <h3 class="sectionTitle">Manage sub-pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + <h3 class="sectionTitle">#{bundle.MANAGE_SUB_PAGES_WITHIN} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> <!-- Sub page addition --> <div class="tenpx-top-bottom"> <h:form> - <span class="portlet-font">Create a page named: </span> + <span class="portlet-font">#{bundle.CREATE_PAGE_NAMED}: </span> <h:inputText id="pageName" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/> - <h:commandButton action="#{addPageAction.execute}" value="Create page" styleClass="portlet-form-button"/> + <h:commandButton action="#{addPageAction.execute}" value="#{bundle.CREATE_PAGE}" styleClass="portlet-form-button"/> <h:message for="pageName" errorClass="portlet-msg-error"/> </h:form> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -6,8 +6,9 @@ xmlns:ct="http://www.julien.com" xmlns:jbp="http://www.jboss.org/portal" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Layout"/> + <ui:param name="portalObjectScreen" value="#{bundle.COMMON_LAYOUT}"/> <ui:define name="content"> <ui:include src="common/editPageLayout.xhtml"> <ui:param name="pageManager" value="#{portalobjectmgr.pageManager}"/> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -3,10 +3,11 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Security"/> + <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>Please set the page permissions</h3> + <h3>#{bundle.SET_PAGE_PERMISSIONS}</h3> <ui:decorate template="/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -3,16 +3,17 @@ 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" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Theme"/> + <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>Page theme properties</h3> + <h3>#{bundle.PAGE_THEME_PROPERTIES}</h3> <ui:decorate template="common/editTheme.xhtml"> <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" + <h:commandButton value="#{bundle.COMMON_UPDATE}" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"/> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -3,10 +3,11 @@ 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" /> <ui:composition template="/jsf/objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Security"/> + <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>Please set the portal permissions</h3> + <h3>#{bundle.SET_PORTAL_PERMISSIONS}</h3> <ui:decorate template="/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -3,20 +3,20 @@ 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" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Theme"/> + <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>Portal theme properties</h3> + <h3>#{bundle.PORTAL_THEME_PROPERTIES}</h3> - <p>These settings are inherited by all the pages and windows of this portal. You may override these settings by - selecting the appropriate value on the respective Theme settings pages.</p> + <p>#{bundle.SETTINGS_ARE_INHERITED_BY_ALL_PAGES}.</p> <br/> <ui:decorate template="common/editTheme.xhtml"> <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" + <h:commandButton value="#{bundle.COMMON_UPDATE}" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"/> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,24 +5,25 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Properties"/> + <ui:param name="portalObjectScreen" value="#{bundle.COMMON_PROPERTIES}"/> <ui:define name="content"> <br/> <div class="tenpx-top-bottom"> - <p class="portlet-area-header">Event Listener Binding</p> + <p class="portlet-area-header">#{bundle.EVENT_LISTENER_BINDING}</p> <div class="portlet-area-body tenpx-top-bottom"> <h:form> <h:outputLabel for="listener" styleClass="portlet-form-field-label"> - Choose the id of the PortalEventListener to bind to this #{portalobjectmgr.selectedObjectType}: + #{bundle.CHOOSE_ID_PORTALEVENTLISTENER} #{portalobjectmgr.selectedObjectType}: </h:outputLabel> <h:selectOneMenu id="listener" value="#{portalobjectmgr.selectedObject.listener}"> <f:selectItems value="#{portalobjectmgr.listenerIds}"/> </h:selectOneMenu> - <h:commandButton value="Update" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button"/> </h:form> </div> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,12 +1,14 @@ <div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Security"/> + <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>Please set the permissions for the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> - window</h3> + <h3>#{bundle.SET_PERMISSIONS_FOR} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{bundle.WINDOW}</h3> <ui:include src="common/editSecurity.xhtml"/> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -3,16 +3,17 @@ 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" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Theme"/> + <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>Window theme properties</h3> + <h3>#{bundle.WINDOW_THEME_PROPERTIES}</h3> <ui:decorate template="common/editWindowTheme.xhtml"> <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" + <h:commandButton value="#{bundle.COMMON_UPDATE}" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button portlet-section-buttonrow"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button portlet-section-buttonrow"/> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -6,6 +6,7 @@ xmlns:jbp="http://www.jboss.com/portal" xmlns:c="http://java.sun.com/jstl/core"> +<f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="instancesTemplate.xhtml"> <ui:define name="content"> @@ -28,9 +29,9 @@ <table id="instancesTable2" class="portlet-def-table datatable"> <thead class="portlet-section-header"> <tr> - <th>Instance id</th> - <th>Instance name</th> - <th>Actions</th> + <th>#{bundle.INSTANCE_ID}</th> + <th>#{bundle.INSTANCE_NAME}</th> + <th>#{bundle.ACTIONS}</th> </tr> </thead> <tbody> @@ -51,18 +52,18 @@ <td><h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionSecurity"> <f:param name="id" value="#{instance.id}"/> <f:param name="plugin" value="security"/> - Security + #{bundle.SECURITY} </h:commandLink> | <h:panelGroup rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}"><h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionPreferences"> <f:param name="id" value="#{instance.id}"/> <f:param name="plugin" value="preferences"/> - Preferences + #{bundle.PREFERENCES} </h:commandLink> | </h:panelGroup><h:commandLink action="confirmDeleteInstance" styleClass="actionDelete" actionListener="#{instancemgr.selectInstance}"> <f:param name="id" value="#{instance.id}"/> - Delete + #{bundle.COMMON_DELETE} </h:commandLink> </td> </tr> @@ -98,12 +99,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <!--#{instancemgr.selectedInstance.portlet.info.security}--> - <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + <h:commandLink action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet details + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PORTLET_DETAILS} </li> </ul> </h:form> @@ -117,7 +117,7 @@ </ui:include> </c:when> <c:otherwise> - The associated portlet is not available. + #{bundle.ASSOCIATED_PORTLET_NOT_AVAILABLE}. </c:otherwise> </c:choose> </c:if> @@ -127,25 +127,25 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + <h:commandLink action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> preferences + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PREFERENCES} </li> </ul> </h:form> <br/> <div class="property-container"> - <ui:include src="common/editPreferences.xhtml"> - <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/> - </ui:include> - <br/> - <h:form> - <h:commandButton value="Save" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/> - </h:form> + <ui:include src="common/editPreferences.xhtml"> + <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/> + </ui:include> + <br /> + <h:form> + <h:commandButton value="#{bundle.SAVE}" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/> + </h:form> </div> </c:if> @@ -154,11 +154,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + <h:commandLink action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> security settings + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.SECURITY_SETTINGS} </li> </ul> </h:form> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,22 +1,24 @@ <div xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" class="admin-ui"> - + + <f:loadBundle basename="Resource" var="bundle" /> <!-- Common nav --> <h:form> <ul class="topnav"> <li> - <h:commandLink value="Portal Objects" action="objects" + <h:commandLink value="#{bundle.PORTAL_OBJECTS}" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/> </li> - <li id="currentTab">Portlet Instances</li> + <li id="currentTab"><h:outputText value="#{bundle.PORTLET_INSTANCES}" /></li> <li> - <h:commandLink value="Portlet Definitions" action="#{portletmgr.selectPortlet}"/> + <h:commandLink value="#{bundle.PORTLET_DEFINITIONS}" action="#{portletmgr.selectPortlet}"/> </li> <li> - <h:commandLink value="Dashboards" action="dashboards"/> + <h:commandLink value="#{bundle.DASHBOARDS}" action="dashboards"/> </li> </ul> </h:form> @@ -27,7 +29,7 @@ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <!-- Content --> - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </ui:define> </ui:decorate> </div> 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-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -7,6 +7,8 @@ xmlns:pfc="http://www.jboss.com/portal/facelet/common" xmlns:c="http://java.sun.com/jstl/core"> + +<f:loadBundle basename="Resource" var="bundle" /> <h:form> <c:if test="#{not empty portalobjectmgr.selectedObject.portals}"> @@ -16,7 +18,7 @@ headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h:outputText value="Portal"/> + <h:outputText value="#{bundle.WIZARD_PORTAL}"/> </f:facet> <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> @@ -24,26 +26,26 @@ </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Actions"/> + <h:outputText value="#{bundle.ACTIONS}"/> </f:facet> <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionSecurity"> <f:param name="id" value="#{object.id}"/> - Security + #{bundle.SECURITY} </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> | <h:commandLink action="editPortalTheme" styleClass="actionTheme" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Theme + #{bundle.THEME} </h:commandLink> <h:panelGroup rendered="#{(object.name != 'admin') and (object.name != 'template')}"> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> - <h:outputText value="Rename"/> + <h:outputText value="#{bundle.RENAME}"/> <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:panelGroup> @@ -52,17 +54,17 @@ | <h:commandLink action="confirm" styleClass="actionDelete" actionListener="#{portalobjectmgr.selectDeletingObject}"> <f:param name="id" value="#{object.id}"/> - Delete + #{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}"/> - Make Default + #{bundle.MAKE_DEFAULT} </h:commandLink> </h:panelGroup> <h:panelGroup rendered="#{object.default}"> | <h:outputText styleClass="actionDefault" - value="Default"/></h:panelGroup> + value="#{bundle.DEFAULT}"/></h:panelGroup> </h:column> </h:dataTable> </c:if> @@ -74,7 +76,7 @@ headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h:outputText value="Page"/> + <h:outputText value="#{bundle.WIZARD_PAGE}"/> </f:facet> <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> @@ -82,51 +84,51 @@ </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Actions"/> + <h:outputText value="#{bundle.ACTIONS}"/> </f:facet> <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionLayout"> <f:param name="id" value="#{object.id}"/> - Page layout + #{bundle.PAGE_LAYOUT} </h:commandLink> | <h:commandLink action="editPageSecurity" styleClass="actionSecurity" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Security + #{bundle.SECURITY} </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> | <h:commandLink action="editPageTheme" styleClass="actionTheme" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Theme + #{bundle.THEME} </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Rename + #{bundle.RENAME} </h:commandLink> | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" styleClass="actionRename" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Display Names + #{bundle.DISPLAY_NAMES} </h:commandLink> |<h:commandLink action="confirm" styleClass="actionDelete" actionListener="#{portalobjectmgr.selectDeletingObject}"> <f:param name="id" value="#{object.id}"/> - Delete + #{bundle.COMMON_DELETE} </h:commandLink> <h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault" action="#{portalobjectmgr.makeObjectDefault}"> <f:param name="id" value="#{object.id}"/> - Make Default + #{bundle.MAKE_DEFAULT} </h:commandLink> </h:panelGroup> <h:panelGroup rendered="#{object.default}"> | <h:outputText styleClass="actionDefault" - value="Default"/></h:panelGroup> + value="#{bundle.DEFAULT}"/></h:panelGroup> </h:column> </h:dataTable> </c:if> <c:if test="#{not empty portalobjectmgr.selectedObject.windows}"> - <h3 class="sectionTitle">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}"/> @@ -137,18 +139,18 @@ headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h:outputText value="Window"/> + <h:outputText value="#{bundle.WINDOW}"/> </f:facet> <h:graphicImage - title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? 'This window is set to a minimized state.' : 'This window defaults to a normal state.'}" + 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' ? 'This window is set to a maximized state.' : 'This window defaults to a minimized state because one window within this page is set to maximized.'}" + 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" @@ -169,25 +171,25 @@ </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Actions"/> + <h:outputText value="#{bundle.ACTIONS}"/> </f:facet> <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionTheme"> <f:param name="id" value="#{object.id}"/> - Theme + #{bundle.THEME} </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> <f:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Rename + #{bundle.RENAME} </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectDeletingObject}" styleClass="actionDelete"> <f:param name="id" value="#{object.id}"/> - Delete + #{bundle.COMMON_DELETE} </h:commandLink> </h:column> </h:dataTable> 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-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -8,17 +8,18 @@ class="admin-ui"> <!-- Common nav --> + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <ul class="topnav"> - <li id="currentTab">Portal Objects</li> + <li id="currentTab">#{bundle.PORTAL_OBJECTS}</li> <li> - <h:commandLink value="Portlet Instances" action="instances"/> + <h:commandLink value="#{bundle.PORTLET_INSTANCES}" action="instances"/> </li> <li> - <h:commandLink value="Portlet Definitions" action="#{portletmgr.selectPortlet}"/> + <h:commandLink value="#{bundle.PORTLET_DEFINITIONS}" action="#{portletmgr.selectPortlet}"/> </li> <li> - <h:commandLink value="Dashboards" action="dashboards"/> + <h:commandLink value="#{bundle.DASHBOARDS}" action="dashboards"/> </li> </ul> </h:form> @@ -43,7 +44,7 @@ <h:commandLink action="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{node.id}"/> <c:choose> - <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when> + <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">#{bundle.PORTALS}</c:when> <c:otherwise><span class="objectName">#{node.name}</span> #{node.typeName}</c:otherwise> </c:choose> </h:commandLink> @@ -62,7 +63,7 @@ <!-- Content --> <div class="property-container"> - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </div> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,9 +1,12 @@ <div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> + + <f:loadBundle basename="Resource" var="bundle" /> <c:choose> <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}"> <ui:include src="editContext.xhtml"/> @@ -21,8 +24,7 @@ </c:choose> <h:form> - <p style="text-align: right"><h:commandLink action="#{newWindowWizard.reset}">Switch to wizard - mode</h:commandLink></p> + <p style="text-align: right"><h:commandLink action="#{newWindowWizard.reset}">#{bundle.SWITCH_TO_WIZARD_MODE}</h:commandLink></p> </h:form> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -8,6 +8,7 @@ xmlns:pfc="http://www.jboss.com/portal/facelet/common" xmlns:portlet="http://java.sun.com/portlet"> +<f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="portletsTemplate.xhtml"> <ui:define name="content"> @@ -43,11 +44,11 @@ <table class="portlet-def-table datatable"> <thead class="portlet-section-header"> <tr> - <th>Portlet name</th> - <th>Description</th> - <th>Remote</th> - <th>Remotable</th> - <th>Actions</th> + <th>#{bundle.PORTLET_NAME}</th> + <th>#{bundle.DESCRIPTION}</th> + <th>#{bundle.REMOTE}</th> + <th>#{bundle.REMOTABLE}</th> + <th>#{bundle.ACTIONS}</th> </tr> </thead> <tbody> @@ -72,12 +73,12 @@ <h:commandLink action="#{portletmgr.selectPortlet}" styleClass="actionPreferences"> <f:param name="id" value="#{portlet.context.id}"/> <f:param name="plugin" value="preferences"/> - Preferences + #{bundle.PREFERENCES} </h:commandLink> | </h:panelGroup> <h:commandLink action="#{portletmgr.selectPortlet}" styleClass="actionCreateInstance"> <f:param name="id" value="#{portlet.context.id}"/> <f:param name="plugin" value="createInstance"/> - Create instance + #{bundle.CREATE_INSTANCE} </h:commandLink> </td> </tr> @@ -114,11 +115,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink> + <h:commandLink action="#{portletmgr.selectPortlet}">#{bundle.PORTLET_DEFINITIONS}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{portletmgr.selectedPortlet.name}</span> details + <span class="objectName">#{portletmgr.selectedPortlet.name}</span> #{bundle.DETAILS} </li> </ul> </h:form> @@ -134,11 +135,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink> + <h:commandLink action="#{portletmgr.selectPortlet}">#{bundle.PORTLET_DEFINITIONS}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{portletmgr.selectedPortlet.name}</span> preferences + <span class="objectName">#{portletmgr.selectedPortlet.name}</span> #{bundle.PREFERENCES} </li> </ul> </h:form> @@ -156,11 +157,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink> + <h:commandLink action="#{portletmgr.selectPortlet}">#{bundle.PORTLET_DEFINITIONS}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{portletmgr.selectedPortlet.name}</span> instance creation + <span class="objectName">#{portletmgr.selectedPortlet.name}</span> #{bundle.INSTANCE_CREATION} </li> </ul> </h:form> @@ -168,7 +169,7 @@ <div class="property-container"> <h:form id="add_instance_form" styleClass="createObjectForm"> - <span class="portlet-font">Create an instance named: </span> + <span class="portlet-font">#{bundle.CREATE_INSTANCE_NAMED}: </span> <h:inputText id="instanceId" value="#{createInstanceAction.instanceId}" styleClass="portlet-form-input-field" required="true"/> <br/> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,22 +1,24 @@ <div xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" class="admin-ui"> <!-- Common nav --> + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <ul class="topnav"> <li> - <h:commandLink value="Portal Objects" action="objects" + <h:commandLink value="#{bundle.PORTAL_OBJECTS}" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/> </li> <li> - <h:commandLink value="Portlet Instances" action="instances"/> + <h:commandLink value="#{bundle.PORTLET_INSTANCES}" action="instances"/> </li> - <li id="currentTab">Portlet Definitions</li> + <li id="currentTab">#{bundle.PORTLET_DEFINITIONS}</li> <li> - <h:commandLink value="Dashboards" action="dashboards"/> + <h:commandLink value="#{bundle.DASHBOARDS}" action="dashboards"/> </li> </ul> </h:form> @@ -27,7 +29,7 @@ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <!-- Content --> - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </ui:define> </ui:decorate> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -4,17 +4,18 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="/jsf/objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="Rename"/> <ui:define name="content"> - <h3>Rename #{portalobjectmgr.selectedObjectType}</h3> + <h3>#{bundle.RENAME} #{portalobjectmgr.selectedObjectType}</h3> <h:form id="renameForm"> <h:message for="newName"/> - <p>Rename the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> - #{portalobjectmgr.selectedObjectType} to: + <p>#{bundle.RENAME_THE} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObjectType} #{bundle.TO}: <h:inputText id="newName" value="#{renameAction.newName}"/> - <h:commandButton value="Rename" action="#{renameAction.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.RENAME}" action="#{renameAction.execute}" styleClass="portlet-form-button"/> </p> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -6,20 +6,21 @@ xmlns:c="http://java.sun.com/jstl/core" class="admin-ui"> +<f:loadBundle basename="Resource" var="bundle" /> <link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="wizard-tab-container"> <ul class="objectpath"> - <li class="selected">Adding a new Portlet</li> + <li class="selected">#{bundle.WIZARD_ADDING_NEW_PORTLET}</li> </ul> <div class="property-container"> <c:choose> <c:when test="#{newWindowWizard.currentStep == 0}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 1</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 1</p> - <p class="stepText">Select Portlet</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTLET}</p> </div> </c:when> <c:otherwise> @@ -29,17 +30,17 @@ <f:param name="step" value="0"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 1</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 1</p> - <p class="stepText">Select Portlet</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTLET}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 1</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 1</p> - <p class="stepText">Select Portlet</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTLET}</p> </div> </c:otherwise> </c:choose> @@ -49,9 +50,9 @@ <c:choose> <c:when test="#{newWindowWizard.currentStep == 1}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 2</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 2</p> - <p class="stepText">Select Portal</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTAL}</p> </div> </c:when> <c:otherwise> @@ -61,17 +62,17 @@ <f:param name="step" value="1"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 2</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 2</p> - <p class="stepText">Select Portal</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTAL}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 2</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 2</p> - <p class="stepText">Select Portal</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTAL}</p> </div> </c:otherwise> </c:choose> @@ -81,9 +82,9 @@ <c:choose> <c:when test="#{newWindowWizard.currentStep == 2}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 3</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 3</p> - <p class="stepText">Select Page</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PAGE}</p> </div> </c:when> <c:otherwise> @@ -93,17 +94,17 @@ <f:param name="step" value="2"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 3</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 3</p> - <p class="stepText">Select Page</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PAGE}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 3</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 3</p> - <p class="stepText">Select Page</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PAGE}</p> </div> </c:otherwise> </c:choose> @@ -113,9 +114,9 @@ <c:choose> <c:when test="#{newWindowWizard.currentStep == 3}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 4</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 4</p> - <p class="stepText">Select Region</p> + <p class="stepText">#{bundle.WIZARD_SELECT_REGION}</p> </div> </c:when> <c:otherwise> @@ -125,17 +126,17 @@ <f:param name="step" value="3"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 4</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 4</p> - <p class="stepText">Select Region</p> + <p class="stepText">#{bundle.WIZARD_SELECT_REGION}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 4</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 4</p> - <p class="stepText">Select Region</p> + <p class="stepText">#{bundle.WIZARD_SELECT_REGION}</p> </div> </c:otherwise> </c:choose> @@ -145,9 +146,9 @@ <c:choose> <c:when test="#{newWindowWizard.currentStep == 4}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 5</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 5</p> - <p class="stepText">Confirm</p> + <p class="stepText">#{bundle.WIZARD_CONFIRM}</p> </div> </c:when> <c:otherwise> @@ -157,17 +158,17 @@ <f:param name="step" value="4"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 5</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 5</p> - <p class="stepText">Confirm</p> + <p class="stepText">#{bundle.WIZARD_CONFIRM}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 5</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 5</p> - <p class="stepText">Confirm</p> + <p class="stepText">#{bundle.WIZARD_CONFIRM}</p> </div> </c:otherwise> </c:choose> @@ -181,21 +182,21 @@ <!-- Content --> <div class="wizardContent"> - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </div> <div class="wizardButtonBox"> <h:form> - <h:commandButton rendered="#{newWindowWizard.currentStep gt 0}" value="Previous" + <h:commandButton rendered="#{newWindowWizard.currentStep gt 0}" value="#{bundle.WIZARD_PREVIOUS}" action="#{newWindowWizard.previous}" styleClass="portlet-form-button"/> <h:commandButton rendered="#{newWindowWizard.currentStep lt 4 and newWindowWizard.enabled[newWindowWizard.currentStep + 1]}" - value="Next" action="#{newWindowWizard.next}" styleClass="portlet-form-button"/> + value="#{bundle.WIZARD_NEXT}" action="#{newWindowWizard.next}" styleClass="portlet-form-button"/> </h:form> </div> <h:form> - <p style="text-align: right;"><h:commandLink action="advancedMode">Switch to advanced mode</h:commandLink></p> + <p style="text-align: right;"><h:commandLink action="advancedMode">#{bundle.WIZARD_SWITCH_ADVANCED_MODE}</h:commandLink></p> </h:form> </div> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,31 +5,32 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> <table> <tr> - <td><b>Portlet:</b></td> + <td><b>#{bundle.WIZARD_PORTLET}:</b></td> <td>#{newWindowWizard.selectedPortlet.name}</td> </tr> <tr> - <td><b>Portal:</b></td> + <td><b>#{bundle.WIZARD_PORTAL}:</b></td> <td>#{newWindowWizard.selectedPortal.name}</td> </tr> <tr> - <td><b>Page:</b></td> + <td><b>#{bundle.WIZARD_PAGE}:</b></td> <td>#{newWindowWizard.selectedPage.name}</td> </tr> <tr> - <td><b>Region:</b></td> + <td><b>#{bundle.WIZARD_REGION}:</b></td> <td>#{newWindowWizard.selectedRegionId}</td> </tr> </table> <h:form> - <h:commandButton value="Confirm" action="#{newWindowWizard.createWindow}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{newWindowWizard.cancel}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.WIZARD_CONFIRM}" action="#{newWindowWizard.createWindow}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{newWindowWizard.cancel}" styleClass="portlet-form-button"/> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,13 +5,14 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> <table class="datatable full-width"> <tbody class="portlet-section-header"> <tr> - <th>Page</th> + <th>#{bundle.WIZARD_PAGE}</th> <th></th> </tr> </tbody> @@ -19,7 +20,7 @@ <h:form> <h:commandLink action="#{newWindowWizard.up}" rendered="#{newWindowWizard.selectedParentPage.type != PortalObject.TYPE_PORTAL}"> - <h:outputText value="Up"/> + <h:outputText value="#{bundle.COMMON_UP}"/> <f:param name="id" value="#{newWindowWizard.selectedParentPageId}"/> </h:commandLink> <c:forEach items="#{newWindowWizard.pages}" var="object" varStatus="status"> @@ -34,7 +35,7 @@ <td> <c:if test="#{not empty object.pages}"> <h:commandLink id="cl2_#{status.index}" action="#{newWindowWizard.selectParentPage}"> - <h:outputText id="ot2_#{status.index}" value="Sub-Pages"/> + <h:outputText id="ot2_#{status.index}" value="#{bundle.WIZARD_SUB_PAGES}"/> <f:param id="f2_#{status.index}" name="id" value="#{object.id}"/> </h:commandLink> </c:if> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,13 +5,14 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> <table class="full-width datatable"> <tbody class="portlet-section-header"> <tr> - <th>Portal</th> + <th>#{bundle.WIZARD_PORTAL}</th> </tr> </tbody> <tbody> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -4,16 +4,17 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> <h:form> <h:outputLabel for="menu"> - <h:outputText value="Portlet provider: " styleClass="portlet-form-field-label"/> + <h:outputText value="#{bundle.WIZARD_PORTLET_PROVIDER}: " styleClass="portlet-form-field-label"/> </h:outputLabel> <h:selectOneMenu id="menu" styleClass="portlet-form-field" value="#{portletmgr.selectedPortletInvokerId}"> <f:selectItems value="#{portletmgr.portletInvokerItems}"/> </h:selectOneMenu> - <h:commandButton value="Change" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.WIZARD_CHANGE}" styleClass="portlet-form-button"/> </h:form> <h:form> @@ -31,7 +32,7 @@ <table class="full-width datatable"> <thead class="portlet-section-header"> <tr> - <th>Name</th> + <th>#{bundle.COMMON_NAME}</th> </tr> </thead> <tbody> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,6 +5,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> @@ -12,7 +13,7 @@ <tbody class="portlet-section-header"> <tr> - <th>Portal</th> + <th>#{bundle.WIZARD_PORTAL}</th> </tr> </tbody> <tbody>