summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/Module/TopGivenNamesModule.php15
-rw-r--r--app/Module/TopPageViewsModule.php15
-rw-r--r--app/Module/TopSurnamesModule.php16
3 files changed, 3 insertions, 43 deletions
diff --git a/app/Module/TopGivenNamesModule.php b/app/Module/TopGivenNamesModule.php
index 04ee1de0ad..8d9f49ceb9 100644
--- a/app/Module/TopGivenNamesModule.php
+++ b/app/Module/TopGivenNamesModule.php
@@ -50,9 +50,8 @@ class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface
$num = $this->getBlockSetting($block_id, 'num', '10');
$infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
- $block = $this->getBlockSetting($block_id, 'block', '0');
- foreach (array('num', 'infoStyle', 'block') as $name) {
+ foreach (array('num', 'infoStyle') as $name) {
if (array_key_exists($name, $cfg)) {
$$name = $cfg[$name];
}
@@ -108,10 +107,6 @@ class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface
$content .= "</div>";
if ($template) {
- if ($block) {
- $class .= ' small_inner_block';
- }
-
return Theme::theme()->formatBlock($id, $title, $class, $content);
} else {
return $content;
@@ -142,12 +137,10 @@ class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface
if (Filter::postBool('save') && Filter::checkCsrf()) {
$this->setBlockSetting($block_id, 'num', Filter::postInteger('num', 1, 10000, 10));
$this->setBlockSetting($block_id, 'infoStyle', Filter::post('infoStyle', 'list|table', 'table'));
- $this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
}
$num = $this->getBlockSetting($block_id, 'num', '10');
$infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
- $block = $this->getBlockSetting($block_id, 'block', '0');
echo '<tr><td class="descriptionbox wrap width33">';
echo I18N::translate('Number of items to show');
@@ -160,11 +153,5 @@ class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface
echo '</td><td class="optionbox">';
echo FunctionsEdit::selectEditControl('infoStyle', array('list' => I18N::translate('list'), 'table' => I18N::translate('table')), null, $infoStyle, '');
echo '</td></tr>';
-
- echo '<tr><td class="descriptionbox wrap width33">';
- echo /* I18N: label for a yes/no option */ I18N::translate('Add a scrollbar when block contents grow');
- echo '</td><td class="optionbox">';
- echo FunctionsEdit::editFieldYesNo('block', $block);
- echo '</td></tr>';
}
}
diff --git a/app/Module/TopPageViewsModule.php b/app/Module/TopPageViewsModule.php
index 626d90bf85..fcb4fc6f8e 100644
--- a/app/Module/TopPageViewsModule.php
+++ b/app/Module/TopPageViewsModule.php
@@ -59,9 +59,8 @@ class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface
$num = $this->getBlockSetting($block_id, 'num', '10');
$count_placement = $this->getBlockSetting($block_id, 'count_placement', 'before');
- $block = $this->getBlockSetting($block_id, 'block', '0');
- foreach (array('count_placement', 'num', 'block') as $name) {
+ foreach (array('count_placement', 'num') as $name) {
if (array_key_exists($name, $cfg)) {
$$name = $cfg[$name];
}
@@ -110,10 +109,6 @@ class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface
$content .= "</table>";
if ($template) {
- if ($block) {
- $class .= ' small_inner_block';
- }
-
return Theme::theme()->formatBlock($id, $title, $class, $content);
} else {
return $content;
@@ -159,12 +154,10 @@ class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface
if (Filter::postBool('save') && Filter::checkCsrf()) {
$this->setBlockSetting($block_id, 'num', Filter::postInteger('num', 1, 10000, 10));
$this->setBlockSetting($block_id, 'count_placement', Filter::post('count_placement', 'before|after', 'before'));
- $this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
}
$num = $this->getBlockSetting($block_id, 'num', '10');
$count_placement = $this->getBlockSetting($block_id, 'count_placement', 'before');
- $block = $this->getBlockSetting($block_id, 'block', '0');
echo '<tr><td class="descriptionbox wrap width33">';
echo I18N::translate('Number of items to show');
@@ -177,11 +170,5 @@ class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface
echo "</td><td class=\"optionbox\">";
echo FunctionsEdit::selectEditControl('count_placement', array('before' => I18N::translate('before'), 'after' => I18N::translate('after')), null, $count_placement, '');
echo '</td></tr>';
-
- echo '<tr><td class="descriptionbox wrap width33">';
- echo /* I18N: label for a yes/no option */ I18N::translate('Add a scrollbar when block contents grow');
- echo '</td><td class="optionbox">';
- echo FunctionsEdit::editFieldYesNo('block', $block);
- echo '</td></tr>';
}
}
diff --git a/app/Module/TopSurnamesModule.php b/app/Module/TopSurnamesModule.php
index a5a6b0a87b..76805fe1a8 100644
--- a/app/Module/TopSurnamesModule.php
+++ b/app/Module/TopSurnamesModule.php
@@ -63,9 +63,8 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface {
$num = $this->getBlockSetting($block_id, 'num', '10');
$infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
- $block = $this->getBlockSetting($block_id, 'block', '0');
- foreach (array('num', 'infoStyle', 'block') as $name) {
+ foreach (array('num', 'infoStyle') as $name) {
if (array_key_exists($name, $cfg)) {
$$name = $cfg[$name];
}
@@ -130,13 +129,8 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface {
}
if ($template) {
- if ($block) {
- $class .= ' small_inner_block';
- }
-
return Theme::theme()->formatBlock($id, $title, $class, $content);
} else {
-
return $content;
}
}
@@ -165,12 +159,10 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface {
if (Filter::postBool('save') && Filter::checkCsrf()) {
$this->setBlockSetting($block_id, 'num', Filter::postInteger('num', 1, 10000, 10));
$this->setBlockSetting($block_id, 'infoStyle', Filter::post('infoStyle', 'list|array|table|tagcloud', 'table'));
- $this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
}
$num = $this->getBlockSetting($block_id, 'num', '10');
$infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
- $block = $this->getBlockSetting($block_id, 'block', '0');
echo '<tr><td class="descriptionbox wrap width33">';
echo I18N::translate('Number of items to show');
@@ -183,12 +175,6 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface {
echo '</td><td class="optionbox">';
echo FunctionsEdit::selectEditControl('infoStyle', array('list' => I18N::translate('bullet list'), 'array' => I18N::translate('compact list'), 'table' => I18N::translate('table'), 'tagcloud' => I18N::translate('tag cloud')), null, $infoStyle, '');
echo '</td></tr>';
-
- echo '<tr><td class="descriptionbox wrap width33">';
- echo /* I18N: label for a yes/no option */ I18N::translate('Add a scrollbar when block contents grow');
- echo '</td><td class="optionbox">';
- echo FunctionsEdit::editFieldYesNo('block', $block);
- echo '</td></tr>';
}
/**