From d9a9529d7664ee194885b3de4658782e6375d734 Mon Sep 17 00:00:00 2001 From: lsces Date: Sat, 31 May 2014 22:54:50 +0100 Subject: Modify templates for ink framework --- templates/admin_boards.tpl | 30 +++++++++++++++--------------- templates/board_assign.tpl | 8 ++++---- templates/board_edit.tpl | 4 ++-- templates/board_table.tpl | 4 ++-- templates/boards_edit_mini_inc.tpl | 2 +- templates/boards_rss_form.tpl | 6 +++--- templates/comment_post.tpl | 8 ++++---- templates/list_posts.tpl | 4 ++-- templates/list_topics.tpl | 2 +- templates/mailing_list.tpl | 32 ++++++++++++++++---------------- templates/post_display.tpl | 2 +- templates/topic_move.tpl | 4 ++-- templates/user_preferences_inc.tpl | 6 +++--- 13 files changed, 56 insertions(+), 56 deletions(-) diff --git a/templates/admin_boards.tpl b/templates/admin_boards.tpl index 5aa5278..ffe269d 100644 --- a/templates/admin_boards.tpl +++ b/templates/admin_boards.tpl @@ -3,7 +3,7 @@ {* {legend legend="Home Message Board"} -
+
{formlabel label="Home BitBoards (main board)" for="homeBitBoards"} {forminput} +
{/legend} *} {legend legend="List Settings"} {foreach from=$formBitBoardsLists key=item item=output} -
+
{formlabel label=$output.label for=$item} {forminput} {html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item} @@ -35,14 +35,14 @@ {/legend} {legend legend="Mailing List Synchronization"} -
+
{forminput}

List to Board Sync

{tr}List to Board Sync allows a bitweaver board to mirror messages that are posted to a mailing list. A single, master email inbox entered below is used for *all* email list subscriptions. Then, configure individual boards to indicate which mailing list to which it is subscribed. The Board Sync cron script will import messages from the master email inbox.{/tr}

{/forminput}
{foreach from=$formBitBoardsSync key=item item=output} -
+
{formlabel label=$output.label for=$item} {forminput} @@ -51,21 +51,21 @@
{/foreach} -
+
{forminput}

Board to List Sync

{tr}Board to List Sync is the opposite of the above. It allows a bitweaver board to send a message to mailing list. You must complete the "List to Board Sync" configuration above for this feature to work.{/tr} {tr}Please see configuration requirements prior to utilizing this feature.{/tr}

