From 63230d60adeed22fdf349ba4a838029c034551b0 Mon Sep 17 00:00:00 2001 From: Max Kremmel Date: Sun, 11 Dec 2005 11:39:10 +0000 Subject: cleanup --- templates/admin_newsletters.tpl | 170 ++++++++++++++++++++-------------------- templates/edit_edition.tpl | 119 ++++++++++++++-------------- 2 files changed, 144 insertions(+), 145 deletions(-) diff --git a/templates/admin_newsletters.tpl b/templates/admin_newsletters.tpl index b9cd035..e2db21f 100644 --- a/templates/admin_newsletters.tpl +++ b/templates/admin_newsletters.tpl @@ -8,104 +8,104 @@
{if !$newsletters || $gContent->isValid() || $smarty.request.new} - {form legend="Create / Edit Newsletters"} - {if $individual eq 'y'} - {tr}There are individual permissions set for this newsletter{/tr}

- {/if} - - maybe we could have an option to autosubscribe users to a list when they register with the site. -
- {formlabel label="Title" for="title"} - {forminput} - - {formhelp note="Title of the newsletter."} - {/forminput} -
+ {form legend="Create / Edit Newsletters"} + {if $individual eq 'y'} + {tr}There are individual permissions set for this newsletter{/tr}

+ {/if} + -
- {formlabel label="Description" for="description"} - {forminput} - - {formhelp note="Description of the newsletter, that users know what they are getting themselves into."} - {/forminput} -
+
+ {formlabel label="Title" for="title"} + {forminput} + + {formhelp note="Title of the newsletter."} + {/forminput} +
-
- {formlabel label="Users can Subscribe" for="allow_user_sub"} - {forminput} - mInfo.allow_user_sub eq 'y'}checked="checked"{/if} /> - {formhelp note="Users can subscribe to this list. Disabling this options means that you have to manually add users to the list."} - {/forminput} -
+
+ {formlabel label="Description" for="description"} + {forminput} + + {formhelp note="Description of the newsletter, that users know what they are getting themselves into."} + {/forminput} +
-
- {formlabel label="Any e-mail Address" for="allow_any_sub"} - {forminput} - mInfo.allow_any_sub eq 'y'}checked="checked"{/if} /> - {formhelp note="Users may subscribe using any email address."} - {/forminput} -
+
+ {formlabel label="Users can Subscribe" for="allow_user_sub"} + {forminput} + mInfo.allow_user_sub eq 'y'}checked="checked"{/if} /> + {formhelp note="Users can subscribe to this list. Disabling this options means that you have to manually add users to the list."} + {/forminput} +
-
- {formlabel label="Append Un/Subscribe Instructions" for="unsub_msg"} - {forminput} - mInfo.unsub_msg eq 'y'}checked="checked"{/if} /> - {formhelp note="Append instructions on how to subscribe / unsubscribe to ever outgoing newsletter. This is only useful when users can un / subscribe to the list themselves."} - {/forminput} -
+
+ {formlabel label="Any e-mail Address" for="allow_any_sub"} + {forminput} + mInfo.allow_any_sub eq 'y'}checked="checked"{/if} /> + {formhelp note="Users may subscribe using any email address."} + {/forminput} +
-
- {formlabel label="Validate e-mail Addresses" for="validate_addr"} - {forminput} - mInfo.validate_addr eq 'y'}checked="checked"{/if} /> - {formhelp note="Validate all email addresses before they are added to the list. This might result in members not being added despite working email addresses."} - {/forminput} -
+
+ {formlabel label="Append Un/Subscribe Instructions" for="unsub_msg"} + {forminput} + mInfo.unsub_msg eq 'y'}checked="checked"{/if} /> + {formhelp note="Append instructions on how to subscribe / unsubscribe to ever outgoing newsletter. This is only useful when users can un / subscribe to the list themselves."} + {/forminput} +
-
- - -
- {/form} +
+ {formlabel label="Validate e-mail Addresses" for="validate_addr"} + {forminput} + mInfo.validate_addr eq 'y'}checked="checked"{/if} /> + {formhelp note="Validate all email addresses before they are added to the list. This might result in members not being added despite working email addresses."} + {/forminput} +
- {else} +
+ + +
+ {/form} - {minifind} + {else} - - - - - - - - - - + {minifind} - {foreach key=nlId from=$newsletters item=nl} - - - - - - - +
{tr}Newsletters{/tr}
{smartlink ititle="Name" isort=name offset=$offset}{smartlink ititle="Description" isort=description offset=$offset}{smartlink ititle="Created" isort=last_sent offset=$offset}{smartlink ititle="Last Sent" isort=created offset=$offset}{smartlink ititle="Users Unsubscribed" isort=users offset=$offset}{tr}Action{/tr}
{$nl.title}{$nl.data}{$nl.created|bit_short_date}{$nl.last_sent|bit_short_date}{$nl.users|default:0} [ {$channels[user].confirmed|default:0} ] - {biticon ipackage=liberty iname=delete iexplain=Remove} - {biticon ipackage=liberty iname=edit iexplain=Edit} - {if $channels[user].individual eq 'y'}({/if}{biticon ipackage=liberty iname=permissions iexplain=Permissions}{if $nl.individual eq 'y'}){/if} -
+ + + + + + + + - {foreachelse} - - - - {/foreach} -
{tr}Newsletters{/tr}
{smartlink ititle="Name" isort=name offset=$offset}{smartlink ititle="Description" isort=description offset=$offset}{smartlink ititle="Created" isort=last_sent offset=$offset}{smartlink ititle="Last Sent" isort=created offset=$offset}{smartlink ititle="Users Unsubscribed" isort=users offset=$offset}{tr}Action{/tr}
{tr}No Records Found{/tr}
- Create new newsletter + {foreach key=nlId from=$newsletters item=nl} + + {$nl.title} + {$nl.data} + {$nl.created|bit_short_date} + {$nl.last_sent|bit_short_date} + {$nl.users|default:0} [ {$channels[user].confirmed|default:0} ] + + {biticon ipackage=liberty iname=delete iexplain=Remove} + {biticon ipackage=liberty iname=edit iexplain=Edit} + {if $channels[user].individual eq 'y'}({/if}{biticon ipackage=liberty iname=permissions iexplain=Permissions}{if $nl.individual eq 'y'}){/if} + + + {foreachelse} + + {tr}No Records Found{/tr} + + {/foreach} + + + Create new newsletter - {pagination} + {pagination} {/if}
diff --git a/templates/edit_edition.tpl b/templates/edit_edition.tpl index 7b2b151..73ac4ca 100644 --- a/templates/edit_edition.tpl +++ b/templates/edit_edition.tpl @@ -6,7 +6,7 @@ {if $preview eq 'y'} -
+

