[pLog-svn] r6196 - in plog/trunk: class/action/admin templates/admin

[mark at devel.lifetype.net]

Author: mark
Date: 2008-02-29 05:41:21 -0500 (Fri, 29 Feb 2008)
New Revision: 6196

Modified:
   plog/trunk/class/action/admin/adminaddresourceaction.class.php
   plog/trunk/templates/admin/newresource.template
   plog/trunk/templates/admin/resources.template
Log:
Add the new uploader to addResource.

TODO: the page need to refresh after file upload complete.

Modified: plog/trunk/class/action/admin/adminaddresourceaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddresourceaction.class.php	2008-02-29 10:40:28 UTC (rev 6195)
+++ plog/trunk/class/action/admin/adminaddresourceaction.class.php	2008-02-29 10:41:21 UTC (rev 6196)
@@ -85,8 +85,12 @@
 				$this->_view = new AdminUserPictureSelectView( $this->_blogInfo, Array( "albumId" => 0 ));
 				$this->_view->setValue( "destination", $this->_destination );
 			}
-			else
-				$this->_view = new AdminResourcesListView( $this->_blogInfo, Array( "albumId" => $this->_albumId, "gotoLastPage" => true ));
+			else {
+				if( $this->_request->getOutput() == "flash" )
+					$this->_view = new AdminPlainView( $this->_blogInfo );
+				else
+					$this->_view = new AdminResourcesListView( $this->_blogInfo, Array( "albumId" => $this->_albumId, "gotoLastPage" => true ));
+			}
 			
 			$successMessage = "";
 			$errorMessage = "";
@@ -133,7 +137,12 @@
 			// file uploaded but this way is not that bad after all...
 			CacheControl::resetBlogCache( $this->_blogInfo->getId(), false );
 			
-			if( $successMessage != "" ) $this->_view->setSuccessMessage( $successMessage );
+			if( $successMessage != "" ) {
+				if( $this->_request->getOutput() == "flash" )
+					$this->_view->setSuccessMessage( "OK" );
+				else
+					$this->_view->setSuccessMessage( $successMessage );
+			}
 			if( $errorMessage != "" ) $this->_view->setErrorMessage( $errorMessage );
             $this->setCommonData();
 			

Modified: plog/trunk/templates/admin/newresource.template
===================================================================
--- plog/trunk/templates/admin/newresource.template	2008-02-29 10:40:28 UTC (rev 6195)
+++ plog/trunk/templates/admin/newresource.template	2008-02-29 10:41:21 UTC (rev 6196)
@@ -9,14 +9,30 @@
 	<span class="required">*</span>
 	<div class="formHelp">{$locale->tr("resource_file_help")}</div>
 	
-    <a href="javascript:addElementToForm('fileFields','file','resourceFile','')">{$locale->tr("add_field")}</a>
-	
-    <input type="file" id="resourceFile_1" name="resourceFile_1" />
-    <div id="marker" style="clear:none;"></div>
-    
-	<a href="javascript:addElementToForm('fileFields','file','resourceFile','')">{$locale->tr("add_field")}</a>
-    
-    {include file="$admintemplatepath/validate.template" field=albumName message=$locale->tr("error_no_resource_uploaded")}	
+	<div id="degradedUI">
+	    <a href="javascript:addElementToForm('fileFields','file','resourceFile','')">{$locale->tr("add_field")}</a>
+		
+	    <input type="file" id="resourceFile_1" name="resourceFile_1" />
+	    <div id="marker" style="clear:none;"></div>
+	    
+		<a href="javascript:addElementToForm('fileFields','file','resourceFile','')">{$locale->tr("add_field")}</a>
+    	{include file="$admintemplatepath/validate.template" field=albumName message=$locale->tr("error_no_resource_uploaded")}	
+	</div>
+	<div id="flashUI" style="display: none;">
+	  <script type="text/javascript">
+		Lifetype.UI.Upload.init( {literal}{{/literal} 
+			swfuploadElement:'flashUI',
+			degradedElement:'degradedUI',
+			fieldName:'resourceFile_1',
+			uploadButton:'AddResource', 
+			fileSizeLimit: {$config->getValue("maximum_file_upload_size")},
+			validFiles: '*.*',
+			url:'{$url->getAdminUrl()}?op=addResource&output=flash',
+			postParams: ['resourceDescription','albumId','locId'],
+			cookieParams: ['{$session}']
+		{literal}}{/literal} );
+	  </script>	
+	</div>
   </div>
   
   <div class="field">  
@@ -51,7 +67,7 @@
   </fieldset>
   <div class="buttons" id="buttons">
     <input type="reset" name="resetButton" value="{$locale->tr("reset")}" />
-    <input type="submit" name="AddResource" onclick="showProgressBar('buttons')" value="{$locale->tr("add")}" />
+    <input type="submit" name="AddResource" id="AddResource" onclick="showProgressBar('buttons')" value="{$locale->tr("add")}" />
     <input type="hidden" name="op" value="addResource" />
   </div>
   <div class="status_bar" id="status_bar" style="display:none">

Modified: plog/trunk/templates/admin/resources.template
===================================================================
--- plog/trunk/templates/admin/resources.template	2008-02-29 10:40:28 UTC (rev 6195)
+++ plog/trunk/templates/admin/resources.template	2008-02-29 10:41:21 UTC (rev 6196)
@@ -4,6 +4,10 @@
 {js src="js/ui/pages/global.js"}
 {js src="js/ui/pages/resources.js"}
 {js src="js/ui/pages/resourcealbums.js"}
+{js src="js/swfupload/swfupload.js"}
+{js src="js/swfupload/plugins/swfupload.graceful_degradation.js"}
+{js src="js/swfupload/plugins/swfupload.queue.js"}
+{js src="js/ui/upload.js"}
 <div id="list_nav_bar">
 <div id="list_nav_select">
 <form id="viewResources" action="admin.php" method="post">