JBoss Portal SVN: r10853 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 04:40:45 -0400 (Fri, 30 May 2008)
New Revision: 10853
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
- Fix portlet_editor i18n
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-29 22:26:49 UTC (rev 10852)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-30 08:40:45 UTC (rev 10853)
@@ -1,3 +1,4 @@
+<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ page import="org.jboss.portal.common.i18n.LocalizedString" %>
<%@ page import="org.jboss.portal.common.util.IteratorStatus" %>
<%@ page import="org.jboss.portal.core.model.instance.Instance" %>
@@ -4,20 +5,20 @@
<%@ page import="org.jboss.portal.core.portlet.info.CorePortletInfo" %>
<%@ page import="org.jboss.portal.core.portlet.info.PortletIconInfo" %>
<%@ page import="org.jboss.portal.core.portlet.info.PortletInfoInfo" %>
-<%@ page language="java" %>
+<%@ page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet" %>
+<%@ page import="org.jboss.portal.portlet.Portlet" %>
+<%@ page import="org.jboss.portal.portlet.PortletInvokerException" %>
+<%@ page import="org.jboss.portal.portlet.info.MetaInfo" %>
+<%@ page import="org.jboss.portal.portlet.info.PortletInfo" %>
+<%@ page import="java.util.Collection" %>
+<%@ page import="java.util.Locale" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%
Collection instances = (Collection)request.getAttribute("INSTANCES");
Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE");
%>
-<%@page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet" %>
-<%@page import="org.jboss.portal.portlet.Portlet" %>
-<%@page import="org.jboss.portal.portlet.PortletInvokerException" %>
-<%@page import="org.jboss.portal.portlet.info.MetaInfo" %>
-<%@page import="org.jboss.portal.portlet.info.PortletInfo" %>
-<%@ page import="java.util.Collection" %>
-<%@ page import="java.util.Locale" %>
<portlet:defineObjects/>
<script type='text/javascript' src='/portal-admin/js/domLib.js'></script>
<script type="text/javascript" src="/portal-admin/js/fadomatic.js"></script>
@@ -33,7 +34,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();
@@ -69,10 +70,10 @@
<span><%= displayName %></span>
<div>
- <span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
+ <span class="portlet-form-field-label">${n:i18n("PORTLET_NAME")}:</span><%= displayName %>
</div>
<div>
- <span class="portlet-form-field-label">Portlet description:</span>
+ <span class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span>
<%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
</div>
@@ -118,9 +119,9 @@
</div>
</div>
<div class="content">
- <div><span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
+ <div><span class="portlet-form-field-label">${n:i18n("PORTLET_NAME")}:</span><%= displayName %>
</div>
- <div><span class="portlet-form-field-label">Portlet description:</span>
+ <div><span class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span>
<%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
</div>
</div>
16 years, 1 month
JBoss Portal SVN: r10852 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-05-29 18:26:49 -0400 (Thu, 29 May 2008)
New Revision: 10852
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
- Fixed improper revert that resulted in lost changes and incorrect markup.
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 20:28:17 UTC (rev 10851)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-29 22:26:49 UTC (rev 10852)
@@ -150,22 +150,15 @@
</div>
</div>
</div>
- <div class="content">
- <div><span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
- </div>
- <div><span class="portlet-form-field-label">Portlet description:</span>
- <%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
- </div>
- </div>
- </div>
- </div>
-
<tr class="<%= rowClass %>">
<td>
<img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
- <span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
- href="<%= url %>" id="portlet-instance-link"><%= displayName %>
- </a></span></td>
+ <span
+ onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
+ href="javascript:void(0);" onclick="submitForm('<%= url %>');return false"
+ id="portlet-instance-link"><%= displayName %>
+ </a></span>
+ </td>
</tr>
<%
}
16 years, 1 month
JBoss Portal SVN: r10851 - in branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates: lostPassword and 1 other directories.
by portal-commits@lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-29 16:28:17 -0400 (Thu, 29 May 2008)
New Revision: 10851
Added:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl
Log:
added italian templates for internationalization
Added: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl 2008-05-29 20:28:17 UTC (rev 10851)
@@ -0,0 +1,9 @@
+Ciao,
+
+Hai provato a cambiare il tuo indirizzo e-mail su ${emailDomain}
+
+Segui questo link per verificare il nuovo indirizzo:
+${activationLink}
+
+Saluti,
+${emailDomain}
Property changes on: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl 2008-05-29 20:28:17 UTC (rev 10851)
@@ -0,0 +1,12 @@
+Ciao,
+
+abbiamo ricevuto la tua richiesta di resettare la password su ${emailDomain}.
+
+Ti mandiamo le informazioni per l'utenza:
+Username: ${username}
+Password: ${password}
+
+E' raccomandato che modifichi la password dopo il prossimo login.
+
+Saluti,
+${emailDomain}
Property changes on: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl 2008-05-29 20:28:17 UTC (rev 10851)
@@ -0,0 +1,15 @@
+Ciao,
+
+hai provato a creare un account su ${emailDomain}
+
+Ti mandiamo le informazioni per l'utenza:
+Username: ${username}
+Password: ${password}
+
+L'account non è ancora abilitato. Hai bisogno di accedere a questo url per abilitare l'account.
+${activationLink}
+
+Se non hai richiesto alcuna creazione, puoi ignorare il messaggio.
+
+Best regards,
+${emailDomain}
Property changes on: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl
___________________________________________________________________
Name: svn:executable
+ *
16 years, 1 month
JBoss Portal SVN: r10850 - in branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF: jsp/cms and 2 other directories.
by portal-commits@lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-29 16:21:23 -0400 (Thu, 29 May 2008)
New Revision: 10850
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp
Log:
internationalization updates
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-05-29 20:21:23 UTC (rev 10850)
@@ -99,4 +99,24 @@
CMS_EMPTY_FOLDER=This folder is empty.
CMS_ERROR_UPLOADARCHIVE_ASYNC=An error occurred while processing your archive. Please try again with 'Asynchronous Processing' activated
-CMS_MSG_UPLOADARCHIVE_ASYNC=Your archive has been accepted for processing. The resources will appear in your Folder once the processing is finished
\ No newline at end of file
+CMS_MSG_UPLOADARCHIVE_ASYNC=Your archive has been accepted for processing. The resources will appear in your Folder once the processing is finished
+
+CMS_REQUIRED=Required
+CMS_LINK_TO_RESOURCES=Links to resources within this portal should be absolute. For example: A link to an image located in default/images/back.gif should be typed in exactly as shown here. Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking on the preview button in the editor
+CMS_ERROR_PROCESSING=ERROR processing export request
+CMS_YOUR_EXPORT_0=Your export of
+CMS_YOUR_EXPORT_1=is ready for download
+CMS_CLICK_TO_DOWNLOAD=Click to Download
+CMS_ROOT_FOLDER=Root Folder
+CMS_MESSAGES=Messages
+CMS_HOME=Home
+CMS_ERROR=Error
+CMS_PENDING_APPROVAL_QUEUE=Pending Approval Queue
+CMS_CONFIGURE_RESTRICTION=Configure security restrictions on node
+CMS_SELECT_ACTION=Select Action
+CMS_BROWSING=Browsing
+CMS_CONTENT_NOT_FOUND=Content could not be found for the selected file
+CMS_INTRODUCTION=Introduction
+CMS_HELP=The CMS Portlet displays content from the file store inside a portlet window, or, in the case of binary content, outside of the portlet window altogether
+CMS_TO_MODIFY=To modify how this portlet behaves, please
+CMS_CLICK_HERE=click here
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-05-29 20:21:23 UTC (rev 10850)
@@ -100,4 +100,23 @@
CMS_ERROR_UPLOADARCHIVE_ASYNC=Si \u00e8 verificato un errore nell\'aggiornamento dell\'archivio. Riprova attivando la modalit\u00e0 asincrona
CMS_MSG_UPLOADARCHIVE_ASYNC=L\'archivio \u00e8 stato accettato. Le risorse appariranno nella tua cartella una volta terminato il processo
-
\ No newline at end of file
+
+CMS_REQUIRED=Obbligatorio
+CMS_LINK_TO_RESOURCES=I link alle risorse all\'interno del portale devono essere assoluti. Per esempio: Un link a un\'immagine che si trova in in default/images/back.gif deve essere digitato esattamente come mostrato. Non iniziare mai il percorso con uno (/). Puoi verificare la correttezza del link cliccando sul bottone di anteprima dell1'editor
+CMS_ERROR_PROCESSING=ERRORE nel processare l\'esportazione
+CMS_YOUR_EXPORT_0=L\'esportazione di
+CMS_YOUR_EXPORT_1=\u00e8 pronta per il Download
+CMS_CLICK_TO_DOWNLOAD=Clicca per il Download
+CMS_ROOT_FOLDER=Cartella principale
+CMS_MESSAGES=Messaggi
+CMS_HOME=Home
+CMS_ERROR=Errore
+CMS_PENDING_APPROVAL_QUEUE=Coda in attesa di approvazione
+CMS_CONFIGURE_RESTRICTION=Configura le restrizioni di sicurezza sul nodo
+CMS_SELECT_ACTION=Seleziona l\'azione
+CMS_BROWSING=Navigazione
+CMS_CONTENT_NOT_FOUND=Non ci sono contenuti per il file selezionato
+CMS_INTRODUCTION=Introduzione
+CMS_HELP=La Portlet CMS visualizza e salva i contenuti di un file da dentro la finestra di una Portlet, o, nel caso di un contenuto binario, fuori della finestra
+CMS_TO_MODIFY=Per modificare il comportamento di questa Portlet,
+CMS_CLICK_HERE=clicca qui
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -27,7 +27,7 @@
<table>
<tr>
<td valign="bottom">
- Destination:
+ ${n:i18n("CMS_DESTINATION")}:
</td>
<td>
<input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>"
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -119,7 +119,7 @@
<input
type="text" name="filename"
class="portlet-form-input-field"/>
- : Required
+ : ${n:i18n("CMS_REQUIRED")}
</td>
</tr>
<tr>
@@ -195,11 +195,7 @@
<tr>
<td class="portlet-section-alternate">
<img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/info.gif" border="0"
- alt="Info"> Links to resources within this portal should be absolute. For example: A link to an image
- located in default/images/back.gif
- should be typed in exactly as shown here.
- Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking on the
- preview button in the editor.
+ alt="Info"> ${n:i18n("CMS_LINK_TO_RESOURCES")}.
</td>
</tr>
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -147,14 +147,7 @@
<td class="portlet-section-alternate">
<img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/info.gif"
border="0"
- alt="Info"> Links to resources within this portal should be absolute. For example: A link to an
- image
- located in default/images/back.gif
- should be typed in exactly as shown here.
- Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking
- on
- the
- preview button in the editor.
+ alt="Info"> ${n:i18n("CMS_LINK_TO_RESOURCES")}.
</td>
</tr>
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -20,8 +20,8 @@
<table width="100%">
<tr>
<td align="center">
- Your export of <b><%= sCurrPath %>
- </b> is ready for download.
+ ${n:i18n("CMS_YOUR_EXPORT_0")} <b><%= sCurrPath %>
+ </b> ${n:i18n("CMS_YOUR_EXPORT_1")}.
</td>
</tr>
<tr>
@@ -32,7 +32,7 @@
<a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank"><img
src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/export_pickup.gif"
alt="${n:i18n("CMS_DELETE")}" border="0"></a><br/>
- <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank">Click to Download</a>
+ <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank">${n:i18n("CMS_CLICK_TO_DOWNLOAD")}</a>
<br/>
<input class="portlet-form-button" type="button" value="${n:i18n("CMS_BACKTOBROWSER")}"
name="cancel"
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -19,7 +19,7 @@
<td align="left">
<table width="100%">
<tr>
- <td align="center"><font color="red">ERROR processing export request!</font></td>
+ <td align="center"><font color="red">${n:i18n("CMS_ERROR_PROCESSING")}!</font></td>
</tr>
<tr>
<td align="center"><input class="portlet-form-button" type="button"
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -40,7 +40,7 @@
<img src="<%= request.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH %>/plus.gif" border="0"
alt="Expand"/></a>
-<a href="javascript:fillform('/')">Root Folder</a><br>
+<a href="javascript:fillform('/')">${n:i18n("CMS_ROOT_FOLDER")}</a><br>
<%
String sNavPath = (String)request.getAttribute("navpath");
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -35,7 +35,7 @@
<!-- Displaying any messages that may have occurred during this request -->
<%if(messages != null && !messages.isEmpty()){%>
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">Messages:</h3></th>
+ <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_MESSAGES")}:</h3></th>
<%for(int i=0; i<messages.size(); i++){%>
<tr colspan="2" align="center">
<td colspan="2">
@@ -54,7 +54,7 @@
<li class="pathItem"><a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li>
<%
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -30,7 +30,7 @@
<li class="pathItem"><a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li>
<%
@@ -72,7 +72,7 @@
{
%>
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">Error:</h3></th>
+ <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_ERROR")}:</h3></th>
<tr colspan="2" align="center">
<td colspan="2">
<font color="red">
@@ -87,7 +87,7 @@
<%}%>
<!-- the table listing the pending queue items -->
-<div align="center"><font class="portlet-font-dim"><b>Pending Approval Queue</b></font></div>
+<div align="center"><font class="portlet-font-dim"><b>${n:i18n("CMS_PENDING_APPROVAL_QUEUE")}</b></font></div>
<br/>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -24,7 +24,7 @@
<li class="pathItem"><a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li>
</ul>
<br/>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -50,7 +50,7 @@
%>
<tr>
<td colspan="2">
- <font class="portlet-font">Configure security restrictions on node: <%= sCurrPath %>
+ <font class="portlet-font">${n:i18n("CMS_CONFIGURE_RESTRICTION")}: <%= sCurrPath %>
</font>
</td>
</tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -57,7 +57,7 @@
<li class="pathItem"><a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li>
<%
@@ -109,7 +109,7 @@
<div class="menu">
<select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
- <option value="">Select Action...</option>
+ <option value="">${n:i18n("CMS_SELECT_ACTION")}...</option>
<%
if (sType.equals("text/html") || sType.equals("text/plain"))
{
@@ -349,7 +349,7 @@
{
%>
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">Error:</h3></th>
+ <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_ERROR")}:</h3></th>
<tr colspan="2" align="center">
<td colspan="2">
<font color="red">
@@ -363,7 +363,7 @@
onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
<%}%>
-<div align="center"><font class="portlet-font-dim"><b>Pending Approval Queue</b></font></div>
+<div align="center"><font class="portlet-font-dim"><b>${n:i18n("CMS_PENDING_APPROVAL_QUEUE")}</b></font></div>
<br/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -25,7 +25,7 @@
%>
<!-- Currently browsing -->
-Browsing: <a href="<%= url %>">Home</a>
+${n:i18n("CMS_BROWSING")}: <a href="<%= url %>">${n:i18n("CMS_HOME")}</a>
<%
StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
String sPathBuilder = "";
@@ -138,7 +138,7 @@
</p>
<%}else{%>
<p class="portlet-font">
- Content could not be found for the selected file
+ ${n:i18n("CMS_CONTENT_NOT_FOUND")}
</p>
<%}%>
<%
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -7,11 +7,9 @@
<h2>CMS Portlet - Help</h2>
-<h2>Introduction</h2>
+<h2>${n:i18n("CMS_INTRODUCTION")}</h2>
-<p class="portlet-font">The CMS Portlet displays content from the file store inside a portlet window, or, in the case of
- binary content, outside of the portlet
- window altogether.</p>
+<p class="portlet-font">${n:i18n("CMS_HELP")}.</p>
-<p class="portlet-font">To modify how this portlet behaves, please
- <a href="<portlet:renderURL portletMode="edit"></portlet:renderURL>">click here.</a></p>
+<p class="portlet-font">${n:i18n("CMS_TO_MODIFY")}
+ <a href="<portlet:renderURL portletMode="edit"></portlet:renderURL>">${n:i18n("CMS_CLICK_HERE")}.</a></p>
16 years, 1 month
JBoss Portal SVN: r10849 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 11:28:38 -0400 (Thu, 29 May 2008)
New Revision: 10849
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
Rolling back i18n of this file so that Chris can work
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 15:24:39 UTC (rev 10848)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-29 15:28:38 UTC (rev 10849)
@@ -17,7 +17,6 @@
<%@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>
@@ -63,7 +62,7 @@
<table style="width:500px;">
<tr>
- <td><h3 class="sectionTitle tenpx-top-bottom">${n:i18n("PORTLET_INSTANCE_ASSOCIATED")}:</h3></td>
+ <td><h3 class="sectionTitle tenpx-top-bottom">Portlet instance associated to this window:</h3></td>
</tr>
<%
Locale locale = renderRequest.getLocale();
@@ -96,10 +95,10 @@
<span><%= displayName %></span>
<div>
- <span class="portlet-form-field-label">${n:i18n("PORTLET_NAME")}:</span><%= displayName %>
+ <span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
</div>
<div>
- <span class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span>
+ <span class="portlet-form-field-label">Portlet description:</span>
<%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
</div>
</td>
@@ -151,22 +150,29 @@
</div>
</div>
</div>
- <tr class="<%= rowClass %>">
- <td>
- <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
- <span
- onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
- href="javascript:void(0);" onclick="submitForm('<%= url %>');return false"
- id="portlet-instance-link"><%= displayName %>
- </a></span>
- </td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- </td>
+ <div class="content">
+ <div><span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
+ </div>
+ <div><span class="portlet-form-field-label">Portlet description:</span>
+ <%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <tr class="<%= rowClass %>">
+ <td>
+ <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
+ <span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
+ href="<%= url %>" id="portlet-instance-link"><%= displayName %>
+ </a></span></td>
+ </tr>
+ <%
+ }
+ %>
+ </table>
+ </div>
+ </td>
</tr>
</table>
16 years, 1 month
JBoss Portal SVN: r10848 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 11:24:39 -0400 (Thu, 29 May 2008)
New Revision: 10848
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
Rolling back i18n of this file so that Chris can work
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-29 15:23:26 UTC (rev 10847)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-29 15:24:39 UTC (rev 10848)
@@ -18,7 +18,6 @@
<%@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>
@@ -34,7 +33,7 @@
<table style="width:500px;">
<tr>
- <td><h3 class="sectionTitle tenpx-top-bottom">${n:i18n("PORTLET_INSTANCE_ASSOCIATED")}:</h3></td>
+ <td><h3 class="sectionTitle tenpx-top-bottom">Portlet instance associated to this window:</h3></td>
</tr>
<%
Locale locale = renderRequest.getLocale();
@@ -70,10 +69,10 @@
<span><%= displayName %></span>
<div>
- <span class="portlet-form-field-label">${n:i18n("PORTLET_NAME")}:</span><%= displayName %>
+ <span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
</div>
<div>
- <span class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span>
+ <span class="portlet-form-field-label">Portlet description:</span>
<%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
</div>
@@ -119,9 +118,9 @@
</div>
</div>
<div class="content">
- <div><span class="portlet-form-field-label">${n:i18n("PORTLET_NAME")}:</span><%= displayName %>
+ <div><span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
</div>
- <div><span class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span>
+ <div><span class="portlet-form-field-label">Portlet description:</span>
<%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
</div>
</div>
16 years, 1 month
JBoss Portal SVN: r10847 - in branches/JBoss_Portal_Branch_2_6: core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common and 2 other directories.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-05-29 11:23:26 -0400 (Thu, 29 May 2008)
New Revision: 10847
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
Log:
- Fixed some issues with EL.
- Minor WSRP i18n update.
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2008-05-29 15:20:44 UTC (rev 10846)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2008-05-29 15:23:26 UTC (rev 10847)
@@ -1,10 +1,11 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
-<f:loadBundle basename="Resource" var="bundle" />
+<f:loadBundle basename="Resource" var="bundle"/>
+
<div class="portlet-area-header">#{bundle.COMMON_PROPERTIES}</div>
<div class="portlet-area-body">
@@ -24,28 +25,29 @@
<h:form>
<!-- defines layout of property form -->
<table>
- <tbody>
+ <tbody>
<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">#{bundle.COMMON_SELECT_PREDEFINED_PROPERTY}:</h:outputLabel>
- </td>
- </tr>
- <tr>
- <td>
- <h:selectOneMenu id="predefinedProperty" value="#{properties.action.selectedProperty}">
- <f:selectItems value="#{properties.propertyItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- <tr>
- <td align="center">#{bundle.COMMON_OR}</td>
- </tr>
+ <tr>
+ <td class="portlet-form-field-label">
+ <h:outputLabel for="predefinedProperty"
+ styleClass="portlet-form-field-label">#{bundle.COMMON_SELECT_PREDEFINED_PROPERTY}:</h:outputLabel>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:selectOneMenu id="predefinedProperty" value="#{properties.action.selectedProperty}">
+ <f:selectItems value="#{properties.propertyItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ <tr>
+ <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">
- #{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:outputLabel>
+ #{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:outputLabel>
</td>
</tr>
<tr>
@@ -57,7 +59,8 @@
</tbody>
</table>
<!-- ends layout of property form -->
- <h:commandButton value="#{bundle.COMMON_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>
@@ -80,7 +83,8 @@
<h:form>
<!-- defines layout of property table -->
- <h:dataTable value="#{properties.entries}" width="100%" headerClass="portlet-section-header" styleClass="datatable full-width"
+ <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">#{bundle.COMMON_NAME}</f:facet>
@@ -92,7 +96,7 @@
</h:column>
<h:column>
<f:facet name="header">#{bundle.COMMON_INHERITED}</f:facet>
- <h:outputText>#{prop.inherited ? '#{bundle.COMMON_YES}' : '#{bundle.COMMON_NO}'}</h:outputText>
+ <h:outputText>#{prop.inherited ? bundle.COMMON_YES : bundle.COMMON_NO}</h:outputText>
</h:column>
<h:column>
<f:facet name="header">#{bundle.COMMON_VALUE}</f:facet>
@@ -132,7 +136,8 @@
</h:dataTable>
<!-- ends property list -->
- <h:commandButton value="#{bundle.COMMON_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_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2008-05-29 15:20:44 UTC (rev 10846)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2008-05-29 15:23:26 UTC (rev 10847)
@@ -1,11 +1,11 @@
<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:fn="http://java.sun.com/jsp/jstl/functions"
- xmlns:pfc="http://www.jboss.com/portal/facelet/common"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+ xmlns:pfc="http://www.jboss.com/portal/facelet/common"
+ xmlns:c="http://java.sun.com/jstl/core">
<f:loadBundle basename="Resource" var="bundle"/>
@@ -42,7 +42,7 @@
#{bundle.THEME}
</h:commandLink>
<h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template')}">
+ rendered="#{(object.name != 'admin') and (object.name != 'template')}">
| <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionRename">
<h:outputText value="#{bundle.RENAME}"/>
@@ -50,7 +50,7 @@
</h:commandLink>
</h:panelGroup>
<h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}">
+ rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}">
| <h:commandLink action="confirm" styleClass="actionDelete"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id" value="#{object.id}"/>
@@ -129,7 +129,7 @@
<c:if test="#{not empty portalobjectmgr.selectedObject.windows}">
<h3 class="sectionTitle">#{bundle.MANAGE_WINDOWS_WITHIN} <span
- class="objectName">#{portalobjectmgr.selectedObject.name}</span>
+ class="objectName">#{portalobjectmgr.selectedObject.name}</span>
#{portalobjectmgr.selectedObject.typeName}</h3>
<ui:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/>
@@ -144,18 +144,18 @@
</f:facet>
<h:graphicImage
- title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '#{bundle.THIS_MINIMIZED_STATE}.' : '#{bundle.THIS_NORMAL_STATE}.'}"
- rendered="#{!maximizedStateExists}"
- value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }"
- styleClass="windowStateIcon"
- alt=""/>
+ title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? bundle.THIS_MINIMIZED_STATE : bundle.THIS_NORMAL_STATE}."
+ rendered="#{!maximizedStateExists}"
+ value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }"
+ styleClass="windowStateIcon"
+ alt=""/>
<h:graphicImage
- title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '#{bundle.THIS_MAXIMIZED_STATE}.' : '#{bundle.THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED}.'}"
- rendered="#{maximizedStateExists}"
- value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}"
- styleClass="windowStateIcon"
- alt=""/>
+ title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? bundle.THIS_MAXIMIZED_STATE : bundle.THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED}."
+ rendered="#{maximizedStateExists}"
+ value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}"
+ styleClass="windowStateIcon"
+ alt=""/>
<!-- disable edit window for content type widget until JBPORTAL-1561 is fixed -->
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-05-29 15:20:44 UTC (rev 10846)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-05-29 15:23:26 UTC (rev 10847)
@@ -32,4 +32,4 @@
path_consumers_consumer = Consumer ''{0}'' configuration
path_consumers_active = active
path_consumers_inactive = inactive
-path_consumers_refreshNeeded = refresh needed
+path_consumers_refreshNeeded = (refresh needed)
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-05-29 15:20:44 UTC (rev 10846)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-05-29 15:23:26 UTC (rev 10847)
@@ -32,4 +32,4 @@
path_consumers_consumer = Configuration du consommateur ''{0}''
path_consumers_active = actif
path_consumers_inactive = inactif
-path_consumers_refreshNeeded = rafra\u00eechissement requis
+path_consumers_refreshNeeded = (rafra\u00eechissement requis)
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-05-29 15:20:44 UTC (rev 10846)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-05-29 15:23:26 UTC (rev 10847)
@@ -10,7 +10,7 @@
<li id="currentTab">#{i18n.nav_tabs_consumers}</li>
<li><h:commandLink value="#{i18n.nav_tabs_producer_config}" action="producer"/></li>
<ui:remove>
- <li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
+ <li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
</ui:remove>
</ul>
</h:form>
@@ -28,9 +28,8 @@
class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
<h:outputFormat value="#{i18n.path_consumers_consumer}">
<f:param value="#{consumer.id}"/>
- </h:outputFormat> (<h:outputText value="#{i18n.path_consumers_active}" rendered="#{consumer.active}"/>
- <h:outputText value="#{i18n.path_consumers_inactive}" rendered="#{!consumer.active}"/>)
- (<h:outputText value="#{i18n.path_consumers_refreshNeeded}" rendered="#{consumer.refreshNeeded}"/>)
+ </h:outputFormat> (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
+ #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}
</li>
</c:if>
</ul>
16 years, 1 month
JBoss Portal SVN: r10846 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/resources/portal-admin-war/jsf/common and 2 other directories.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-05-29 11:20:44 -0400 (Thu, 29 May 2008)
New Revision: 10846
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/objectNavigation.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
Log:
- Fixed some EL errors.
- Minor modification to WSRP i18n.
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 14:16:40 UTC (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2008-05-29 15:20:44 UTC (rev 10846)
@@ -1,10 +1,11 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
-<f:loadBundle basename="Resource" var="bundle" />
+<f:loadBundle basename="Resource" var="bundle"/>
+
<div class="portlet-area-header">#{bundle.COMMON_PROPERTIES}</div>
<div class="portlet-area-body">
@@ -24,28 +25,29 @@
<h:form>
<!-- defines layout of property form -->
<table>
- <tbody>
+ <tbody>
<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">#{bundle.COMMON_SELECT_PREDEFINED_PROPERTY}:</h:outputLabel>
- </td>
- </tr>
- <tr>
- <td>
- <h:selectOneMenu id="predefinedProperty" value="#{properties.action.selectedProperty}">
- <f:selectItems value="#{properties.propertyItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- <tr>
- <td align="center">#{bundle.COMMON_OR}</td>
- </tr>
+ <tr>
+ <td class="portlet-form-field-label">
+ <h:outputLabel for="predefinedProperty"
+ styleClass="portlet-form-field-label">#{bundle.COMMON_SELECT_PREDEFINED_PROPERTY}:</h:outputLabel>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:selectOneMenu id="predefinedProperty" value="#{properties.action.selectedProperty}">
+ <f:selectItems value="#{properties.propertyItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ <tr>
+ <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">
- #{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:outputLabel>
+ #{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:outputLabel>
</td>
</tr>
<tr>
@@ -57,7 +59,8 @@
</tbody>
</table>
<!-- ends layout of property form -->
- <h:commandButton value="#{bundle.COMMON_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>
@@ -80,7 +83,8 @@
<h:form>
<!-- defines layout of property table -->
- <h:dataTable value="#{properties.entries}" width="100%" headerClass="portlet-section-header" styleClass="datatable full-width"
+ <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">#{bundle.COMMON_NAME}</f:facet>
@@ -92,7 +96,7 @@
</h:column>
<h:column>
<f:facet name="header">#{bundle.COMMON_INHERITED}</f:facet>
- <h:outputText>#{prop.inherited ? '#{bundle.COMMON_YES}' : '#{bundle.COMMON_NO}'}</h:outputText>
+ <h:outputText>#{prop.inherited ? bundle.COMMON_YES : bundle.COMMON_NO}</h:outputText>
</h:column>
<h:column>
<f:facet name="header">#{bundle.COMMON_VALUE}</f:facet>
@@ -132,7 +136,8 @@
</h:dataTable>
<!-- ends property list -->
- <h:commandButton value="#{bundle.COMMON_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/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-05-29 14:16:40 UTC (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-05-29 15:20:44 UTC (rev 10846)
@@ -1,14 +1,14 @@
<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:fn="http://java.sun.com/jsp/jstl/functions"
- xmlns:pfc="http://www.jboss.com/portal/facelet/common"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+ xmlns:pfc="http://www.jboss.com/portal/facelet/common"
+ xmlns:c="http://java.sun.com/jstl/core">
-<f:loadBundle basename="Resource" var="bundle" />
+<f:loadBundle basename="Resource" var="bundle"/>
<h:form>
<c:if test="#{not empty portalobjectmgr.selectedObject.portals}">
@@ -42,7 +42,7 @@
#{bundle.THEME}
</h:commandLink>
<h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template')}">
+ rendered="#{(object.name != 'admin') and (object.name != 'template')}">
| <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionRename">
<h:outputText value="#{bundle.RENAME}"/>
@@ -50,13 +50,13 @@
</h:commandLink>
</h:panelGroup>
<h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}">
- | <h:commandLink action="confirm" styleClass="actionDelete"
- actionListener="#{portalobjectmgr.selectDeletingObject}">
- <f:param name="id" value="#{object.id}"/>
- #{bundle.COMMON_DELETE}
- </h:commandLink>
- </h:panelGroup>
+ rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}">
+ | <h:commandLink action="confirm" styleClass="actionDelete"
+ actionListener="#{portalobjectmgr.selectDeletingObject}">
+ <f:param name="id" value="#{object.id}"/>
+ #{bundle.COMMON_DELETE}
+ </h:commandLink>
+ </h:panelGroup>
<h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault"
action="#{portalobjectmgr.makeObjectDefault}">
<f:param name="id" value="#{object.id}"/>
@@ -143,18 +143,18 @@
</f:facet>
<h:graphicImage
- title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '#{bundle.THIS_MINIMIZED_STATE}.' : '#{bundle.THIS_NORMAL_STATE}.'}"
- rendered="#{!maximizedStateExists}"
- value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }"
- styleClass="windowStateIcon"
- alt=""/>
+ title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? bundle.THIS_MINIMIZED_STATE : bundle.THIS_NORMAL_STATE}."
+ rendered="#{!maximizedStateExists}"
+ value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }"
+ styleClass="windowStateIcon"
+ alt=""/>
<h:graphicImage
- title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '#{bundle.THIS_MAXIMIZED_STATE}.' : '#{bundle.THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED}.'}"
- rendered="#{maximizedStateExists}"
- value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}"
- styleClass="windowStateIcon"
- alt=""/>
+ title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? bundle.THIS_MAXIMIZED_STATE : bundle.THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED}."
+ rendered="#{maximizedStateExists}"
+ value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}"
+ styleClass="windowStateIcon"
+ alt=""/>
<!-- disable edit window for content type widget until JBPORTAL-1561 is fixed -->
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-05-29 14:16:40 UTC (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-05-29 15:20:44 UTC (rev 10846)
@@ -32,4 +32,4 @@
path_consumers_consumer = Consumer ''{0}'' configuration
path_consumers_active = active
path_consumers_inactive = inactive
-path_consumers_refreshNeeded = refresh needed
+path_consumers_refreshNeeded = (refresh needed)
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-05-29 14:16:40 UTC (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-05-29 15:20:44 UTC (rev 10846)
@@ -32,4 +32,4 @@
path_consumers_consumer = Configuration du consommateur ''{0}''
path_consumers_active = actif
path_consumers_inactive = inactif
-path_consumers_refreshNeeded = rafra\u00eechissement requis
+path_consumers_refreshNeeded = (rafra\u00eechissement requis)
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-05-29 14:16:40 UTC (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-05-29 15:20:44 UTC (rev 10846)
@@ -10,7 +10,7 @@
<li id="currentTab">#{i18n.nav_tabs_consumers}</li>
<li><h:commandLink value="#{i18n.nav_tabs_producer_config}" action="producer"/></li>
<ui:remove>
- <li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
+ <li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
</ui:remove>
</ul>
</h:form>
@@ -28,12 +28,11 @@
class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
<h:outputFormat value="#{i18n.path_consumers_consumer}">
<f:param value="#{consumer.id}"/>
- </h:outputFormat> (<h:outputText value="#{i18n.path_consumers_active}" rendered="#{consumer.active}"/>
- <h:outputText value="#{i18n.path_consumers_inactive}" rendered="#{!consumer.active}"/>)
- (<h:outputText value="#{i18n.path_consumers_refreshNeeded}" rendered="#{consumer.refreshNeeded}"/>)
+ </h:outputFormat> (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
+ #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}
</li>
</c:if>
</ul>
</h:form>
</ui:define>
-</ui:decorate>
\ No newline at end of file
+</ui:decorate>
16 years, 1 month
JBoss Portal SVN: r10845 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 10:16:40 -0400 (Thu, 29 May 2008)
New Revision: 10845
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
Log:
- Get the correct Locale from user's profile if available
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2008-05-29 14:15:15 UTC (rev 10844)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2008-05-29 14:16:40 UTC (rev 10845)
@@ -42,7 +42,14 @@
import org.jboss.portal.web.ServletContextDispatcher;
import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletRequestWrapper;
+import javax.servlet.http.HttpServletRequestWrapper;
+
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Locale;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -82,7 +89,21 @@
{
public void sendResponse(ServerInvocationContext ctx) throws IOException, ServletException
{
- ServletContextDispatcher dispatcher = new ServletContextDispatcher(invocation.getServerContext().getClientRequest(), invocation.getServerContext().getClientResponse(), invocation.getRequest().getServer().getServletContainer());
+ HttpServletRequestWrapper request = new HttpServletRequestWrapper(invocation.getServerContext().getClientRequest()) {
+ @Override
+ public Locale getLocale()
+ {
+ return invocation.getRequest().getLocale();
+ }
+
+ @Override
+ public Enumeration<Locale> getLocales()
+ {
+ return null;
+ }
+
+ };
+ ServletContextDispatcher dispatcher = new ServletContextDispatcher(request, invocation.getServerContext().getClientResponse(), invocation.getRequest().getServer().getServletContainer());
MarkupInfo markupInfo = (MarkupInfo)invocation.getResponse().getContentInfo();
rendition.render(markupInfo, dispatcher);
}
16 years, 1 month
JBoss Portal SVN: r10844 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 10:15:15 -0400 (Thu, 29 May 2008)
New Revision: 10844
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
Log:
- Get the correct Locale from user's profile if available
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2008-05-29 12:27:50 UTC (rev 10843)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2008-05-29 14:15:15 UTC (rev 10844)
@@ -42,7 +42,14 @@
import org.jboss.portal.web.ServletContextDispatcher;
import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletRequestWrapper;
+import javax.servlet.http.HttpServletRequestWrapper;
+
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Locale;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -82,7 +89,21 @@
{
public void sendResponse(ServerInvocationContext ctx) throws IOException, ServletException
{
- ServletContextDispatcher dispatcher = new ServletContextDispatcher(invocation.getServerContext().getClientRequest(), invocation.getServerContext().getClientResponse(), invocation.getRequest().getServer().getServletContainer());
+ HttpServletRequestWrapper request = new HttpServletRequestWrapper(invocation.getServerContext().getClientRequest()) {
+ @Override
+ public Locale getLocale()
+ {
+ return invocation.getRequest().getLocale();
+ }
+
+ @Override
+ public Enumeration<Locale> getLocales()
+ {
+ return null;
+ }
+
+ };
+ ServletContextDispatcher dispatcher = new ServletContextDispatcher(request, invocation.getServerContext().getClientResponse(), invocation.getRequest().getServer().getServletContainer());
MarkupInfo markupInfo = (MarkupInfo)invocation.getResponse().getContentInfo();
rendition.render(markupInfo, dispatcher);
}
16 years, 1 month