Author: sshyrkov
Date: Fri Sep 14 18:14:13 2007
New Revision: 18508
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18508&repname=
=3Djahia
Log:
JAHIA-2161: Sp3: File field: do not list unselect file if not required - pl=
ease add an unselect icon near the select icon
http://www.jahia.net/jira/browse/JAHIA-2161
Resolution: added new toolbar action button for unselecting file. The link =
"Unselect file" is not shown now, if no file is selected
Added:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/f=
ilemanager/unselectFile.gif (with props)
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/f=
ilemanager/unselectFile_disabled.gif (with props)
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/f=
ilemanager/unselectFile_hover.gif (with props)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e=
mbedded_filemanager.jsp
Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/image=
s/filemanager/unselectFile.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/filemanager/unselec=
tFile.gif&rev=3D18508&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 file - no diff available.
Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/image=
s/filemanager/unselectFile_disabled.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/filemanager/unselec=
tFile_disabled.gif&rev=3D18508&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 file - no diff available.
Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/image=
s/filemanager/unselectFile_hover.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/filemanager/unselec=
tFile_hover.gif&rev=3D18508&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 file - no diff available.
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/embedded_filemanager.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp&r=
ev=3D18508&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/e=
mbedded_filemanager.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e=
mbedded_filemanager.jsp Fri Sep 14 18:14:13 2007
@@ -229,6 +229,7 @@
if (msg) {
var tag =3D "value";
document.mainForm.selectedFileName.value =3D XmlUtils.getNodeV=
alue(msg.getDocXml(), tag);
+ checkSelectFileLink();
}
}
=
@@ -520,18 +521,38 @@
"title=3D'<jahia:engineResourceBundle reso=
urceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.selectFile.lab=
el"/>'" +
"border=3D'0' src=3D'<jahia:serverHttpPath=
/>/jsp/jahia/engines/images/filemanager/selectFile_disabled.gif' width=3D'2=
4'height=3D'24'/>";
}
+ element =3D document.getElementById("unselectFile");
+ if ($F('selectedFileName') && $F('selectedFileName').length > 0) {
+ element.innerHTML =3D "<a href=3D\"javascript:go('selectFileEm=
pty', true);\"><img " +
+ "onmouseover=3D'this.src =3D \"<jahia:serv=
erHttpPath/>/jsp/jahia/engines/images/filemanager/unselectFile_hover.gif\"'=
" +
+ "onmouseout=3D'this.src =3D \"<jahia:serve=
rHttpPath/>/jsp/jahia/engines/images/filemanager/unselectFile.gif\"'" +
+ "alt=3D'<jahia:engineResourceBundle resour=
ceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.unselectFile.lab=
el"/>'" +
+ "title=3D'<jahia:engineResourceBundle reso=
urceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.unselectFile.l=
abel"/>'" +
+ "border=3D'0' src=3D'<jahia:serverHttpPath=
/>/jsp/jahia/engines/images/filemanager/unselectFile.gif' width=3D'24'heigh=
t=3D'24'/></a>";
+ } else {
+ element.innerHTML =3D "<img alt=3D'<jahia:engineResourceBundle=
resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.unselectF=
ile.label"/>'" +
+ "title=3D'<jahia:engineResourceBundle reso=
urceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.unselectFile.l=
abel"/>'" +
+ "border=3D'0' src=3D'<jahia:serverHttpPath=
/>/jsp/jahia/engines/images/filemanager/unselectFile_disabled.gif' width=3D=
'24'height=3D'24'/>";
+ }
delete tmp;
delete element;
delete child;
delete obj;
}
+
+ function checkSelectFileLink() {
+ if ($F('selectedFileName') && $F('selectedFileName').length > 0) {
+ $('selectFileLink').show();
+ } else {
+ $('selectFileLink').hide();
+ }
+ updateMenuBar();
+ }
+ Event.observe(window, 'load', checkSelectFileLink);
//-->
</script>
=
<input id=3D"file_id" name=3D"file_id" type=3D"hidden" value=3D"<%=3Dfilen=
ame%>">
-<!--<div><a href=3D"javascript:handleActionChanges('edit&viewtype=3Dflat')=
">
- <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.filemana=
ger.Filemanager_Engine.switchFlat.label"/></a>
-</div>-->
=
<%
final Set deniedUsers =3D (Set) engineMap.get("deniedUsers");
@@ -661,6 +682,15 @@
=
width=3D"24"
=
height=3D"24"/>
</td>
+ <td class=3D"tdIcone" id=3D"unselectFile">
+ <img alt=3D"<jahia:engineResourceBundle
+ resourceName=3D"org.jahia.engines.filemanager.Filemana=
ger_Engine.unselectFile.label"/>"
+ title=3D"<jahia:engineResourceBundle
+ resourceName=3D"org.jahia.engines.filemanager.Filemana=
ger_Engine.unselectFile.label"/>" border=3D"0"
+ =
src=3D"<jahia:serverHttpPath/>/jsp/jahia/engi=
nes/images/filemanager/selectFile_disabled.gif"
+ =
width=3D"24"
+ =
height=3D"24"/>
+ </td>
<td class=3D"separator"> </td>
<td class=3D"tdIcone">
<a href=3D"javascript:getFolderWithKey('/users/<%=3D TableEntr=
y.javascriptEncode(jParams.getUser().getUsername()) %>', 'tree1');">
@@ -712,8 +742,8 @@
<div id=3D"currentFile">
<strong><jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engi=
ne.selectedFile.label"/>:</strong>
- <input type=3D"text" name=3D"selectedFileName" style=3D"width:45%;" va=
lue=3D"<%=3DTableEntry.javascriptDecode(filename) %>"/>
- - <a href=3D"javascript:go('selectFileEmpty')"><jahia:engineResourceB=
undle resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.unse=
lectFile.label"/></a>
+ <input type=3D"text" id=3D"selectedFileName" name=3D"selectedFileName"=
style=3D"width:45%;" value=3D"<%=3DTableEntry.javascriptDecode(filename) %=
>" onchange=3D"alert('onchange')"/>
+ <span id=3D"selectFileLink" style=3D"display:none;"> - <a href=3D"java=
script:go('selectFileEmpty')"><jahia:engineResourceBundle resourceName=3D"o=
rg.jahia.engines.filemanager.Filemanager_Engine.unselectFile.label"/></a></=
span>
</div>
<input type=3D"hidden" id=3D"addressBar" name=3D"addressBar" />
<div>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
![svn commit: [jahia] r18508 - in /branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines: images/filemanager/unselectFile.gif images/filemanager/unselectFile_disabled.gif images/filemanager/unselectFile_hover.gif shared/embedded_filemanager.jsp](/search?l=cvs_list@jahia.org&q=subject:%22svn+commit%5C%3A+%5C%5Bjahia%5C%5D+r18508+%5C-+in%09%5C%2Fbranches%5C%2FJAHIA%5C-5%5C-0%5C-SP%5C-BRANCH%5C%2Fcore%5C%2Fsrc%5C%2Fwebapp%5C%2Fjsp%5C%2Fjahia%5C%2Fengines%5C%3A%09images%5C%2Ffilemanager%5C%2FunselectFile.gif%09images%5C%2Ffilemanager%5C%2FunselectFile_disabled.gif%09images%5C%2Ffilemanager%5C%2FunselectFile_hover.gif%09shared%5C%2Fembedded_filemanager.jsp%22&o=newest){kind=link}
