Author: xlawrence
Date: Fri Aug 31 12:46:51 2007
New Revision: 18326
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18326&repname=
=3Djahia
Log:
resolve issue: http://www.jahia.net/jira/browse/JAHIA-2157: Sp3: share the =
content with other languages icons - not present for page fields
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Pag=
e_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/p=
age_field.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Page_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Page_Field.java&rev=3D18326&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Pag=
e_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Pag=
e_Field.java Fri Aug 31 12:46:51 2007
@@ -539,8 +539,8 @@
theField.setHasChanged(true);
}
// Verify if the page title is shared
- String sharedTitle =3D jParams.getParameter("shared_title");
- if (sharedTitle !=3D null) {
+ final String sharedTitle =3D jParams.getParameter("shared_title");
+ if ("true".equals(sharedTitle)) {
// Set the same title to all languages
Vector languageSettings =3D jParams.getSite().getLanguageSetti=
ngs();
Enumeration languageEnum =3D languageSettings.elements();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/page_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp&rev=3D18326=
&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/p=
age_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/p=
age_field.jsp Fri Aug 31 12:46:51 2007
@@ -409,9 +409,39 @@
teleportCaptainFlam(document.mainForm);
}
=
+function switchIcons(callingElementID) {
+ var element =3D document.getElementById("shared_title");
+ var callingElement =3D document.getElementById(callingElementID);
+ if (element) {
+ var theValue =3D element.value;
+ if (theValue =3D=3D "true") {
+ theValue =3D "false";
+ callingElement.className =3D "sharedLanguageNo";
+ callingElement.title =3D '<jahia:engineResourceBundle resource=
Name=3D"org.jahia.applyToSingleLanguage.label"/>';
+ } else {
+ theValue =3D "true";
+ callingElement.className =3D "sharedLanguageYes";
+ callingElement.title =3D '<jahia:engineResourceBundle resource=
Name=3D"org.jahia.applyToAllLanguages.label"/>';
+ }
+ element.value =3D theValue;
+ }
+}
</script>
=
<h4 class=3D"page_type_big">
+ <% if (jParams.getSite().getLanguageSettings(true).size() > 1 &&
+ ServicesRegistry.getInstance().getJahiaACLManagerService().has=
WriteAccesOnAllLangs(jParams)) { %>
+ <% if (pageBean.isSharedTitle()) { %>
+ <span title=3D"<jahia:engineResourceBundle resourceName=3D'org.jahia.s=
ameInAllLanguage.label'/>"
+ class=3D"sharedLanguageYesDisabled"> </span>
+ <% } else { %>
+ <a id=3D"switchIcons_<%=3DpageBean.getID()%>" href=3D"javascript:switc=
hIcons('switchIcons_<%=3DpageBean.getID()%>');"
+ title=3D'<jahia:engineResourceBundle resourceName=3D"org.jahia.appl=
yToSingleLanguage.label"/>'
+ class=3D"sharedLanguageNo">
+ </a>
+ <% } %>
+ <input id=3D"shared_title" type=3D"hidden" name=3D"shared_title" value=
=3D"<%=3DpageBean.isSharedTitle()%>"/>
+ <% } %>
<% if (isNewPage) { %>
<% if (isLinkOnly) { %>
<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.shared.P=
age_Field.jahiaLinkCreation.label"/>
@@ -453,13 +483,6 @@
<input type=3D"text" size=3D"80" name=3D"page_title" onkeyup=3D"javascript=
:titleInputEvent()"
onchange=3D"javascript:titleInputEvent()"
value=3D"<%=3DJahiaTools.text2html(title)%>" maxlength=3D"250">
-<br/>
-<% if (jParams.getSite().getLanguageSettings(true).size() > 1 &&
- ServicesRegistry.getInstance().getJahiaACLManagerService().hasWrit=
eAccesOnAllLangs(jParams)) { %>
-<input type=3D"checkbox" name=3D"shared_title"
-<% if (pageBean.isSharedTitle()) { %> checked=3D"checked"<% } %>>
-<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.shared.Page_=
Field.shareTitleWithOtherLanguages.label"/>.
-<% } %>
<table>
=
<%
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
