revamped schema, add libetry support. admin can now save a newsletter but that is about it, but it is using proper liberty inheritance

1 files changed, 23 insertions, 38 deletions

diff --git a/templates/admin_newsletters.tpl b/templates/admin_newsletters.tpl
index 2eb51c3..fdc49e4 100644
--- a/templates/admin_newsletters.tpl
+++ b/templates/admin_newsletters.tpl
@@ -1,5 +1,5 @@
 <a class="pagetitle" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php">{tr}Admin newsletters{/tr}</a>
-  
+
 {if $gBitSystemPrefs.feature_help eq 'y'}
 <a href="http://bitweaver.org/wiki/PackageNewsletters" target="help" title="{tr}Tikiwiki.org help{/tr}: {tr}Newsletters{/tr}"><img class="icon" src="{$smarty.const.IMG_PKG_URL}icons/help.gif" alt="help" /></a>
 {/if}
@@ -15,22 +15,22 @@
 
 <h2>{tr}Create/edit newsletters{/tr}</h2>
 {if $individual eq 'y'}
-<a href="{$smarty.const.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$info.name}&amp;object_type=newsletter&amp;permType=newsletters&amp;object_id={$info.nl_id}">{tr}There are individual permissions set for this newsletter{/tr}</a><br /><br />
+<a href="{$smarty.const.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$gContent->mInfo.name}&amp;object_type=newsletter&amp;permType=newsletters&amp;object_id={$gContent->mInfo.nl_id}">{tr}There are individual permissions set for this newsletter{/tr}</a><br /><br />
 {/if}
 
 <form action="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php" method="post">
-<input type="hidden" name="nl_id" value="{$info.nl_id|escape}" />
+<input type="hidden" name="nl_id" value="{$gContent->mInfo.nl_id|escape}" />
 <table class="panel">
-<tr><td>{tr}Name{/tr}:</td><td><input type="text" name="name" value="{$info.name|escape}" /></td></tr>
-<tr><td>{tr}Description{/tr}:</td><td><textarea name="description" rows="4" cols="40">{$info.description|escape}</textarea></td></tr>
+<tr><td>{tr}Name{/tr}:</td><td><input type="text" name="title" value="{$gContent->mInfo.title|escape}" /></td></tr>
+<tr><td>{tr}Description{/tr}:</td><td><textarea name="edit" rows="4" cols="40">{$gContent->mInfo.data|escape:html}</textarea></td></tr>
 <tr><td>{tr}Users can subscribe/unsubscribe to this list{/tr}</td><td>
-<input type="checkbox" name="allow_user_sub" {if $info.allow_user_sub eq 'y'}checked="checked"{/if} /></td></tr>
+<input type="checkbox" name="allow_user_sub" {if $gContent->mInfo.allow_user_sub eq 'y'}checked="checked"{/if} /></td></tr>
 <tr><td>{tr}Users can subscribe any email address{/tr}</td><td>
-<input type="checkbox" name="allow_any_sub" {if $info.allow_any_sub eq 'y'}checked="checked"{/if} /></td></tr>
+<input type="checkbox" name="allow_any_sub" {if $gContent->mInfo.allow_any_sub eq 'y'}checked="checked"{/if} /></td></tr>
 <tr><td>{tr}Add unsubscribe instructions to each newsletter{/tr}</td><td>
-<input type="checkbox" name="unsub_msg" {if $info.unsub_msg eq 'y'}checked="checked"{/if} /></td></tr>
+<input type="checkbox" name="unsub_msg" {if $gContent->mInfo.unsub_msg eq 'y'}checked="checked"{/if} /></td></tr>
 <tr><td>{tr}Validate email addresses{/tr}</td><td>
-<input type="checkbox" name="validate_addr" {if $info.validate_addr eq 'y'}checked="checked"{/if} /></td></tr>
+<input type="checkbox" name="validate_addr" {if $gContent->mInfo.validate_addr eq 'y'}checked="checked"{/if} /></td></tr>
 <tr class="panelsubmitrow"><td colspan="2"><input type="submit" name="save" value="{tr}Save{/tr}" /></td></tr>
 </table>
 </form>
@@ -48,6 +48,7 @@
 </tr>
 </table>
 
+
 <table class="panel">
 <tr>
 <th><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'nl_id_desc'}nl_id_asc{else}nl_id_desc{/if}">{tr}ID{/tr}</a></th>
@@ -59,38 +60,22 @@
 <th>{tr}action{/tr}</th>
 </tr>
 {cycle values="even,odd" print=false}
-{section name=user loop=$channels}
+{foreach key=nlId from=$newsletters item=nl}
 <tr class="{cycle}">
-<td>{$channels[user].nl_id}</td>
-<td>{$channels[user].name}</td>
-<td>{$channels[user].description}</td>
-<td>{$channels[user].users} ({$channels[user].confirmed})</td>
-<td>{$channels[user].editions}</td>
-<td>{$channels[user].last_sent|bit_short_datetime}</td>
+<td>{$nlIid}</td>
+<td>{$nl.title}</td>
+<td>{$nl.data}</td>
+<td>{$nl.users} ({$channels[user].confirmed})</td>
+<td>{$nl.editions}</td>
+<td>{$nl.last_sent|bit_short_datetime}</td>
 <td>
-   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].nl_id}">{tr}remove{/tr}</a>
-   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;nl_id={$channels[user].nl_id}">{tr}edit{/tr}</a>
-   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$channels[user].nl_id}">{tr}subscriptions{/tr}</a>
-   {if $channels[user].individual eq 'y'}({/if}<a href="{$smarty.const.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$channels[user].name}&amp;object_type=newsletter&amp;permType=newsletters&amp;object_id={$channels[user].nl_id}">{tr}perms{/tr}</a>{if $channels[user].individual eq 'y'}){/if}
+   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$nlId}">{tr}remove{/tr}</a>
+   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;nl_id={$nlId}">{tr}edit{/tr}</a>
+   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nlId}">{tr}subscriptions{/tr}</a>
+   {if $channels[user].individual eq 'y'}({/if}<a href="{$smarty.const.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$nl.title}&amp;object_type={$smarty.const.BITNEWSLETTER_CONTENT_TYPE_GUID}&amp;permType=newsletters&amp;object_id={$nlId}">{tr}perms{/tr}</a>{if $nl.individual eq 'y'}){/if}
 </td>
 </tr>
-{/section}
+{/foreach}
 </table>
 
-<div class="pagination">
-{if $prev_offset >= 0}
-[<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$prev_offset}&amp;sort_mode={$sort_mode}">{tr}prev{/tr}</a>]&nbsp;
-{/if}
-{tr}Page{/tr}: {$actual_page}/{$cant_pages}
-{if $next_offset >= 0}
-&nbsp;[<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$next_offset}&amp;sort_mode={$sort_mode}">{tr}next{/tr}</a>]
-{/if}
-{if $direct_pagination eq 'y'}
-<br />
-{section loop=$cant_pages name=foo}
-{assign var=selector_offset value=$smarty.section.foo.index|times:$maxRecords}
-<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}">
-{$smarty.section.foo.index_next}</a>&nbsp;
-{/section}
-{/if}
-</div>
+{pagination}