2 files changed, 17 insertions, 35 deletions
diff --git a/mod/diagnostics/views/default/admin/administer_utilities/diagnostics.php b/mod/diagnostics/views/default/admin/administer_utilities/diagnostics.php
new file mode 100644
index 000000000..c7ff3d5fc
--- /dev/null
+++ b/mod/diagnostics/views/default/admin/administer_utilities/diagnostics.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Diagnostics admin page
+ */
+
+$diagnostics_title = elgg_echo('diagnostics:report');
+$diagnostics = '<p>' . elgg_echo('diagnostics:description') .'</p>';
+$params = array(
+	'text' => elgg_echo('diagnostics:download'),
+	'href' => 'action/diagnostics/download',
+	'class' => 'elgg-button elgg-button-submit',
+	'is_action' => true,
+	'is_trusted' => true,
+);
+$diagnostics .= '<p>' . elgg_view('output/url', $params) . '</p>';
+
+echo elgg_view_module('inline', $diagnostics_title, $diagnostics, array('class' => 'elgg-form-settings'));
diff --git a/mod/diagnostics/views/default/admin/utilities/diagnostics.php b/mod/diagnostics/views/default/admin/utilities/diagnostics.php
deleted file mode 100644
index 44e6fa17b..000000000
--- a/mod/diagnostics/views/default/admin/utilities/diagnostics.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-
-$title = elgg_view_title(elgg_echo('diagnostics'));
-
-$diagnostics = "<h3>".elgg_echo('diagnostics:report')."</h3>";
-$diagnostics .= elgg_echo('diagnostics:description');
-$diagnostics .= elgg_view('diagnostics/forms/download');
-
-// unit tests
-$unit_tests = "<h3>".elgg_echo('diagnostics:unittester')."</h3>";
-$unit_tests .= "<p>" . elgg_echo('diagnostics:unittester:description') . "</p>";
-$unit_tests .= "<p>" . elgg_echo('diagnostics:unittester:warning') . "</p>";
-
-if (isset($CONFIG->debug)) {
-	// create a button to run tests
-	$params = array(
-		'text' => elgg_echo('diagnostics:test:executeall'),
-		'href' => elgg_get_site_url() . 'engine/tests/suite.php',
-		'class' => 'elgg-submit-button',
-	);
-	$unit_tests .= elgg_view('output/url', $params);
-} else {
-	// no tests when not in debug mode
-	$unit_tests .= elgg_echo('diagnostics:unittester:debug');
-}
-
-// display admin body
-echo <<<HTML
-$title
-<div class="admin_settings diagnostics">
-	$diagnostics
-	$unit_tests
-</div>
-HTML;