diff options
Diffstat (limited to 'modules_v3/top10_surnames/module.php')
| -rw-r--r-- | modules_v3/top10_surnames/module.php | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/modules_v3/top10_surnames/module.php b/modules_v3/top10_surnames/module.php index d22c8097a3..001faa4b87 100644 --- a/modules_v3/top10_surnames/module.php +++ b/modules_v3/top10_surnames/module.php @@ -1,6 +1,6 @@ <?php // webtrees: Web based Family History software -// Copyright (C) 2014 webtrees development team. +// Copyright (C) 2015 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -20,6 +20,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA use WT\Auth; +use WT\Theme; /** * Class top10_surnames_WT_Module @@ -44,9 +45,10 @@ class top10_surnames_WT_Module extends WT_Module implements WT_Module_Block { $COMMON_NAMES_REMOVE = $WT_TREE->getPreference('COMMON_NAMES_REMOVE'); $COMMON_NAMES_THRESHOLD = $WT_TREE->getPreference('COMMON_NAMES_THRESHOLD'); - $num = get_block_setting($block_id, 'num', 10); + $num = get_block_setting($block_id, 'num', '10'); $infoStyle = get_block_setting($block_id, 'infoStyle', 'table'); - $block = get_block_setting($block_id, 'block', false); + $block = get_block_setting($block_id, 'block', '0'); + if ($cfg) { foreach (array('num', 'infoStyle', 'block') as $name) { if (array_key_exists($name, $cfg)) { @@ -115,10 +117,9 @@ class top10_surnames_WT_Module extends WT_Module implements WT_Module_Block { if ($template) { if ($block) { - require WT_THEME_DIR . 'templates/block_small_temp.php'; - } else { - require WT_THEME_DIR . 'templates/block_main_temp.php'; + $class .= ' small_inner_block'; } + return Theme::theme()->formatBlock($id, $title, $class, $content); } else { return $content; @@ -146,26 +147,26 @@ class top10_surnames_WT_Module extends WT_Module implements WT_Module_Block { set_block_setting($block_id, 'num', WT_Filter::postInteger('num', 1, 10000, 10)); set_block_setting($block_id, 'infoStyle', WT_Filter::post('infoStyle', 'list|array|table|tagcloud', 'table')); set_block_setting($block_id, 'block', WT_Filter::postBool('block')); - exit; } require_once WT_ROOT . 'includes/functions/functions_edit.php'; - $num = get_block_setting($block_id, 'num', 10); + $num = get_block_setting($block_id, 'num', '10'); + $infoStyle = get_block_setting($block_id, 'infoStyle', 'table'); + $block = get_block_setting($block_id, 'block', '0'); + echo '<tr><td class="descriptionbox wrap width33">'; echo WT_I18N::translate('Number of items to show'); echo '</td><td class="optionbox">'; echo '<input type="text" name="num" size="2" value="', $num, '">'; echo '</td></tr>'; - $infoStyle = get_block_setting($block_id, 'infoStyle', 'table'); echo '<tr><td class="descriptionbox wrap width33">'; echo WT_I18N::translate('Presentation style'); echo '</td><td class="optionbox">'; echo select_edit_control('infoStyle', array('list' => WT_I18N::translate('bullet list'), 'array' => WT_I18N::translate('compact list'), 'table' => WT_I18N::translate('table'), 'tagcloud' => WT_I18N::translate('tag cloud')), null, $infoStyle, ''); echo '</td></tr>'; - $block = get_block_setting($block_id, 'block', false); echo '<tr><td class="descriptionbox wrap width33">'; echo /* I18N: label for a yes/no option */ WT_I18N::translate('Add a scrollbar when block contents grow'); echo '</td><td class="optionbox">'; |