Fixup ajax uploader and restore delete functionality.

1 files changed, 15 insertions, 14 deletions

diff --git a/templates/edit_storage_list.tpl b/templates/edit_storage_list.tpl
index 96dbb2c..9ea5b5f 100644
--- a/templates/edit_storage_list.tpl
+++ b/templates/edit_storage_list.tpl
@@ -1,5 +1,6 @@
 {php} include (LIBERTY_PKG_PATH."edit_storage_inc.php"); {/php}
 {strip}
+<div id="edit_storage_list{if !$uploadTab}_tab{/if}">
 {if $gContent->mStorage}
 	<div class="row">
 		<table class="data" summary="List of attached files">
@@ -9,9 +10,9 @@
 				<caption>{tr}Items {if $libertyUploader && empty($gContent->mContentId)}That Will Be{/if} Attached Directly to this Content{/tr}</caption>
 			{/if}
 			<tr>
-				<th scope="col" style="width:30%:" title="{tr}Thumbnail{/tr}">{tr}Thumbnail{/tr}</th>
-				<th scope="col" style="width:40%:" title="{tr}Inclusion Code{/tr}">{tr}Inclusion Code{/tr}</th>
-				<th scope="col" style="width:30%:" title="{tr}Actions{/tr}">{tr}Actions{/tr}</th>
+				<th scope="col" style="width:30%;" title="{tr}Thumbnail{/tr}">{tr}Thumbnail{/tr}</th>
+				<th scope="col" style="width:40%;" title="{tr}Inclusion Code{/tr}">{tr}Inclusion Code{/tr}</th>
+				<th scope="col" style="width:30%;" title="{tr}Actions{/tr}">{tr}Actions{/tr}</th>
 			</tr>
 
 			{foreach from=$gContent->mStorage item=storage key=attachmentId name=atts}
@@ -31,24 +32,24 @@
 					</td>
 					<td class="actionicon">
 						{if $uploadTab}
-							{if $gBitUser->isAdmin() || ($storage.user_id == $gBitUser->mUserId && $gBitUser->hasPermission('p_liberty_delete_attachments') ) }
-								{if $attachmentBrowser}
-									<a href="javascript:ajax_updater('attbrowser', '{$attachmentActionBaseURL}', 'deleteAttachment={$attachmentId}');">{biticon ipackage="icons" iname="edit-delete" iexplain="delete"}</a>
-								{elseif $libertyUploader || $gBitSystem->getConfig('liberty_attachment_style') == 'ajax'}
-									<a href="javascript:ajax_updater('edit_storage_list_div', '{$attachmentActionBaseURL}', 'deleteAttachment={$attachmentId}');">{biticon ipackage="icons" iname="edit-delete" iexplain="delete"}</a>
-								{else}
-									<a href="{$attachmentActionBaseURL}&amp;deleteAttachment={$attachmentId}">{biticon ipackage="icons" iname="edit-delete" iexplain="delete"}</a>
-								{/if}
-							{/if}
-						{else}
 							{* these radio buttons can not be displayed twice in the same form due to interference in $_REQUEST *}
-							<label>{tr}{$primary_label|default:"Primary"}{/tr}: <input type="radio" name="liberty_attachments[primary]" value="{$attachmentId}"{if $storage.is_primary eq 'y'} checked="checked"{/if}/></label>
+							{tr}{$primary_label|default:"Primary"}{/tr}:&nbsp;<input type="radio" name="liberty_attachments[primary]" value="{$attachmentId}"{if $storage.is_primary eq 'y'} checked="checked"{/if}/>
 							<br />
 						{/if}
+						{if $gBitUser->isAdmin() || ($storage.user_id == $gBitUser->mUserId && $gBitUser->hasPermission('p_liberty_delete_attachments') ) }
+							{if $attachmentBrowser}
+								<a href="javascript:ajax_updater('attbrowser', '{$attachmentActionBaseURL}', 'deleteAttachment={$attachmentId}');">{biticon ipackage="icons" iname="edit-delete" iexplain="delete"}</a>
+							{elseif $libertyUploader || $gBitSystem->getConfig('liberty_attachment_style') == 'ajax'}
+								<a href="javascript:ajax_updater('edit_storage_list', '{$attachmentActionBaseURL}', 'deleteAttachment={$attachmentId}{if empty($gContent->mContentId)}{foreach from=$gContent->mStorage key=key item=val}&STORAGE[existing][{$val.attachment_id}]={$val.attachment_id}{/foreach}{/if}');">{biticon ipackage="icons" iname="edit-delete" iexplain="delete"}</a>
+							{else}
+								<a href="{$attachmentActionBaseURL}&amp;deleteAttachment={$attachmentId}">{biticon ipackage="icons" iname="edit-delete" iexplain="delete"}</a>
+							{/if}
+						{/if}
 					</td>
 				</tr>
 			{/foreach}
 		</table>
 	</div>
 {/if}
+</div>
 {/strip}