[pLog-svn] r5249 - in plog/branches/lifetype-1.2: class/action/admin/chooser class/view/admin/chooser js/tinymce templates/admin/chooser

mark at devel.lifetype.net mark at devel.lifetype.net
Sat Mar 31 12:56:51 EDT 2007


Author: mark
Date: 2007-03-31 12:56:51 -0400 (Sat, 31 Mar 2007)
New Revision: 5249

Modified:
   plog/branches/lifetype-1.2/class/action/admin/chooser/adminresourcelistaction.class.php
   plog/branches/lifetype-1.2/class/view/admin/chooser/adminsimpleresourceslistview.class.php
   plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog-resourcelist.js
   plog/branches/lifetype-1.2/templates/admin/chooser/resourcelist.template
Log:
Refactoring the insert resource javascript/action/view and template.

Now, it will get the url from our $url object directly, instead of building by those passing parameters.

It should works better then before, and also support all request form, all resource file naming and, subdomain and blogdomain.

Modified: plog/branches/lifetype-1.2/class/action/admin/chooser/adminresourcelistaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/chooser/adminresourcelistaction.class.php	2007-03-31 15:51:15 UTC (rev 5248)
+++ plog/branches/lifetype-1.2/class/action/admin/chooser/adminresourcelistaction.class.php	2007-03-31 16:56:51 UTC (rev 5249)
@@ -11,8 +11,6 @@
      */
     class AdminResourceListAction extends AdminAction
     {
-
-    	var $_destination;
 		var $_albumId;
 
     	/**
@@ -23,8 +21,6 @@
         {
         	$this->AdminAction( $actionInfo, $request );
 			
-        	$this->_destination = $this->_request->getValue( "mode" );
-        	
             $this->_albumId = $this->_request->getValue( "albumId" );
             if( $this->_albumId == "" )
             	$this->_albumId = 0;	
@@ -38,7 +34,6 @@
         function perform()
         {
 			$this->_view = new AdminSimpleResourcesListView( $this->_blogInfo, Array( "albumId" => $this->_albumId));
-			$this->_view->setValue( "destination", $this->_destination );
             $this->setCommonData();
 
             return true;

Modified: plog/branches/lifetype-1.2/class/view/admin/chooser/adminsimpleresourceslistview.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/view/admin/chooser/adminsimpleresourceslistview.class.php	2007-03-31 15:51:15 UTC (rev 5248)
+++ plog/branches/lifetype-1.2/class/view/admin/chooser/adminsimpleresourceslistview.class.php	2007-03-31 16:56:51 UTC (rev 5249)
@@ -28,47 +28,14 @@
             $this->setValue( "baseurl", $config->getValue( "base_url" ));
 
 			// whether resources are enabled or not
-			$this->setValue( "resources_enabled", $config->getValue( "resources_enabled", true ));
-			
-            $destination = $this->getValue( "destination" );			
+			$this->setValue( "resources_enabled", $config->getValue( "resources_enabled", true ));		
+
 			// check if htmlarea is enabled
 			$blogSettings = $this->_blogInfo->getSettings();
-			
             $this->setValue( "htmlarea", $blogSettings->getValue( "htmlarea_enabled", false ));
 
-			// generate the dummy album and resource, with the placeholders
-			$dummyAlbum = new GalleryAlbum( $this->_blogInfo->getId(),   // owner id
-				                            "XXALBUMNAMEXX",  // album name
-				                            "XXALBUMDESCXX",  // description
-				                            0,  // flags
-				                            0, // parent id
-				                            new Timestamp(),  // date 
-				                            Array(),  // properties
-				                            true,   // show blog
-				                            "XXALBUMIDXX" );    // id 
-			$dummyResource = new GalleryResource( $this->_blogInfo->getId(), // owner id
-			                                      -1,  // album id
-			                                      "XXRESOURCEDESCXX",  // description
-			                                      0, // flags
-			                                      GALLERY_RESOURCE_IMAGE, // an image, but it doesn't really matter
-			                                      "XXRESOURCEPATHXX", // file path 
-			                                      "XXRESOURCENAMEXX", // file name
-			                                      Array(), // no metadata
-			                                      new Timestamp(), // date
-			                                      THUMBNAIL_OUTPUT_FORMAT_SAME_AS_IMAGE, // it doesn't matter
-			                                      Array(),
-			                                      "XXRESOURCEIDXX" ); // id
-			$dummyResource->setAlbumId( "XXALBUMIDXX" );
-			$dummyResource->setAlbum( $dummyAlbum );
-			// generate 4 urls with the current blog settings
-			$url = $this->_blogInfo->getBlogRequestGenerator();
-			$this->setValue( "albumlink", $url->albumLink( $dummyAlbum ));
-			$this->setValue( "resourcelink", $url->resourceDownloadLink( $dummyResource ));
-			$this->setValue( "resourcepreviewlink", $url->resourcePreviewLink( $dummyResource ));
-			$this->setValue( "resourcemediumpreviewlink", $url->resourceMediumSizePreviewLink( $dummyResource ));
+			$this->_pagerUrl = "?op=resourceList&page=";
 
-			$this->_pagerUrl = "?op=resourceList&mode=$destination&page=";
-
 			parent::render();
 		}
 	}

Modified: plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog-resourcelist.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog-resourcelist.js	2007-03-31 15:51:15 UTC (rev 5248)
+++ plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog-resourcelist.js	2007-03-31 16:56:51 UTC (rev 5249)
@@ -1,147 +1,76 @@
-function _generateResourceLink( dest, blogId, type, resourceName, resourceDesc, preview, mimeType, resId, albumName, albumId )
+/*
+ * Insert resource related javascript functions
+ */
+
+function _generateResourceLink( resourceId, resourceLink, targetLink, resourceName, resourceDesc, resourceType, resourceMimeType )
 {
     var htmlCode = '';
 
-	// build the templates and use the default ones if no templates available
-	if( resourceLink == '' )
-		resourceLink = plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource=XXRESOURCENAMEXX';
-	if( resourcePreviewLink == '' )
-		resourcePreviewLink = plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource=XXRESOURCENAMEXX&mode=preview';		
-	if( resourceMediumPreviewLink == '' )
-		resourceMediumPreviewLink = plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource=XXRESOURCENAMEXX&mode=medium';
-		
-	// link template
-	resLink = resourceLink.replace( /XXRESOURCENAMEXX/i, encodeURIComponent(resourceName));
-	resLink = resLink.replace( /XXRESOURCEIDXX/i, resId );
-	resLink = resLink.replace( /XXALBUMNAMEXX/i, albumName );
-	resLink = resLink.replace( /XXALBUMIDXX/i, albumId );	
-	// preview template
-	prevLink = resourcePreviewLink.replace( /XXRESOURCENAMEXX/i, encodeURIComponent(resourceName));
-	prevLink = prevLink.replace( /XXRESOURCEIDXX/i, resId );
-	prevLink = prevLink.replace( /XXALBUMNAMEXX/i, albumName );
-	prevLink = prevLink.replace( /XXALBUMIDXX/i, albumId );
-	// medium preview link
-	medPrevLink = resourceMediumPreviewLink.replace( /XXRESOURCENAMEXX/i, encodeURIComponent(resourceName));
-	medPrevLink = medPrevLink.replace( /XXRESOURCEIDXX/i, resId );
-	medPrevLink = medPrevLink.replace( /XXALBUMNAMEXX/i, albumName );
-	medPrevLink = medPrevLink.replace( /XXALBUMNAMEXX/i, albumName );	
-	medPrevLink = medPrevLink.replace( /XXALBUMIDXX/i, albumId );
-
-    if( type == 1 ) {
-	    // if the resource is an image, check the second parameter to see wether we'd like
-	    // to show the preview with a link to the real size image or the real image
-	    // inlined with the text
-	    if( preview == 1 ) {			 
-		    htmlCode = '<a id="res_' + resId+ '" href="'+resLink+'" type="'+mimeType+'">';
-		    htmlCode += '<img style="margin: 5px;" border="0" alt="'+resourceDesc+'" src="'+prevLink+'" />';
+    if( resourceType == 1 ) {
+		if( targetLink != '' ) {
+		    htmlCode = '<a id="res_'+resourceId+ '" href="'+targetLink+'" type="'+resourceMimeType+'">';
+		    htmlCode += '<img style="margin: 5px;" border="0" alt="'+resourceDesc+'" src="'+resourceLink+'" />';
 		    htmlCode += '</a>';
-	    }
-		else if ( preview == 2 ) {
-		    htmlCode = '<a id="res_' + resId+ '" href="'+resLink+'" type="'+mimeType+'">';
-		    htmlCode += '<img style="margin: 5px;" border="0" alt="'+resourceDesc+'" src="'+medPrevLink+'" />';
-		    htmlCode += '</a>';
-		}
+	    } 
 	    else {
-		    htmlCode = '<img style="margin: 5px;" alt="'+resourceDesc+'" src="'+resLink+'" />';
+		    htmlCode = '<img style="margin: 5px;" alt="'+resourceDesc+'" src="'+resourceLink+'" />';
 	    }
     }
     else {
 	    // if not an image, there is not much we can do
-	    htmlCode = '<a id="res_'+resId+'" title="'+resourceDesc+'" href="'+resLink+'" type="'+mimeType+'">'+resourceName+'</a>';
+	    htmlCode = '<a id="res_'+resourceId+'" title="'+resourceDesc+'" href="'+resourceLink+'" type="'+resourceMimeType+'">'+resourceName+'</a>';
     }
   
     return htmlCode;
 
 }
 
-function addResourceLink( dest, reqFormat, blogId, type, resourceName, resourceDesc, preview, mimeType, resId, albumName, albumId ) 
+function addHtmlareaLink( resourceId, resourceLink, targetLink, resourceName, resourceDesc, resourceType, resourceMimeType ) {
+    var htmlCode = _generateResourceLink( resourceId, resourceLink, targetLink, resourceName, resourceDesc, resourceType, resourceMimeType );
+    
+    tinyMCE.execCommand("mceInsertContent",true,htmlCode);
+	tinyMCE.selectedInstance.repaint();
+
+	// Close the dialog
+	tinyMCE.closeWindow(window);
+};
+
+function addResourceLink( resourceId, resourceLink, targetLink, resourceName, resourceDesc, resourceType, resourceMimeType ) 
 {
     // generate the link
-    var htmlCode = _generateResourceLink( dest, reqFormat, blogId, type, resourceName, resourceDesc, preview, mimeType, resId, albumName, albumId );
-  
-    // and now send the value to the text area where we are typing the post
-    if( dest == 1 ) {
-	    //parent.opener.document.newPost.postText.value += htmlCode;
-	    addText( parent.opener.document.newPost.postText, htmlCode );
-    }
-    else {
-	    //parent.opener.document.newPost.postExtendedText.value += htmlCode;
-	    addText( parent.opener.document.newPost.postExtendedText, htmlCode );
-    }	
+    var htmlCode = _generateResourceLink( resourceId, resourceLink, targetLink, resourceName, resourceDesc, resourceType, resourceMimeType );
 
-    // finally close this window since we don't need it anymore
-    //window.close();
+    addText( parent.opener.document.newPost.postText, htmlCode );
 }
 
-function _generateAlbumLink( dest, blogId, albumId, albumName, albumDesc ) 
+/*
+ * Insert album related javascript functions
+ */
+ 
+function _generateAlbumLink( albumLink, albumName, albumDesc ) 
 {
     var htmlCode = '';
-    
-    // if no other global variable called 'indexPage' is defined, use the
-    // default one
-    if( indexPage == '' )
-        indexPage = 'index.php';
-
-	defaultAlbumLink = plogBaseUrl+'/'+indexPage+'?op=ViewAlbum&amp;blogId='+blogId+'&amp;albumId=XXALBUMIDXX';
-	if( albumLink == '' )
-		albumLink = defaultAlbumLink;
-		
-	albumLink = albumLink.replace(/XXALBUMNAMEXX/i,albumName);
-	albumLink = albumLink.replace(/XXALBUMIDXX/i,albumId);
-
     htmlCode = '<a title="'+albumDesc+'" href="'+albumLink+'">'+albumName+'</a>';
 	
     return htmlCode;      
 }
 
-/**
- * generates and adds a link to an album to the textarea
- *
- * @param dest
- * @param blogId
- * @param albumId
- * @param albumName
- * @param albumDesc
- */
-function addAlbumLink( dest, blogId, albumId, albumName, albumDesc ) 
+function addHtmlareaAlbumLink( albumLink, albumName, albumDesc ) 
 {
-    albumLink = _generateAlbumLink( dest, blogId, albumId, albumName, albumDesc );
+    var htmlCode = _generateAlbumLink( albumLink, albumName, albumDesc );
 
-    // and now send the value to the text area where we are typing the post
-    if( dest == 1 ) {
-        addText( parent.opener.document.newPost.postText, albumLink );
-    }	
-    else {
-		addText( parent.opener.document.newPost.postExtendedText, albumLink );
-    }
-}
-
-// ------
-//
-// htmlarea-related code
-//
-// -------
-//
-
-function addHtmlareaLink(dest, blogId, type, resourceName, resourceDesc, preview, mimeType, resId, albumName, albumId ) {
-    var htmlCode = _generateResourceLink( dest, blogId, type, resourceName, resourceDesc, preview, mimeType, resId, albumName, albumId );
-    
     tinyMCE.execCommand("mceInsertContent",true,htmlCode);
 	tinyMCE.selectedInstance.repaint();
 
 	// Close the dialog
 	tinyMCE.closeWindow(window);
-};
+}
 
-function addHtmlareaAlbumLink( dest, blogId, albumId, albumName, albumDesc ) 
+function addAlbumLink( albumLink, albumName, albumDesc ) 
 {
-    var htmlCode = _generateAlbumLink( dest, blogId, albumId, albumName, albumDesc );
+    var htmlCode = _generateAlbumLink( albumLink, albumName, albumDesc );
 
-    tinyMCE.execCommand("mceInsertContent",true,htmlCode);
-	tinyMCE.selectedInstance.repaint();
-
-	// Close the dialog
-	tinyMCE.closeWindow(window);
+    addText( parent.opener.document.newPost.postText, htmlCode );
 }
 
 function onCancel() {

Modified: plog/branches/lifetype-1.2/templates/admin/chooser/resourcelist.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/chooser/resourcelist.template	2007-03-31 15:51:15 UTC (rev 5248)
+++ plog/branches/lifetype-1.2/templates/admin/chooser/resourcelist.template	2007-03-31 16:56:51 UTC (rev 5249)
@@ -1,12 +1,14 @@
 {include file="$admintemplatepath/chooser/header.template"}
 <script type="text/javascript" src="js/tinymce/tiny_mce-plog-resourcelist.js"></script>
 <script type="text/javascript" src="js/ui/plogui.js"></script>
+
 {if $htmlarea}
   <script type="text/javascript" src="js/tinymce/tiny_mce_popup.js"></script>
   <script type="text/javascript">
    tinyMCE.setWindowArg('mce_windowresize', false);
   </script>
 {/if}
+
 {literal}
 <style>
 #resource_list_upload
@@ -16,22 +18,16 @@
 	text-align: left;
 }
 </style>
-{/literal}
+
 <script type="text/javascript">
-	var albumLink = '{$albumlink}';
-	var resourceLink = '{$resourcelink}';
-	var resourcePreviewLink = '{$resourcepreviewlink}';
-	var resourceMediumPreviewLink = '{$resourcemediumpreviewlink}';		
-</script>
-<script type="text/javascript">
-{literal}
 YAHOO.util.Event.addListener( window, "load", function() {
 		var t = new Lifetype.UI.TableEffects( "list" );
 		t.stripe();
 		t.highlightRows();
 	});
-{/literal}
 </script>
+{/literal}
+
 <div id="list_nav_bar">
 <div id="list_nav_select"> 
 <form id="resourceListAlbum" action="admin.php" method="post">
@@ -42,18 +38,17 @@
 	<br />
     <select name="albumId" id="albumId">
       <option value="0">{$locale->tr("root_album")}</option>
-   {foreach from=$albumsList item=albumItem}
-     {assign var=indentLevel value=$albumItem->getValue("level")}
-	 <option value="{$albumItem->getId()}" {if $album}{if $album->getName()==$albumItem->getName()}selected="selected"{/if}{/if}>
-	   {textformat indent=$indentLevel indent_char="&nbsp;&nbsp;&nbsp;"}{$albumItem->getName()}{/textformat}   
-	 </option>
-   {/foreach}
-   </select>
+	  {foreach from=$albumsList item=albumItem}
+	    {assign var=indentLevel value=$albumItem->getValue("level")}
+		<option value="{$albumItem->getId()}" {if $album}{if $album->getName()==$albumItem->getName()}selected="selected"{/if}{/if}>
+		  {textformat indent=$indentLevel indent_char="&nbsp;&nbsp;&nbsp;"}{$albumItem->getName()}{/textformat}   
+		</option>
+	  {/foreach}
+    </select>
    </div>
    <div class="list_nav_option">
     <br />
     <input type="hidden" name="op" value="resourceList" />
-    <input type="hidden" name="mode" value="{$destination}" />
     <input type="submit" name="Show" value="{$locale->tr("show")}" />
    </div>
   </fieldset> 
@@ -76,7 +71,7 @@
   {if $album && $pager->getCurrentPage()==1}
    <tr>
     <td>
-     <a href="admin.php?op=resourceList&amp;albumId={$album->getParentId()}&amp;mode={$destination}&amp;page=1">
+     <a href="admin.php?op=resourceList&amp;albumId={$album->getParentId()}&amp;page=1">
      <img src="imgs/admin/icon_folder-72.png" border="0" alt="Parent" />&nbsp;<br/>..</a>
     </td>
     <td>
@@ -90,20 +85,18 @@
   {foreach from=$albums item=resalbum}
    <tr>
     <td>
-     <a href="admin.php?op=resourceList&amp;albumId={$resalbum->getId()}&amp;mode={$destination}&amp;page=1">
+     <a href="admin.php?op=resourceList&amp;albumId={$resalbum->getId()}&amp;page=1">
      <img src="imgs/admin/icon_folder-72.png" border="0" alt="folder" /><br/>{$resalbum->getName()}</a><br/>
     </td>
     <td>
-      <script type="text/javascript">
-       var albumName_{$resalbum->getId()} = '{$resalbum->getMangledName()|escape:"javascript"}';
-       var albumDesc_{$resalbum->getId()} = '{$resalbum->getDescription()|escape:"javascript"}';
-      </script>    
-     {if $htmlarea}
-      <a href="javascript:addHtmlareaAlbumLink({$destination},{$blog->getId()},{$resalbum->getId()},albumName_{$resalbum->getId()},albumDesc_{$resalbum->getId()},false);">{$locale->tr("add_album")}</a><br/>
+    {assign var=albumLink value=$url->albumLink($resalbum)}
+    {assign var=albumName value=$resalbum->getName()}
+    {assign var=albumDesc value=$resalbum->getDescription()}
+    {if $htmlarea}
+      <a href="javascript:addHtmlareaAlbumLink('{$albumLink}','{$albumName|escape:"javascript"}','{$albumDesc|escape:"javascript"}');">{$locale->tr("add_album")}</a><br/>
     {else}
-
-      <a href="javascript:addAlbumLink({$destination},{$blog->getId()},{$resalbum->getId()},albumName_{$resalbum->getId()},albumDesc_{$resalbum->getId()},false);">{$locale->tr("add_album")}</a><br/>
-  {/if}
+      <a href="javascript:addAlbumLink('{$albumLink}','{$albumName|escape:"javascript"}','{$albumDesc|escape:"javascript"}');">{$locale->tr("add_album")}</a><br/>
+    {/if}
    </td>
    </tr>
 {/foreach}
@@ -126,28 +119,28 @@
   <a target="_blank" href="{$url->resourceLink($resource)}"><br/>{$resource->getFileName()}</a>
   </td>
   <td>
-  <script type="text/javascript">
-    var resName_{$resource->getId()} = '{$resource->getFileName()|escape:"javascript"}';
-    var resDesc_{$resource->getId()} = '{$resource->getDescription()|escape:"javascript"}';
-    var resPreviewName_{$resource->getId()} = '{$resource->getPreviewFileName()|escape:"javascript"}';
-    var resMediunPreviewName_{$resource->getId()} = '{$resource->getMediumSizePreviewFileName()|escape:"javascript"}';
-    {assign var=resourceAlbum value=$resource->getAlbum()}
-	var resAlbumName_{$resource->getId()} = '{$resourceAlbum->getMangledName()|escape:"javascript"}';
-	var resAlbumId_{$resource->getId()} = '{$resourceAlbum->getId()}';
-  </script>
+  {assign var=resourceId value=$resource->getId()}
+  {assign var=resourceLink value=$url->resourceLink($resource)}
+  {assign var=resourceDownloadLink value=$url->resourceDownloadLink($resource)}
+  {assign var=resourceMediumSizePreviewLink value=$url->resourceMediumSizePreviewLink($resource)}
+  {assign var=resourcePreviewLink value=$url->resourcePreviewLink($resource)}
+  {assign var=resourceName value=$resource->getFileName()}
+  {assign var=resourceDesc value=$resource->getDescription()}
+  {assign var=resourceType value=$resource->getResourceType()}
+  {assign var=resourceMimeType value=$resource->getMimeType()}
   {if $htmlarea}
-  <a href="javascript:addHtmlareaLink({$destination},{$blog->getId()},{$resource->getResourceType()},resName_{$resource->getId()},resDesc_{$resource->getId()},false,'{$resource->getMimeType()}','{$resource->getId()}',resAlbumName_{$resource->getId()},resAlbumId_{$resource->getId()});">{$locale->tr("add_resource")}</a><br/> 
+    <a href="javascript:addHtmlareaLink('{$resourceId}','{$resourceDownloadLink}','','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource")}</a><br/> 
   {else}
