merge recent changes into HEAD

1 files changed, 42 insertions, 29 deletions

diff --git a/templates/attachment_browser.tpl b/templates/attachment_browser.tpl
index 7dbf389..0d4f3ad 100644
--- a/templates/attachment_browser.tpl
+++ b/templates/attachment_browser.tpl
@@ -1,36 +1,49 @@
 {strip}
-	<noscript>
-		<p>Please insert {ldelim}attachment id=#{rdelim} where # is the appropriate attachment ID.</p>
-	</noscript>
+<div class="row">
+	{formlabel label="Attach File(s)"}
+	{forminput}
+		<input type="text" name="existing_attachment_id[]" id="existing_attachment_id_input" size="20"/>
+		{formhelp note="Attaching an item to your page will insert a small icon representing the file. Please use the attachment IDs listed below.<br />You can attach multiple items at once by seperating them with a ',' (comma)."}
+	{/forminput}
+</div>
 
-	<table class="data">
-		<caption>{tr}Available Attachements{/tr}</caption>
-		{counter start=-1 name="cells" print=false}
-		{foreach from=$userAttachments item=attachment key=foo}
-			{counter name="cells" assign="cells" print=false}
-			{if $cells % 2 eq 0}
-				<tr class="{cycle values="odd,even"}">
-			{/if}
+<div class="row">
+	{formlabel label="Insert Attachment"}
+	{forminput}
+		<input type="text" name="dummy" id="copy" size="30" class="success" />
+		<input type="button" value="{tr}Clear{/tr}" onclick="document.getElementById( 'copy' ).value = '';" />
+		{formhelp note="Clicking on any of the attachments below, will display the correct attachment syntax in the textbox above. Insert this text into the textarea where needed."}
+	{/forminput}
+</div>
 
-			<td>
-				<a title="{tr}Attachment id: {$attachment.attachment_id}{/tr}" href="javascript:insertAt( 'copy', '{ldelim}attachment id={$attachment.attachment_id}{rdelim}' );">
-					<img src="{$attachment.thumbnail_url.small}" alt="{$attachment.filename}" /><br />
-					{$attachment.filename}<br />
-					Attachment ID: {$attachment.attachment_id}
-				</a>
-			</td>
-
-			{if $cells % 2 ne 0}
-				</tr>
-			{/if}
-		{foreachelse}
-			<tr class="norecords"><td>{tr}No Records Found{/tr}</td></tr>
-		{/foreach}
+<table class="data">
+	<caption>{tr}Available Attachements{/tr} <span class="total">[ {$userAttachments.cant} ]</span></caption>
+	{counter start=-1 name="cells" print=false}
+	{foreach from=$userAttachments.data item=attachment key=foo}
+		{counter name="cells" assign="cells" print=false}
 		{if $cells % 2 eq 0}
-			<td>&nbsp;</td></tr>
+			<tr class="{cycle values="odd,even"}">
+		{/if}
+
+		<td>
+			<a title="{tr}Attachment id: {$attachment.attachment_id}{/tr}" href="javascript:insertAt( 'copy', '{ldelim}attachment id={$attachment.attachment_id}{rdelim}' );">
+				<img src="{$attachment.thumbnail_url.small}" alt="{$attachment.filename}" /><br />
+				{$attachment.filename}<br />
+				Attachment ID: {$attachment.attachment_id}
+			</a>
+		</td>
+
+		{if $cells % 2 ne 0}
+			</tr>
 		{/if}
-	</table>
-	{if $userAttachments}
-		{formhelp note="Clicking on an item will attach the item to your wiki page."}
+	{foreachelse}
+		<tr class="norecords"><td>{tr}No Records Found{/tr}</td></tr>
+	{/foreach}
+
+	{if $cells % 2 eq 0}
+		<td>&nbsp;</td></tr>
 	{/if}
+</table>
+
+{libertypagination pgnName="pgnPage" pgnPage=$curPage numPages=$numPages offset=$smarty.request.offset}
 {/strip}