Author: xlawrence
Date: Thu Jun 28 17:06:56 2007
New Revision: 17822
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17822&repname=
=3Djahia
Log:
optimize java imports
Modified:
trunk/core/src/java/org/jahia/engines/EngineLanguageHelper.java
trunk/core/src/webapp/WEB-INF/etc/config/log4j.xml
trunk/core/src/webapp/WEB-INF/var/shared_templates/corporate_portal_tem=
plates.jar
trunk/core/src/webapp/WEB-INF/var/shared_templates/corporate_portal_tem=
plates_v2.jar
trunk/core/src/webapp/jsp/jahia/administration/menu.jsp
trunk/core/src/webapp/jsp/jahia/administration/site_multiple_delete.jsp
trunk/core/src/webapp/jsp/jahia/engines/filemanager/close.jsp
trunk/core/src/webapp/jsp/jahia/engines/filemanager/error.jsp
trunk/core/src/webapp/jsp/jahia/engines/filemanager/info.jsp
trunk/core/src/webapp/views/engines/engines_default_layout.jsp
trunk/core/src/webapp/views/engines/versioning/pages/sitemap.jsp
Modified: trunk/core/src/java/org/jahia/engines/EngineLanguageHelper.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/EngineLanguageHelper.java&rev=3D17822&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/java/org/jahia/engines/EngineLanguageHelper.java (origin=
al)
+++ trunk/core/src/java/org/jahia/engines/EngineLanguageHelper.java Thu Jun=
28 17:06:56 2007
@@ -14,21 +14,18 @@
* 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.
- */package org.jahia.engines;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Locale;
-import java.io.Serializable;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+ */
+package org.jahia.engines;
=
import org.jahia.bin.Jahia;
import org.jahia.params.ProcessingContext;
import org.jahia.params.SessionState;
-import org.jahia.utils.LanguageCodeConverters;
import org.jahia.services.version.EntryLoadRequest;
+import org.jahia.utils.LanguageCodeConverters;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Locale;
=
/**
*
Modified: trunk/core/src/webapp/WEB-INF/etc/config/log4j.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/config/log4j.xml&rev=3D17822&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/WEB-INF/etc/config/log4j.xml (original)
+++ trunk/core/src/webapp/WEB-INF/etc/config/log4j.xml Thu Jun 28 17:06:56 =
2007
@@ -95,32 +95,25 @@
</category>
=
-->
- <category name=3D"org.jahia.services.esi.EsiSOAPInvalidatorService">
- <priority value=3D"info"/>
+ <category name=3D"org.jahia.engines.filemanager.DAVFilemanager_Engine">
+ <priority value=3D"debug"/>
</category>
+ <!-- (FH): changing the following level to DEBUG will generate a lot o=
f logs, think twice before changing it! -->
=
-
- <!-- (FH): changing the following level to DEBUG will generate a lot o=
f logs,
-think twice before changing it! -->
-
- <category name=3D"jsp.jahia.engines">
- <priority value=3D"error"/>
+ <category name=3D"org.jahia.ajax.categories">
+ <priority value=3D"info"/>
</category>
=
- <category name=3D"org.apache.commons">
+ <category name=3D"org.jahia.services.webdav.listeners.SysDocProtoListe=
ner">
<priority value=3D"error"/>
</category>
=
- <category name=3D"org.apache.jasper">
+ <category name=3D"org.jahia.ajax.webdav">
<priority value=3D"info"/>
</category>
=
- <category name=3D"org.springframework">
- <priority value=3D"error"/>
- </category>
-
- <category name=3D"org.jahia.blogs">
- <priority value=3D"error"/>
+ <category name=3D"jsp.jahia.engines">
+ <priority value=3D"debug"/>
</category>
=
<category name=3D"org.hibernate">
@@ -139,10 +132,6 @@
<priority value=3D"error"/>
</category>
=
- <category name=3D"org.jahia.hibernate.cache">
- <priority value=3D"info"/>
- </category>
-
<category name=3D"org.jboss.cache">
<priority value=3D"fatal"/>
</category>
@@ -157,7 +146,7 @@
=
<category name=3D"org.jahia.spring.aop.interceptor">
<!-- Set this to debug to activate JAMon monitoring -->
- <priority value=3D"info"/>
+ <priority value=3D"debug"/>
</category>
=
<root>
Modified: trunk/core/src/webapp/WEB-INF/var/shared_templates/corporate_port=
al_templates.jar
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/shared_templates/corporate_portal_templates.jar&rev=3D17822&re=
pname=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
Binary files - no diff available.
Modified: trunk/core/src/webapp/WEB-INF/var/shared_templates/corporate_port=
al_templates_v2.jar
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/shared_templates/corporate_portal_templates_v2.jar&rev=3D17822=
&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
Binary files - no diff available.
Modified: trunk/core/src/webapp/jsp/jahia/administration/menu.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/menu.jsp&rev=3D17822&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/menu.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/administration/menu.jsp Thu Jun 28 17:0=
6:56 2007
@@ -322,9 +322,8 @@
</div>
=
</div> =
- =
- <% if ((siteID.intValue() > 0) && (currentSite !=3D null)) { %>
=
+<% if ((siteID.intValue() > 0) && (currentSite !=3D null)) { %>
<h2 class=3D"display" title=3D"sites">
<a href=3D"#sites" class=3D"sectionLink">
<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.siteSet=
tings.label"/>
Modified: trunk/core/src/webapp/jsp/jahia/administration/site_multiple_dele=
te.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/site_multiple_delete.jsp&rev=3D17822&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/administration/site_multiple_delete.jsp=
(original)
+++ trunk/core/src/webapp/jsp/jahia/administration/site_multiple_delete.jsp=
Thu Jun 28 17:06:56 2007
@@ -14,16 +14,15 @@
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.*"%>
+--%>
+<%@ page import=3D"org.jahia.services.usermanager.JahiaUserManagerProvider=
" %>
<[EMAIL PROTECTED] file=3D"/jsp/jahia/administration/include/header.inc"%>
-<[EMAIL PROTECTED] import =3D "org.jahia.services.usermanager.*"%>
+<%@ page import=3D"java.util.Iterator" %>
<%@ page import=3D"java.util.List" %>
<%@ page import=3D"java.util.Vector" %>
-<%@ page import=3D"java.util.Iterator" %>
-<%@ page import=3D"org.jahia.services.sites.JahiaSite" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%
- List sites =3D (List) request.getAttribute("sites");
+ final List sites =3D (List) request.getAttribute("sites");
=
Vector usrProviders =3D (Vector) request.getAttribute("usrProviders");
if (usrProviders =3D=3D null) {
@@ -33,17 +32,26 @@
=
<div id=3D"topTitle">
<div id=3D"topTitleLogo">
- <img name=3D"virtual_sites" src=3D"<%=3DURL%>images/icons/admin/envi=
ronment.gif" width=3D"48" height=3D"48" border=3D"0" />
+ <img alt=3D"" name=3D"virtual_sites" src=3D"<%=3DURL%>images/icons=
/admin/environment.gif" width=3D"48" height=3D"48" border=3D"0"/>
</div>
- <h1 id=3D"topTitleLabel"><jahia:adminResourceBundle resourceName=3D"org.=
jahia.admin.site.ManageSites.manageVirtualSites.label"/></h1>
+
+ <h1 id=3D"topTitleLabel"><jahia:adminResourceBundle
+ resourceName=3D"org.jahia.admin.site.ManageSites.manageVirtual=
Sites.label"/></h1>
</div>
=
<div id=3D"adminMainContent">
=
+<% if (sites =3D=3D null || sites.size() =3D=3D 0) { %>
+<div class=3D"error">
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.site.Manage=
Sites.noSiteSpecified.label"/>
+</div>
+<% } else { %>
+
<form method=3D"POST" action=3D'<%=3DJahiaAdministration.composeActionUR=
L(request,response,"sites","")%>' name=3D"mainForm">
<input type=3D"hidden" name=3D"sub" value=3D"processmultipledelete" =
/>
=
- <p class=3D"errorbold"><jahia:adminResourceBundle resourceName=3D"org.=
jahia.admin.site.ManageSites.pleaseBeCareful.label"/></p>
+<p class=3D"errorbold"><jahia:adminResourceBundle
+ resourceName=3D"org.jahia.admin.site.ManageSites.pleaseBeCareful.l=
abel"/></p>
=
<h2><jahia:adminResourceBundle resourceName=3D"org.jahia.admin.site.Ma=
nageSites.doYouWantToContinue.label"/></h2>
=
@@ -95,30 +103,35 @@
<table border=3D"0" cellpadding=3D"0" cellspacing=3D"0">
<tr>
<td>
- <input name=3D"deleteTemplates" type=3D"checkbox" =
value=3D"1" checked > <jahia:adminResourceBundle resourceName=3D"org.j=
ahia.admin.site.ManageSites.deleteSiteTemplates.label"/>
+ <input name=3D"deleteTemplates" type=3D"checkbox" =
value=3D"1" checked> <jahia:adminResourceBundle
+ resourceName=3D"org.jahia.admin.site.ManageSit=
es.deleteSiteTemplates.label"/>
</td>
</tr>
<tr>
<td>
- <input name=3D"deleteFileRepository" type=3D"check=
box" value=3D"1" checked > <jahia:adminResourceBundle resourceName=3D"=
org.jahia.admin.site.ManageSites.deleteSiteFileRepository.label"/>
+ <input name=3D"deleteFileRepository" type=3D"check=
box" value=3D"1" checked>
+ <jahia:adminResourceBundle
+ resourceName=3D"org.jahia.admin.site.Manag=
eSites.deleteSiteFileRepository.label"/>
</td>
</tr>
<tr>
<td>
<br><br>
<%
- if ( usrProviders.size()>0 )
- {
+ if (usrProviders.size() > 0) {
%>
- <jahia:adminResourceBundle resourceName=3D"org.jah=
ia.admin.site.ManageSites.deleteSiteUsersAndGroups.label"/> :<br>
+ <jahia:adminResourceBundle
+ resourceName=3D"org.jahia.admin.site.Manag=
eSites.deleteSiteUsersAndGroups.label"/> :
+ <br>
<%
JahiaUserManagerProvider usrProviderBean;
int size =3D usrProviders.size();
- for ( int i=3D0 ; i<size ; i++ )
- {
+ for (int i =3D 0; i < size; i++) {
usrProviderBean =3D (JahiaUserManagerP=
rovider)usrProviders.get(i);
%>
- &n=
bsp; <input name=
=3D"usrProviders" type=3D"checkbox" value=3D"<%=3DusrProviderBean.getKey()%=
>" checked> <%=3DusrProviderBean.getKey()%>
+ &n=
bsp;
+ <input name=3D"usrProviders" type=3D"checkbox" val=
ue=3D"<%=3DusrProviderBean.getKey()%>" checked>
+ <%=3DusrProviderBean.getKey()%>
<%
}
}
@@ -136,8 +149,10 @@
<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.cance=
l.label"/>
</a>
</div>
+
<div class=3D"button">
- <a href=3D"javascript:document.mainForm.submit()" onclick=3D"openW=
orkInProgressWindow('<%=3Drequest.getContextPath()%>')">
+ <a href=3D"javascript:document.mainForm.submit()"
+ onclick=3D"openWorkInProgressWindow('<%=3Drequest.getContextPat=
h()%>')">
<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.delet=
e.label"/>
</a>
</div>
@@ -145,16 +160,22 @@
=
</form>
=
+<% } %>
+
<div id=3D"operationMenu">
<div id=3D"operationMenuLabel">
<jahia:adminResourceBundle
resourceName=3D"org.jahia.admin.otherOperati=
ons.label"/> :
</div>
<ul id=3D"operationList">
<li class=3D"operationEntry">
- <a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.compose=
ActionURL(request,response,"sites","&sub=3Dlist")%>'><jahia:adminResourceBu=
ndle resourceName=3D"org.jahia.admin.site.ManageSites.backToSitesList.label=
"/></a>
+ <a class=3D"operationLink"
+ href=3D'<%=3DJahiaAdministration.composeActionURL(request,r=
esponse,"sites","&sub=3Dlist")%>'>
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.admin=
.site.ManageSites.backToSitesList.label"/></a>
</li>
<li class=3D"operationEntry">
- <a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.compose=
ActionURL(request,response,"displaymenu","")%>'><jahia:adminResourceBundle =
resourceName=3D"org.jahia.admin.backToMenu.label"/></a>
+ <a class=3D"operationLink"
+ href=3D'<%=3DJahiaAdministration.composeActionURL(request,r=
esponse,"displaymenu","")%>'>
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.admin=
.backToMenu.label"/></a>
</li>
</ul>
</div>
Modified: trunk/core/src/webapp/jsp/jahia/engines/filemanager/close.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/filemanager/close.jsp&rev=3D17822&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/close.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/filemanager/close.jsp Thu Jun 2=
8 17:06:56 2007
@@ -18,11 +18,19 @@
<%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" %>
<%@ page import=3D"java.util.HashMap" %>
<%@ page import=3D"org.jahia.params.ParamBean"%>
+<%@ page import=3D"org.jahia.engines.filemanager.TableEntry" %>
=
<%
final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
final String javaScriptPath =3D (String) engineMap.get("javaScriptPath=
");
final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+ final Object justUploaded =3D session.getAttribute(jParams.getSiteID()=
+ "-justUploaded");
+ final String fileName;
+ if (justUploaded =3D=3D null) {
+ fileName =3D null;
+ } else {
+ fileName =3D justUploaded.toString();
+ }
%>
=
<html>
@@ -33,9 +41,8 @@
var bar =3D window.opener.document.getElementById("addressBar");
if (bar) {
window.opener.waitForClosePopup();
- var uploadedFile =3D "<%=3Dsession.getAttribute(jParams.getSit=
eID() + "-justUploaded")%>";
+ var uploadedFile =3D "<%=3DTableEntry.javascriptEncode(fileNam=
e)%>";
if (uploadedFile.length > 0 && uploadedFile !=3D "null" && win=
dow.opener.document.mainForm.selectedFileName) {
- window.opener.document.mainForm.selectedFileName.value =3D=
uploadedFile;
window.opener.document.mainForm.file_id.value =3D uploaded=
File;
window.opener.selectUnselectFile(uploadedFile);
}
Modified: trunk/core/src/webapp/jsp/jahia/engines/filemanager/error.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/filemanager/error.jsp&rev=3D17822&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/error.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/filemanager/error.jsp Thu Jun 2=
8 17:06:56 2007
@@ -36,7 +36,7 @@
</h3>
=
<!-- Langs -->
-<jsp:include page=3D"../multilanguage_links.jsp" flush=3D"true"/>
+<%--<jsp:include page=3D"../multilanguage_links.jsp" flush=3D"true"/>--%>
<!-- End Langs -->
=
<div id=3D"buttons">
@@ -61,7 +61,8 @@
<ul>
<% for (int i =3D 0; i < listOfFiles.size(); i++) { %>
<li>
- <% final DAVFileAccess dav =3D (DAVFileAccess) listOfFiles.get=
(i); %>
+ <% if (listOfFiles.get(i) instanceof DAVFileAccess) {
+ final DAVFileAccess dav =3D (DAVFileAccess) listOfFiles.ge=
t(i); %>
<% if (dav.isCollection()) { %>
<img src=3D"<jahia:serverHttpPath/>/jsp/jahia/engines/images/t=
ypes/folder_open.gif" alt=3D""/>
<% } else { %>
@@ -70,7 +71,11 @@
<% } %>
<%=3Ddav.getPath()%>
+ <% } else { %>
+ <%=3D listOfFiles.get(i) %> =
+ <% } %>
</li>
+
<% } %>
</ul>
<% } %>
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=3D17822&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 Thu Jun 28=
17:06:56 2007
@@ -90,7 +90,7 @@
window.close();
}
=
-window.onunload =3D null;
+window.onunload =3D removeAll;
=
function handleTabChange(what) {
document.mainForm.tab.value =3D what;
Modified: trunk/core/src/webapp/views/engines/engines_default_layout.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/views/engines/engines_default_layout.jsp&rev=3D17822&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/engines_default_layout.jsp (origina=
l)
+++ trunk/core/src/webapp/views/engines/engines_default_layout.jsp Thu Jun =
28 17:06:56 2007
@@ -11,6 +11,8 @@
<%@ page import=3D"java.util.List" %>
<%@ page import=3D"org.jahia.services.lock.LockRegistry" %>
<%@ page import=3D"java.util.Map" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
=
<%@ include file=3D"/views/engines/common/taglibs.jsp" %>
=
@@ -55,6 +57,10 @@
=
final LockKey lockKey =3D (LockKey) engineMap.get("LockKey");
final LockPrerequisitesResult results =3D LockPrerequisites.getInstanc=
e().getLockPrerequisitesResult(lockKey);
+ EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+ if (elh !=3D null) {
+ jParams.setCurrentLocale(elh.getCurrentLocale());
+ }
%>
=
<html xmlns=3D"http://www.w3.org/1999/xhtml"; xml:lang=3D"<%=3DjParams.getL=
ocale()%>" lang=3D"<%=3DjParams.getLocale()%>">
@@ -212,11 +218,23 @@
}
=
function closeTheWindow() {
+ var last =3D "<%=3DtheScreen%>";
+ var src =3D "<%=3DjspSource%>";
+
+ if (src =3D=3D "apply" || src =3D=3D "delete_container") return;
+ //alert (submittedCount + "-" + last + "-" + src);
if (submittedCount =3D=3D 0) {
+ if (last !=3D "save" && last !=3D "cancel" && last !=3D "showR=
eport" && src !=3D "apply" &&
+ src !=3D "close" && src !=3D "lock") {
sendFormCancel();
- setTimeout("void(0)",2000);
+ //alert ("sendFormCancel" + "-" + last + "-" + src);
+ }
+ if (src =3D=3D "close") {
+ // Do refresh opener by setting argument to "yes"
+ CloseJahiaWindow("yes");
} else {
- closeEngineWin();
+ CloseJahiaWindow();
+ }
}
}
=
Modified: trunk/core/src/webapp/views/engines/versioning/pages/sitemap.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/views/engines/versioning/pages/sitemap.jsp&rev=3D17822&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/pages/sitemap.jsp (origi=
nal)
+++ trunk/core/src/webapp/views/engines/versioning/pages/sitemap.jsp Thu Ju=
n 28 17:06:56 2007
@@ -176,7 +176,10 @@
<% } %>
<tr>
<td align=3D"left" valign=3D"top" colspan=3D"3">
- <b><jahia:engineResourceBundle resourceName=3D"org.jahia.engin=
es.version.pagesSelection"/> :</b><br/>
+ <b><jahia:engineResourceBundle resourceName=3D"org.jahia.engin=
es.version.pagesSelection"/> :</b>
+ <p>
+ <!--span class=3D"error">N.B: <jahia:engineResourceBu=
ndle resourceName=3D"org.jahia.engines.version.lockedPages"/></span-->
+ </p>
<%
// Restore specific
final int restoreVersionID =3D (int) (pagesVersViewHelper.=
getRestoreDateCalendar().getDateLong().longValue() / 1000);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