{/forminput}
-
+
{forminput} {/forminput}
{foreach from=$formGroupEmailList key=item item=output} -
+
{formlabel label=$output.label for=$item} {forminput} {html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item} @@ -74,14 +74,14 @@
{/foreach} -
+
{formlabel label="Email Host" for='boards_email_host'} {forminput} {formhelp note="Enter the host name to which all mailing lists will be hosted and addressed."} {/forminput}
-
+
{formlabel label="Administrator Email" for='boards_email_admin'} {forminput} @@ -89,7 +89,7 @@ {/forminput}
-
+
{formlabel label="Mailman bin Path" for='server_mailman_bin'} {forminput} @@ -99,21 +99,21 @@ {/if} {/forminput}
-
+
{formlabel label="Mailman Command Path" for='mailman_cmd'} {forminput} {formhelp note="Path to mailman binary, typically: /usr/lib/mailman/mail/mailman"} {/forminput}
-
+
{formlabel label="Newaliases command" for='server_newaliases_cmd'} {forminput} {formhelp note="Path to the command to tell the mail server to reload the aliases file. For sendmail typically: /usr/bin/newaliases"} {/forminput}
-
+
{formlabel label="MTA Aliases Map" for='server_aliases_file'} {forminput} @@ -122,7 +122,7 @@
{/legend}
- +
{/form} {/strip} diff --git a/templates/board_assign.tpl b/templates/board_assign.tpl index 8fc9b07..b7d31e6 100644 --- a/templates/board_assign.tpl +++ b/templates/board_assign.tpl @@ -7,7 +7,7 @@
{if $data.umap} {form legend="Assign Content"} -
+
{formlabel label="Add Content" for="assign"} {forminput} @@ -36,7 +36,7 @@
- +
{/form} {else} @@ -85,7 +85,7 @@
- +
{/form} {/if} diff --git a/templates/board_edit.tpl b/templates/board_edit.tpl index f372533..8fc6a94 100644 --- a/templates/board_edit.tpl +++ b/templates/board_edit.tpl @@ -45,7 +45,7 @@ {legend legend=$leg} -
+
{formlabel label="Title" for="title"} {forminput} @@ -65,7 +65,7 @@ {/jstabs}
- +
diff --git a/templates/board_table.tpl b/templates/board_table.tpl index 2bea801..29e559c 100644 --- a/templates/board_table.tpl +++ b/templates/board_table.tpl @@ -26,10 +26,10 @@ {$board.parsed_data}
- + {$board.topic_count} - + {$board.post_count} diff --git a/templates/boards_edit_mini_inc.tpl b/templates/boards_edit_mini_inc.tpl index 13b52b9..ed16625 100644 --- a/templates/boards_edit_mini_inc.tpl +++ b/templates/boards_edit_mini_inc.tpl @@ -1,6 +1,6 @@ {if $gBitUser->hasPermission('p_boards_link_content') && $gContent->mContentTypeGuid != $smarty.const.BITBOARD_CONTENT_TYPE_GUID} {* {$gContent->mContentTypeGuid} *} -
+
{formlabel label="Linked Board"} {forminput} {if $boardList} diff --git a/templates/boards_rss_form.tpl b/templates/boards_rss_form.tpl index e7fa510..c31fc3d 100644 --- a/templates/boards_rss_form.tpl +++ b/templates/boards_rss_form.tpl @@ -23,7 +23,7 @@
{/if} -
+
{formlabel label="Feed Format" for="format"} {forminput} {html_options name=format id=format values=$feedFormat options=$feedFormat selected=$feedlink.format} @@ -31,7 +31,7 @@ {/forminput}
-
+
{formlabel label="Feed" for="pkg"} {forminput} {if $gContent->isValid()}{tr}{$gContent->getField('title')} Feed{/tr}{else}{tr}Recent Discussions{/tr}{/if} @@ -40,7 +40,7 @@
- +
{/legend} {/form} diff --git a/templates/comment_post.tpl b/templates/comment_post.tpl index 8099c20..6d0c201 100644 --- a/templates/comment_post.tpl +++ b/templates/comment_post.tpl @@ -22,7 +22,7 @@ -
+
{formlabel label="Title" for="comments-title"} {forminput} @@ -36,9 +36,9 @@ {textarea noformat=1 label="Comment" id="commentpost" name="comment_data" rows="6" edit=$postComment.data}
-   -   - +   +   +
{/legend} {/if} diff --git a/templates/list_posts.tpl b/templates/list_posts.tpl index 977e3d5..7a26b10 100644 --- a/templates/list_posts.tpl +++ b/templates/list_posts.tpl @@ -54,7 +54,7 @@
{if !$topic_locked && $board->hasPostCommentsPermission()}
- {booticon iname="icon-comment-alt" ipackage="icons" iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr} + {booticon iname="icon-comment-alt" ipackage="icons" iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}
{/if} @@ -82,7 +82,7 @@ {if !$topic_locked && $board->hasPostCommentsPermission()}
- {booticon iname="icon-comment-alt" ipackage="icons" iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr} + {booticon iname="icon-comment-alt" ipackage="icons" iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}
{/if} diff --git a/templates/list_topics.tpl b/templates/list_topics.tpl index 36efdd4..ef9605d 100644 --- a/templates/list_topics.tpl +++ b/templates/list_topics.tpl @@ -144,7 +144,7 @@ {/if} - +
{/if} {/form} diff --git a/templates/mailing_list.tpl b/templates/mailing_list.tpl index ce83cae..33d7c27 100644 --- a/templates/mailing_list.tpl +++ b/templates/mailing_list.tpl @@ -11,7 +11,7 @@ {jstab title="Mailing List Information"} {if $board->getPreference('boards_mailing_list')} -
+
{formlabel label="Address"} {forminput} {$board->getPreference('boards_mailing_list')}@{$gBitSystem->getConfig('boards_email_host',$gBitSystem->getConfig('kernel_server_name'))} @@ -19,15 +19,15 @@
{form} -
+
{formlabel label="Subscribe"} {forminput} {if mailman_findmember($board->getPreference('boards_mailing_list'),$gBitUser->getField('email'))}

