[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] news_admin/js/fckeditor/editor/filemanager/browser/d
|
From: |
skwashd |
|
Subject: |
[Phpgroupware-cvs] news_admin/js/fckeditor/editor/filemanager/browser/default frmupload.html, 1.2 frmresourcetype.html, 1.2 frmresourceslist.html, 1.2 frmfolders.html, 1.2 browser.html, 1.2 frmactualfolder.html, 1.2 frmcreatefolder.html, 1.2 |
|
Date: |
Thu, 4 Aug 2005 05:54:00 +0200 |
Update of news_admin/js/fckeditor/editor/filemanager/browser/default
Modified Files:
Branch: MAIN
frmupload.html lines: +2 -5
frmresourcetype.html lines: +2 -5
frmresourceslist.html lines: +5 -5
frmfolders.html lines: +5 -5
browser.html lines: +40 -7
frmactualfolder.html lines: +2 -5
frmcreatefolder.html lines: +7 -5
Log Message:
new newsletter builder, updated FCK and a few other things
====================================================
Index: news_admin/js/fckeditor/editor/filemanager/browser/default/frmupload.html
diff -u
news_admin/js/fckeditor/editor/filemanager/browser/default/frmupload.html:1.1
news_admin/js/fckeditor/editor/filemanager/browser/default/frmupload.html:1.2
---
news_admin/js/fckeditor/editor/filemanager/browser/default/frmupload.html:1.1
Tue May 24 14:32:53 2005
+++ news_admin/js/fckeditor/editor/filemanager/browser/default/frmupload.html
Thu Aug 4 03:54:32 2005
@@ -1,6 +1,6 @@
<!--
* FCKeditor - The text editor for internet
- * Copyright (C) 2003-2004 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2005 Frederico Caldeira Knabben
*
* Licensed under the terms of the GNU Lesser General Public License:
* http://www.opensource.org/licenses/lgpl-license.php
@@ -11,16 +11,13 @@
* File Name: frmupload.html
* Page used to upload new files in the current folder.
*
- * Version: 2.0 RC3
- * Modified: 2004-11-29 16:04:32
- *
* File Authors:
* Frederico Caldeira Knabben (address@hidden)
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <link href="Browser.css" type="text/css" rel="stylesheet" />
+ <link href="browser.css" type="text/css" rel="stylesheet" />
<script type="text/javascript" src="js/common.js"></script>
<script language="javascript">
====================================================
Index:
news_admin/js/fckeditor/editor/filemanager/browser/default/frmresourcetype.html
diff -u
news_admin/js/fckeditor/editor/filemanager/browser/default/frmresourcetype.html:1.1
news_admin/js/fckeditor/editor/filemanager/browser/default/frmresourcetype.html:1.2
---
news_admin/js/fckeditor/editor/filemanager/browser/default/frmresourcetype.html:1.1
Tue May 24 14:32:53 2005
+++
news_admin/js/fckeditor/editor/filemanager/browser/default/frmresourcetype.html
Thu Aug 4 03:54:32 2005
@@ -1,6 +1,6 @@
<!--
* FCKeditor - The text editor for internet
- * Copyright (C) 2003-2004 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2005 Frederico Caldeira Knabben
*
* Licensed under the terms of the GNU Lesser General Public License:
* http://www.opensource.org/licenses/lgpl-license.php
@@ -11,9 +11,6 @@
* File Name: frmresourcetype.html
* This page shows the list of available resource types.
*
- * Version: 2.0 RC3
- * Modified: 2005-02-25 22:01:23
- *
* File Authors:
* Frederico Caldeira Knabben (address@hidden)
-->
@@ -21,7 +18,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html;
charset=utf-8">
- <link href="Browser.css" type="text/css" rel="stylesheet">
+ <link href="browser.css" type="text/css" rel="stylesheet">
<script type="text/javascript" src="js/common.js"></script>
<script language="javascript">
====================================================
Index:
news_admin/js/fckeditor/editor/filemanager/browser/default/frmresourceslist.html
diff -u
news_admin/js/fckeditor/editor/filemanager/browser/default/frmresourceslist.html:1.1
news_admin/js/fckeditor/editor/filemanager/browser/default/frmresourceslist.html:1.2
---
news_admin/js/fckeditor/editor/filemanager/browser/default/frmresourceslist.html:1.1
Tue May 24 14:32:53 2005
+++
news_admin/js/fckeditor/editor/filemanager/browser/default/frmresourceslist.html
Thu Aug 4 03:54:32 2005
@@ -1,6 +1,6 @@
<!--
* FCKeditor - The text editor for internet
- * Copyright (C) 2003-2004 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2005 Frederico Caldeira Knabben
*
* Licensed under the terms of the GNU Lesser General Public License:
* http://www.opensource.org/licenses/lgpl-license.php
@@ -11,16 +11,13 @@
* File Name: frmresourceslist.html
* This page shows all resources available in a folder in the File Browser.
*
- * Version: 2.0 RC3
- * Modified: 2005-02-25 22:01:23
- *
* File Authors:
* Frederico Caldeira Knabben (address@hidden)
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <link href="Browser.css" type="text/css" rel="stylesheet">
+ <link href="browser.css" type="text/css" rel="stylesheet">
<script type="text/javascript" src="js/common.js"></script>
<script language="javascript">
@@ -113,6 +110,9 @@
function GetFoldersAndFilesCallBack( fckXml )
{
+ if ( oConnector.CheckError( fckXml ) != 0 )
+ return ;
+
// Get the current folder path.
var oNode = fckXml.SelectSingleNode( 'Connector/CurrentFolder' ) ;
var sCurrentFolderPath = oNode.attributes.getNamedItem('path').value ;
====================================================
Index:
news_admin/js/fckeditor/editor/filemanager/browser/default/frmfolders.html
diff -u
news_admin/js/fckeditor/editor/filemanager/browser/default/frmfolders.html:1.1
news_admin/js/fckeditor/editor/filemanager/browser/default/frmfolders.html:1.2
---
news_admin/js/fckeditor/editor/filemanager/browser/default/frmfolders.html:1.1
Tue May 24 14:32:53 2005
+++ news_admin/js/fckeditor/editor/filemanager/browser/default/frmfolders.html
Thu Aug 4 03:54:31 2005
@@ -1,6 +1,6 @@
<!--
* FCKeditor - The text editor for internet
- * Copyright (C) 2003-2004 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2005 Frederico Caldeira Knabben
*
* Licensed under the terms of the GNU Lesser General Public License:
* http://www.opensource.org/licenses/lgpl-license.php
@@ -12,16 +12,13 @@
* This page shows the list of folders available in the parent folder
* of the current folder.
*
- * Version: 2.0 RC3
- * Modified: 2005-02-25 22:01:23
- *
* File Authors:
* Frederico Caldeira Knabben (address@hidden)
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <link href="Browser.css" type="text/css" rel="stylesheet">
+ <link href="browser.css" type="text/css" rel="stylesheet">
<script type="text/javascript" src="js/common.js"></script>
<script language="javascript">
@@ -151,6 +148,9 @@
function GetFoldersCallBack( fckXml )
{
+ if ( oConnector.CheckError( fckXml ) != 0 )
+ return ;
+
// Get the current folder path.
var oNode = fckXml.SelectSingleNode( 'Connector/CurrentFolder' ) ;
var sCurrentFolderPath = oNode.attributes.getNamedItem('path').value ;
====================================================
Index: news_admin/js/fckeditor/editor/filemanager/browser/default/browser.html
diff -u
news_admin/js/fckeditor/editor/filemanager/browser/default/browser.html:1.1
news_admin/js/fckeditor/editor/filemanager/browser/default/browser.html:1.2
--- news_admin/js/fckeditor/editor/filemanager/browser/default/browser.html:1.1
Tue May 24 14:32:53 2005
+++ news_admin/js/fckeditor/editor/filemanager/browser/default/browser.html
Thu Aug 4 03:54:31 2005
@@ -1,6 +1,6 @@
<!--
* FCKeditor - The text editor for internet
- * Copyright (C) 2003-2004 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2005 Frederico Caldeira Knabben
*
* Licensed under the terms of the GNU Lesser General Public License:
* http://www.opensource.org/licenses/lgpl-license.php
@@ -11,9 +11,6 @@
* File Name: browser.html
* This page compose the File Browser dialog frameset.
*
- * Version: 2.0 RC3
- * Modified: 2005-02-25 22:01:23
- *
* File Authors:
* Frederico Caldeira Knabben (address@hidden)
-->
@@ -21,7 +18,7 @@
<html>
<head>
<title>FCKeditor - Resources Browser</title>
- <link href="Browser.css" type="text/css" rel="stylesheet">
+ <link href="browser.css" type="text/css" rel="stylesheet">
<script type="text/javascript" src="js/fckxml.js"></script>
<script language="javascript">
@@ -45,7 +42,7 @@
if ( sConnUrl.substr(0,1) != '/' && sConnUrl.indexOf( '://' ) < 0 )
sConnUrl = window.location.href.replace( /browser.html.*$/, '' ) +
sConnUrl ;
-oConnector.ConnectorUrl = sConnUrl + '?' ;
+oConnector.ConnectorUrl = sConnUrl + ( sConnUrl.indexOf('?') != -1 ? '&' : '?'
) ;
var sServerPath = GetUrlParam( 'ServerPath' ) ;
if ( sServerPath.length > 0 )
@@ -73,6 +70,42 @@
return oXML.LoadUrl( sUrl ) ;
}
+oConnector.CheckError = function( responseXml )
+{
+ var iErrorNumber = 0
+ var oErrorNode = responseXml.SelectSingleNode( 'Connector/Error' ) ;
+
+ if ( oErrorNode )
+ {
+ iErrorNumber = parseInt(
oErrorNode.attributes.getNamedItem('number').value ) ;
+
+ switch ( iErrorNumber )
+ {
+ case 0 :
+ break ;
+ case 1 : // Custom error. Message placed in the
"text" attribute.
+ alert(
oErrorNode.attributes.getNamedItem('text').value ) ;
+ break ;
+ case 101 :
+ alert( 'Folder already exists' ) ;
+ break ;
+ case 102 :
+ alert( 'Invalid folder name' ) ;
+ break ;
+ case 103 :
+ alert( 'You have no permissions to create the
folder' ) ;
+ break ;
+ case 110 :
+ alert( 'Unknown error creating folder' ) ;
+ break ;
+ default :
+ alert( 'Error on your request. Error number: '
+ iErrorNumber ) ;
+ break ;
+ }
+ }
+ return iErrorNumber ;
+}
+
var oIcons = new Object() ;
oIcons.AvailableIconsArray = [
@@ -106,7 +139,7 @@
<frameset cols="150,*,0" framespacing="0"
frameborder="no">
<frame name="frmCreateFolder"
src="frmcreatefolder.html" scrolling="no" frameborder="no">
<frame name="frmUpload" src="frmupload.html"
scrolling="no" frameborder="no">
- <frame name="frmUploadWorker" src=""
scrolling="no" frameborder="no">
+ <frame name="frmUploadWorker"
src="../../../fckblank.html" scrolling="no" frameborder="no">
</frameset>
</frameset>
</frameset>
====================================================
Index:
news_admin/js/fckeditor/editor/filemanager/browser/default/frmactualfolder.html
diff -u
news_admin/js/fckeditor/editor/filemanager/browser/default/frmactualfolder.html:1.1
news_admin/js/fckeditor/editor/filemanager/browser/default/frmactualfolder.html:1.2
---
news_admin/js/fckeditor/editor/filemanager/browser/default/frmactualfolder.html:1.1
Tue May 24 14:32:53 2005
+++
news_admin/js/fckeditor/editor/filemanager/browser/default/frmactualfolder.html
Thu Aug 4 03:54:31 2005
@@ -1,6 +1,6 @@
<!--
* FCKeditor - The text editor for internet
- * Copyright (C) 2003-2004 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2005 Frederico Caldeira Knabben
*
* Licensed under the terms of the GNU Lesser General Public License:
* http://www.opensource.org/licenses/lgpl-license.php
@@ -11,16 +11,13 @@
* File Name: frmactualfolder.html
* This page shows the actual folder path.
*
- * Version: 2.0 RC3
- * Modified: 2005-02-25 22:01:23
- *
* File Authors:
* Frederico Caldeira Knabben (address@hidden)
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <link href="Browser.css" type="text/css" rel="stylesheet">
+ <link href="browser.css" type="text/css" rel="stylesheet">
<script type="text/javascript">
function OnResize()
====================================================
Index:
news_admin/js/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html
diff -u
news_admin/js/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html:1.1
news_admin/js/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html:1.2
---
news_admin/js/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html:1.1
Tue May 24 14:32:53 2005
+++
news_admin/js/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html
Thu Aug 4 03:54:31 2005
@@ -1,6 +1,6 @@
<!--
* FCKeditor - The text editor for internet
- * Copyright (C) 2003-2004 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2005 Frederico Caldeira Knabben
*
* Licensed under the terms of the GNU Lesser General Public License:
* http://www.opensource.org/licenses/lgpl-license.php
@@ -11,9 +11,6 @@
* File Name: frmcreatefolder.html
* Page used to create new folders in the current folder.
*
- * Version: 2.0 RC3
- * Modified: 2005-02-25 22:01:23
- *
* File Authors:
* Frederico Caldeira Knabben (address@hidden)
-->
@@ -21,7 +18,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html;
charset=utf-8">
- <link href="Browser.css" type="text/css" rel="stylesheet">
+ <link href="browser.css" type="text/css" rel="stylesheet">
<script type="text/javascript" src="js/common.js"></script>
<script language="javascript">
@@ -52,6 +49,10 @@
function CreateFolderCallBack( fckXml )
{
+ if ( oConnector.CheckError( fckXml ) == 0 )
+ window.parent.frames['frmResourcesList'].Refresh() ;
+
+ /*
// Get the current folder path.
var oNode = fckXml.SelectSingleNode( 'Connector/Error' ) ;
var iErrorNumber = parseInt(
oNode.attributes.getNamedItem('number').value ) ;
@@ -77,6 +78,7 @@
alert( 'Error creating folder. Error number: ' +
iErrorNumber ) ;
break ;
}
+ */
}
window.onload = function()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] news_admin/js/fckeditor/editor/filemanager/browser/default frmupload.html, 1.2 frmresourcetype.html, 1.2 frmresourceslist.html, 1.2 frmfolders.html, 1.2 browser.html, 1.2 frmactualfolder.html, 1.2 frmcreatefolder.html, 1.2,
skwashd <=