tdraier 2005/03/30 15:39:08 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/views/jsp/jahia/engines/filemanager close.jsp view.jsp
src/views/jsp/jahia/engines/shared
embedded_flat_filemanager.jsp
Log:
updated filemanager :
-can't copy/move if no admin rights
-sort with Collator
-use anchors when reloading filemanager window
-remove fix rights buttons if no admin rights
Revision Changes Path
1.2.4.1 +26 -14 jahia/src/views/jsp/jahia/engines/filemanager/close.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/engines/filemanager/close.jsp.diff?r1=1.2&r2=1.2.4.1&f=h
1.9.2.2 +1 -1 jahia/src/views/jsp/jahia/engines/filemanager/view.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/engines/filemanager/view.jsp.diff?r1=1.9.2.1&r2=1.9.2.2&f=h
1.16.2.7 +10 -4
jahia/src/views/jsp/jahia/engines/shared/embedded_flat_filemanager.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/engines/shared/embedded_flat_filemanager.jsp.diff?r1=1.16.2.6&r2=1.16.2.7&f=h
Index: close.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/engines/filemanager/Attic/close.jsp,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- close.jsp 15 Feb 2002 11:42:21 -0000 1.2
+++ close.jsp 30 Mar 2005 13:39:08 -0000 1.2.4.1
@@ -1,21 +1,33 @@
<%@ page language="java" %>
-<%@ page import="java.util.*,org.jahia.data.fields.*" %>
+<%@ page import="java.util.*" %>
+<%@ page import="org.jahia.data.containers.*" %>
+<%@ page import="org.jahia.params.*" %>
<%
HashMap engineMap = (HashMap) request.getAttribute(
"org.jahia.engines.EngineHashMap" );
+ String engineName = (String) engineMap.get( "engineName" );
String javaScriptPath = (String) engineMap.get( "javaScriptPath" );
- Integer fileID = (Integer)engineMap.get("fileID");
- Integer fieldID = (Integer) engineMap.get( "fieldID" );
-
+ String url =
(String)engineMap.get("engineUrl");
+ boolean addNew = (request.getParameter("addnew") !=
null );
+ boolean refreshMainPage =
((request.getParameter("refreshMainPage")==null) ||
"yes".equals((String)request.getParameter("refreshMainPage")));
+ String refreshMainPageVal = "no";
+ if (refreshMainPage){
+ refreshMainPageVal = "yes";
+ }
+ ParamBean jParams = (ParamBean) request.getAttribute(
"org.jahia.params.ParamBean" );
+ Integer parentID = (Integer)engineMap.get( "containerParentID" );
+ String languageCode = (String) engineMap.get( "languageCode" );
+
%>
-<script language="javascript">
-<!--
-window.opener.document.mainForm.file_id.length++;
-window.opener.document.mainForm.file_id.options[window.opener.document.mainForm.file_id.length-1].value=<%=fileID.intValue()%>;
-window.opener.document.mainForm.file_id.options[window.opener.document.mainForm.file_id.length-1].selected=
true;
-window.opener.document.mainForm.action += "&screen=edit&fid=" + <%=fieldID%>;
-window.opener.document.mainForm.submit();
-window.close();
-//-->
-</script>
+<html>
+<head>
+ <script language="javascript" src="<%=javaScriptPath%>">
+ </script>
+ <script language="javascript">
+ CloseJahiaWindow("#<%=jParams.getRequest ().getParameter
("path")%>");
+ </script>
+</head>
+<body bgcolor="white">
+</body>
+</html>
Index: view.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/engines/filemanager/Attic/view.jsp,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- view.jsp 6 Aug 2004 18:01:11 -0000 1.9.2.1
+++ view.jsp 30 Mar 2005 13:39:08 -0000 1.9.2.2
@@ -176,7 +176,7 @@
if
(tableEntry.getEncodedName().equals(request.getSession().getAttribute(jParams.getSiteID()+"-filepicker-selecteddir")))
{
style += "font-weight: bold;";
};
- %><span style="<%=style%>"><% if (tableEntry.isCanWrite()) { %><a
href="javascript:selectFile('<%=tableEntry.getEncodedName()%>')" ><%= name
%></a><% } else { %><%=tableEntry.getName()%><% } %></span>
+ %><span style="<%=style%>"><% if (tableEntry.isCanWrite() &&
tableEntry.isCanAdmin()) { %><a
href="javascript:selectFile('<%=tableEntry.getEncodedName()%>')" ><%= name
%></a><% } else { %><%=tableEntry.getName()%><% } %></span>
</td>
</tr>
Index: embedded_flat_filemanager.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/engines/shared/Attic/embedded_flat_filemanager.jsp,v
retrieving revision 1.16.2.6
retrieving revision 1.16.2.7
diff -u -r1.16.2.6 -r1.16.2.7
--- embedded_flat_filemanager.jsp 17 Mar 2005 16:13:25 -0000 1.16.2.6
+++ embedded_flat_filemanager.jsp 30 Mar 2005 13:39:08 -0000 1.16.2.7
@@ -44,7 +44,7 @@
JahiaData jData = (JahiaData) request.getAttribute(
"org.jahia.data.JahiaData" );
ParamBean jParams = (ParamBean) request.getAttribute(
"org.jahia.params.ParamBean" );
Set deniedUsers = (Set) engineMap.get("deniedUsers");
-
+ Boolean canAdmin = (Boolean) engineMap.get("canAdmin");
String filename = (String) engineMap.get("filename");
List dirEntries = (List) engineMap.get("dirEntries");
@@ -59,12 +59,15 @@
<script language="javascript">
<!--
+
+window.onload = null;
+
function sendForm( val )
{
document.mainForm.file_id.value = val;
<%-- window.opener.document.eval('sendFormSave()');--%>
<%-- window.close();--%>
- document.mainForm.action +="&screen=apply";
+ document.mainForm.action +="&screen=apply#"+val;
document.mainForm.submit();
}
@@ -782,7 +785,9 @@
}
} else if (deniedUsers != null && !deniedUsers.isEmpty()) {
%>
- <p class="text"><p class="text"><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.fixRights.label"/>
<%=TableEntry.javascriptDecode(filename)%></p>
+ <p class="text"><p class="text"><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.warnRights.label"/><p>
+<% if (canAdmin.booleanValue()) { %>
+ <jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.fixRights.label"/>
<%=TableEntry.javascriptDecode(filename)%></p>
<input type="hidden" name="fixrights" value=""/>
<center><table>
<%
@@ -808,6 +813,7 @@
</table></center>
<%
}
+ }
%>
@@ -824,7 +830,7 @@
if (tableEntry.getIndent() == 1) {
%>
<tr class="text"><td nowrap>
- <a name="<%=tableEntry.getName()%>"></a><%
+ <a name="<%=tableEntry.getEncodedName()%>"></a><%
String name;
name =
tableEntry.getName().substring(tableEntry.getName().lastIndexOf('/')+1);
if (!tableEntry.getDisplayName().equals(name) ) {