{tr}You are currently subscribed to the mailing list using the email:{/tr} {$gBitUser->getField('email')}

- + {else}

{tr}You are currently not subscribed to the mailing list.{/tr}

- + {/if} {/forminput}
@@ -63,7 +63,7 @@ {form} {if $gBitSystem->getConfig('boards_sync_mail_server')} -
+
{formlabel label="Mailing List Address" for="boardsync"} {forminput} @@ -71,7 +71,7 @@ {formfeedback warning="The Mailing List Address does not match the configured board mailing list."} {/if} {formhelp note="All messages posted to this email address will mirrored on the board. The 'Board Sync Inbox' email account must be subscribed to this list and receive the messages in its INBOX."} - + {/forminput}
@@ -82,21 +82,21 @@ {/forminput}
{if $board->getPreference('boards_mailing_list')} -
+
{formlabel label="Subscribe"} {forminput} {if mailman_findmember($board->getPreference('boards_mailing_list'),$boardSyncInbox)}

{$boardSyncInbox} {tr}is subscribed to{/tr} {$boardsMailingList}

- + {else}

{$boardSyncInbox} {tr}is currently not subscribed to the mailing list.{/tr}

- + {/if} {/forminput}
{/if} {else} -
+
{formlabel label="Board Sync" for="boardsync"} {forminput} {tr}Board Sync is not available since the Board Sync master email box has not been configured.{/tr} {if !$gBitUser->isAdmin()}{tr}Check with your site administrator.{/tr}{/if} @@ -111,7 +111,7 @@ {form} {if $board->getPreference('boards_mailing_list')} -
+
{formlabel label="Address"} {forminput} {$board->getPreference('boards_mailing_list')}@{$gBitSystem->getConfig('boards_email_host',$gBitSystem->getConfig('kernel_server_name'))} @@ -119,10 +119,10 @@
{forminput} - + {/forminput}
-
+
{formlabel label="Advanced Configuration"} {forminput} getPreference('boards_mailing_list')}"> @@ -133,14 +133,14 @@ {if $gBitSystem->getConfig('server_mailman_bin') && $gBitSystem->getConfig('boards_sync_user') && $gBitSystem->getConfig('boards_sync_mail_server')} {legend legend="Group Mailing List"} -
+
{formlabel label="Mailing List Address" for='emailhost'} {forminput} @ {$gBitSystem->getConfig('boards_email_host',$gBitSystem->getConfig('kernel_server_name'))} {formhelp note="This is the email address for the group. It needs to be all lowercase alpha-numeric characters."} {/forminput}
-
+
{formlabel label="Administrator Password" for='emailhost'} {forminput} @@ -149,7 +149,7 @@
{forminput} - + {/forminput}
{/legend} diff --git a/templates/post_display.tpl b/templates/post_display.tpl index baf22cf..923bbce 100644 --- a/templates/post_display.tpl +++ b/templates/post_display.tpl @@ -61,7 +61,7 @@ - + {/form}
{/if} diff --git a/templates/topic_move.tpl b/templates/topic_move.tpl index ac0ee0e..4b5ab7c 100644 --- a/templates/topic_move.tpl +++ b/templates/topic_move.tpl @@ -12,7 +12,7 @@ {assign var=title value=$gContent->mInfo.title|escape} -
+
{formlabel label="To Board" for="target"} {forminput} +
{/form}
diff --git a/templates/user_preferences_inc.tpl b/templates/user_preferences_inc.tpl index 396db88..c3caf07 100644 --- a/templates/user_preferences_inc.tpl +++ b/templates/user_preferences_inc.tpl @@ -6,7 +6,7 @@ {form legend="Simple Settings"} {foreach from=$boardsSettings key=option item=output} -
+
{assign var='pref' value=$output.pref} {if $userPrefs.$pref == null} {assign var='value' value=$output.default} @@ -25,7 +25,7 @@
{/foreach}
- +
{/form} {/if} @@ -35,7 +35,7 @@ {formfeedback warning=$error} {textarea gContent=$signatureContent name="bitboarduprefs[edit]" rows=4 edit=$editUser->getPreference('signature_content_data')}
- +
{/form} -- cgit v1.3