Author: knguyen
Date: Mon Oct 8 17:57:13 2007
New Revision: 18783
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18783&repname=
=3Djahia
Log:
JAHIA-2342: Fixed loosing Language settings in Versioning engine
Added:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/common/multi=
language_links.jsp
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/engines/vers=
ioning/actions/ContentVersioningAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/struts/jahia-t=
iles-defs.xml
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/c=
ommon-javascript.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/engine=
s/versioning/actions/ContentVersioningAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/views/engines/versioning/actions/ContentVer=
sioningAction.java&rev=3D18783&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/views/engines/vers=
ioning/actions/ContentVersioningAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/engines/vers=
ioning/actions/ContentVersioningAction.java Mon Oct 8 17:57:13 2007
@@ -193,6 +193,7 @@
=
final EngineLanguageHelper elh =3D (EngineLanguageHelper)
engineMap.get(JahiaEngine.ENGINE_LANGUAGE_HELPER);
+ elh.update(engineCommonData.getParamBean());
if (elh !=3D null &&
!engineViewHelper.getLanguagesToRestore().contains=
(elh.getCurrentLocale())) {
engineViewHelper.getLanguagesToRestore().add(elh.getCu=
rrentLocale().clone());
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/struts/j=
ahia-tiles-defs.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/etc/struts/jahia-tiles-defs.xml&rev=3D18783=
&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/WEB-INF/etc/struts/jahia-t=
iles-defs.xml (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/struts/jahia-t=
iles-defs.xml Mon Oct 8 17:57:13 2007
@@ -56,9 +56,7 @@
<put name=3D"top-action-menu"
value=3D"/views/engines/common/actions_s=
elector.jsp" />
<put name=3D"tab-buttons"
value=3D"/views/engines/common/tab_buttons.j=
sp" />
-->
- <!--
- <put name=3D"language-switch-buttons"
value=3D"/views/engines/common/l=
anguage-switch-buttons.jsp" />
- -->
+ <put name=3D"multilanguage-links"
value=3D"/views/engines/common/multi=
language_links.jsp" />
<put name=3D"buttons" value=3D"/jsp/jahia/engines/buttons.jsp"
/>
<put name=3D"menu-bar" value=3D"/jsp/jahia/engines/menuBar.jsp"
/>
</definition>
Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/common/mu=
ltilanguage_links.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-SP-BRANCH/core/src/webapp/views/engines/common/multilanguage_links.jsp=
&rev=3D18783&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/views/engines/common/multi=
language_links.jsp (added)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/common/multi=
language_links.jsp Mon Oct 8 17:57:13 2007
@@ -0,0 +1,98 @@
+<%--
+Copyright 2002-2006 Jahia Ltd
+
+Licensed under the JAHIA SUSTAINABLE SOFTWARE LICENSE (JSSL), =
+Version 1.0 (the "License"), or (at your option) any later version; you ma=
y =
+not use this file except in compliance with the License. You should have =
+received a copy of the License along with this program; if not, you may ob=
tain =
+a copy of the License at =
+
+ http://www.jahia.org/license/
+
+Unless required by applicable law or agreed to in writing, software =
+distributed under the License is distributed on an "AS IS" BASIS, =
+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] language =3D "java"%>
+<%@ page import=3D"java.util.*" %>
+<%@ page import=3D"org.jahia.params.ParamBean" %>
+<%@ page import=3D"org.jahia.engines.*" %>
+<%@ page import=3D"org.jahia.services.sites.*" %>
+<%@ page import=3D"org.jahia.utils.*" %>
+<%@ page import=3D"org.jahia.services.acl.JahiaBaseACL"%>
+<%@ page import=3D"org.jahia.registries.ServicesRegistry"%>
+<%@ page import =3D "org.jahia.views.engines.*"%>
+<%@ page import=3D"org.jahia.views.engines.versioning.revisionsdetail.acti=
ons.*" %>
+<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
+<[EMAIL PROTECTED] file=3D"/views/engines/common/taglibs.jsp" %>
+<jsp:useBean id=3D"URL" class=3D"java.lang.String" scope=3D"request"/>
+<%
+
+ final HashMap engineMap =3D (HashMap) request.getAttribute("jahia_sess=
ion_engineMap");
+ final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+ final String theScreen =3D (String) engineMap.get("screen");
+ final String actionURL =3D (String) request.getAttribute("ContentVersi=
oning.ActionURL");
+ String engineUrl =3D actionURL;
+
+ EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+ if (elh =3D=3D null) {
+ elh =3D new EngineLanguageHelper(jParams.getLocale());
+ }
+
+ final ArrayList localeList =3D new ArrayList();
+ final Vector siteLanguageSettings =3D jParams.getSite().getLanguageSet=
tings();
+ if (siteLanguageSettings !=3D null) {
+ for (int i =3D 0; i < siteLanguageSettings.size(); i++) {
+ final SiteLanguageSettings curSetting =3D (SiteLanguageSetting=
s) siteLanguageSettings.elementAt(i);
+ if (curSetting.isActivated()) {
+ final Locale tempLocale =3D LanguageCodeConverters.languag=
eCodeToLocale(curSetting.getCode());
+ final boolean canEdit =3D ServicesRegistry.getInstance().g=
etJahiaACLManagerService().getSiteActionPermission("engines.languages." +
+ tempLocale.toString(),
+ jParams.getUser(),
+ JahiaBaseACL.READ_RIGHTS,
+ jParams.getSiteID()) > 0;
+ if (canEdit) localeList.add(tempLocale);
+ }
+ }
+ }
+
+ request.setAttribute("localeList", localeList);
+
+ final LangLinksFactory langLinksFactory =3D
+ new LangLinksFactory(engineUrl + "&screen=3D" + theScreen,
+ localeList,
+ elh.getCurrentLanguageCode(), // previous Lang
+ elh.getCurrentLanguageCode());
+
+ final Enumeration langsEnum =3D langLinksFactory.getLinks(); %>
+ <% /*display information about langs. only if there multiple langs.*/
+ if (localeList.size() > 1) {%>
+<div id=3D"langs">
+
+ <% while (langsEnum.hasMoreElements()) { %>
+ <span>
+<%
+ final LangLink link =3D (LangLink) langsEnum.nextElement();
+ final String href =3D "javascript:handleLanguageChange('" + link.getLa=
nguageCode() + "');";
+
+ if (link.getLocale().toString().equals(elh.getCurrentLanguageCode())) =
{ %>
+
+ <jahia:displayLanguageFlag code=3D"<%=3Dlink.getLocale().getLanguage()=
%>"
+ alt=3D"<%=3Dlink.getLocale().getDisplayName=
()%>"/>
+ <% } else { %>
+ <jahia:displayLanguageFlag href=3D"<%=3Dhref%>" code=3D"<%=3Dlink.getL=
ocale().getLanguage()%>"
+ alt=3D"<%=3Dlink.getLocale().getDisplayName=
()%>"/>
+ <% } %>
+ </span>
+ <% } %>
+
+ <span class=3D"label"><jahia:engineResourceBundle resourceName=3D"org.=
jahia.curLang.label"/>: </span>
+ <jahia:displayLanguageFlag code=3D"<%=3Delh.getCurrentLocale().getLang=
uage()%>"
+ alt=3D"<%=3Delh.getCurrentLocale().getDispl=
ayName()%>"/>
+</div>
+<%}%>
+
+<input type=3D"hidden" name=3D"engine_lang" value=3D"<%=3Delh.getCurrentLa=
nguageCode()%>"/>
+<input type=3D"hidden" name=3D"prev_engine_lang" value=3D"<%=3Delh.getCurr=
entLanguageCode()%>"/>
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versio=
ning/common-javascript.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/views/engines/versioning/common-javascript.inc&rev=
=3D18783&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/views/engines/versioning/c=
ommon-javascript.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/c=
ommon-javascript.inc Mon Oct 8 17:57:13 2007
@@ -10,6 +10,21 @@
}
}
=
+function handleLanguageChange(lang) {
+ document.mainForm.method =3D "POST";
+ document.mainForm.screen.value =3D "<%=3DtheScreen%>";
+ document.mainForm.engine_lang.value =3D lang;
+ var engineView =3D '<%=3DengineView%>';
+ var method =3D "";
+ if ( "operationChoices"=3D=3DengineView ){
+ method =3D "showOperationChoices"; =
+ } else if ( "sitemap"=3D=3DengineView ){
+ method =3D "showSiteMap"; =
+ }
+ sendForm(method);
+} =
+
+
function sendFormSave(){
window.close();
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
