Author: bpapez
Date: Fri Jun 15 14:34:03 2007
New Revision: 17580
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17580&repname=
=3Djahia
Log:
encoding problem with Javascript error msg =
Modified:
trunk/core/src/webapp/jsp/jahia/administration/group_management/group_e=
dit.jsp
trunk/core/src/webapp/jsp/jahia/administration/manage_components.jsp
trunk/core/src/webapp/jsp/jahia/administration/manage_languages.jsp
trunk/core/src/webapp/jsp/jahia/administration/manage_production.jsp
trunk/core/src/webapp/jsp/jahia/administration/manage_templates.jsp
trunk/core/src/webapp/jsp/jahia/administration/statistics_display.jsp
trunk/core/src/webapp/jsp/jahia/administration/statistics_display_summa=
ry.jsp
trunk/core/src/webapp/jsp/jahia/engines/containerlistproperties/contain=
erlistproperties.jsp
trunk/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManager.jsp
trunk/core/src/webapp/jsp/jahia/engines/filemanager/info.jsp
trunk/core/src/webapp/jsp/jahia/engines/filemanager/view.jsp
trunk/core/src/webapp/jsp/jahia/engines/rights/manage_rights.jsp
trunk/core/src/webapp/jsp/jahia/engines/shared/application_field.jsp
trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp
trunk/core/src/webapp/jsp/jahia/engines/shared/float_field.jsp
trunk/core/src/webapp/jsp/jahia/engines/shared/integer_field.jsp
trunk/core/src/webapp/views/engines/versioning/container/revisions-list=
.jsp
Modified: trunk/core/src/webapp/jsp/jahia/administration/group_management/g=
roup_edit.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/group_management/group_edit.jsp&rev=3D17580&repna=
me=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/administration/group_management/group_e=
dit.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/administration/group_management/group_e=
dit.jsp Fri Jun 15 14:34:03 2007
@@ -18,16 +18,20 @@
<[EMAIL PROTECTED] import=3D"java.security.Principal" %>
<[EMAIL PROTECTED] import =3D "java.util.*"%>
<[EMAIL PROTECTED] import=3D"org.jahia.bin.*"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.utils.*"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.params.ParamBean"%>
<[EMAIL PROTECTED] import =3D "org.jahia.services.pages.*"%>
<%@ page import=3D"org.jahia.data.viewhelper.principal.PrincipalViewHelper=
" %>
<[EMAIL PROTECTED] uri=3D"JahiaLib" prefix=3D"jahia" %>
+<[EMAIL PROTECTED] import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
<jsp:useBean id=3D"URL" class=3D"java.lang.String" scope=3D"request"/> <=
% // http files path. %>
<jsp:useBean id=3D"groupMessage" class=3D"java.lang.String" scope=3D"sessi=
on"/>
=
<%
+ final ParamBean jParams =3D (ParamBean) request.getAttribute("org.ja=
hia.params.ParamBean" );
String groupName =3D (String)session.getAttribute("selectedGroup");
String homePageLabel =3D (String)session.getAttribute("homePageLabel");
-
+ =
if(homePageLabel.equalsIgnoreCase("none")){
try {
homePageLabel=3DResourceBundle.getBundle("JahiaAdministrationR=
esources").getString("org.jahia.userMessage."+homePageLabel);
@@ -73,9 +77,10 @@
if (index > 0) {
var badName =3D "\n";
for (i =3D 0; i < index; i++) {
- badName +=3D "- " + usrgrpname[i].substr(1) + "\n";
+ badName +=3D "- " + usrgrpname[i].substr(1, usrgrpname[i].last=
IndexOf(':') - 1) + "\n";
}
- alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.user=
s.ManageGroups.alertUsersGroupAlreadyMember.label"/>" + badName);
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResource(=
"org.jahia.admin.users.ManageGroups.alertUsersGroupAlreadyMember.label",
+ jParams, jParams.getLocale()))%>" + badName);
index =3D 0;
}
}
Modified: trunk/core/src/webapp/jsp/jahia/administration/manage_components.=
jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/manage_components.jsp&rev=3D17580&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/administration/manage_components.jsp (o=
riginal)
+++ trunk/core/src/webapp/jsp/jahia/administration/manage_components.jsp Fr=
i Jun 15 14:34:03 2007
@@ -21,7 +21,7 @@
<[EMAIL PROTECTED] import =3D "java.util.*,org.jahia.registries.*"%>
<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
<%@ page import=3D"org.jahia.params.ProcessingContext"%>
-
+<[EMAIL PROTECTED] import=3D"org.jahia.utils.JahiaTools"%>
=
<%
=
@@ -150,7 +150,7 @@
String url =3D jData.gui().html().drawUpda=
teApplicationLauncher(app);
if ( url.equals("") ){
url =3D "alert('" +
- JahiaResourceBundle.getAdminReso=
urce("org.jahia.admin.components.ManageComponents.noRightToEdit.label", jPa=
rams, jParams.getLocale()) +
+ JahiaTools.html2text(JahiaResource=
Bundle.getAdminResource("org.jahia.admin.components.ManageComponents.noRigh=
tToEdit.label", jParams, jParams.getLocale())) +
"')";
}
%>
Modified: trunk/core/src/webapp/jsp/jahia/administration/manage_languages.j=
sp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/manage_languages.jsp&rev=3D17580&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/administration/manage_languages.jsp (or=
iginal)
+++ trunk/core/src/webapp/jsp/jahia/administration/manage_languages.jsp Fri=
Jun 15 14:34:03 2007
@@ -14,7 +14,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
See the License for the specific language governing permissions and =
limitations under the License.
---%><[EMAIL PROTECTED] import =3D
"org.jahia.bin.JahiaAdministration,org.jahia.para=
ms.ProcessingContext,org.jahia.services.sites.JahiaSite,org.jahia.services.=
sites.SiteLanguageMapping,org.jahia.services.sites.SiteLanguageSettings,org=
.jahia.utils.LanguageCodeConverters"%>
+--%><[EMAIL PROTECTED] import =3D
"org.jahia.bin.JahiaAdministration,org.jahia.para=
ms.*,org.jahia.services.sites.JahiaSite,org.jahia.services.sites.SiteLangua=
geMapping,org.jahia.services.sites.SiteLanguageSettings,org.jahia.utils.*,o=
rg.jahia.resourcebundle.*"%>
<%@ page import=3D"java.util.Enumeration"%>
<%@ page import=3D"java.util.Iterator"%>
<%@ page import=3D"java.util.Locale"%>
@@ -23,7 +23,7 @@
<[EMAIL PROTECTED] file=3D"/jsp/jahia/administration/include/header.inc"%>
=
<%
-
+ ParamBean jParams =3D (ParamBean) request.getAttribute( "org.jahia.p=
arams.ParamBean" );
String theURL =3D "";
Enumeration languageList =3D (Enumeration)request.getAttribute("langua=
geList");
Iterator mappingList =3D (Iterator) request.getAttribute("mappingList"=
);
@@ -58,6 +58,7 @@
%>
=
=
+<[EMAIL PROTECTED] import=3D"org.jahia.params.ParamBean"%>
<script language=3D"javascript">
<!--
=
@@ -85,7 +86,8 @@
}
if ( <%=3DlanguageSet.size()%>=3D=3D count
|| count =3D=3D homePageLanguage.length ){
- alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.ad=
min.languages.ManageSiteLanguages.homePageLangWarning"/>");
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminR=
esource("org.jahia.admin.languages.ManageSiteLanguages.homePageLangWarning",
+ jParams, jParams.getLocale()))%>");
return false;
}
}
Modified: trunk/core/src/webapp/jsp/jahia/administration/manage_production.=
jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/manage_production.jsp&rev=3D17580&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/administration/manage_production.jsp (o=
riginal)
+++ trunk/core/src/webapp/jsp/jahia/administration/manage_production.jsp Fr=
i Jun 15 14:34:03 2007
@@ -16,8 +16,10 @@
limitations under the License.
--%><%@ include file=3D"/jsp/jahia/administration/include/header.inc" %>
<%@ page import=3D"org.jahia.bin.JahiaAdministration,
- org.jahia.params.ProcessingContext,
org.jahia.services.importexport.ImportExportService,
+ org.jahia.params.*, =
+ org.jahia.utils.*,
+ org.jahia.resourcebundle.*,
java.util.Locale,
java.util.Properties" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
@@ -25,7 +27,7 @@
<%
=
String theURL =3D "";
-
+ ParamBean jParams =3D (ParamBean) request.getAttribute( "org.jahia.p=
arams.ParamBean" );
JahiaSite currentSite =3D (JahiaSite) request.getAttribute("site");
=
Locale currentLocale =3D request.getLocale();
@@ -112,27 +114,33 @@
var regexp =3D /[\w:\/\*\?\-,#]/ig;
var form =3D document.mainForm;
if(!form.targetSite.value.match(regexp)) {
- alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.=
productionManager.form.error.required.targetSite"/>");
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResou=
rce("org.jahia.admin.productionManager.form.error.required.targetSite",
+ jParams, jParams.getLocale()))%>");
return false;
}
if(!form.username.value.match(regexp)) {
- alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.=
productionManager.form.error.required.username"/>");
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResou=
rce("org.jahia.admin.productionManager.form.error.required.username",
+ jParams, jParams.getLocale()))%>");
return false;
}
if(!form.password.value.match(regexp)) {
- alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.=
productionManager.form.error.required.password"/>");
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResou=
rce("org.jahia.admin.productionManager.form.error.required.password",
+ jParams, jParams.getLocale()))%>");
return false;
}
if(!form.cron.value.match(regexp)) {
- alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.=
productionManager.form.error.required.cron"/>");
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResou=
rce("org.jahia.admin.productionManager.form.error.required.cron",
+ jParams, jParams.getLocale()))%>");
return false;
}
if(!form.profile.value.match(regexp)) {
- alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.=
productionManager.form.error.required.profile"/>");
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResou=
rce("org.jahia.admin.productionManager.form.error.required.profile",
+ jParams, jParams.getLocale()))%>");
return false;
}
if(!form.alias.value.match(regexp)) {
- alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.=
productionManager.form.error.required.alias"/>");
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResou=
rce("org.jahia.admin.productionManager.form.error.required.alias",
+ jParams, jParams.getLocale()))%>");
return false;
}
return true;
Modified: trunk/core/src/webapp/jsp/jahia/administration/manage_templates.j=
sp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/manage_templates.jsp&rev=3D17580&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/administration/manage_templates.jsp (or=
iginal)
+++ trunk/core/src/webapp/jsp/jahia/administration/manage_templates.jsp Fri=
Jun 15 14:34:03 2007
@@ -18,7 +18,7 @@
<[EMAIL PROTECTED] import=3D"org.jahia.bin.*"%>
<[EMAIL PROTECTED] import=3D"org.jahia.params.*"%>
<[EMAIL PROTECTED] import=3D"org.jahia.resourcebundle.*"%>
-
+<[EMAIL PROTECTED] import=3D"org.jahia.utils.*"%>
<[EMAIL PROTECTED] import =3D "java.util.*,org.jahia.services.pages.*"%>
<[EMAIL PROTECTED] import =3D "java.util.*,org.jahia.data.JahiaData"%>
=
@@ -110,7 +110,7 @@
String url =3D jData.gui().html().drawUpdateTemplateLa=
uncher(templ);
if ( url.equals("") ){
url =3D "alert('" +
- JahiaResourceBundle.getAdminResource("org.ja=
hia.admin.templates.ManageTemplates.noRightToEdit.label", jParams, jParams.=
getLocale()) +
+ JahiaTools.html2text(JahiaResourceBundle.getAd=
minResource("org.jahia.admin.templates.ManageTemplates.noRightToEdit.label"=
, jParams, jParams.getLocale())) +
"')";
}
%>
@@ -129,7 +129,7 @@
String url =3D jData.gui().html().drawUpdateTemplateLa=
uncher(templ);
if ( url.equals("") ){
url =3D "alert('" +
- JahiaResourceBundle.getAdminResource("org.ja=
hia.admin.templates.ManageTemplates.noRightToEdit.label", jParams, jParams.=
getLocale()) +
+ JahiaTools.html2text(JahiaResourceBundle.getAd=
minResource("org.jahia.admin.templates.ManageTemplates.noRightToEdit.label"=
, jParams, jParams.getLocale())) +
"')";
}
=
Modified: trunk/core/src/webapp/jsp/jahia/administration/statistics_display=
.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/statistics_display.jsp&rev=3D17580&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/administration/statistics_display.jsp (=
original)
+++ trunk/core/src/webapp/jsp/jahia/administration/statistics_display.jsp F=
ri Jun 15 14:34:03 2007
@@ -20,6 +20,9 @@
<[EMAIL PROTECTED] import =3D "org.jahia.services.sites.JahiaSite" %>
<[EMAIL PROTECTED] import =3D
"org.jahia.services.statistics.JahiaStatisticsRecordBea=
n" %>
<[EMAIL PROTECTED] import =3D
"org.jahia.services.statistics.JahiaStatisticsListener"=
%>
+<[EMAIL PROTECTED] import =3D "org.jahia.params.*" %>
+<[EMAIL PROTECTED] import =3D "org.jahia.resourcebundle.*"%>
+<[EMAIL PROTECTED] import =3D "org.jahia.utils.*"%>
<[EMAIL PROTECTED] import =3D "java.util.*" %>
<[EMAIL PROTECTED] import =3D "java.text.*" %>
=
@@ -36,6 +39,8 @@
<%@ taglib uri=3D"http://java.sun.com/jstl/core_rt"; prefix=3D"c"%>
=
<%
+ ParamBean jParams =3D (ParamBean) request.getAttribute( "org.jahia.p=
arams.ParamBean" );
+
List listSites =3D (ArrayList) request.getAttribute("listSites");
List listObjectTypes =3D (ArrayList)
request.getAttribute("listObjectType=
s");
=
@@ -86,19 +91,23 @@
var month =3D document.mainForm.month.value;
var day =3D document.mainForm.day.value;
if (year !=3D "" && (! isNumeric(year) || year<1) ) {
- alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.year.label"/>');
+ alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.year.label",
+ jParams, jParams.getLocale()))%>');
return false;
}
if ( month !=3D "" && (! isNumeric(month) || month<1 || month>12) ) {
- alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.month.label"/>');
+ alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.month.label",
+ jParams, jParams.getLocale()))%>');
return false;
}
if (day !=3D "" && (! isNumeric(day) || day<1 || day>31) ) {
- alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.day.label"/>');
+ alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.day.label",
+ jParams, jParams.getLocale()))%>');
return false;
}
if (year !=3D "" && month !=3D "" && day !=3D "" && ! isValidDate(year=
,month,day)) {
- alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.date.label"/>');
+ alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.date.label",
+ jParams, jParams.getLocale()))%>');
return false;
}
return true;
Modified: trunk/core/src/webapp/jsp/jahia/administration/statistics_display=
_summary.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/statistics_display_summary.jsp&rev=3D17580&repnam=
e=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/administration/statistics_display_summa=
ry.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/administration/statistics_display_summa=
ry.jsp Fri Jun 15 14:34:03 2007
@@ -20,6 +20,9 @@
<[EMAIL PROTECTED] import =3D "org.jahia.services.sites.JahiaSite" %>
<[EMAIL PROTECTED] import =3D
"org.jahia.services.statistics.JahiaStatisticsSummaryRe=
cordBean" %>
<[EMAIL PROTECTED] import =3D
"org.jahia.services.statistics.JahiaStatisticsListener"=
%>
+<[EMAIL PROTECTED] import =3D "org.jahia.params.*" %>
+<[EMAIL PROTECTED] import =3D "org.jahia.resourcebundle.*"%>
+<[EMAIL PROTECTED] import =3D "org.jahia.utils.*"%>
<[EMAIL PROTECTED] import =3D "java.util.*" %>
<[EMAIL PROTECTED] import =3D "java.text.*" %>
<[EMAIL PROTECTED] import =3D "java.util.HashMap" %>
@@ -37,6 +40,8 @@
<%@ taglib uri=3D"http://java.sun.com/jstl/core_rt"; prefix=3D"c"%>
=
<%
+ ParamBean jParams =3D (ParamBean) request.getAttribute( "org.jahia.p=
arams.ParamBean" );
+
List listSites =3D (ArrayList) request.getAttribute("listSites");
List listObjectTypes =3D (ArrayList)
request.getAttribute("listObjectType=
s");
=
@@ -80,19 +85,23 @@
var month =3D document.mainForm.month.value;
var day =3D document.mainForm.day.value;
if (year !=3D "" && (! isNumeric(year) || year<1) ) {
- alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.year.label"/>');
+ alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.year.label",
+ jParams, jParams.getLocale()))%>');
return false;
}
if ( month !=3D "" && (! isNumeric(month) || month<1 || month>12) ) {
- alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.month.label"/>');
+ alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.month.label",
+ jParams, jParams.getLocale()))%>');
return false;
}
if (day !=3D "" && (! isNumeric(day) || day<1 || day>31) ) {
- alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.day.label"/>');
+ alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.day.label",
+ jParams, jParams.getLocale()))%>');
return false;
}
if (year !=3D "" && month !=3D "" && day !=3D "" && ! isValidDate(year=
,month,day)) {
- alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.date.label"/>');
+ alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.date.label",
+ jParams, jParams.getLocale()))%>');
return false;
}
return true;
Modified: trunk/core/src/webapp/jsp/jahia/engines/containerlistproperties/c=
ontainerlistproperties.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/containerlistproperties/containerlistproperties.jsp&rev=
=3D17580&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/containerlistproperties/contain=
erlistproperties.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/containerlistproperties/contain=
erlistproperties.jsp Fri Jun 15 14:34:03 2007
@@ -23,6 +23,7 @@
<%@ page import=3D"java.text.DateFormat"%>
<%@ page import=3D"java.text.SimpleDateFormat"%>
<%@ page import=3D"java.util.*"%>
+<%@ page import=3D"org.jahia.utils.JahiaTools"%>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
=
<jsp:useBean id=3D"jspSource" class=3D"java.lang.String" scope=3D"request"=
/>
@@ -190,7 +191,8 @@
element.options[index] =3D null;
}
} else {
- alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.engin=
es.containerlistproperties.ContainerListProperties_Engine.alertSelectValue.=
label"/>");
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngineReso=
urce("org.jahia.engines.containerlistproperties.ContainerListProperties_Eng=
ine.alertSelectValue.label",
+ jParams, jParams.getLocale()))%>");
}
}
//-->
Modified: trunk/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManag=
er.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/filemanager/AjaxFileManager.jsp&rev=3D17580&repname=3Dja=
hia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManager.jsp=
(original)
+++ trunk/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManager.jsp=
Fri Jun 15 14:34:03 2007
@@ -18,7 +18,8 @@
<%@ page import=3D"org.jahia.ajax.webdav.DAVAbstractAction,
org.jahia.engines.filemanager.TableEntry,
org.jahia.params.ParamBean,
- org.jahia.resourcebundle.JahiaResourceBundle,
+ org.jahia.resourcebundle.JahiaResourceBundle,
+ org.jahia.utils.*, =
org.jahia.taglibs.ajax.ComplexTreeInclude" %>
<%@ page import=3D"java.util.HashMap"%>
<%@ taglib uri=3D"ajaxLib" prefix=3D"ajax" %>
@@ -158,7 +159,8 @@
openManager(path, screen);
}
} else {
- alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.e=
ngines.filemanager.Filemanager_Engine.empty.label"/>");
+ alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngine=
Resource("org.jahia.engines.filemanager.Filemanager_Engine.empty.label",
+ jParams, jParams.getLocale()))%>');
}
}
=
Modified: trunk/core/src/webapp/jsp/jahia/engines/filemanager/info.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/filemanager/info.jsp&rev=3D17580&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/filemanager/info.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/filemanager/info.jsp Fri Jun 15=
14:34:03 2007
@@ -748,7 +748,8 @@
for (i =3D 0; i < index; i++) {
badName +=3D "- " + usrgrpname[i].substr(1) + "\n";
}
- alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.engin=
es.rights.ManageRights.alertAlreadyInAcl.label"/>" + badName);
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngineReso=
urce("org.jahia.engines.rights.ManageRights.alertAlreadyInAcl.label",
+ jParams, jParams.getLocale()))%>" + badName);
index =3D 0;
}
}
Modified: trunk/core/src/webapp/jsp/jahia/engines/filemanager/view.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/filemanager/view.jsp&rev=3D17580&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/filemanager/view.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/filemanager/view.jsp Fri Jun 15=
14:34:03 2007
@@ -18,6 +18,7 @@
org.jahia.params.ParamBean,
org.jahia.resourcebundle.JahiaResourceBundle,
org.jahia.taglibs.ajax.ComplexTreeInclude,
+ org.jahia.utils.*,
java.util.HashMap"%>
<%@ page import=3D"org.jahia.engines.filemanager.TableEntry"%>
<%@ page import=3D"java.util.List"%>
@@ -94,7 +95,8 @@
=
function selectFile(dir) {
if (dir =3D=3D "<%=3D pathes[pathes.length - 1] %>") {
- alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.e=
ngines.template.Template_Engine.sourceDest.label"/>");
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngine=
Resource("org.jahia.engines.template.Template_Engine.sourceDest.label",
+ jParams, jParams.getLocale()))%>");
return;
}
document.mainForm.selectDir.value =3D dir;
Modified: trunk/core/src/webapp/jsp/jahia/engines/rights/manage_rights.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/rights/manage_rights.jsp&rev=3D17580&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/rights/manage_rights.jsp (origi=
nal)
+++ trunk/core/src/webapp/jsp/jahia/engines/rights/manage_rights.jsp Fri Ju=
n 15 14:34:03 2007
@@ -448,7 +448,7 @@
if (index > 0) {
var badName =3D "\n";
for (i =3D 0; i < index; i++) {
- badName +=3D "- " + usrgrpname[i].substr(1) + "\n";
+ badName +=3D "- " + usrgrpname[i].substr(1, usrgrpname[i].last=
IndexOf(':') - 1) + "\n";
}
alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngineReso=
urce("org.jahia.engines.rights.ManageRights.alertAlreadyInAcl.label",
jParams, jParams.getLocale()))%>" + badName);
Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/application_field.=
jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/application_field.jsp&rev=3D17580&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/shared/application_field.jsp (o=
riginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/application_field.jsp Fr=
i Jun 15 14:34:03 2007
@@ -25,6 +25,7 @@
<%@ page import=3D"org.jahia.params.ParamBean" %>
<%@ page import=3D"org.jahia.registries.ServicesRegistry" %>
<%@ page import=3D"org.jahia.services.sites.JahiaSite" %>
+<%@ page import=3D"org.jahia.utils.*"%>
<%@ page import=3D"java.security.Principal" %>
<%@ page import=3D"org.jahia.services.categories.Category" %>
<%@ page import=3D"java.util.*" %>
@@ -111,9 +112,10 @@
} else {
badName +=3D "<jahia:engineResourceBundle resourceName=
=3D"org.jahia.engines.shared.Application_Field.groupName.label"/>";
}
- badName +=3D usrgrpname[i].substr(1, usrgrpname[i].indexOf=
(":") - 1) + "\n";
+ badName +=3D usrgrpname[i].substr(1, usrgrpname[i].lastInd=
exOf(':') - 1) + "\n";
}
- alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.e=
ngines.shared.Application_Field.alertUsersGroupAlreadyMember.label"/>" + ba=
dName);
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngine=
Resource("org.jahia.engines.shared.Application_Field.alertUsersGroupAlready=
Member.label",
+ jParams, jParams.getLocale()))%>" + badName);
index =3D 0;
}
}
Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanag=
er.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/embedded_filemanager.jsp&rev=3D17580&repname=3Dja=
hia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp=
(original)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp=
Fri Jun 15 14:34:03 2007
@@ -21,6 +21,7 @@
org.jahia.engines.filemanager.TableEntry" %>
<%@ page import=3D"org.jahia.params.ParamBean"%>
<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
+<%@ page import=3D"org.jahia.utils.JahiaTools"%>
<%@ page import=3D"org.jahia.taglibs.ajax.ComplexTreeInclude"%>
<%@ page import=3D"java.util.HashMap"%>
<%@ page import=3D"java.util.Set"%>
@@ -192,7 +193,8 @@
openManager(path, screen);
}
} else {
- alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.e=
ngines.filemanager.Filemanager_Engine.empty.label"/>");
+ alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngine=
Resource("org.jahia.engines.filemanager.Filemanager_Engine.empty.label",
+ jParams, jParams.getLocale()))%>');
}
}
=
Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/float_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/float_field.jsp&rev=3D17580&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/shared/float_field.jsp (origina=
l)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/float_field.jsp Fri Jun =
15 14:34:03 2007
@@ -17,6 +17,7 @@
--%><%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" %>
<%@ page import=3D"org.jahia.data.fields.JahiaField" %>
<%@ page import=3D"org.jahia.params.ParamBean" %>
+<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
<%@ page import=3D"org.jahia.services.pages.ContentPage" %>
<%@ page import=3D"org.jahia.utils.JahiaTools" %>
<%@ page import=3D"java.util.HashMap" %>
@@ -154,7 +155,8 @@
{ =
document.mainForm.elements["_<%=3DtheField.getID()%>"].value =3D 0;
document.mainForm.elements["_<%=3DtheField.getID()%>"].focus();
- alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.engin=
es.shared.Float_Field.valueMustBeNumber.label"/>");
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngineReso=
urce("org.jahia.engines.shared.Float_Field.valueMustBeNumber.label",
+ jParams, jParams.getLocale()))%>");
return false;
}
}
Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/integer_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/integer_field.jsp&rev=3D17580&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/shared/integer_field.jsp (origi=
nal)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/integer_field.jsp Fri Ju=
n 15 14:34:03 2007
@@ -17,6 +17,7 @@
--%><%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" %>
<%@ page import=3D"org.jahia.data.fields.JahiaField" %>
<%@ page import=3D"org.jahia.params.ParamBean" %>
+<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
<%@ page import=3D"org.jahia.services.pages.ContentPage" %>
<%@ page import=3D"org.jahia.utils.JahiaTools" %>
<%@ page import=3D"java.util.HashMap" %>
@@ -158,7 +159,8 @@
{
document.mainForm.elements["_<%=3DtheField.getID()%>"].value =
=3D 0;
document.mainForm.elements["_<%=3DtheField.getID()%>"].focus();
- alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.e=
ngines.shared.Float_Field.valueMustBeNumber.label"/>");
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngine=
Resource("org.jahia.engines.shared.Integer_Field.valueMustBeInteger.label",
+ jParams, jParams.getLocale()))%>");
return false;
}
}
Modified: trunk/core/src/webapp/views/engines/versioning/container/revision=
s-list.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/views/engines/versioning/container/revisions-list.jsp&rev=3D17580&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/views/engines/versioning/container/revisions-list=
.jsp (original)
+++ trunk/core/src/webapp/views/engines/versioning/container/revisions-list=
.jsp Fri Jun 15 14:34:03 2007
@@ -2,6 +2,7 @@
<%@ page import=3D"org.jahia.content.JahiaObject" %>
<%@ page import=3D"org.jahia.params.ProcessingContext" %>
<%@ page import=3D"org.jahia.resourcebundle.*" %>
+<%@ page import=3D"org.jahia.utils.JahiaTools"%>
<%@ page import=3D"org.jahia.services.pages.ContentPage" %>
<%@ page import=3D"org.jahia.engines.calendar.CalendarHandler" %>
<%@ page import=3D"org.jahia.services.version.*" %>
@@ -88,7 +89,8 @@
=
function handleCompare(){
if (containerCompareHandler._count < 2 ){
- alert('<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.v=
ersion.atLeastTwoRevisionsMustBeSelected" defaultValue=3D"At least two revi=
sions must be selected" />');
+ alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngineResource=
("org.jahia.engines.version.atLeastTwoRevisionsMustBeSelected",
+ jParams, jParams.getLocale(), "At least two revisions must be =
selected"))%>');
return;
} =
var actionURL =3D '<%=3DactionURL%>&engineview=3D<%=3DengineView%>&metho=
d=3DcontainerVersionCompare';
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