- <a href="javascript:addResourceLink({$destination},{$blog->getId()},{$resource->getResourceType()},resName_{$resource->getId()},resDesc_{$resource->getId()},false,'{$resource->getMimeType()}','{$resource->getId()}',resAlbumName_{$resource->getId()},resAlbumId_{$resource->getId()});">{$locale->tr("add_resource")}</a><br/> 
+    <a href="javascript:addResourceLink('{$resourceId}','{$resourceDownloadLink}','','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource")}</a><br/>
   {/if}
   {if $resource->hasPreview()}
-   {if $htmlarea}
-    <a href="javascript:addHtmlareaLink({$destination},{$blog->getId()},{$resource->getResourceType()},resMediunPreviewName_{$resource->getId()},resDesc_{$resource->getId()},1,'{$resource->getMimeType()}','{$resource->getId()}',resAlbumName_{$resource->getId()},resAlbumId_{$resource->getId()});">{$locale->tr("add_resource_preview")}</a><br/>
-    <a href="javascript:addHtmlareaLink({$destination},{$blog->getId()},{$resource->getResourceType()},resMediunPreviewName_{$resource->getId()},resDesc_{$resource->getId()},2,'{$resource->getMimeType()}','{$resource->getId()}',resAlbumName_{$resource->getId()},resAlbumId_{$resource->getId()});">{$locale->tr("add_resource_medium")}</a><br/>
-   {else}
-   <a href="javascript:addResourceLink({$destination},{$blog->getId()},{$resource->getResourceType()},resPreviewName_{$resource->getId()},resDesc_{$resource->getId()},1,'{$resource->getMimeType()}','{$resource->getId()}',resAlbumName_{$resource->getId()},resAlbumId_{$resource->getId()});">{$locale->tr("add_resource_preview")}</a><br/>
-   <a href="javascript:addResourceLink({$destination},{$blog->getId()},{$resource->getResourceType()},resPreviewName_{$resource->getId()},resDesc_{$resource->getId()},2,'{$resource->getMimeType()}','{$resource->getId()}',resAlbumName_{$resource->getId()},resAlbumId_{$resource->getId()});">{$locale->tr("add_resource_medium")}</a><br/>
-   {/if}
+    {if $htmlarea}
+      <a href="javascript:addHtmlareaLink('{$resourceId}','{$resourcePreviewLink}','{$resourceDownloadLink}','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource_preview")}</a><br/>
+      <a href="javascript:addHtmlareaLink('{$resourceId}','{$resourceMediumSizePreviewLink}','{$resourceDownloadLink}','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource_medium")}</a><br/>
+    {else}
+      <a href="javascript:addResourceLink('{$resourceId}','{$resourcePreviewLink}','{$resourceDownloadLink}','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource_preview")}</a><br/>
+      <a href="javascript:addResourceLink('{$resourceId}','{$resourceMediumSizePreviewLink}','{$resourceDownloadLink}','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource_medium")}</a><br/>
+    {/if}
   {/if}
  </td>
 {/foreach}
@@ -177,7 +170,6 @@
   <input type="hidden" name="albumId" value="{$album->getId()}" />
   <input type="hidden" name="op" value="addResource" /><br/>
   <input type="hidden" name="destView" value="resourceList" />
-  <input type="hidden" name="destination" value="{$destination}" />
   </div>
   <div class="status_bar" id="status_bar" style="display: none;">
     {$locale->tr("upload_in_progress")}&nbsp;
@@ -195,4 +187,4 @@
   {/if}
 </div>
 </div>
-{include file="$admintemplatepath/chooser/footer.template"}
+{include file="$admintemplatepath/chooser/footer.template"}
\ No newline at end of file



More information about the pLog-svn mailing list