Index: openacs-4/packages/ajax-filestorage-ui/catalog/ajax-filestorage-ui.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/catalog/ajax-filestorage-ui.en_US.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ajax-filestorage-ui/catalog/ajax-filestorage-ui.en_US.ISO-8859-1.xml 26 Nov 2007 12:52:43 -0000 1.3
+++ openacs-4/packages/ajax-filestorage-ui/catalog/ajax-filestorage-ui.en_US.ISO-8859-1.xml 3 Aug 2008 02:23:36 -0000 1.4
@@ -40,11 +40,14 @@
Permission Denied
Properties
Your session has expired. You need to login again. <br>You will be redirected to a login page shortly
+ Tag
This is a ZIP file containing multiple files.
Title
<b>Title</b> and <b>File to upload</b> are required.
+ Tools
Upload failed, please try again later.
Click <b>Browse</b> to select a file to upload to the selected folder.
Uploading ...
+ Views
Zip File (Will be extracted after upload)
Index: openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.adp 28 Jun 2008 07:06:38 -0000 1.8
+++ openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.adp 3 Aug 2008 02:23:36 -0000 1.9
@@ -52,6 +52,7 @@
permissions:"#file-storage.Permissions#",
linkaddress:"#ajax-filestorage-ui.CopyLink#",
upload: "#file-storage.Upload#",
+ open:"#acs-kernel.common_Open#",
cancel: "#ajax-filestorage-ui.Cancel#",
close: "#ajax-filestorage-ui.Close#",
browse: "#ajax-filestorage-ui.Browse#",
@@ -97,9 +98,13 @@
file_description: "#ajax-filestorage-ui.Description#",
multiple_files: "#ajax-filestorage-ui.MultipleFiles#",
multiple_files_msg: "#ajax-filestorage-ui.ThisIsAZip#",
+ download:"#file-storage.Download#",
download_archive: "#ajax-filestorage-ui.DownloadArchive#",
request_notification:"#notifications.lt_You_may_a_hrefsub_url#",
- unsubscribe_notification:"#notifications.lt_You_have_requested_no#"
+ unsubscribe_notification:"#notifications.lt_You_have_requested_no#",
+ tools:"#ajax-filestorage-ui.Tools#",
+ tag:"#ajax-filestorage-ui.Tag#",
+ views:"#ajax-filestorage-ui.Views#"
}
Ext.onReady(function() {
Ext.get("@layoutdiv;noquote@").setHeight(400,false);
Index: openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs-min.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs-min.js,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs-min.js 1 Jul 2008 13:39:43 -0000 1.12
+++ openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs-min.js 3 Aug 2008 02:23:36 -0000 1.13
@@ -93,15 +93,15 @@
this.layout=new Ext.Viewport({id:"fs-ui",layout:"border",tbar:this.createToolbar(),items:_f});
}
},createToolsMenu:function(){
-var _10=new Ext.menu.Menu({id:"toolsmenu",shadow:false,items:[new Ext.menu.Item({id:"mnOpen",text:"Open",icon:"/resources/ajaxhelper/icons/page_white.png"}),new Ext.menu.Item({id:"mnTag",text:"Tag",icon:"/resources/ajaxhelper/icons/tag_blue.png"}),new Ext.menu.Item({id:"mnView",text:"Views",icon:"/resources/ajaxhelper/icons/camera.png"}),new Ext.menu.Item({id:"mnRename",text:acs_lang_text.rename||"Rename",icon:"/resources/ajaxhelper/icons/page_edit.png"}),new Ext.menu.Item({id:"mnCopyLink",text:acs_lang_text.linkaddress||"Copy Link Address",icon:"/resources/ajaxhelper/icons/page_copy.png"}),new Ext.menu.Item({id:"mnPerms",text:acs_lang_text.permissions||"Permissions",icon:"/resources/ajaxhelper/icons/group_key.png"}),new Ext.menu.Item({id:"mnProp",text:acs_lang_text.properties||"Properties",icon:"/resources/ajaxhelper/icons/page_edit.png"}),new Ext.menu.Item({id:"mnArch",text:acs_lang_text.download_archive||"Download archive",icon:"/resources/ajaxhelper/icons/arrow_down.png"}),new Ext.menu.Item({id:"mnShare",text:acs_lang_text.sharefolder||"Share Folder",icon:"/resources/ajaxhelper/icons/group_link.png"}),new Ext.menu.Item({id:"mnNotif",text:acs_lang_text.request_notification||"Request Notification",icon:"/resources/ajaxhelper/icons/email.png"})]});
+var _10=new Ext.menu.Menu({id:"toolsmenu",shadow:false,items:[new Ext.menu.Item({id:"mnOpen",text:acs_lang_text.open||"Open",icon:"/resources/ajaxhelper/icons/page_white.png"}),new Ext.menu.Item({id:"mnTag",text:acs_lang_text.tag||"Tag",icon:"/resources/ajaxhelper/icons/tag_blue.png"}),new Ext.menu.Item({id:"mnView",text:acs_lang_text.views||"Views",icon:"/resources/ajaxhelper/icons/camera.png"}),new Ext.menu.Item({id:"mnRename",text:acs_lang_text.rename||"Rename",icon:"/resources/ajaxhelper/icons/page_edit.png"}),new Ext.menu.Item({id:"mnCopyLink",text:acs_lang_text.linkaddress||"Copy Link Address",icon:"/resources/ajaxhelper/icons/page_copy.png"}),new Ext.menu.Item({id:"mnPerms",text:acs_lang_text.permissions||"Permissions",icon:"/resources/ajaxhelper/icons/group_key.png"}),new Ext.menu.Item({id:"mnProp",text:acs_lang_text.properties||"Properties",icon:"/resources/ajaxhelper/icons/page_edit.png"}),new Ext.menu.Item({id:"mnArch",text:acs_lang_text.download_archive||"Download archive",icon:"/resources/ajaxhelper/icons/arrow_down.png"}),new Ext.menu.Item({id:"mnShare",text:acs_lang_text.sharefolder||"Share Folder",icon:"/resources/ajaxhelper/icons/group_link.png"}),new Ext.menu.Item({id:"mnNotif",text:acs_lang_text.request_notification||"Request Notification",icon:"/resources/ajaxhelper/icons/email.png"})]});
_10.on("beforeshow",function(){
var _11=this.layout.findById("filepanel");
var _12=this.layout.findById("treepanel");
if(_11.getSelectionModel().getCount()==0){
for(var x=0;x<_10.items.items.length;x++){
_10.items.items[x].enable();
}
-_10.items.items[0].setText("Open");
+_10.items.items[0].setText(acs_lang_text.open||"Open");
_10.items.items[0].disable();
_10.items.items[1].disable();
_10.items.items[6].disable();
@@ -128,7 +128,7 @@
_10.items.items[9].setText(acs_lang_text.request_notification||"Request Notification");
switch(_16[0].get("type")){
case "folder":
-_10.items.items[0].setText("Open");
+_10.items.items[0].setText(acs_lang_text.open||"Open");
_10.items.items[1].disable();
_10.items.items[6].disable();
Ext.Ajax.request({url:this.xmlhttpurl+"notif_p",success:function(o){
@@ -143,21 +143,21 @@
_10.items.items[9].enable();
break;
case "symlink":
-_10.items.items[0].setText("Open");
+_10.items.items[0].setText(acs_lang_text.open||"Open");
_10.items.items[1].disable();
_10.items.items[3].disable();
_10.items.items[6].disable();
_10.items.items[9].disable();
break;
case "url":
-_10.items.items[0].setText("Open");
+_10.items.items[0].setText(acs_lang_text.open||"Open");
_10.items.items[6].disable();
_10.items.items[7].disable();
_10.items.items[8].disable();
_10.items.items[9].disable();
break;
default:
-_10.items.items[0].setText("Download");
+_10.items.items[0].setText(acs_lang_text.download||"Download");
_10.items.items[7].disable();
_10.items.items[8].disable();
_10.items.items[9].disable();
@@ -752,9 +752,9 @@
var _c5=acs_lang_text.multiple_files||"Multiple Files";
var _c6=acs_lang_text.multiple_files_msg||"This is a ZIPfile containing multiple files.";
var _c7=true;
-var _c8="Upload a File";
+var _c8=acs_lang_text.uploadfile||"Upload a File";
var _c9=new Ext.Panel({id:"form_addfile",align:"left",frame:true,html:"
"});
-var _ca=[{text:"Upload",handler:this.uploadOneFile.createDelegate(this),icon:"/resources/ajaxhelper/icons/arrow_up.png",cls:"x-btn-text-icon"},{text:"Close",handler:function(){
+var _ca=[{text:acs_lang_text.upload||"Upload",handler:this.uploadOneFile.createDelegate(this),icon:"/resources/ajaxhelper/icons/arrow_up.png",cls:"x-btn-text-icon"},{text:acs_lang_text.close||"Close",handler:function(){
this.upldWindow.hide();
}.createDelegate(this),icon:"/resources/ajaxhelper/icons/cross.png",cls:"x-btn-text-icon"}];
}else{
Index: openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs.js,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs.js 1 Jul 2008 13:39:43 -0000 1.15
+++ openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs.js 3 Aug 2008 02:23:36 -0000 1.16
@@ -226,17 +226,17 @@
items: [
new Ext.menu.Item({
id:'mnOpen',
- text: 'Open',
+ text: acs_lang_text.open || 'Open',
icon: '/resources/ajaxhelper/icons/page_white.png'
}),
new Ext.menu.Item({
id:'mnTag',
- text: 'Tag',
+ text: acs_lang_text.tag || 'Tag',
icon: '/resources/ajaxhelper/icons/tag_blue.png'
}),
new Ext.menu.Item({
id:'mnView',
- text: 'Views',
+ text: acs_lang_text.views || 'Views',
icon: '/resources/ajaxhelper/icons/camera.png'
}),
new Ext.menu.Item({
@@ -291,7 +291,7 @@
menu.items.items[x].enable();
}
- menu.items.items[0].setText("Open");
+ menu.items.items[0].setText(acs_lang_text.open || 'Open');
menu.items.items[0].disable();
menu.items.items[1].disable();
menu.items.items[6].disable();
@@ -333,7 +333,7 @@
switch (selectedRow[0].get("type")) {
case "folder":
- menu.items.items[0].setText("Open");
+ menu.items.items[0].setText(acs_lang_text.open || 'Open');
menu.items.items[1].disable();
menu.items.items[6].disable();
//check if the user is subscribed to this folder
@@ -353,21 +353,21 @@
menu.items.items[9].enable();
break;
case "symlink":
- menu.items.items[0].setText("Open");
+ menu.items.items[0].setText(acs_lang_text.open || 'Open');
menu.items.items[1].disable();
menu.items.items[3].disable();
menu.items.items[6].disable();
menu.items.items[9].disable();
break;
case "url" :
- menu.items.items[0].setText("Open");
+ menu.items.items[0].setText(acs_lang_text.open || 'Open');
menu.items.items[6].disable();
menu.items.items[7].disable();
menu.items.items[8].disable();
menu.items.items[9].disable();
break;
default :
- menu.items.items[0].setText("Download");
+ menu.items.items[0].setText(acs_lang_text.download || 'Download');
menu.items.items[7].disable();
menu.items.items[8].disable();
menu.items.items[9].disable();
@@ -1348,7 +1348,7 @@
var msg4=acs_lang_text.multiple_files || "Multiple Files";
var msg5=acs_lang_text.multiple_files_msg || "This is a ZIPfile containing multiple files.";
var modal = true;
- var title = "Upload a File";
+ var title = acs_lang_text.uploadfile || "Upload a File";
var uploadBody = new Ext.Panel({
id:'form_addfile',
@@ -1357,12 +1357,12 @@
html: ""
});
var uploadBtns = [{
- text: 'Upload',
+ text: acs_lang_text.upload || 'Upload',
handler: this.uploadOneFile.createDelegate(this),
icon:"/resources/ajaxhelper/icons/arrow_up.png",
cls:"x-btn-text-icon"
},{
- text: 'Close',
+ text: acs_lang_text.close || 'Close',
handler: function(){
this.upldWindow.hide();
}.createDelegate(this),
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/add-blankfolder.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/add-blankfolder.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/add-blankfolder.tcl 26 Nov 2007 12:52:45 -0000 1.1
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/add-blankfolder.tcl 3 Aug 2008 02:23:37 -0000 1.2
@@ -31,7 +31,7 @@
}
set description ""
-set pretty_folder_name "New Folder"
+set pretty_folder_name "#file-storage.New_Folder#"
set folder_name [string tolower [util_text_to_url -text $pretty_folder_name]]
set file_exists_count [db_string "count_existing" "select count(*) from cr_items where name like '$folder_name%' and parent_id=:folder_id"]
if { $file_exists_count != 0 } {