{$info.subject}

@@ -22,73 +22,72 @@ {jstabs} {jstab title="Edition Body"} {legend legend="Edition Body"} -
- {formlabel label="Subject" for="subject"} - {forminput} - - {formhelp note=""} - {/forminput} -
+
+ {formlabel label="Subject" for="subject"} + {forminput} + + {formhelp note="This will appear in the subject line of the email."} + {/forminput} +
-
- {formlabel label="" for=""} - {forminput} - - {formhelp note=""} - {/forminput} -
+
+ {formlabel label="Newsletter" for="nl_id"} + {forminput} + + {formhelp note="Pick the newsletter you want to post to."} + {/forminput} +
- {if $gBitUser->hasPermission( 'bit_p_use_content_templates' ) && $templates} -
- {formlabel label="Template" for=""} - {forminput} - - {formhelp note=""} - {/forminput} -
- {/if} - - {include file="bitpackage:liberty/edit_services_inc.tpl serviceFile=content_edit_mini_tpl} - -
- {formlabel label="Draft" for="draft"} - {forminput} - getField('is_draft')}checked="checked"{/if}" /> - {formhelp note=""} - {/forminput} -
- -
- {formlabel label="Body" for="body"} - {forminput} - - {formhelp note=""} - {/forminput} -
+ {if $gBitUser->hasPermission( 'bit_p_use_content_templates' ) && $templates} +
+ {formlabel label="Template" for=""} + {forminput} + + {formhelp note=""} + {/forminput} +
+ {/if} - {/legend} - {/jstab} + {include file="bitpackage:liberty/edit_services_inc.tpl serviceFile=content_edit_mini_tpl} - {include file="bitpackage:liberty/edit_services_inc.tpl serviceFile=content_edit_tab_tpl} +
+ {formlabel label="Draft" for="draft"} + {forminput} + getField('is_draft')}checked="checked"{/if}" /> + {formhelp note=""} + {/forminput} +
- {if $gBitUser->hasPermission('bit_p_content_attachments')} - {jstab title="Attachments"} - {legend legend="Attachments"} - {include file="bitpackage:liberty/edit_storage.tpl"} +
+ {formlabel label="Body" for="body"} + {forminput} + + {formhelp note=""} + {/forminput} +
{/legend} {/jstab} - {/if} - {/jstabs} + {include file="bitpackage:liberty/edit_services_inc.tpl serviceFile=content_edit_tab_tpl} + + {if $gBitUser->hasPermission('bit_p_content_attachments')} + {jstab title="Attachments"} + {legend legend="Attachments"} + {include file="bitpackage:liberty/edit_storage.tpl"} + {/legend} + {/jstab} + {/if} + + {/jstabs}
-- cgit v1.3