svn commit: [jahia] r18509 - in /trunk/core/src/webapp/jsp/jahia/engines: images/filemanager/unselectFile.gif images/filemanager/unselectFile_disabled.gif images/filemanager/unselectFile_hover.gif shared/embedded_filemanager.jsp

[sshyrkov]

Author: sshyrkov
Date: Fri Sep 14 18:30:37 2007
New Revision: 18509

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18509&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:
    trunk/core/src/webapp/jsp/jahia/engines/images/filemanager/unselectFile=
.gif
      - copied unchanged from r18508, branches/JAHIA-5-0-SP-BRANCH/core/src=
/webapp/jsp/jahia/engines/images/filemanager/unselectFile.gif
    trunk/core/src/webapp/jsp/jahia/engines/images/filemanager/unselectFile=
_disabled.gif
      - copied unchanged from r18508, branches/JAHIA-5-0-SP-BRANCH/core/src=
/webapp/jsp/jahia/engines/images/filemanager/unselectFile_disabled.gif
    trunk/core/src/webapp/jsp/jahia/engines/images/filemanager/unselectFile=
_hover.gif
      - copied unchanged from r18508, branches/JAHIA-5-0-SP-BRANCH/core/src=
/webapp/jsp/jahia/engines/images/filemanager/unselectFile_hover.gif
Modified:
    trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp

Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanag=
er.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/embedded_filemanager.jsp&rev=3D18509&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/engines/shared/embedded_filemanager.jsp=
 (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp=
 Fri Sep 14 18:30:37 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");
@@ -654,6 +675,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">&nbsp;</td>
         <td class=3D"tdIcone">
             <a href=3D"javascript:getFolderWithKey('<%=3D jParams.getSiteK=
ey() %>/users/<%=3D TableEntry.javascriptEncode(jParams.getUser().getUserna=
me()) %>', 'tree1');">
@@ -705,8 +735,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
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list