From 0bc6f589dd5b3d091fff781f9173c8ec86a11261 Mon Sep 17 00:00:00 2001 From: lsces Date: Thu, 11 Jul 2013 22:18:53 +0100 Subject: Docblock header added --- user_register_inc.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/user_register_inc.php b/user_register_inc.php index 6fbe6f6..2b422b7 100644 --- a/user_register_inc.php +++ b/user_register_inc.php @@ -1,5 +1,18 @@ + */ +/** + * Initialization + */ require_once NEWSLETTERS_PKG_PATH.'BitNewsletter.php'; $listHash = array( 'registration_optin' => TRUE ); -- cgit v1.3 From ea95979007bb56f86a3de6219438cec4d4936288 Mon Sep 17 00:00:00 2001 From: lsces Date: Thu, 11 Jul 2013 23:42:13 +0100 Subject: New phpdoc2 likes the @package tags to be the last entry on the block. Not a reneral requirement, but something they are enforcing. --- user_register_inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_register_inc.php b/user_register_inc.php index 2b422b7..d16932d 100644 --- a/user_register_inc.php +++ b/user_register_inc.php @@ -5,9 +5,9 @@ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details * * created 2005/12/10 + * @author spider * * @package newsletters - * @author spider */ /** -- cgit v1.3 From 2292f41ceef16abd84a83632cda6aabc12b51fd5 Mon Sep 17 00:00:00 2001 From: spiderr Date: Fri, 23 May 2014 15:32:54 -0400 Subject: bootstrap3-btn-default --- templates/admin_newsletter_subscriptions.tpl | 4 ++-- templates/admin_newsletters.tpl | 2 +- templates/center_list_newsletters.tpl | 6 +++--- templates/edit_edition.tpl | 6 +++--- templates/edit_newsletter.tpl | 4 ++-- templates/mail_queue.tpl | 2 +- templates/send_newsletters.tpl | 6 +++--- templates/user_subscriptions.tpl | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/templates/admin_newsletter_subscriptions.tpl b/templates/admin_newsletter_subscriptions.tpl index 31f5d38..170832d 100644 --- a/templates/admin_newsletter_subscriptions.tpl +++ b/templates/admin_newsletter_subscriptions.tpl @@ -27,7 +27,7 @@
{forminput} - + {/forminput}
{/form} @@ -81,7 +81,7 @@ //]]> {/form} diff --git a/templates/admin_newsletters.tpl b/templates/admin_newsletters.tpl index b09d2e6..54d82d7 100644 --- a/templates/admin_newsletters.tpl +++ b/templates/admin_newsletters.tpl @@ -13,7 +13,7 @@ {/foreach}
- +
{/legend} {/form} diff --git a/templates/center_list_newsletters.tpl b/templates/center_list_newsletters.tpl index 3dc6222..d5d04e7 100644 --- a/templates/center_list_newsletters.tpl +++ b/templates/center_list_newsletters.tpl @@ -39,11 +39,11 @@
{forminput} - + {if $gContent->getField( 'subscribed_date' )} - + {else} - + {/if} {/forminput}
diff --git a/templates/edit_edition.tpl b/templates/edit_edition.tpl index b96ae20..a020563 100644 --- a/templates/edit_edition.tpl +++ b/templates/edit_edition.tpl @@ -90,9 +90,9 @@ {/jstabs}
- - - + + +
{/form} diff --git a/templates/edit_newsletter.tpl b/templates/edit_newsletter.tpl index 6e5b609..ba18770 100644 --- a/templates/edit_newsletter.tpl +++ b/templates/edit_newsletter.tpl @@ -66,8 +66,8 @@
- - + +
{/form} diff --git a/templates/mail_queue.tpl b/templates/mail_queue.tpl index 0fcf621..786283d 100644 --- a/templates/mail_queue.tpl +++ b/templates/mail_queue.tpl @@ -41,7 +41,7 @@
- +
{/form} diff --git a/templates/send_newsletters.tpl b/templates/send_newsletters.tpl index c9a1c7c..945e2e9 100644 --- a/templates/send_newsletters.tpl +++ b/templates/send_newsletters.tpl @@ -50,8 +50,8 @@ {/jstabs}
- - + +
{else} {legend legend="Recipient Groups"} @@ -80,7 +80,7 @@ *}
- +
{/legend} {/if} diff --git a/templates/user_subscriptions.tpl b/templates/user_subscriptions.tpl index 73ee932..42ae5d0 100644 --- a/templates/user_subscriptions.tpl +++ b/templates/user_subscriptions.tpl @@ -44,7 +44,7 @@ {/forminput}
- +
{/form} -- cgit v1.3 From 7f1b50d946949dcbb50550ff762dabaf4e4b2437 Mon Sep 17 00:00:00 2001 From: spiderr Date: Fri, 6 Jun 2014 15:24:41 -0400 Subject: boostrap3-control-group-2-from-group --- templates/admin_newsletter_subscriptions.tpl | 6 +++--- templates/admin_newsletters.tpl | 4 ++-- templates/center_list_newsletters.tpl | 8 ++++---- templates/edit_edition.tpl | 12 ++++++------ templates/edit_newsletter.tpl | 16 ++++++++-------- templates/send_newsletters.tpl | 14 +++++++------- templates/user_register_inc.tpl | 2 +- templates/user_subscriptions.tpl | 10 +++++----- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/templates/admin_newsletter_subscriptions.tpl b/templates/admin_newsletter_subscriptions.tpl index 170832d..b0de9ef 100644 --- a/templates/admin_newsletter_subscriptions.tpl +++ b/templates/admin_newsletter_subscriptions.tpl @@ -9,7 +9,7 @@ {form} -
+
{if $gContent->getField('validate_addr') eq 'y'} {formfeedback warning="Validate Email is enabled, a confirmation email will be sent to every subsciber inviting them to the newsletter. Any duplicate or previously unsubscribed emails will *NOT* be re-subscribed using this method."} {else} @@ -17,7 +17,7 @@ {/if}
-
+
{formlabel label="New Subscribers" for=""} {forminput} @@ -25,7 +25,7 @@ {/forminput}
-
+
{forminput} {/forminput} diff --git a/templates/admin_newsletters.tpl b/templates/admin_newsletters.tpl index 54d82d7..c7824a1 100644 --- a/templates/admin_newsletters.tpl +++ b/templates/admin_newsletters.tpl @@ -3,7 +3,7 @@ {legend legend="Newsletter Mail Server Settings"} {foreach from=$formNewsletterFeatures key=item item=output} -
+
{formlabel label=$output.label for=$item} {forminput} @@ -12,7 +12,7 @@
{/foreach} -
+
{/legend} diff --git a/templates/center_list_newsletters.tpl b/templates/center_list_newsletters.tpl index d5d04e7..29d9ba5 100644 --- a/templates/center_list_newsletters.tpl +++ b/templates/center_list_newsletters.tpl @@ -11,14 +11,14 @@ {formfeedback hash=$feedback} {if $subscribe eq 'y'}

{tr}Subscribe to Newsletter{/tr}

-
+
{formlabel label="Name" for=""} {forminput} {$gContent->getTitle()} {/forminput}
-
+
{formlabel label="Description" for=""} {forminput} {$gContent->parseData()} @@ -27,7 +27,7 @@ {if ($gContent->getField('allow_user_sub') eq 'y') or $gBitUser->hasPermission( 'p_newsletters_subscribe' )} {form} -
+
{formlabel label="Email" for=""} {forminput} {if $gBitUser->hasPermission( 'p_newsletters_subscribe_email' )} @@ -37,7 +37,7 @@ {/if} {/forminput}
-
+
{forminput} {if $gContent->getField( 'subscribed_date' )} diff --git a/templates/edit_edition.tpl b/templates/edit_edition.tpl index a020563..c9a4c44 100644 --- a/templates/edit_edition.tpl +++ b/templates/edit_edition.tpl @@ -22,7 +22,7 @@ {jstabs} {jstab title="Edition Body"} {legend legend="Edition Body"} -
+
{formlabel label="Newsletter" for="nl_content_id"} {forminput} @@ -51,14 +51,14 @@ {include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"} -
+
-
+
{formlabel label="Subject" for="subject"} {forminput} @@ -66,7 +66,7 @@ {/forminput}
-
+
{formlabel label="Reply-To" for="replyto"} {forminput} @@ -89,7 +89,7 @@ {/jstabs} -
+
diff --git a/templates/edit_newsletter.tpl b/templates/edit_newsletter.tpl index ba18770..a55e2c6 100644 --- a/templates/edit_newsletter.tpl +++ b/templates/edit_newsletter.tpl @@ -14,7 +14,7 @@ {/if} -
+
{formlabel label="Title" for="title"} {forminput} @@ -22,7 +22,7 @@ {/forminput}
-
+
{formlabel label="Description" for="description"} {forminput} @@ -30,42 +30,42 @@ {/forminput}
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/templates/send_newsletters.tpl b/templates/send_newsletters.tpl index 945e2e9..8be1f17 100644 --- a/templates/send_newsletters.tpl +++ b/templates/send_newsletters.tpl @@ -8,7 +8,7 @@
{if $feedback} -
+
{formfeedback hash=$feedback}
{/if} @@ -31,7 +31,7 @@ {jstab title="Preview Recipient List"} {legend legend="Preview Recipient List"} -
+
{foreach from=$smarty.request.send_group item=groupId key=i} {/foreach} @@ -49,13 +49,13 @@ {/jstab} {/jstabs} -
+
{else} {legend legend="Recipient Groups"} -
+
{formlabel label="Groups"} {forminput} {foreach from=$groupList item=group key=groupId } @@ -65,21 +65,21 @@ {/forminput}
-
+
{* -
+
{formlabel label="Only send to validated emails"} {forminput} {/forminput}
*} -
+
{/legend} diff --git a/templates/user_register_inc.tpl b/templates/user_register_inc.tpl index fa55312..373b4f1 100644 --- a/templates/user_register_inc.tpl +++ b/templates/user_register_inc.tpl @@ -15,7 +15,7 @@ for (var i = 0; i < checkboxes.length; i++){ {/literal} -
+
{formlabel label="Subscriptions"} {forminput} {foreach from=$newsletters item='newsletter'} diff --git a/templates/user_subscriptions.tpl b/templates/user_subscriptions.tpl index 42ae5d0..7581b63 100644 --- a/templates/user_subscriptions.tpl +++ b/templates/user_subscriptions.tpl @@ -11,7 +11,7 @@ {if $smarty.request.c} -
+
{formlabel label="In Response To"} {forminput} @@ -20,14 +20,14 @@
{/if} -
+
{formlabel label="User Information"} {forminput} {displayname hash=$subInfo}
{$subInfo.email} {/forminput}
-
+
{formlabel label="Subscriptions"} {forminput} {foreach from=$newsletters key=nlId item=nl} @@ -37,13 +37,13 @@ {/foreach} {/forminput}
-
+
{formlabel label="Permanent Unsubscribe"} {forminput} {tr}Remove myself from all lists, and receive no further mailings from{/tr} {$gBitSystem->getConfig('siteTitle','this site')}.
{/forminput}
-
+
{/form} -- cgit v1.3 From 18cd96ffd0caae3c1e2ddd94cdc0d685dea901f0 Mon Sep 17 00:00:00 2001 From: spiderr Date: Wed, 19 Nov 2014 16:19:41 -0500 Subject: add-forminput-label-param-for-bs3 --- templates/edit_edition.tpl | 4 ++-- templates/edit_newsletter.tpl | 20 ++++++++++---------- templates/send_newsletters.tpl | 4 ++-- templates/user_register_inc.tpl | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/templates/edit_edition.tpl b/templates/edit_edition.tpl index c9a4c44..de49918 100644 --- a/templates/edit_edition.tpl +++ b/templates/edit_edition.tpl @@ -52,10 +52,10 @@ {include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"}
- + {/forminput}
diff --git a/templates/edit_newsletter.tpl b/templates/edit_newsletter.tpl index a55e2c6..a655767 100644 --- a/templates/edit_newsletter.tpl +++ b/templates/edit_newsletter.tpl @@ -31,38 +31,38 @@
- + {/forminput}
- + {/forminput}
- + {/forminput}
- + {/forminput}
- + {/forminput}
diff --git a/templates/send_newsletters.tpl b/templates/send_newsletters.tpl index 8be1f17..bb1d0c3 100644 --- a/templates/send_newsletters.tpl +++ b/templates/send_newsletters.tpl @@ -66,10 +66,10 @@
- + {/forminput}
{*
diff --git a/templates/user_register_inc.tpl b/templates/user_register_inc.tpl index 373b4f1..6e42ccf 100644 --- a/templates/user_register_inc.tpl +++ b/templates/user_register_inc.tpl @@ -19,7 +19,7 @@ for (var i = 0; i < checkboxes.length; i++){ {formlabel label="Subscriptions"} {forminput} {foreach from=$newsletters item='newsletter'} - + {forminput label="checkbox"}{$newsletter.title}{/forminput} {/foreach} {formhelp note="Uncheck the box to opt-out of the specified newsletter."} {if count($newsletters) > 1} -- cgit v1.3