Author: bpapez
Date: Mon Jan 21 13:00:05 2008
New Revision: 19553
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19553&repname=
=3Djahia
Log:
DOC-199: 4.2 Slide: no "please wait" pop-up when copying directories/files =
from within the engine
- added "please wait" popup for copy, move operations
Modified:
branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/engine.jsp
branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/filemanager/view.=
jsp
Modified: branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/engine.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/views/jsp/jahia/engines/engine.jsp&rev=3D19553&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-4-1-BRANCH/src/views/jsp/jahia/engines/engine.jsp (origi=
nal)
+++ branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/engine.jsp Mon Ja=
n 21 13:00:05 2008
@@ -234,6 +234,12 @@
}
}
=
+function setWaitingCursor (showWaitingImage) {
+ document.body.style.cursor =3D "wait";
+ if (showWaitingImage =3D=3D 1)
+ openWorkInProgressWindow('<%=3Drequest.getContextPath()%>');
+}
+
<%--
The following code has been deactivated because it causes problems with
FORMs being submitted more than once under IE 6. Sadly the cause of this
Modified: branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/filemanager=
/view.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/views/jsp/jahia/engines/filemanager/view.jsp&rev=3D19553&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-4-1-BRANCH/src/views/jsp/jahia/engines/filemanager/view.=
jsp (original)
+++ branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/filemanager/view.=
jsp Mon Jan 21 13:00:05 2008
@@ -12,7 +12,7 @@
org.jahia.data.files.JahiaFileField"%>
=
=
-<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
+<%@ taglib uri=3D"contentLib" prefix=3D"content" %>
=
<%!
=
@@ -37,7 +37,7 @@
} // getPicto
%>
=
-<jahia:i18n />
+<content:i18n />
=
<%
HashMap engineMap =3D (HashMap)request.getAttribute("org.jahia.engines=
.EngineHashMap");
@@ -51,23 +51,23 @@
String fileeditUrl =3D (String) engineMap.get( "engineUrl" );
=
%>
-<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.filemanager.=
Filemanager_Engine.selectDir.label"/>
+<content:engineResourceBundle resourceName=3D"org.jahia.engines.filemanage=
r.Filemanager_Engine.selectDir.label"/>
<form name=3D"selector" action=3D"">
<table border=3D"0" cellpadding=3D"0" cellspacing=3D"0" width=3D"90%" alig=
n=3D"center">
<tr>
- <td><img src=3D"<jahia:serverHttpPath /><jahia:engineResourceBundle re=
sourceName=3D"org.jahia.pix.image" />" width=3D"5" height=3D"24"></td>
+ <td><img src=3D"<content:serverHttpPath /><content:engineResourceBundl=
e resourceName=3D"org.jahia.pix.image" />" width=3D"5" height=3D"24"></td>
<td width=3D"100%" align=3D"right" valign=3D"bottom" class=3D"text">
- <jahia:jahiaButton img=3D"ok"
- href=3D"javascript:sendFormSave();"
+ <content:jahiaButton img=3D"ok"
+ href=3D"javascript:sendFormSave();" onclick=3D"javascript:setW=
aitingCursor(1);"
altBundle=3D"engine" altKey=3D"org.jahia.altApplyAndClose.labe=
l" />
- <jahia:jahiaButton img=3D"apply"
+ <content:jahiaButton img=3D"apply"
href=3D"javascript:sendFormApply();"
altBundle=3D"engine" altKey=3D"org.jahia.altApplyWithoutClose.=
label" />
- <jahia:jahiaButton img=3D"cancel"
+ <content:jahiaButton img=3D"cancel"
href=3D"javascript:sendFormCancel();"
altBundle=3D"engine" altKey=3D"org.jahia.altCloseWithoutSave.l=
abel" />
</td>
- <td><img src=3D"<jahia:serverHttpPath /><jahia:engineResourceBundle re=
sourceName=3D"org.jahia.pix.image" />" width=3D"5" height=3D"24"></td>
+ <td><img src=3D"<content:serverHttpPath /><content:engineResourceBundl=
e resourceName=3D"org.jahia.pix.image" />" width=3D"5" height=3D"24"></td>
</tr>
</table>
</form>
@@ -126,22 +126,22 @@
}
if (tableEntry.getIndent() > level) {
if (((Boolean)shouldDrawLineSegment.get(level)).booleanValu=
e()) {
- %><jahia:displayIcon src=3D"vLineIcon" align=3D"absmiddle"/><%
+ %><content:displayIcon src=3D"vLineIcon" align=3D"absmiddle"/><%
} else {
- %><jahia:displayIcon src=3D"org.jahia.pix.image" width=3D"14" height=
=3D"0" align=3D"absmiddle"/><%
+ %><content:displayIcon src=3D"org.jahia.pix.image" width=3D"14" height=
=3D"0" align=3D"absmiddle"/><%
}
} else {
if (tableEntry.isExpanded() || !tableEntry.hasChildren()) {
if (tableEntry.getIndent()>0) {
if (tableEntry.isLastSister()) {
shouldDrawLineSegment.set(level, Boolean.FALSE);
- %><jahia:displayIcon src=3D"lastNodeIcon" align=3D"absmiddle"/><%
+ %><content:displayIcon src=3D"lastNodeIcon" align=3D"absmiddle"/><%
} else {
shouldDrawLineSegment.set(level, Boolean.TRUE);
- %><jahia:displayIcon src=3D"lineNodeIcon" align=3D"absmiddle"/><%
+ %><content:displayIcon src=3D"lineNodeIcon" align=3D"absmiddle"/><%
}
} else {
- %><jahia:displayIcon src=3D"org.jahia.pix.image" width=3D"14" height=
=3D"0" align=3D"absmiddle"/><%
+ %><content:displayIcon src=3D"org.jahia.pix.image" width=3D"14" height=
=3D"0" align=3D"absmiddle"/><%
}
}
}
@@ -152,19 +152,19 @@
=
if (tableEntry.isExpanded() && tableEntry.hasChildren()) {
%><a href=3D"javascript:handleActionChange('view&filetree=3Dcollapse|<=
%=3DtableEntry.getEncodedName()%>')"
- ><jahia:displayIcon src=3D"minusNodeIcon" alt=3D"Collapse" align=3D"ab=
smiddle" /></a
+ ><content:displayIcon src=3D"minusNodeIcon" alt=3D"Collapse" align=3D"=
absmiddle" /></a
><a href=3D"javascript:handleActionChange('view&filetree=3Dcollapse|<%=
=3DtableEntry.getEncodedName()%>')"
-><jahia:displayIcon src=3D"org.jahia.engines.filemanager.types.folderopen"=
alt=3D"Collapse" width=3D"16" align=3D"absmiddle" /></a>
+><content:displayIcon src=3D"org.jahia.engines.filemanager.types.folderope=
n" alt=3D"Collapse" width=3D"16" align=3D"absmiddle" /></a>
<% } else if (tableEntry.hasChildren()) {
%><a href=3D"javascript:handleActionChange('view&filetree=3Dexpandall|=
<%=3DtableEntry.getEncodedName()%>')"
- ><jahia:displayIcon src=3D"expandAllNodeIcon" alt=3D"Expand all" align=
=3D"absmiddle" /></a
+ ><content:displayIcon src=3D"expandAllNodeIcon" alt=3D"Expand all" ali=
gn=3D"absmiddle" /></a
><a href=3D"javascript:handleActionChange('view&filetree=3Dexpand|<%=
=3D tableEntry.getEncodedName()%>')"
- ><jahia:displayIcon src=3D"plusNodeIcon" alt=3D"Expand" align=3D"absmi=
ddle" /></a
+ ><content:displayIcon src=3D"plusNodeIcon" alt=3D"Expand" align=3D"abs=
middle" /></a
><a href=3D"javascript:handleActionChange('view&filetree=3Dexpand|<%=
=3D tableEntry.getEncodedName()%>')"
-><jahia:displayIcon src=3D"org.jahia.engines.filemanager.types.folderclose=
" alt=3D"Expand" width=3D"16" align=3D"absmiddle" /></a>
+><content:displayIcon src=3D"org.jahia.engines.filemanager.types.folderclo=
se" alt=3D"Expand" width=3D"16" align=3D"absmiddle" /></a>
<% } else {
- %><jahia:displayIcon src=3D"org.jahia.pix.image" width=3D"14" height=
=3D"0" align=3D"absmiddle"
- /><jahia:displayIcon src=3D"org.jahia.engines.filemanager.types.folder=
close" alt=3D"Expand" width=3D"16" align=3D"absmiddle" />
+ %><content:displayIcon src=3D"org.jahia.pix.image" width=3D"14" height=
=3D"0" align=3D"absmiddle"
+ /><content:displayIcon src=3D"org.jahia.engines.filemanager.types.fold=
erclose" alt=3D"Expand" width=3D"16" align=3D"absmiddle" />
<% }
String name;
if (tableEntry.getName().equals("/")) {
@@ -202,8 +202,8 @@
<%-- <% shade =3D !shade; %>--%>
<%--// if (fileEntry.isSelectable()) { --%>
<%----%>
-<%-- <td nowrap valign=3D"top" width=3D"16"><a href=3D"javascript:se=
ndForm('<%=3D fileEntry.getRealName() %>')"><jahia:displayIcon src=3D'<%=3D=
\"org.jahia.engines.filemanager.types.\"+ thisPicto%>' width=3D"16" height=
=3D"16" align=3D"absmiddle" /></a></td>--%>
-<%-- <td nowrap width=3D"5"><jahia:displayIcon src=3D"org.jahia.pix.=
image" width=3D"5" height=3D"0" align=3D"absmiddle" /></td>--%>
+<%-- <td nowrap valign=3D"top" width=3D"16"><a href=3D"javascript:se=
ndForm('<%=3D fileEntry.getRealName() %>')"><content:displayIcon src=3D'<%=
=3D\"org.jahia.engines.filemanager.types.\"+ thisPicto%>' width=3D"16" heig=
ht=3D"16" align=3D"absmiddle" /></a></td>--%>
+<%-- <td nowrap width=3D"5"><content:displayIcon src=3D"org.jahia.pi=
x.image" width=3D"5" height=3D"0" align=3D"absmiddle" /></td>--%>
<%-- <td style=3D"<%=3Dstyle%>" nowrap valign=3D"top" width=3D"80%">=
<a href=3D"javascript:sendForm('<%=3D fileEntry.getRealName() %>')"><%=3Dfi=
leEntry.getTitle()%></a></td>--%>
<%-- <td nowrap> <%=3D fileEntry.getFormatedSize() %> </td=
>--%>
<%-- <td nowrap>/ <%=3D fileEntry.getFormatedLastModifDate() %>=
 </td>--%>
@@ -223,14 +223,14 @@
<%--<table border=3D"0" width=3D"210" align=3D"center">--%>
<%--<tr>--%>
<%-- <td width=3D"50%" class=3D"text">--%>
-<%-- <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
filemanager.Filemanager_Engine.fileLocation.label"/>--%>
+<%-- <content:engineResourceBundle resourceName=3D"org.jahia.engine=
s.filemanager.Filemanager_Engine.fileLocation.label"/>--%>
<%-- </td>--%>
<%-- <td width=3D"50%" class=3D"text">--%>
<%-- <input class=3D"input" type=3D"text" name=3D"dir_name" size=3D=
"15" maxlength=3D"250">--%>
<%-- <input type=3D"hidden" name=3D"screen" value=3D"createDirActio=
n" />--%>
<%-- </td>--%>
<%-- <td colspan=3D"2" align=3D"right">--%>
-<%-- <a href=3D"javascript:document.jahiaFilemanager.submit();" onM=
ouseOut=3D"MM_swapImgRestore()" onMouseOver=3D"MM_swapImage('Upload','','<j=
ahia:serverHttpPath/><jahia:engineResourceBundle resourceName=3D"org.jahia.=
okOn.button"/>',1)"><img name=3D"Upload" src=3D"<jahia:serverHttpPath/><jah=
ia:engineResourceBundle resourceName=3D"org.jahia.okOff.button"/>" border=
=3D"0"></a>--%>
+<%-- <a href=3D"javascript:document.jahiaFilemanager.submit();" onM=
ouseOut=3D"MM_swapImgRestore()" onMouseOver=3D"MM_swapImage('Upload','','<c=
ontent:serverHttpPath/><content:engineResourceBundle resourceName=3D"org.ja=
hia.okOn.button"/>',1)"><img name=3D"Upload" src=3D"<content:serverHttpPath=
/><content:engineResourceBundle resourceName=3D"org.jahia.okOff.button"/>" =
border=3D"0"></a>--%>
<%-- </td>--%>
<%--</tr>--%>
<%--</table>--%>
@@ -238,21 +238,21 @@
<%----%>
<%----%>
<%--<div align=3D"right">--%>
-<%--<a href=3D"javascript:handleActionChange('createDir')"><jahia:engineRe=
sourceBundle resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engi=
ne.createDir.label"/></a><br/>--%>
-<%--<a href=3D"javascript:handleActionChange('fileUpload')"><jahia:engineR=
esourceBundle resourceName=3D"org.jahia.engines.filemanager.Filemanager_Eng=
ine.uploadNewFile.label"/></a>--%>
+<%--<a href=3D"javascript:handleActionChange('createDir')"><content:engine=
ResourceBundle resourceName=3D"org.jahia.engines.filemanager.Filemanager_En=
gine.createDir.label"/></a><br/>--%>
+<%--<a href=3D"javascript:handleActionChange('fileUpload')"><content:engin=
eResourceBundle resourceName=3D"org.jahia.engines.filemanager.Filemanager_E=
ngine.uploadNewFile.label"/></a>--%>
<%--</div>--%>
<%----%>
<%--<table border=3D"0" width=3D"210" align=3D"center">--%>
<%--<tr>--%>
<%-- <td width=3D"50%" class=3D"text">--%>
-<%-- <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
filemanager.Filemanager_Engine.fileLocation.label"/>--%>
+<%-- <content:engineResourceBundle resourceName=3D"org.jahia.engine=
s.filemanager.Filemanager_Engine.fileLocation.label"/>--%>
<%-- </td>--%>
<%-- <td width=3D"50%" class=3D"text">--%>
<%-- <input class=3D"input" type=3D"file" name=3D"file_ul" size=3D"=
15" maxlength=3D"250">--%>
<%-- <input class=3D"input" type=3D"hidden" name=3D"screen" value=
=3D"fileUploadAction">--%>
<%-- </td>--%>
<%-- <td colspan=3D"2" align=3D"right">--%>
-<%-- <a href=3D"javascript:document.jahiaFilemanager2.submit();" on=
MouseOut=3D"MM_swapImgRestore()" onMouseOver=3D"MM_swapImage('Upload','','<=
jahia:serverHttpPath/><jahia:engineResourceBundle resourceName=3D"org.jahia=
.okOn.button"/>',1)"><img name=3D"Upload" src=3D"<jahia:serverHttpPath/><ja=
hia:engineResourceBundle resourceName=3D"org.jahia.okOff.button"/>" border=
=3D"0"></a>--%>
+<%-- <a href=3D"javascript:document.jahiaFilemanager2.submit();" on=
MouseOut=3D"MM_swapImgRestore()" onMouseOver=3D"MM_swapImage('Upload','','<=
content:serverHttpPath/><content:engineResourceBundle resourceName=3D"org.j=
ahia.okOn.button"/>',1)"><img name=3D"Upload" src=3D"<content:serverHttpPat=
h/><content:engineResourceBundle resourceName=3D"org.jahia.okOff.button"/>"=
border=3D"0"></a>--%>
<%-- </td>--%>
<%--</tr>--%>
<%--</table>--%>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
