Skip to content

Commit

Permalink
Merge pull request XoopsModules25x#43 from aerograf/master
Browse files Browse the repository at this point in the history
Add help digest
  • Loading branch information
mambax7 authored Sep 18, 2017
2 parents d00cae0 + a7b9785 commit 5250545
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 1 deletion.
6 changes: 6 additions & 0 deletions admin/admin_cat_manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,12 @@ function editCategory(XoopsObject $categoryObject = null)
}
echo '</table>';
echo '</td></tr></table>';
echo '<fieldset>';
echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_CATEGORY . '&nbsp;</legend>';
echo _AM_NEWBB_HELP_CATEGORY_TAB;
echo '<br>' . newbbDisplayImage('admin_edit', _EDIT) . '&nbsp;-&nbsp;' . _EDIT;
echo '<br>' . newbbDisplayImage('admin_delete', _DELETE) . '&nbsp;-&nbsp;' . _DELETE;
echo '</fieldset>';
break;
}

Expand Down
4 changes: 4 additions & 0 deletions admin/admin_digest.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@

echo '</table>';
echo '</td></tr></table>';
echo '<fieldset>';
echo '<legend>&nbsp;' . _AM_NEWBB_PREFERENCES . '&nbsp;-&nbsp;' . _MI_NEWBB_ADMENU_DIGEST . '&nbsp;</legend>';
echo _AM_NEWBB_DIGEST_HELP_AUTO_DIGEST;
echo '</fieldset>';
$nav = new XoopsPageNav($digestHandler->getDigestCount(), $limit, $start, 'start');
echo $nav->renderNav(4);

Expand Down
9 changes: 9 additions & 0 deletions admin/admin_forum_manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,15 @@
echo $echo;
echo '</table>';
echo '</td></tr></table>';
echo '<fieldset>';
echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_FORUM . '&nbsp;</legend>';
echo _AM_NEWBB_HELP_FORUM_TAB;
echo '<br>' . newbbDisplayImage('admin_edit', _EDIT) . '&nbsp;-&nbsp;' . _EDIT;
echo '<br>' . newbbDisplayImage('admin_delete', _DELETE) . '&nbsp;-&nbsp;' . _DELETE;
echo '<br>' . newbbDisplayImage('new_forum', _AM_NEWBB_CREATEFORUM) . '&nbsp;-&nbsp;' . _AM_NEWBB_CREATEFORUM;
echo '<br>' . newbbDisplayImage('admin_move', _AM_NEWBB_MOVE) . '&nbsp;-&nbsp;' . _AM_NEWBB_MOVE;
echo '<br>' . newbbDisplayImage('admin_merge', _AM_NEWBB_MERGE) . '&nbsp;-&nbsp;' . _AM_NEWBB_MERGE;
echo '</fieldset>';
break;
}
include_once __DIR__ . '/admin_footer.php';
5 changes: 5 additions & 0 deletions language/english/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
define('_AM_NEWBB_DIGEST_HELP_2', 'Create a newsletter is possible only after the topic is marked as \'Digest\'.');
define('_AM_NEWBB_DIGEST_HELP_3', 'The dispatch is made only to users signed up for notification of digest topics.');
define('_AM_NEWBB_DIGEST_HELP_4', 'After creating and sending, do not delete the created messages. Otherwise they will be generated again.');
define('_AM_NEWBB_DIGEST_HELP_AUTO_DIGEST', 'To configure the automatic creation and distribution of Digest topics, you need to create a cron task on your server.<br>For example: * NIX systems: <strong>0 6 * * * wget --post-data \'foo=bar\' https://example.com/modules/newbb/digest.php</strong><br>In this example, the script will run every day at 6.00 and check if there are any new Digest topics. If they are not found, mailing will not be done.<br>If for any reason you do not have the opportunity to create a task, then it is possible to create and make the dispatch on this page manually by clicking on the button above.<br>Please note that it is not recommended to delete created mailings, otherwise they will be created and sent again.');
//define('_AM_NEWBB_DIGEST_PAST', '<span style="color:red;">Should be sent out %d minutes ago</span>');
//define('_AM_NEWBB_DIGEST_NEXT', 'Need to send out in %d minutes');
//define('_AM_NEWBB_DIGEST_ARCHIVE', 'Digest archive');
Expand Down Expand Up @@ -317,3 +318,7 @@
define('_AM_NEWBB_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
define('_AM_NEWBB_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
define('_AM_NEWBB_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');

// Help tab
define('_AM_NEWBB_HELP_CATEGORY_TAB', 'To create a category, use the button above and fill in all the fields on the form.<br>By default, category images are located: /modules/newbb/assets/images/category/<br>Sponsor link should be written in the following format: https://xoops.org/modules/newbb/ newBB Support. First the link, then the sponsor\'s name or other text.');
define('_AM_NEWBB_HELP_FORUM_TAB', 'To create and manage the forums use the buttons with the right<br>To create the forum, use the \'Create forum\' button. Then fill in all the fields of the form. You can also create a subforum.<br>To move the forum between categories, use the \'Move\' button. Follow the further instructions.<br>To merge forums, use the \'Merge\' button. Follow the further instructions.');
2 changes: 1 addition & 1 deletion language/english/modinfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
define('_MI_NEWBB_SHOW_PERMISSIONTABLE', 'Show Permission Table');
define('_MI_NEWBB_SHOW_PERMISSIONTABLE_DESC', 'Setting YES will display user\'s right');
define('_MI_NEWBB_EMAIL_DIGEST', 'Email post digest');
define('_MI_NEWBB_EMAIL_DIGEST_DESC', 'Set time period for sending post digest to users');
define('_MI_NEWBB_EMAIL_DIGEST_DESC', 'Set time period for sending post digest to users<br><strong>Note:</strong> To enable this feature, read <a href="/modules/newbb/admin/admin_digest.php">recommendations</a> on setting up.');
define('_MI_NEWBB_EMAIL_NONE', 'No email');
define('_MI_NEWBB_EMAIL_DAILY', 'Daily');
define('_MI_NEWBB_EMAIL_WEEKLY', 'Weekly');
Expand Down

0 comments on commit 5250545

Please sign in to comment.