+
+
+@@ -63,4 +68,4 @@
+ #photo-album.shutterflycom# #photo-album.lt_for______printing_fro# #photo-album.clipboard# #photo-album.screen#
+
+
+-
++
+Index: www/photo-delete.tcl
+===================================================================
+--- www/photo-delete.tcl (revision 92)
++++ www/photo-delete.tcl (working copy)
+@@ -13,6 +13,7 @@
+ } {
+ photo_id:integer,notnull
+ {confirmed_p "f"}
++ return_url:optional
+ } -validate {
+ valid_photo -requires {photo_id:integer} {
+ if [string equal [pa_is_photo_p $photo_id] "f"] {
+@@ -44,7 +45,12 @@
+
+ pa_flush_photo_in_album_cache $album_id
+
+- ad_returnredirect "album?album_id=$album_id"
++ # HAM : added return_url
++ if { ![exists_and_not_null return_url] } {
++ ad_returnredirect "album?album_id=$album_id"
++ } else {
++ ad_returnredirect $return_url
++ }
+ ad_script_abort
+
+ } else {
+Index: www/folder-add.tcl
+===================================================================
+--- www/folder-add.tcl (revision 92)
++++ www/folder-add.tcl (working copy)
+@@ -9,6 +9,7 @@
+ @cvs-id $Id: photo-album-ajaxpa.diff,v 1.1 2009/04/11 15:56:13 hamiltonc Exp $
+ } {
+ parent_id:integer,notnull
++ return_url:optional
+ } -validate {
+ valid_parent -requires {parent_id:integer} {
+ if [string equal [pa_is_folder_p $parent_id] "f"] {
+@@ -104,7 +105,12 @@
+ ad_script_abort
+ }
+
+- #redirect back to index page with parent_id
+- ad_returnredirect "?folder_id=$parent_id"
++ # HAM : added return_url
++ if { ![exists_and_not_null return_url] } {
++ #redirect back to index page with parent_id
++ ad_returnredirect "?folder_id=$parent_id"
++ } else {
++ ad_returnredirect $return_url
++ }
+ ad_script_abort
+ }
+Index: www/photos-add-2.tcl
+===================================================================
+--- www/photos-add-2.tcl (revision 92)
++++ www/photos-add-2.tcl (working copy)
+@@ -11,6 +11,7 @@
+ {upload_file:optional,trim ""}
+ upload_file.tmpfile:optional,tmpfile
+ album_id:integer,notnull
++ return_url:optional
+ } -validate {
+ valid_album -requires {album_id:integer} {
+ if [string equal [pa_is_album_p $album_id] "f"] {
+@@ -37,18 +38,24 @@
+ [ catch {set tmp_dir [pa_expand_archive $upload_file ${upload_file.tmpfile} pa-$album_id] } errMsg] } {
+ ad_return_complaint 1 "Unable to expand your archive file"
+ ad_script_abort
+-}
++}
+
++if { ![exists_and_not_null return_url] } {
+ ReturnHeaders text/html
+ ns_write "@folder_description;noquote@
+Upload Log
\n" ++} + + if {![empty_string_p $upload_file]} { +- ns_write "starting to load images from file $upload_file
\n" ++ if { ![exists_and_not_null return_url] } { ++ ns_write "starting to load images from file $upload_file
\n" ++ } + ns_log Debug "made directory $tmp_dir to extract from ${upload_file.tmpfile} ($upload_file)\n" + set allfiles [pa_walk $tmp_dir] + set remove 1 + } else { +- ns_write "starting to load images from directory [parameter::get -parameter FullTempPhotoDir -package_id [ad_conn package_id]]
\n" ++ if { ![exists_and_not_null return_url] } { ++ ns_write "starting to load images from directory [parameter::get -parameter FullTempPhotoDir -package_id [ad_conn package_id]]
\n" ++ } + set allfiles [pa_walk [parameter::get -parameter FullTempPhotoDir -package_id [ad_conn package_id]]] + set remove 0 + } +@@ -58,10 +65,19 @@ + pa_flush_photo_in_album_cache $album_id + + set page [pa_page_of_photo_in_album [lindex $new_photo_ids 0] $album_id] ++ ++if { ![exists_and_not_null return_url] } { + ns_write "View the images" + ns_write "" ++} + + # Now that we are done working on the upload we delete the tmp file + if [info exists tmp_dir] { + file delete -force $tmp_dir + } ++ ++# HAM : added return_url ++if { [exists_and_not_null return_url] } { ++ ad_returnredirect $return_url ++ ad_script_abort ++} +Index: www/photo-add-2.tcl +=================================================================== +--- www/photo-add-2.tcl (revision 92) ++++ www/photo-add-2.tcl (working copy) +@@ -15,6 +15,7 @@ + {description [db_null]} + {caption [db_null]} + {story [db_null]} ++ return_url:optional + } -validate { + valid_album -requires {album_id:integer} { + if [string equal [pa_is_album_p $album_id] "f"] { +@@ -70,4 +71,12 @@ + # page used as part of redirect so user returns to the album page containing the newly uploaded photo + set page [pa_page_of_photo_in_album [lindex $new_photo_ids 0] $album_id] + +-ad_returnredirect "album?album_id=$album_id&page=$page" ++ ++# HAM : added return_url ++if { ![exists_and_not_null return_url] } { ++ ad_returnredirect "album?album_id=$album_id&page=$page" ++} else { ++ ad_returnredirect $return_url ++} ++ ++ Index: openacs-4/packages/ajax-photoalbum-ui/www/download/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-photoalbum-ui/www/download/index.vuh,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ajax-photoalbum-ui/www/download/index.vuh 11 Apr 2009 15:56:13 -0000 1.1 @@ -0,0 +1,26 @@ +# /packages/photo-album/www/images/index.vuh +# @author Tom Baginski, bags@arsdigita.com +# #cvs-id $Id: index.vuh,v 1.1 2009/04/11 15:56:13 hamiltonc Exp $ +# +# serves images +# +# expecting a image_id as path_info + +# wtem@olywa.net, 2001-09-24 +# fully reworked + +regexp {^([0-9]+)} [ad_conn path_info] match image_id + +if {[string equal [ad_parameter CheckPermissionOnImageServeP] "t"]} { + ad_require_permission $image_id "read" +} + +ns_set put [ad_conn outputheaders] Content-Disposition attachment + +if {[catch {cr_write_content -revision_id $image_id} errMsg]} { + if {[string equal $::errorCode NOT_FOUND]} { + ns_returnnotfound + ad_script_abort + } + error $errMsg $::errorInfo $::errorCode +} Index: openacs-4/packages/ajax-photoalbum-ui/www/java-upload/ThinUPload.jar =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-photoalbum-ui/www/java-upload/Attic/ThinUPload.jar,v diff -u Binary files differ Index: openacs-4/packages/ajax-photoalbum-ui/www/java-upload/ThinUPload.jar.bak =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-photoalbum-ui/www/java-upload/Attic/ThinUPload.jar.bak,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ajax-photoalbum-ui/www/java-upload/ThinUPload.jar.bak 11 Apr 2009 15:56:13 -0000 1.1 @@ -0,0 +1,3011 @@ +PK XO|7{y�l � META-INF/MANIFEST.MF�XI��Z�WD��\Ԣ;�L@p�"z�"� Ƞ���U� 2���|ݯ�����p8��w>$; +��(_O /�~�߰�_��O��3���K�Y���m���6v ��M���� +� '_ �x��V�/R��h�$� ��o����|�ʒ�;��_$;H_��]/u�/x�=x/vU��.����_U{_�|�r���%����o��ˋ f /P|��qk���o��/.#����e��
| Directory listing | |
| � � | ��� �� �� + |
+Drag photos from your computer here. + + \ No newline at end of file Index: openacs-4/packages/ajax-photoalbum-ui/www/java-upload/done.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-photoalbum-ui/www/java-upload/Attic/done.html,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ajax-photoalbum-ui/www/java-upload/done.html 11 Apr 2009 15:56:13 -0000 1.1 @@ -0,0 +1,9 @@ + + +
+Uploads completed.
One moment please ...
+
+
+
+
+
\ No newline at end of file
Index: openacs-4/packages/ajax-photoalbum-ui/www/java-upload/handle-upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-photoalbum-ui/www/java-upload/Attic/handle-upload.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ajax-photoalbum-ui/www/java-upload/handle-upload.tcl 11 Apr 2009 15:56:13 -0000 1.1
@@ -0,0 +1,72 @@
+ad_page_contract {
+
+ Upload photos dragged into the java applet
+
+} { }
+
+set q [ns_parsequery [ns_conn query]]
+set album_id [ns_set get $q album_id]
+set package_id [ns_set get $q package_id]
+
+# ns_log notice "HANDLING UPLOAD via Java Applet : $album_id : $package_id"
+
+# Set the form conn
+
+set formvar [ns_conn form]
+
+set variable_count [ns_set size $formvar]
+set total_file_count [expr {$variable_count / 3}]
+
+for {set i 0} {$i < $variable_count} {incr i} {
+ set aname [ns_set key $formvar $i]
+ append var_string "$aname "
+ # ns_log notice "HAM : $aname *************"
+}
+
+# ns_log notice "$variable_count : $total_file_count"
+
+# upload the image file
+for {set i 0} {$i < $total_file_count} {incr i} {
+
+ set file_variable_name "userfile\[$i\]"
+ set tmpfile_name "${file_variable_name}.tmpfile"
+
+ set filename [ns_set value $formvar [ns_set find $formvar $file_variable_name]]
+
+ if {$filename==""} {
+ continue
+ }
+
+ # Get rid of UNIX style directory names.
+
+ set filename [file tail [DoubleApos $filename]]
+ set filetype [string tolower [file extension ${filename}]]
+
+ # Get rid of DOS style directory names.
+
+ regsub {.*\\([^\\]+)$} $filename {\1} filename
+
+ # Get the file uploaded to the server
+
+ set input_file_location [ns_set value $formvar [ns_set find $formvar $tmpfile_name]]
+
+ # create a new photo
+
+ # ns_log notice " ********** $input_file_location ***************"
+
+ set new_photo_ids [pa_load_images \
+ -remove 1 \
+ -client_name $filename \
+ -description "" \
+ -story "" \
+ -caption "" \
+ -package_id $package_id \
+ ${input_file_location} $album_id 568]
+
+ # ns_log notice "uploading : $new_photo_ids *************"
+
+}
+
+pa_flush_photo_in_album_cache $album_id
+
+ns_return 200 "text/html" "One moment please ....
','
","",'')}else{this.thumbTemplate=new Ext.XTemplate('','ext:qtip="{story}"',"",">
",'{shortcaption}
','','
','
','
','
',"
',' ',' ','',"','
","','ext:qtip="{story}"',"",">
",'{shortcaption}
','','',"
',"No photos found
',plugins:new Ext.DataView.DragSelector({dragSafe:true}),prepareData:function(d){d.caption=Ext.util.Format.ellipsis(d.caption,20);return d},listeners:{mouseenter:{fn:function(d,f,g,h){var i=Ext.get(g).id.substring(4,Ext.get(g).id.length);Ext.get("tools-"+i).show()},scope:this},mouseleave:{fn:function(d,f,g,h){var i=Ext.get(g).id.substring(4,Ext.get(g).id.length);Ext.get("tools-"+i).hide()},scope:this},dblclick:{fn:function(f,g,h,i){var k=Ext.get(h).id.substring(4,Ext.get(h).id.length);var d=this.photoStore.getById(k);var j=this.photoStore.indexOf(d);Shadowbox.open(this.shadowbox_gallery);Shadowbox.change(j)},scope:this}}})});var a=new Ext.Panel({id:"pa-card",layout:"card",region:"center",activeItem:0,items:[{xtype:"panel",html:'Click on an album to view photos
'},b]});return a},loadPhotos:function(a,b){if(a.attributes.attributes.type=="album"){Ext.getCmp("pa-card").layout.setActiveItem(1);this.photoStore.baseParams={album_id:a.id,package_id:this.config.package_id};this.photoStore.load({params:{start:0,limit:parseInt(this.config.pagesize)}})}else{Ext.getCmp("pa-card").layout.setActiveItem(0)}},refreshTreenode:function(){var a=Ext.getCmp("pa-nav").getSelectionModel().getSelectedNode();a.fireEvent("click",a)},delTreenode:function(){if(!this.checkPerms("write")){Ext.MessageBox.alert("Permission Denied","Sorry you do not have permission to perform this action.");return}var a=Ext.getCmp("pa-nav");var d=a.getSelectionModel().getSelectedNode();var b=d.attributes.attributes.type;if(a.getRootNode().id==d.id){Ext.Msg.alert("Error","Sorry, you can not delete the root folder")}else{if(b==="folder"){var e="deletefolder";var g={confirmed_p:"t",folder_id:d.id,return_url:this.xmlhttpurl+"formok"}}if(b==="album"){var e="deletealbum";var g={confirmed_p:"t",album_id:d.id,return_url:this.xmlhttpurl+"formok"}}var f=function(i){var h=d.parentNode;h.fireEvent("click",h);h.removeChild(d)};var c=this.genericErrorFn;if(e){Ext.MessageBox.confirm("Delete","Are you sure you want to delete "+d.text+" ?",function(h){if(h==="yes"){this.paCore.doAction(e,f,c,null,g,this)}},this)}}},addTreenode:function(a){if(!this.checkPerms("write")){Ext.MessageBox.alert("Permission Denied","Sorry you do not have permission to perform this action.");return}if(a==="folder"){var i="pa-win-newfolder";var f="new_folder_form";var l="addfolder";var b=acs_lang_text.newfolder||"New Folder";var k=function(n){Ext.getCmp("new_folder_formid").setValue("folder_add");var m=this.getSelectedTreeNodeId();Ext.getCmp("new_folder_parentid").setValue(m);Ext.getCmp("new_folder_folderid").setValue(n.responseText);Ext.getCmp("new_folder_returnurl").setValue(this.xmlhttpurl+"load-onenode?type=folder&node_id="+n.responseText);g.show()};var d="Creating folder"}if(a==="album"){var i="pa-win-newalbum";var f="new_album_form";var l="addalbum";var b=acs_lang_text.newalbum||"New Album";var k=function(n){Ext.getCmp("new_album_formid").setValue("album_add");var m=this.getSelectedTreeNodeId();Ext.getCmp("new_album_parentid").setValue(m);Ext.getCmp("new_album_albumid").setValue(n.responseText);Ext.getCmp("new_album_returnurl").setValue(this.xmlhttpurl+"load-onenode?type=album&node_id="+n.responseText);g.show()};var d="Creating album"}var g=this.createOrGetWindow(i);var h=Ext.getCmp(f);var j=function(m,n){if(n.result){if(n.result.info!="null"){this.addTreenodeEl(n.result.info)}else{Ext.MessageBox.alert("Error","Sorry an error occured. Please try again later.")}g.hide()}else{Ext.MessageBox.alert("Error","Sorry an error occured. Make sure you have filled up all required fields.")}};var c=function(m,n){if(n.result){Ext.MessageBox.alert("Error",n.result.info)}else{Ext.MessageBox.alert("Error","Error occurred. Try again later")}};var e=function(){this.paCore.formSubmit(l,h.getForm(),d,null,true,j,c,this)};if(g){g.setTitle(b);h.buttons[0].setHandler(e,this);h.buttons[0].setText("Create");this.paCore.doAction("getnextobjid",k,this.genericErrorFn,null,null,this)}},addTreenodeEl:function(c){var a=Ext.getCmp("pa-nav");var d=a.getSelectionModel().getSelectedNode();var b=new Ext.tree.TreeNode(c);var e=d.appendChild(b);a.getSelectionModel().select(e);e.loaded=true;e.fireEvent("click",e)},editTreenode:function(){if(!this.checkPerms("write")){Ext.MessageBox.alert("Permission Denied","Sorry you do not have permission to perform this action.");return}var e=Ext.getCmp("pa-nav").getSelectionModel().getSelectedNode();if(e){var f=e.attributes.attributes.type;var k=e.id;if(f==="folder"){var j="pa-win-newfolder";var g="new_folder_form";var a=acs_lang_text.editfolder||"Edit Folder";var n="editfolder";var m=function(q){var p=Ext.decode(q.responseText);if(p.success){Ext.getCmp("new_folder_formid").setValue("folder_edit");Ext.getCmp("new_folder_folderid").setValue(p.info.id);Ext.getCmp("new_folder_name").setValue(p.info.text);Ext.getCmp("new_folder_desc").setValue(p.info.qtip);Ext.getCmp("new_folder_returnurl").setValue(this.xmlhttpurl+"load-onenode?type=folder&node_id="+p.info.id);h.show()}};var c="Updating folder ..."}if(f==="album"){var j="pa-win-newalbum";var g="new_album_form";var a=acs_lang_text.editalbum||"Edit Album";var n="editalbum";var m=function(q){var p=Ext.decode(q.responseText);if(p.success){Ext.getCmp("new_album_formid").setValue("edit_album");Ext.getCmp("new_album_albumid").setValue(p.info.id);Ext.getCmp("new_album_name").setValue(p.info.text);Ext.getCmp("new_album_desc").setValue(p.info.qtip);Ext.getCmp("new_album_story").setValue(p.info.attributes.story);Ext.getCmp("new_album_photographer").setValue(p.info.attributes.photographer);Ext.getCmp("new_album_revisionid").setValue(p.info.attributes.revision_id);Ext.getCmp("new_album_prevrevisionid").setValue(p.info.attributes.previous_revision);Ext.getCmp("new_album_returnurl").setValue(this.xmlhttpurl+"load-onenode?type=album&node_id="+p.info.id);h.show()}};var c="Updating album ..."}var h=this.createOrGetWindow(j);var i=Ext.getCmp(g);var l=function(o,p){if(p.result){if(p.result.info!="null"){this.editTreenodeEl(p.result.info)}else{Ext.MessageBox.alert("Error","Sorry an error occured updating. Please try again later.")}h.hide()}else{Ext.MessageBox.alert("Error","Sorry an error occured. Make sure you have filled up all required fields.")}};var b=function(o,p){if(p.result){Ext.MessageBox.alert("Error",p.result.info)}else{Ext.MessageBox.alert("Error","Error occurred. Try again later")}};var d=function(){this.paCore.formSubmit(n,i.getForm(),c,null,true,l,b,this)};if(h){h.setTitle(a);i.buttons[0].setHandler(d,this);i.buttons[0].setText("Update");Ext.Ajax.request({url:this.config.xmlhttpurl+"load-onenode",params:{type:f,node_id:k,mode:"edit"},success:m,failure:this.genericErrorFn,scope:this})}}else{Ext.Msg.alert("Error","Please select a folder or album")}},editTreenodeEl:function(a){var b=Ext.getCmp("pa-nav").getSelectionModel().getSelectedNode();b.setText(a.text);b.ui.getTextEl().setAttributeNS("ext","qtip",a.qtip)},getSelectedTreeNodeId:function(){var a=Ext.getCmp("pa-nav").getSelectionModel().getSelectedNode().id;return a},createOrGetWindow:function(a){var b=Ext.getCmp(a);if(!b){switch(a){case"pa-win-newcollection":b=new Ext.Window({id:"pa-win-newphotocollection",title:acs_lang_text.collection||"Add a collection of photos to this album",width:290,height:140,autoScroll:true,modal:true,draggable:false,resizable:false,items:[{id:"new_photo_collection_form",xtype:"form",titlebar:false,plain:true,autoHeight:true,bodyStyle:{padding:"5px"},labelAlign:"top",method:"post",fileUpload:true,items:[{id:"new_photo_collection_formid",xtype:"hidden",name:"form:id",value:"photos_upload"},{id:"new_photo_collection_formode",xtype:"hidden",name:"form:mode",value:"edit"},{id:"new_photo_collection_returnurl",xtype:"hidden",name:"return_url",value:""},{id:"new_photo_collection_photoid",xtype:"hidden",name:"photo_id",value:""},{id:"new_photo_collection_albumid",xtype:"hidden",name:"album_id",value:""},{id:"new_photo_collection_file",xtype:"fileuploadfield",name:"upload_file",fieldLabel:"Choose a tar or zip file to upload",allowBlank:false,anchor:"95%",buttonCfg:{text:"",iconCls:"upload-icon"}}],buttons:[{text:"Upload",name:"formbutton:ok",scope:this,icon:"/resources/ajaxhelper/icons/accept.png",cls:"x-btn-text-icon"},{text:"Close",handler:function(){Ext.getCmp("new_photo_collection_form").getForm().reset();Ext.getCmp("pa-win-newphotocollection").close()},scope:this,icon:"/resources/ajaxhelper/icons/cross.png",cls:"x-btn-text-icon"}]}]});break;case"pa-win-newphoto":b=new Ext.Window({id:"pa-win-newphoto",title:acs_lang_text.uploadphoto||"Upload a New Photo",width:290,height:360,autoScroll:true,closeAction:"hide",modal:true,draggable:false,resizable:false,items:[{id:"new_photo_form",xtype:"form",titlebar:false,plain:true,autoHeight:true,bodyStyle:{padding:"5px"},labelAlign:"top",method:"post",fileUpload:true,items:[{id:"new_photo_formid",xtype:"hidden",name:"form:id",value:"photo_upload"},{id:"new_photo_formode",xtype:"hidden",name:"form:mode",value:"edit"},{id:"new_photo_returnurl",xtype:"hidden",name:"return_url",value:""},{id:"new_photo_photoid",xtype:"hidden",name:"photo_id",value:""},{id:"new_photo_albumid",xtype:"hidden",name:"album_id",value:""},{id:"new_photo_file",xtype:"fileuploadfield",name:"upload_file",fieldLabel:"Photo",allowBlank:false,emptyText:"Choose a photo to upload",anchor:"95%",buttonCfg:{text:"",iconCls:"upload-icon"}},{id:"new_photo_caption",xtype:"textfield",name:"caption",fieldLabel:"Caption",width:220},{id:"new_photo_desc",xtype:"textarea",name:"description",fieldLabel:"Description",width:220},{id:"new_photo_story",xtype:"textarea",name:"story",fieldLabel:"Story",width:220}],buttons:[{text:"Upload",name:"formbutton:ok",scope:this,icon:"/resources/ajaxhelper/icons/accept.png",cls:"x-btn-text-icon"},{text:"Close",handler:function(){Ext.getCmp("new_photo_form").getForm().reset();Ext.getCmp("pa-win-newphoto").hide()},scope:this,icon:"/resources/ajaxhelper/icons/cross.png",cls:"x-btn-text-icon"}]}]});break;case"pa-win-editphoto":b=new Ext.Window({id:"pa-win-editphoto",title:acs_lang_text.editphoto||"Edit Photo Attributes",width:290,height:360,autoScroll:true,closeAction:"hide",modal:true,draggable:false,resizable:false,listeners:{show:{scope:this,fn:function(){Ext.getCmp("edit_photo_title").focus(false,10)}}},items:[{id:"edit_photo_form",xtype:"form",titlebar:false,plain:true,autoHeight:true,bodyStyle:{padding:"5px"},labelAlign:"top",method:"post",items:[{id:"edit_photo_formid",xtype:"hidden",name:"form:id",value:"edit_photo"},{id:"edit_photo_formode",xtype:"hidden",name:"form:mode",value:"edit"},{id:"edit_photo_returnurl",xtype:"hidden",name:"return_url",value:""},{id:"edit_photo_photoid",xtype:"hidden",name:"photo_id",value:""},{id:"edit_photo_revisionid",xtype:"hidden",name:"revision_id",value:""},{id:"edit_photo_prevrevisionid",xtype:"hidden",name:"previous_revision",value:""},{id:"edit_photo_title",xtype:"textfield",name:"title",fieldLabel:"Title",width:220},{id:"edit_photo_caption",xtype:"textfield",name:"caption",fieldLabel:"Caption",width:220},{id:"edit_photo_desc",xtype:"textarea",name:"description",fieldLabel:"Description",width:220},{id:"edit_photo_story",xtype:"textarea",name:"story",fieldLabel:"Story",width:220}],buttons:[{text:"Update",name:"formbutton:ok",scope:this,icon:"/resources/ajaxhelper/icons/accept.png",cls:"x-btn-text-icon"},{text:"Close",handler:function(){Ext.getCmp("edit_photo_form").getForm().reset();Ext.getCmp("pa-win-editphoto").hide()},scope:this,icon:"/resources/ajaxhelper/icons/cross.png",cls:"x-btn-text-icon"}]}]});break;case"pa-win-newfolder":b=new Ext.Window({id:"pa-win-newfolder",title:acs_lang_text.newfolder||"New Folder",width:290,height:220,autoScroll:true,closeAction:"hide",modal:true,draggable:false,resizable:false,items:[{id:"new_folder_form",xtype:"form",titlebar:false,plain:true,autoHeight:true,bodyStyle:{padding:"5px"},labelAlign:"top",method:"post",items:[{id:"new_folder_name",xtype:"textfield",name:"label",fieldLabel:"Folder Name",width:220,allowBlank:false},{id:"new_folder_desc",xtype:"textarea",name:"description",fieldLabel:"Folder Description",width:220},{id:"new_folder_formid",xtype:"hidden",name:"form:id",value:"folder_add"},{id:"new_folder_formode",xtype:"hidden",name:"form:mode",value:"edit"},{id:"new_folder_returnurl",xtype:"hidden",name:"return_url",value:""},{id:"new_folder_folderid",xtype:"hidden",name:"folder_id",value:""},{id:"new_folder_parentid",xtype:"hidden",name:"parent_id",value:""}],buttons:[{text:"Create Folder",name:"formbutton:ok",scope:this,icon:"/resources/ajaxhelper/icons/accept.png",cls:"x-btn-text-icon"},{text:"Close",handler:function(){Ext.getCmp("new_folder_form").getForm().reset();Ext.getCmp("pa-win-newfolder").hide()},scope:this,icon:"/resources/ajaxhelper/icons/cross.png",cls:"x-btn-text-icon"}]}],listeners:{show:{scope:this,fn:function(){Ext.getCmp("new_folder_name").focus(false,10)}}}});break;case"pa-win-newalbum":b=new Ext.Window({id:"pa-win-newalbum",title:acs_lang_text.newalbum||"New Abum",width:290,autoHeight:true,autoScroll:true,closeAction:"hide",modal:true,draggable:false,resizable:false,listeners:{show:{scope:this,fn:function(){Ext.getCmp("new_album_name").focus(false,10)}}},items:[{id:"new_album_form",xtype:"form",titlebar:false,plain:true,autoHeight:true,bodyStyle:{padding:"5px"},labelAlign:"top",method:"post",items:[{id:"new_album_name",xtype:"textfield",name:"title",fieldLabel:"Album Name",width:220,allowBlank:false},{id:"new_album_photographer",xtype:"textfield",name:"photographer",fieldLabel:"Photographer",width:220},{id:"new_album_desc",xtype:"textarea",name:"description",fieldLabel:"Description",width:220},{id:"new_album_story",xtype:"textarea",name:"story",fieldLabel:"Album Story",width:220},{id:"new_album_formid",xtype:"hidden",name:"form:id",value:"album_add"},{id:"new_album_formmode",xtype:"hidden",name:"form:mode",value:"edit"},{id:"new_album_returnurl",xtype:"hidden",name:"return_url",value:""},{id:"new_album_albumid",xtype:"hidden",name:"album_id",value:""},{id:"new_album_revisionid",xtype:"hidden",name:"revision_id",value:""},{id:"new_album_prevrevisionid",xtype:"hidden",name:"previous_revision",value:""},{id:"new_album_parentid",xtype:"hidden",name:"parent_id",value:""}],buttons:[{text:"Create Album",name:"formbutton:ok",scope:this,icon:"/resources/ajaxhelper/icons/accept.png",cls:"x-btn-text-icon"},{text:"Close",handler:function(){Ext.getCmp("new_album_form").getForm().reset();Ext.getCmp("pa-win-newalbum").hide()},scope:this,icon:"/resources/ajaxhelper/icons/cross.png",cls:"x-btn-text-icon"}]}]});break}}return b},newPhoto:function(){if(!this.checkPerms("write")){Ext.MessageBox.alert("Permission Denied","Sorry you do not have permission to perform this action.");return}var e=this.createOrGetWindow("pa-win-newphoto");var c="new_photo_form";var b=Ext.getCmp(c);var a=function(g){Ext.getCmp("new_photo_formid").setValue("photo_upload");var f=this.getSelectedTreeNodeId();Ext.getCmp("new_photo_albumid").setValue(f);Ext.getCmp("new_photo_photoid").setValue(g.responseText);Ext.getCmp("new_photo_returnurl").setValue(this.xmlhttpurl+"formok");e.show()};var d=function(){if(b.getForm().isValid()){b.getForm().submit({url:this.config.package_url+"photo-add-2",waitMsg:"Uploading photo...",reset:true,scope:this,success:function(f,g){if(g.result){this.photoStore.reload();e.hide()}else{Ext.MessageBox.alert("Error","Sorry an error occured. Make sure you have filled up all required fields.")}},failure:function(f,g){if(g.result){Ext.MessageBox.alert("Error",g.result.info)}else{Ext.MessageBox.alert("Error","Error occurred. Try again later")}}})}};b.getForm().reset();b.buttons[0].setHandler(d,this);b.buttons[0].setText("Upload");this.paCore.doAction("getnextobjid",a,this.genericErrorFn,null,null,this)},delPhoto:function(a){Ext.MessageBox.confirm("Delete","Are you sure you want to delete this photo?",function(b){if(b==="yes"){var d=function(e){this.photoStore.reload()};var c=this.genericErrorFn;this.paCore.doAction("deletephoto",d,c,null,{confirmed_p:"t",photo_id:a,return_url:this.xmlhttpurl+"formok"},this)}},this)},editPhoto:function(f){var e=this.createOrGetWindow("pa-win-editphoto");var c="edit_photo_form";var b=Ext.getCmp(c);var a=function(h){var g=Ext.decode(h.responseText);if(g.success){Ext.getCmp("edit_photo_formid").setValue("edit_photo");Ext.getCmp("edit_photo_returnurl").setValue(this.xmlhttpurl+"get-onephoto?photo_id="+g.info.photo_id+"&package_id="+this.config.package_id+"&mode=display");Ext.getCmp("edit_photo_photoid").setValue(g.info.photo_id);Ext.getCmp("edit_photo_revisionid").setValue(g.info.revision_id);Ext.getCmp("edit_photo_prevrevisionid").setValue(g.info.prevrevision_id);Ext.getCmp("edit_photo_title").setValue(g.info.title);Ext.getCmp("edit_photo_caption").setValue(g.info.caption);Ext.getCmp("edit_photo_desc").setValue(g.info.description);Ext.getCmp("edit_photo_story").setValue(g.info.story);e.show()}};var d=function(){if(b.getForm().isValid()){var h=function(j,k){if(k.result){if(k.result.info!="null"){Ext.get("caption-"+k.result.info.photo_id).update(k.result.info.caption);if(k.result.info.story&&k.result.info.story!=""){var i=document.createAttribute("ext:qtip");i.value=k.result.info.story;Ext.get("thumb"+k.result.info.photo_id).dom.attributes.setNamedItem(i)}}else{Ext.MessageBox.alert("Error","Sorry an error occured trying to create your new folder. Please try again later.")}Ext.getCmp("pa-win-editphoto").hide()}else{Ext.MessageBox.alert("Error","Sorry an error occured. Make sure you have filled up all required fields.")}};var g=function(i,j){if(j.result){Ext.MessageBox.alert("Error",j.result.info)}else{Ext.MessageBox.alert("Error","Error occurred. Try again later")}};this.paCore.formSubmit("editphoto",currentfor.getForm(),"Updating photo ....",null,true,h,g,this)}};b.buttons[0].setHandler(d,this);b.buttons[0].setText("Update");this.paCore.doAction("getonephoto",a,this.genericErrorFn,null,{photo_id:f,package_id:this.config.package_id,mode:"edit"},this)}};
\ No newline at end of file
Index: openacs-4/packages/ajax-photoalbum-ui/www/resources/ajaxpa.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-photoalbum-ui/www/resources/ajaxpa.css,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ajax-photoalbum-ui/www/resources/ajaxpa.css 11 Apr 2009 15:56:13 -0000 1.1
@@ -0,0 +1,113 @@
+.x-tree-node img.folder, .x-tree-node-collapsed img.folder{
+ background: url(/resources/ajaxhelper/ext2/resources/images/default/tree/folder.gif)
+}
+.x-tree-node-expanded img.folder {
+ background: url(/resources/ajaxhelper/ext2/resources/images/default/tree/folder-open.gif)
+}
+.x-tree-node img.album, .x-tree-node-collapsed img.album {
+ background: transparent url(/resources/ajaxhelper/icons/folder_picture.png) no-repeat;
+}
+.x-tree-node-expanded img.album {
+ background: transparent url(/resources/ajaxhelper/icons/folder_picture.png) no-repeat;
+}
+
+/*
+ * FileUploadField component styles
+ */
+.x-form-file-wrap {
+ position: relative;
+ height: 22px;
+}
+.x-form-file-wrap .x-form-file {
+ position: absolute;
+ right: 0;
+ -moz-opacity: 0;
+ filter:alpha(opacity: 0);
+ opacity: 0;
+ z-index: 2;
+ height: 22px;
+}
+.x-form-file-wrap .x-form-file-btn {
+ position: absolute;
+ right: 0;
+ z-index: 1;
+}
+.x-form-file-wrap .x-form-file-text {
+ position: absolute;
+ left: 0;
+ z-index: 3;
+ color: #777;
+}
+
+
+#pa-thumbsview .x-panel-body {
+ background:white none repeat scroll 0%;
+ font-family:Arial,Helvetica,sans-serif;
+ font-size:11px;
+ font-size-adjust:none;
+ font-stretch:normal;
+ font-style:normal;
+ font-variant:normal;
+ font-weight:normal;
+ line-height:normal;
+}
+#pa-thumbsview .thumb {
+ background:#DDDDDD none repeat scroll 0%;
+ padding:3px;
+ margin-bottom:2px;
+}
+#pa-thumbsview .thumb-wrap {
+ float:left;
+ margin:4px 0 0 4px;
+ padding:5px;
+}
+#pa-thumbsview .thumb-wrap span {
+ display:block;
+ overflow:hidden;
+}
+#pa-thumbsview .x-view-over {
+ background:#EFEFEF url(/resources/ajaxhelper/ext2/resources/images/default/grid/row-over.gif) repeat-x scroll left top;
+ border:1px solid #DDDDDD;
+ padding:4px;
+}
+#pa-thumbsview .x-view-selected {
+ background:#EFF5FB no-repeat scroll right bottom;
+ border:1px solid #99BBE8;
+ padding:4px;
+}
+#pa-thumbsview .x-view-selected .thumb {
+ background:transparent none repeat scroll 0%;
+}
+#pa-thumbsview .loading-indicator {
+ background-image:url(../../resources/images/default/grid/loading.gif);
+ background-position:left center;
+ background-repeat:no-repeat;
+ font-size:11px;
+ margin:10px;
+ padding-left:20px;
+}
+.largetext {
+ padding:20px 10px 10px 10px;
+ text-align:center;
+ color:#cccccc;
+ font-size:24px;
+ font-weight:bold;
+}
+.img_caption {
+ width:80px;
+ padding-left:3px;
+ float:left;
+}
+.img_tools img {
+ cursor:pointer;
+}
+.upload-icon {
+ background: url(/resources/ajaxhelper/icons/image_add.png) no-repeat 0 0 !important;
+}
+.x-dd-drag-proxy .multi-proxy .thumb {
+ height: 20px;
+ width: 30px;
+ margin:1px;
+ float:left;
+ overflow:auto;
+}
Index: openacs-4/packages/ajax-photoalbum-ui/www/resources/ajaxpa.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-photoalbum-ui/www/resources/ajaxpa.js,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ajax-photoalbum-ui/www/resources/ajaxpa.js 11 Apr 2009 15:56:13 -0000 1.1
@@ -0,0 +1,1546 @@
+/*
+
+ Ajax Photo Album UI
+ @author Hamilton Chua (ham@solutiongrove.com)
+ @creation-date 2007-11-18
+
+*/
+
+Ext.namespace('paCore');
+Ext.namespace('ajaxpa');
+Ext.BLANK_IMAGE_URL = '/resources/ajaxhelper/ext2/resources/images/default/s.gif';
+
+/******** Photo Album Core Functions ***********/
+
+paCore = function(package_id,xmlhttpurl,packageurl) {
+ this.package_id = package_id;
+ this.xmlhttpurl = xmlhttpurl;
+ this.packageurl = packageurl;
+}
+
+paCore.prototype = {
+
+ createTreeloader : function() {
+ var treeloader = new Ext.tree.TreeLoader({
+ dataUrl:this.xmlhttpurl+'load-treenodes',
+ baseParams: { package_id:this.package_id }
+ })
+ return treeloader
+ },
+
+ createPhotoStore : function(scope) {
+ var store = new Ext.data.JsonStore({
+ url : scope.xmlhttpurl + 'get-photos',
+ totalProperty: 'totalPhotos',
+ root : 'photos',
+ id:'photo_id',
+ fields:[
+ {name:'photo_id',type:'int'},
+ {name:'view_image_id',type:'int'},
+ {name:'thumb_photo_id',type:'int'},
+ {name:'caption'},
+ {name:'shortcaption'},
+ {name:'path'},
+ {name:'story'},
+ {name:'fullimage_path'},
+ {name:'shadowbox'}
+ ]
+ })
+ return store;
+ },
+
+ // do a form submit for a given action
+ formSubmit : function(action, extform, waitmsg, params, reset, success, failure, scope) {
+
+ switch(action) {
+ case 'addfolder':
+ var url = this.packageurl+"folder-add"
+ break;
+ case 'editfolder':
+ var url = this.packageurl+"folder-edit"
+ break;
+ case 'addalbum':
+ var url = this.packageurl+"album-add"
+ break;
+ case 'editalbum':
+ var url = this.packageurl+"album-edit"
+ break;
+ case 'editphoto':
+ var url = this.packageurl+"photo-edit"
+ break;
+ }
+
+ if (url) {
+ extform.submit({
+ url:url,
+ waitMsg:waitmsg,
+ params:params,
+ scope:scope,
+ success:success,
+ failure:failure
+ })
+ }
+ },
+
+ // executes the action thru an ajax call
+
+ doAction : function(action,successFn, failureFn, callbackFn, paramsObj, scope) {
+
+ var url = null;
+
+ switch(action) {
+ case 'deletefolder':
+ url = this.packageurl + 'folder-delete';
+ break;
+ case 'deletealbum':
+ url = this.packageurl + 'album-delete';
+ break;
+ case 'deletephoto':
+ url = this.packageurl + 'photo-delete';
+ break;
+ case 'getonephoto':
+ url = this.xmlhttpurl + 'get-onephoto';
+ break;
+ case 'getnextobjid':
+ url = this.xmlhttpurl + 'nextobjid';
+ break;
+ case 'movephoto':
+ url = this.xmlhttpurl + 'move-photos';
+ break;
+ case 'movenode':
+ url = this.xmlhttpurl + 'move-node';
+ break;
+ }
+
+ if(url) {
+
+ var config = {
+ url:url,
+ success: successFn,
+ failure: failureFn,
+ params: paramsObj
+ }
+
+ if(callbackFn) { config.callback = callbackFn }
+ if(successFn) { config.success = successFn }
+ if(failureFn) { config.failure = failureFn }
+ if(scope) { config.scope = scope }
+
+ Ext.Ajax.request(config)
+
+ }
+
+ }
+
+}
+
+/******** Create a DragZone instance for our JsonView *************/
+
+ImageDragZone = function(view, config){
+ this.view = view;
+ ImageDragZone.superclass.constructor.call(this, view.getEl(), config);
+};
+Ext.extend(ImageDragZone, Ext.dd.DragZone, {
+ // We don't want to register our image elements, so let's
+ // override the default registry lookup to fetch the image
+ // from the event instead
+ getDragData : function(e){
+ var target = e.getTarget('.thumb-wrap');
+ if(target){
+ var view = this.view;
+ if(e.ctrlKey == false) {
+ if(!view.isSelected(target)){
+ view.onClick(e);
+ }
+ }
+ var selNodes = view.getSelectedNodes();
+ var dragData = {
+ nodes: selNodes
+ };
+
+ if(selNodes.length == 1){
+ dragData.ddel = target.firstChild;
+ dragData.single = true;
+ }else{
+ var div = document.createElement('div'); // create the multi element drag "ghost"
+ div.className = 'multi-proxy';
+ for(var i = 0, len = selNodes.length; i < len; i++){
+ var proxy_node = selNodes[i].firstChild.cloneNode(true);
+ Ext.get(proxy_node).setSize(50,50,false);
+ div.appendChild(proxy_node); // image nodes only
+ if((i+1) % 3 == 0){
+ div.appendChild(document.createElement('br'));
+ }
+ }
+ var count = document.createElement('div'); // selected image count
+ count.innerHTML = i + ' images selected';
+ Ext.get(count).setStyle('clear','both');
+ div.appendChild(count);
+
+ dragData.ddel = div;
+ dragData.multi = true;
+ }
+ return dragData;
+ }
+ return false;
+ },
+
+ // this method is called by the TreeDropZone after a node drop
+ // to get the new tree node (there are also other way, but this is easiest)
+ getTreeNode : function(){
+ var treeNodes = [];
+ var nodeData = this.view.getRecords(this.dragData.nodes);
+ for(var i = 0, len = nodeData.length; i < len; i++){
+ var data = nodeData[i].data;
+ treeNodes.push(new Ext.tree.TreeNode({
+ text: data.name,
+ icon: '../view/'+data.url,
+ data: data,
+ leaf:true,
+ cls: 'image-node'
+ }));
+ }
+ return treeNodes;
+ },
+
+ // the default action is to "highlight" after a bad drop
+ // but since an image can't be highlighted, let's frame it
+ afterRepair:function(){
+ for(var i = 0, len = this.dragData.nodes.length; i < len; i++){
+ Ext.fly(this.dragData.nodes[i]).frame('#8db2e3', 1);
+ }
+ this.dragging = false;
+ },
+
+ // override the default repairXY with one offset for the margins and padding
+ getRepairXY : function(e){
+ if(!this.dragData.multi){
+ var xy = Ext.Element.fly(this.dragData.ddel).getXY();
+ xy[0]+=3;xy[1]+=3;
+ return xy;
+ }
+ return false;
+ }
+});
+
+
+/*** ajaxpa class ****************/
+
+ajaxpa = function(configObj) {
+
+ // ****** properties ********
+
+ this.config = null;
+ this.layout = null;
+ this.xmlhttpurl = '/ajaxpa/xmlhttp/';
+ this.shadowbox_gallery = [];
+
+ this.genericErrorFn = function() {
+ Ext.Msg.alert('Error','Sorry, an error occurred. Please try again later.');
+ }
+
+ this.restore_window = function() {
+ window.focus();
+ this.refreshTreenode();
+ }
+
+
+ // ****** initialize ********
+
+ this.initObj = function() {
+
+ // prevent users from dropping stuff into this page
+ // this will prevent users from accidentally loading images when trying to drag and drop images for upload
+ if(!Ext.isIE) { window.addEventListener('dragdrop', function(event) { event.stopPropagation() }, false) }
+ if(Ext.isSafari) { window.addEventListener('dragover', function(event) { event.returnValue=false; }, false) }
+
+ if(configObj) {
+ this.config = configObj;
+ if(this.config.xmlhttpurl) {
+ this.xmlhttpurl = this.config.xmlhttpurl;
+ }
+ }
+
+
+ if (this.config.user_id != 0) {
+
+ this.thumbTemplate = new Ext.XTemplate(
+ '',
+ '
',
+ '',
+ 'ext:qtip="{story}"',
+ '',
+ '>
',
+ '{shortcaption}
',
+ '',
+ ' ',
+ ' ',
+ ' ',
+ '',
+ '
',
+ ' ',
+ ' ',
+ '',
+ '',
+ '
',
+ '',
+ 'ext:qtip="{story}"',
+ '',
+ '>
',
+ '{shortcaption}
',
+ '',
+ '',
+ '
',
+ 'No photos found
',
+ plugins: new Ext.DataView.DragSelector({dragSafe:true}),
+ prepareData: function(data){
+ data.caption = Ext.util.Format.ellipsis(data.caption, 20);
+ return data;
+ }, listeners: {
+ 'mouseenter': {
+ fn:function(view,index,node,e) {
+ var id = Ext.get(node).id.substring(4,Ext.get(node).id.length);
+ Ext.get('tools-'+id).show();
+ },scope:this
+ }, 'mouseleave' : {
+ fn:function(view,index,node,e) {
+ var id = Ext.get(node).id.substring(4,Ext.get(node).id.length);
+ Ext.get('tools-'+id).hide();
+ },scope:this
+ }, 'dblclick' : {
+ fn:function(view,index,node,e) {
+ var id = Ext.get(node).id.substring(4,Ext.get(node).id.length);
+ var record = this.photoStore.getById(id);
+ var n = this.photoStore.indexOf(record);
+ Shadowbox.open(this.shadowbox_gallery);
+ Shadowbox.change(n);
+ },scope:this
+ }
+ }
+ })
+ });
+
+ var panel = new Ext.Panel({
+ id:'pa-card',
+ layout:'card',
+ region:'center',
+ activeItem:0,
+ items: [
+ {xtype:'panel',html:'Click on an album to view photos
'},
+ thumbspanel
+ ]
+ });
+
+ return panel;
+ },
+
+ // if the tree item is an album, load the photos
+
+ loadPhotos : function(node,e) {
+
+ // the current album we are in
+ if(node.attributes.attributes.type == "album") {
+
+ Ext.getCmp('pa-card').layout.setActiveItem(1);
+ this.photoStore.baseParams={album_id:node.id,package_id:this.config.package_id};
+ this.photoStore.load({params:{start:0,limit:parseInt(this.config.pagesize)}});
+
+ } else {
+ Ext.getCmp('pa-card').layout.setActiveItem(0);
+ }
+
+ },
+
+ // reload the currently selected node
+
+ refreshTreenode : function() {
+
+ var currentTreenode = Ext.getCmp('pa-nav').getSelectionModel().getSelectedNode();
+ currentTreenode.fireEvent("click",currentTreenode);
+
+ },
+
+ // delete a node from the tree
+
+ delTreenode : function() {
+
+ if(!this.checkPerms('write')) {
+ Ext.MessageBox.alert('Permission Denied','Sorry you do not have permission to perform this action.')
+ return;
+ }
+
+ var treepanel = Ext.getCmp('pa-nav');
+ var currentTreenode = treepanel.getSelectionModel().getSelectedNode();
+ var treenodeType = currentTreenode.attributes.attributes.type;
+
+ if (treepanel.getRootNode().id == currentTreenode.id) {
+
+ Ext.Msg.alert('Error','Sorry, you can not delete the root folder');
+
+ } else {
+
+ if (treenodeType === "folder") {
+ var action = 'deletefolder';
+ var params = { confirmed_p:'t', folder_id:currentTreenode.id, return_url:this.xmlhttpurl+'formok'};
+ }
+
+ if (treenodeType === "album") {
+ var action = 'deletealbum';
+ var params = { confirmed_p:'t', album_id:currentTreenode.id, return_url:this.xmlhttpurl+'formok'};
+ }
+
+ var success = function(o) {
+ var parentnode = currentTreenode.parentNode;
+ parentnode.fireEvent("click",parentnode);
+ parentnode.removeChild(currentTreenode);
+ }
+
+ var failure = this.genericErrorFn;
+
+ if (action) {
+ Ext.MessageBox.confirm('Delete','Are you sure you want to delete '+currentTreenode.text+' ?',function(choice) {
+ if (choice === "yes") {
+ this.paCore.doAction(action,success,failure,null,params,this);
+ }
+ },this)
+ }
+
+ }
+ },
+
+ // add a folder or album to the tree
+
+ addTreenode : function(nodetype) {
+
+ if(!this.checkPerms('write')) {
+ Ext.MessageBox.alert('Permission Denied','Sorry you do not have permission to perform this action.')
+ return;
+ }
+
+ if(nodetype === "folder") {
+ var windowid = 'pa-win-newfolder';
+ var formname = 'new_folder_form';
+ var formaction = 'addfolder';
+ var windowtitle = acs_lang_text.newfolder || 'New Folder';
+ var successFn = function(o) {
+
+ Ext.getCmp('new_folder_formid').setValue('folder_add');
+
+ // get the parent_id of this new folder
+ // parent_id is the id of the currently selected node in the tree
+ var parent_id = this.getSelectedTreeNodeId();
+
+ // set the parent_id hidden field
+ Ext.getCmp('new_folder_parentid').setValue(parent_id);
+
+ // set the folder_id hidden field
+ Ext.getCmp('new_folder_folderid').setValue(o.responseText);
+
+ // set the return_url
+ Ext.getCmp('new_folder_returnurl').setValue(this.xmlhttpurl+'load-onenode?type=folder&node_id='+o.responseText);
+
+ // show the window
+ extwindow.show();
+
+ }
+ var waitMsg = 'Creating folder';
+ }
+
+ if(nodetype === "album") {
+ var windowid = 'pa-win-newalbum';
+ var formname = 'new_album_form';
+ var formaction = 'addalbum';
+ var windowtitle = acs_lang_text.newalbum || 'New Album';
+ var successFn=function(o) {
+
+ Ext.getCmp('new_album_formid').setValue('album_add');
+
+ // get the parent_id of this new folder
+ // parent_id is the id of the currently selected node in the tree
+ var parent_id = this.getSelectedTreeNodeId();
+
+ // set the parent_id hidden field
+ Ext.getCmp('new_album_parentid').setValue(parent_id);
+
+ // set the folder_id hidden field
+ Ext.getCmp('new_album_albumid').setValue(o.responseText);
+
+ // set the return_url
+ Ext.getCmp('new_album_returnurl').setValue(this.xmlhttpurl+'load-onenode?type=album&node_id='+o.responseText);
+
+ // show the window
+ extwindow.show();
+
+ }
+ var waitMsg = 'Creating album';
+ }
+
+ var extwindow = this.createOrGetWindow(windowid);
+ var currentform = Ext.getCmp(formname);
+
+ var success =function(form,action) {
+ if(action.result) {
+
+ if(action.result.info != "null") {
+ // create and select the new tree node
+ this.addTreenodeEl(action.result.info);
+ } else {
+ Ext.MessageBox.alert('Error','Sorry an error occured. Please try again later.')
+ }
+
+ // hide the window
+ extwindow.hide();
+
+ } else {
+ Ext.MessageBox.alert('Error','Sorry an error occured. Make sure you have filled up all required fields.')
+ }
+ }
+
+ var failure = function(form,action) {
+ if(action.result) {
+ Ext.MessageBox.alert('Error',action.result.info)
+ } else {
+ Ext.MessageBox.alert('Error','Error occurred. Try again later')
+ }
+ }
+
+ var submitFn=function() {
+ this.paCore.formSubmit(formaction, currentform.getForm(), waitMsg, null, true, success, failure, this)
+ }
+
+
+ if(extwindow) {
+
+ extwindow.setTitle(windowtitle);
+
+ currentform.buttons[0].setHandler(submitFn,this)
+ currentform.buttons[0].setText('Create');
+
+ // use ajax to get a new object_id, before we show the window
+ this.paCore.doAction('getnextobjid',successFn,this.genericErrorFn,null,null,this);
+
+ }
+
+ },
+
+ // add a node with the given json object properties to the tree
+
+ addTreenodeEl : function(configobj) {
+ var treepanel =Ext.getCmp('pa-nav');
+ var currentTreeNode = treepanel.getSelectionModel().getSelectedNode();
+ var nodespec = new Ext.tree.TreeNode(configobj);
+ var newnode = currentTreeNode.appendChild(nodespec);
+ treepanel.getSelectionModel().select(newnode);
+ newnode.loaded=true;
+ newnode.fireEvent("click",newnode);
+ },
+
+ // window to edit folder info
+
+ editTreenode : function() {
+
+ if(!this.checkPerms('write')) {
+ Ext.MessageBox.alert('Permission Denied','Sorry you do not have permission to perform this action.')
+ return;
+ }
+
+ var currentTreenode = Ext.getCmp('pa-nav').getSelectionModel().getSelectedNode();
+
+ if (currentTreenode) {
+
+ var treenodeType = currentTreenode.attributes.attributes.type;
+ var treenodeId = currentTreenode.id;
+
+ if (treenodeType === "folder") {
+
+ var windowid = 'pa-win-newfolder';
+ var formname = 'new_folder_form';
+ var windowtitle = acs_lang_text.editfolder || 'Edit Folder';
+ var formaction = 'editfolder';
+ var successFn = function(o) {
+ var resultObj = Ext.decode(o.responseText);
+ if(resultObj.success) {
+ Ext.getCmp('new_folder_formid').setValue('folder_edit');
+ Ext.getCmp('new_folder_folderid').setValue(resultObj.info.id);
+ Ext.getCmp('new_folder_name').setValue(resultObj.info.text);
+ Ext.getCmp('new_folder_desc').setValue(resultObj.info.qtip);
+ Ext.getCmp('new_folder_returnurl').setValue(this.xmlhttpurl+'load-onenode?type=folder&node_id='+resultObj.info.id);
+ extwindow.show();
+ }
+ }
+ var waitMsg = 'Updating folder ...';
+ }
+
+ if (treenodeType === "album") {
+
+ var windowid = 'pa-win-newalbum';
+ var formname = 'new_album_form';
+ var windowtitle = acs_lang_text.editalbum || 'Edit Album';
+ var formaction = 'editalbum';
+ var successFn = function(o) {
+ var resultObj = Ext.decode(o.responseText);
+ if(resultObj.success) {
+ Ext.getCmp('new_album_formid').setValue('edit_album');
+ Ext.getCmp('new_album_albumid').setValue(resultObj.info.id);
+ Ext.getCmp('new_album_name').setValue(resultObj.info.text);
+ Ext.getCmp('new_album_desc').setValue(resultObj.info.qtip);
+ Ext.getCmp('new_album_story').setValue(resultObj.info.attributes.story);
+ Ext.getCmp('new_album_photographer').setValue(resultObj.info.attributes.photographer);
+ Ext.getCmp('new_album_revisionid').setValue(resultObj.info.attributes.revision_id);
+ Ext.getCmp('new_album_prevrevisionid').setValue(resultObj.info.attributes.previous_revision);
+ Ext.getCmp('new_album_returnurl').setValue(this.xmlhttpurl+'load-onenode?type=album&node_id='+resultObj.info.id);
+ extwindow.show();
+ }
+ }
+ var waitMsg = 'Updating album ...';
+ }
+
+ var extwindow = this.createOrGetWindow(windowid);
+ var currentform = Ext.getCmp(formname);
+
+ var success = function(form,action) {
+ if(action.result) {
+
+ if(action.result.info != "null") {
+ // create and select the new tree node
+ this.editTreenodeEl(action.result.info);
+ } else {
+ Ext.MessageBox.alert('Error','Sorry an error occured updating. Please try again later.')
+ }
+
+ // hide the window
+ extwindow.hide();
+
+ } else {
+ Ext.MessageBox.alert('Error','Sorry an error occured. Make sure you have filled up all required fields.')
+ }
+ }
+
+ var failure = function(form,action) {
+ if(action.result) {
+ Ext.MessageBox.alert('Error',action.result.info)
+ } else {
+ Ext.MessageBox.alert('Error','Error occurred. Try again later')
+ }
+ }
+
+ var submitFn=function() {
+ this.paCore.formSubmit(formaction, currentform.getForm(), waitMsg, null, true, success, failure, this)
+ }
+
+ if(extwindow) {
+
+ // change window title to edit
+ extwindow.setTitle(windowtitle);
+
+ // change url to folder_edit
+ currentform.buttons[0].setHandler(submitFn,this);
+ currentform.buttons[0].setText('Update');
+
+ // use ajax to get retrieve info about the album or folder
+ Ext.Ajax.request({
+ url: this.config.xmlhttpurl + 'load-onenode',
+ params: {type:treenodeType,node_id:treenodeId,mode:'edit'},
+ success: successFn, failure: this.genericErrorFn ,scope: this
+ });
+
+ }
+
+ } else {
+ Ext.Msg.alert('Error','Please select a folder or album');
+ }
+
+ },
+
+ // edit the node
+
+ editTreenodeEl : function(configobj) {
+ var currentTreeNode = Ext.getCmp('pa-nav').getSelectionModel().getSelectedNode();
+ currentTreeNode.setText(configobj.text);
+ currentTreeNode.ui.getTextEl().setAttributeNS('ext','qtip',configobj.qtip);
+ },
+
+ // return the id of the selected treenode
+
+ getSelectedTreeNodeId : function() {
+ var id = Ext.getCmp('pa-nav').getSelectionModel().getSelectedNode().id;
+ return id
+ },
+
+ // create or get a reference to a popup window
+
+ createOrGetWindow : function(windowid) {
+
+ var extwindow = Ext.getCmp(windowid);
+
+ if(!extwindow) {
+
+ switch (windowid) {
+
+ case "pa-win-newcollection":
+
+ extwindow = new Ext.Window({
+ id:'pa-win-newphotocollection',
+ title:acs_lang_text.collection || 'Add a collection of photos to this album',
+ width:290,
+ height:140,
+ autoScroll:true,
+ modal:true,
+ draggable:false,
+ resizable:false,
+ items:[
+ {id:'new_photo_collection_form',
+ xtype:'form',
+ titlebar:false,
+ plain:true,
+ autoHeight:true,
+ bodyStyle:{'padding':'5px'},
+ labelAlign:'top',
+ method:'post',
+ fileUpload:true,
+ items:[
+ {id:'new_photo_collection_formid',xtype:'hidden',name:'form:id',value:'photos_upload'},
+ {id:'new_photo_collection_formode',xtype:'hidden',name:'form:mode',value:'edit'},
+ {id:'new_photo_collection_returnurl',xtype:'hidden',name:'return_url',value:''},
+ {id:'new_photo_collection_photoid',xtype:'hidden',name:'photo_id',value:''},
+ {id:'new_photo_collection_albumid',xtype:'hidden',name:'album_id',value:''},
+ {id:'new_photo_collection_file',
+ xtype:'fileuploadfield',
+ name:'upload_file',
+ fieldLabel:'Choose a tar or zip file to upload',
+ allowBlank:false,
+ anchor:'95%',
+ buttonCfg: {
+ text: '',
+ iconCls: 'upload-icon'
+ }
+ }],
+ buttons: [{
+ text: 'Upload',
+ name:'formbutton:ok',
+ scope:this,
+ icon:'/resources/ajaxhelper/icons/accept.png',
+ cls:'x-btn-text-icon'
+ }, {
+ text: 'Close',
+ handler: function(){
+ Ext.getCmp('new_photo_collection_form').getForm().reset();
+ Ext.getCmp('pa-win-newphotocollection').close();
+ },scope:this,
+ icon:'/resources/ajaxhelper/icons/cross.png',
+ cls:'x-btn-text-icon'
+ }]}
+ ]
+ })
+
+ break;
+
+ case "pa-win-newphoto" :
+
+ extwindow = new Ext.Window({
+ id:'pa-win-newphoto',
+ title:acs_lang_text.uploadphoto || 'Upload a New Photo',
+ width:290,
+ height:360,
+ autoScroll:true,
+ closeAction:'hide',
+ modal:true,
+ draggable:false,
+ resizable:false,
+ items:[
+ {id:'new_photo_form',
+ xtype:'form',
+ titlebar:false,
+ plain:true,
+ autoHeight:true,
+ bodyStyle:{'padding':'5px'},
+ labelAlign:'top',
+ method:'post',
+ fileUpload:true,
+ items:[
+ {id:'new_photo_formid',xtype:'hidden',name:'form:id',value:'photo_upload'},
+ {id:'new_photo_formode',xtype:'hidden',name:'form:mode',value:'edit'},
+ {id:'new_photo_returnurl',xtype:'hidden',name:'return_url',value:''},
+ {id:'new_photo_photoid',xtype:'hidden',name:'photo_id',value:''},
+ {id:'new_photo_albumid',xtype:'hidden',name:'album_id',value:''},
+ {id:'new_photo_file',
+ xtype:'fileuploadfield',
+ name:'upload_file',
+ fieldLabel:'Photo',
+ allowBlank:false,
+ emptyText:'Choose a photo to upload',
+ anchor:'95%',
+ buttonCfg: {
+ text: '',
+ iconCls: 'upload-icon'
+ }
+ },
+ {id:'new_photo_caption',xtype:'textfield',name:'caption',fieldLabel:'Caption',width:220},
+ {id:'new_photo_desc',xtype:'textarea',name:'description',fieldLabel:'Description',width:220},
+ {id:'new_photo_story',xtype:'textarea',name:'story',fieldLabel:'Story',width:220}],
+ buttons: [{
+ text: 'Upload',
+ name:'formbutton:ok',
+ scope:this,
+ icon:'/resources/ajaxhelper/icons/accept.png',
+ cls:'x-btn-text-icon'
+ }, {
+ text: 'Close',
+ handler: function(){
+ Ext.getCmp('new_photo_form').getForm().reset();
+ Ext.getCmp('pa-win-newphoto').hide();
+ },scope:this,
+ icon:'/resources/ajaxhelper/icons/cross.png',
+ cls:'x-btn-text-icon'
+ }]}
+ ]
+ });
+
+ break;
+
+ case "pa-win-editphoto" :
+
+ extwindow = new Ext.Window({
+ id:'pa-win-editphoto',
+ title:acs_lang_text.editphoto || 'Edit Photo Attributes',
+ width:290,
+ height:360,
+ autoScroll:true,
+ closeAction:'hide',
+ modal:true,
+ draggable:false,
+ resizable:false,
+ listeners:{
+ "show":{
+ scope:this,
+ fn:function() {
+ Ext.getCmp('edit_photo_title').focus(false,10);
+ }
+ }
+ },
+ items:[
+ {id:'edit_photo_form',
+ xtype:'form',
+ titlebar:false,
+ plain:true,
+ autoHeight:true,
+ bodyStyle:{'padding':'5px'},
+ labelAlign:'top',
+ method:'post',
+ items:[
+ {id:'edit_photo_formid',xtype:'hidden',name:'form:id',value:'edit_photo'},
+ {id:'edit_photo_formode',xtype:'hidden',name:'form:mode',value:'edit'},
+ {id:'edit_photo_returnurl',xtype:'hidden',name:'return_url',value:''},
+ {id:'edit_photo_photoid',xtype:'hidden',name:'photo_id',value:''},
+ {id:'edit_photo_revisionid',xtype:'hidden',name:'revision_id',value:''},
+ {id:'edit_photo_prevrevisionid',xtype:'hidden',name:'previous_revision',value:''},
+ {id:'edit_photo_title',xtype:'textfield',name:'title',fieldLabel:'Title',width:220},
+ {id:'edit_photo_caption',xtype:'textfield',name:'caption',fieldLabel:'Caption',width:220},
+ {id:'edit_photo_desc',xtype:'textarea',name:'description',fieldLabel:'Description',width:220},
+ {id:'edit_photo_story',xtype:'textarea',name:'story',fieldLabel:'Story',width:220}],
+ buttons: [{
+ text: 'Update',
+ name:'formbutton:ok',
+ scope:this,
+ icon:'/resources/ajaxhelper/icons/accept.png',
+ cls:'x-btn-text-icon'
+ }, {
+ text: 'Close',
+ handler: function(){
+ Ext.getCmp('edit_photo_form').getForm().reset();
+ Ext.getCmp('pa-win-editphoto').hide();
+ },scope:this,
+ icon:'/resources/ajaxhelper/icons/cross.png',
+ cls:'x-btn-text-icon'
+ }]}
+ ]
+ });
+
+ break;
+
+ case "pa-win-newfolder":
+
+ extwindow = new Ext.Window({
+ id:'pa-win-newfolder',
+ title: acs_lang_text.newfolder || 'New Folder',
+ width:290,
+ height:220,
+ autoScroll:true,
+ closeAction:'hide',
+ modal:true,
+ draggable:false,
+ resizable:false,
+ items:[
+ {id:'new_folder_form',
+ xtype:'form',
+ titlebar:false,
+ plain:true,
+ autoHeight:true,
+ bodyStyle:{'padding':'5px'},
+ labelAlign:'top',
+ method:'post',
+ items:[
+ {id:'new_folder_name',xtype:'textfield',name:'label',fieldLabel:'Folder Name',width:220,allowBlank:false},
+ {id:'new_folder_desc',xtype:'textarea',name:'description',fieldLabel:'Folder Description',width:220},
+ {id:'new_folder_formid',xtype:'hidden',name:'form:id',value:'folder_add'},
+ {id:'new_folder_formode',xtype:'hidden',name:'form:mode',value:'edit'},
+ {id:'new_folder_returnurl',xtype:'hidden',name:'return_url',value:''},
+ {id:'new_folder_folderid',xtype:'hidden',name:'folder_id',value:''},
+ {id:'new_folder_parentid',xtype:'hidden',name:'parent_id',value:''}],
+ buttons: [{
+ text: 'Create Folder',
+ name:'formbutton:ok',
+ scope:this,
+ icon:'/resources/ajaxhelper/icons/accept.png',
+ cls:'x-btn-text-icon'
+ }, {
+ text: 'Close',
+ handler: function(){
+ Ext.getCmp('new_folder_form').getForm().reset();
+ Ext.getCmp('pa-win-newfolder').hide();
+ },scope:this,
+ icon:'/resources/ajaxhelper/icons/cross.png',
+ cls:'x-btn-text-icon'
+ }]}
+ ],listeners:{
+ "show":{
+ scope:this,
+ fn:function() {
+ Ext.getCmp('new_folder_name').focus(false,10);
+ }
+ }
+ }
+ });
+
+ break;
+
+ case "pa-win-newalbum":
+
+ extwindow = new Ext.Window({
+ id:'pa-win-newalbum',
+ title:acs_lang_text.newalbum || 'New Abum',
+ width:290,
+ autoHeight:true,
+ autoScroll:true,
+ closeAction:'hide',
+ modal:true,
+ draggable:false,
+ resizable:false,
+ listeners:{
+ "show":{
+ scope:this,
+ fn:function() {
+ Ext.getCmp('new_album_name').focus(false,10);
+ }
+ }
+ }, items:[
+ {id:'new_album_form',
+ xtype:'form',
+ titlebar:false,
+ plain:true,
+ autoHeight:true,
+ bodyStyle:{'padding':'5px'},
+ labelAlign:'top',
+ method:'post',
+ items:[
+ {id:'new_album_name',xtype:'textfield',name:'title',fieldLabel:'Album Name',width:220,allowBlank:false},
+ {id:'new_album_photographer',xtype:'textfield',name:'photographer',fieldLabel:'Photographer',width:220},
+ {id:'new_album_desc',xtype:'textarea',name:'description',fieldLabel:'Description',width:220},
+ {id:'new_album_story',xtype:'textarea',name:'story',fieldLabel:'Album Story',width:220},
+ {id:'new_album_formid',xtype:'hidden',name:'form:id',value:'album_add'},
+ {id:'new_album_formmode',xtype:'hidden',name:'form:mode',value:'edit'},
+ {id:'new_album_returnurl',xtype:'hidden',name:'return_url',value:''},
+ {id:'new_album_albumid',xtype:'hidden',name:'album_id',value:''},
+ {id:'new_album_revisionid',xtype:'hidden',name:'revision_id',value:''},
+ {id:'new_album_prevrevisionid',xtype:'hidden',name:'previous_revision',value:''},
+ {id:'new_album_parentid',xtype:'hidden',name:'parent_id',value:''}],
+ buttons: [{
+ text: 'Create Album',
+ name:'formbutton:ok',
+ scope:this,
+ icon:'/resources/ajaxhelper/icons/accept.png',
+ cls:'x-btn-text-icon'
+ }, {
+ text: 'Close',
+ handler: function(){
+ Ext.getCmp('new_album_form').getForm().reset();
+ Ext.getCmp('pa-win-newalbum').hide();
+ },scope:this,
+ icon:'/resources/ajaxhelper/icons/cross.png',
+ cls:'x-btn-text-icon'
+ }]
+ }
+ ]
+ });
+
+ break;
+
+ }
+ }
+
+ return extwindow;
+
+ },
+
+ // upload a new photo
+
+ newPhoto : function() {
+
+ if(!this.checkPerms('write')) {
+ Ext.MessageBox.alert('Permission Denied','Sorry you do not have permission to perform this action.')
+ return;
+ }
+
+ var extwindow = this.createOrGetWindow('pa-win-newphoto');
+ var formname = 'new_photo_form';
+ var currentform = Ext.getCmp(formname);
+
+ var successFn = function(o) {
+
+ Ext.getCmp('new_photo_formid').setValue('photo_upload');
+
+ var album_id = this.getSelectedTreeNodeId();
+
+ Ext.getCmp('new_photo_albumid').setValue(album_id);
+ Ext.getCmp('new_photo_photoid').setValue(o.responseText);
+
+ // set the return_url
+ Ext.getCmp('new_photo_returnurl').setValue(this.xmlhttpurl+'formok');
+
+ extwindow.show();
+ };
+
+ var submitFn = function() {
+ if (currentform.getForm().isValid()) {
+ currentform.getForm().submit({
+ url:this.config.package_url+'photo-add-2',
+ waitMsg:'Uploading photo...',
+ reset:true,
+ scope:this,
+ success: function(form,action) {
+ if(action.result) {
+ // reload center panel
+ this.photoStore.reload();
+ // hide the window
+ extwindow.hide();
+
+ } else {
+ Ext.MessageBox.alert('Error','Sorry an error occured. Make sure you have filled up all required fields.')
+ }
+ },
+ failure: function(form,action) {
+ if(action.result) {
+ Ext.MessageBox.alert('Error',action.result.info)
+ } else {
+ Ext.MessageBox.alert('Error','Error occurred. Try again later')
+ }
+ }
+ })
+ }
+ };
+
+
+ currentform.getForm().reset();
+
+ // change url to folder_edit
+ currentform.buttons[0].setHandler(submitFn,this);
+ currentform.buttons[0].setText('Upload');
+
+ // use ajax to get retrieve info about the album or folder
+ this.paCore.doAction('getnextobjid',successFn,this.genericErrorFn,null,null,this);
+
+ },
+
+ // delete a photo
+
+ delPhoto : function(id) {
+ Ext.MessageBox.confirm('Delete','Are you sure you want to delete this photo?',function(choice) {
+ if (choice === "yes") {
+ var success=function(o) {this.photoStore.reload()};
+ var failure=this.genericErrorFn;
+ this.paCore.doAction('deletephoto',success,failure,null,{confirmed_p:'t',photo_id:id,return_url:this.xmlhttpurl+'formok'},this);
+ }
+ },this)
+ },
+
+ // edit photo attributes
+
+ editPhoto : function(id) {
+
+ var extwindow = this.createOrGetWindow('pa-win-editphoto');
+ var formname = 'edit_photo_form';
+ var currentform = Ext.getCmp(formname);
+
+ var successFn = function(o) {
+
+ var resultObj = Ext.decode(o.responseText);
+
+ if(resultObj.success) {
+ Ext.getCmp('edit_photo_formid').setValue('edit_photo');
+ Ext.getCmp('edit_photo_returnurl').setValue(this.xmlhttpurl+'get-onephoto?photo_id='+resultObj.info.photo_id+'&package_id='+this.config.package_id+'&mode=display');
+ Ext.getCmp('edit_photo_photoid').setValue(resultObj.info.photo_id);
+ Ext.getCmp('edit_photo_revisionid').setValue(resultObj.info.revision_id);
+ Ext.getCmp('edit_photo_prevrevisionid').setValue(resultObj.info.prevrevision_id);
+ Ext.getCmp('edit_photo_title').setValue(resultObj.info.title);
+ Ext.getCmp('edit_photo_caption').setValue(resultObj.info.caption);
+ Ext.getCmp('edit_photo_desc').setValue(resultObj.info.description);
+ Ext.getCmp('edit_photo_story').setValue(resultObj.info.story);
+ extwindow.show();
+ }
+ }
+
+ var submitFn = function() {
+
+ if (currentform.getForm().isValid()) {
+
+ var success = function(form,action) {
+ if(action.result) {
+
+ if(action.result.info != "null") {
+ // updte the caption of the node
+ Ext.get('caption-'+action.result.info.photo_id).update(action.result.info.caption);
+ if(action.result.info.story && action.result.info.story != "") {
+ var newtip = document.createAttribute('ext:qtip');
+ newtip.value = action.result.info.story;
+ Ext.get('thumb'+action.result.info.photo_id).dom.attributes.setNamedItem(newtip);
+ }
+ } else {
+ Ext.MessageBox.alert('Error','Sorry an error occured trying to create your new folder. Please try again later.')
+ }
+
+ // hide the window
+ Ext.getCmp('pa-win-editphoto').hide();
+
+ } else {
+ Ext.MessageBox.alert('Error','Sorry an error occured. Make sure you have filled up all required fields.')
+ }
+ }
+
+ var failure = function(form,action) {
+ if(action.result) {
+ Ext.MessageBox.alert('Error',action.result.info)
+ } else {
+ Ext.MessageBox.alert('Error','Error occurred. Try again later')
+ }
+ }
+
+ this.paCore.formSubmit('editphoto', currentfor.getForm(), 'Updating photo ....', null, true, success, failure, this)
+ }
+ };
+
+ // change url to folder_edit
+ currentform.buttons[0].setHandler(submitFn,this);
+ currentform.buttons[0].setText('Update');
+
+ // use ajax to get retrieve info about the album or folder
+ this.paCore.doAction('getonephoto',successFn,this.genericErrorFn,null,{photo_id:id,package_id:this.config.package_id,mode:'edit'},this);
+
+ }
+}
+
+
Index: openacs-4/packages/ajax-photoalbum-ui/www/resources/data-view-plugins.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-photoalbum-ui/www/resources/data-view-plugins.js,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ajax-photoalbum-ui/www/resources/data-view-plugins.js 11 Apr 2009 15:56:13 -0000 1.1
@@ -0,0 +1,141 @@
+/*
+ * Ext JS Library 2.2
+ * Copyright(c) 2006-2008, Ext JS, LLC.
+ * licensing@extjs.com
+ *
+ * http://extjs.com/license
+ */
+
+
+Ext.DataView.LabelEditor = function(cfg, field){
+ Ext.DataView.LabelEditor.superclass.constructor.call(this,
+ field || new Ext.form.TextField({
+ allowBlank: false,
+ growMin:90,
+ growMax:240,
+ grow:true,
+ selectOnFocus:true
+ }), cfg
+ );
+}
+
+Ext.extend(Ext.DataView.LabelEditor, Ext.Editor, {
+ alignment: "tl-tl",
+ hideEl : false,
+ cls: "x-small-editor",
+ shim: false,
+ completeOnEnter: true,
+ cancelOnEsc: true,
+ labelSelector: 'span.x-editable',
+
+ init : function(view){
+ this.view = view;
+ view.on('render', this.initEditor, this);
+ this.on('complete', this.onSave, this);
+ },
+
+ initEditor : function(){
+ this.view.getEl().on('mousedown', this.onMouseDown, this, {delegate: this.labelSelector});
+ },
+
+ onMouseDown : function(e, target){
+ if(!e.ctrlKey && !e.shiftKey){
+ var item = this.view.findItemFromChild(target);
+ e.stopEvent();
+ var record = this.view.store.getAt(this.view.indexOf(item));
+ this.startEdit(target, record.data[this.dataIndex]);
+ this.activeRecord = record;
+ }else{
+ e.preventDefault();
+ }
+ },
+
+ onSave : function(ed, value){
+ this.activeRecord.set(this.dataIndex, value);
+ }
+});
+
+
+Ext.DataView.DragSelector = function(cfg){
+ cfg = cfg || {};
+ var view, regions, proxy, tracker;
+ var rs, bodyRegion, dragRegion = new Ext.lib.Region(0,0,0,0);
+ var dragSafe = cfg.dragSafe === true;
+
+ this.init = function(dataView){
+ view = dataView;
+ view.on('render', onRender);
+ };
+
+ function fillRegions(){
+ rs = [];
+ view.all.each(function(el){
+ rs[rs.length] = el.getRegion();
+ });
+ bodyRegion = view.el.getRegion();
+ }
+
+ function cancelClick(){
+ return false;
+ }
+
+ function onBeforeStart(e){
+ return !dragSafe || e.target == view.el.dom;
+ }
+
+ function onStart(e){
+ view.on('containerclick', cancelClick, view, {single:true});
+ if(!proxy){
+ proxy = view.el.createChild({cls:'x-view-selector'});
+ }else{
+ proxy.setDisplayed('block');
+ }
+ fillRegions();
+ view.clearSelections();
+ }
+
+ function onDrag(e){
+ var startXY = tracker.startXY;
+ var xy = tracker.getXY();
+
+ var x = Math.min(startXY[0], xy[0]);
+ var y = Math.min(startXY[1], xy[1]);
+ var w = Math.abs(startXY[0] - xy[0]);
+ var h = Math.abs(startXY[1] - xy[1]);
+
+ dragRegion.left = x;
+ dragRegion.top = y;
+ dragRegion.right = x+w;
+ dragRegion.bottom = y+h;
+
+ dragRegion.constrainTo(bodyRegion);
+ proxy.setRegion(dragRegion);
+
+ for(var i = 0, len = rs.length; i < len; i++){
+ var r = rs[i], sel = dragRegion.intersect(r);
+ if(sel && !r.selected){
+ r.selected = true;
+ view.select(i, true);
+ }else if(!sel && r.selected){
+ r.selected = false;
+ view.deselect(i);
+ }
+ }
+ }
+
+ function onEnd(e){
+ if(proxy){
+ proxy.setDisplayed(false);
+ }
+ }
+
+ function onRender(view){
+ tracker = new Ext.dd.DragTracker({
+ onBeforeStart: onBeforeStart,
+ onStart: onStart,
+ onDrag: onDrag,
+ onEnd: onEnd
+ });
+ tracker.initEl(view.el);
+ }
+}
\ No newline at end of file
Index: openacs-4/packages/ajax-photoalbum-ui/www/resources/gfx/handle-left.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-photoalbum-ui/www/resources/gfx/handle-left.png,v
diff -u
Binary files differ
Index: openacs-4/packages/ajax-photoalbum-ui/www/resources/gfx/handle-right.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-photoalbum-ui/www/resources/gfx/handle-right.png,v
diff -u
Binary files differ
Index: openacs-4/packages/ajax-photoalbum-ui/www/resources/shadowbox/flvplayer.swf
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-photoalbum-ui/www/resources/shadowbox/flvplayer.swf,v
diff -u
Binary files differ
Index: openacs-4/packages/ajax-photoalbum-ui/www/resources/shadowbox/shadowbox.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-photoalbum-ui/www/resources/shadowbox/shadowbox.js,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ajax-photoalbum-ui/www/resources/shadowbox/shadowbox.js 11 Apr 2009 15:56:13 -0000 1.1
@@ -0,0 +1 @@
+if(typeof Shadowbox=="undefined"){throw"Unable to load Shadowbox, no base library adapter found"}(function(){var version="2.0";var options={animate:true,animateFade:true,animSequence:"wh",flvPlayer:"flvplayer.swf",modal:false,overlayColor:"#000",overlayOpacity:0.8,flashBgColor:"#000000",autoplayMovies:true,showMovieControls:true,slideshowDelay:0,resizeDuration:0.55,fadeDuration:0.35,displayNav:true,continuous:false,displayCounter:true,counterType:"default",counterLimit:10,viewportPadding:20,handleOversize:"resize",handleException:null,handleUnsupported:"link",initialHeight:160,initialWidth:320,enableKeys:true,onOpen:null,onFinish:null,onChange:null,onClose:null,skipSetup:false,errors:{fla:{name:"Flash",url:"http://www.adobe.com/products/flashplayer/"},qt:{name:"QuickTime",url:"http://www.apple.com/quicktime/download/"},wmp:{name:"Windows Media Player",url:"http://www.microsoft.com/windows/windowsmedia/"},f4m:{name:"Flip4Mac",url:"http://www.flip4mac.com/wmv_download.htm"}},ext:{img:["png","jpg","jpeg","gif","bmp"],swf:["swf"],flv:["flv"],qt:["dv","mov","moov","movie","mp4"],wmp:["asf","wm","wmv"],qtwmp:["avi","mpg","mpeg"],iframe:["asp","aspx","cgi","cfm","htm","html","pl","php","php3","php4","php5","phtml","rb","rhtml","shtml","txt","vbs"]}};var SB=Shadowbox;var SL=SB.lib;var default_options;var RE={domain:/:\/\/(.*?)[:\/]/,inline:/#(.+)$/,rel:/^(light|shadow)box/i,gallery:/^(light|shadow)box\[(.*?)\]/i,unsupported:/^unsupported-(\w+)/,param:/\s*([a-z_]*?)\s*=\s*(.+)\s*/,empty:/^(?:br|frame|hr|img|input|link|meta|range|spacer|wbr|area|param|col)$/i};var cache=[];var gallery;var current;var content;var content_id="shadowbox_content";var dims;var initialized=false;var activated=false;var slide_timer;var slide_start;var slide_delay=0;var ua=navigator.userAgent.toLowerCase();var client={isStrict:document.compatMode=="CSS1Compat",isOpera:ua.indexOf("opera")>-1,isIE:ua.indexOf("msie")>-1,isIE7:ua.indexOf("msie 7")>-1,isSafari:/webkit|khtml/.test(ua),isWindows:ua.indexOf("windows")!=-1||ua.indexOf("win32")!=-1,isMac:ua.indexOf("macintosh")!=-1||ua.indexOf("mac os x")!=-1,isLinux:ua.indexOf("linux")!=-1};client.isBorderBox=client.isIE&&!client.isStrict;client.isSafari3=client.isSafari&&!!(document.evaluate);client.isGecko=ua.indexOf("gecko")!=-1&&!client.isSafari;var ltIE7=client.isIE&&!client.isIE7;var plugins;if(navigator.plugins&&navigator.plugins.length){var detectPlugin=function(plugin_name){var detected=false;for(var i=0,len=navigator.plugins.length;i