aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
Diffstat (limited to 'views/default')
-rw-r--r--views/default/forms/tidypics/admin/settings.php (renamed from views/default/tidypics/forms/settings.php)12
-rw-r--r--views/default/tidypics/admin/settings.php29
2 files changed, 21 insertions, 20 deletions
diff --git a/views/default/tidypics/forms/settings.php b/views/default/forms/tidypics/admin/settings.php
index 7e2aabb14..06b3f4cb9 100644
--- a/views/default/tidypics/forms/settings.php
+++ b/views/default/forms/tidypics/admin/settings.php
@@ -1,12 +1,8 @@
<?php
/**
- * Tidypics admin settings form
+ * Tidypics admin settings form body
*/
-
-
-$action = $vars['url'] . 'action/tidypics/admin/settings';
-
$plugin = find_plugin_settings('tidypics');
@@ -117,7 +113,7 @@ $img_river_view = $plugin->img_river_view;
if (!$img_river_view) {
$img_river_view = 'batch';
}
-$form_body .= '<p>' . elgg_echo('tidypics:settings:img_river_view');
+$form_body .= '<p>' . elgg_echo('tidypics:settings:img_river_view') . ': ';
$form_body .= elgg_view('input/pulldown', array(
'internalname' => 'params[img_river_view]',
'options_values' => array(
@@ -134,7 +130,7 @@ $album_river_view = $plugin->album_river_view;
if (!$album_river_view) {
$album_river_view = 'set';
}
-$form_body .= '<p>' . elgg_echo('tidypics:settings:album_river_view');
+$form_body .= '<p>' . elgg_echo('tidypics:settings:album_river_view') . ': ';
$form_body .= elgg_view('input/pulldown', array(
'internalname' => 'params[album_river_view]',
'options_values' => array(
@@ -180,4 +176,4 @@ $form_body .= '<p class="admin_debug">' . elgg_view("input/checkboxes", array('o
$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
-echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
+echo $form_body;
diff --git a/views/default/tidypics/admin/settings.php b/views/default/tidypics/admin/settings.php
index 6dace1830..e1d20f953 100644
--- a/views/default/tidypics/admin/settings.php
+++ b/views/default/tidypics/admin/settings.php
@@ -1,18 +1,23 @@
<?php
+/**
+ * Tidypics admin settings tab
+ */
-echo elgg_view('output/longtext', array('value' => elgg_echo("tidypics:admin:instructions")));
+$form_body = elgg_view('forms/tidypics/admin/settings', $vars);
-?>
-<p>
-<?php
-echo elgg_view('tidypics/admin/upgrade');
+$server_analysis_link = elgg_view('output/url', array(
+ 'href' => "{$vars['url']}mod/tidypics/pages/server_analysis.php",
+ 'text' => elgg_echo('tidypics:settings:server:analysis'),
+));
-$url = "{$vars['url']}mod/tidypics/pages/server_analysis.php";
-$text = elgg_echo('tidypics:settings:server:analysis');
+echo elgg_view('output/longtext', array('value' => elgg_echo('tidypics:admin:instructions')));
-echo "<a href=\"$url\">$text</a>";
-?>
-</p>
-<?php
+echo '<p>';
+echo elgg_view('tidypics/admin/upgrade');
+echo $server_analysis_link;
+echo '</p>';
-echo elgg_view("tidypics/forms/settings");
+echo elgg_view('input/form', array(
+ 'body' => $form_body,
+ 'action' => $vars['url'] . 'action/tidypics/admin/settings',
+));