3 files changed, 17 insertions, 25 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/diagnostics/forms/download.php b/mod/diagnostics/views/default/diagnostics/forms/download.php
deleted file mode 100644
index 93d1f12be..000000000
--- a/mod/diagnostics/views/default/diagnostics/forms/download.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-	/**
-	 * Elgg diagnostics
-	 * 
-	 * @package ElggDiagnostics
-	 * @author Curverider Ltd
-	 * @link http://elgg.com/
-	 */
-	
-	$form_body = elgg_view('input/submit', array('value' => elgg_echo('diagnostics:download')));
-	echo elgg_view('input/form', array('body' => $form_body, 'action' => $CONFIG->url . "action/diagnostics/download"));
-?>
-\ No newline at end of file
diff --git a/mod/diagnostics/views/default/diagnostics/runalltests.php b/mod/diagnostics/views/default/diagnostics/runalltests.php
deleted file mode 100644
index a21c58c80..000000000
--- a/mod/diagnostics/views/default/diagnostics/runalltests.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-	/**
-	 * Elgg diagnostics - unit tester
-	 * 
-	 * @package ElggDiagnostics
-	 * @author Curverider Ltd
-	 * @link http://elgg.com/
-	 */
-
-	$form_body .= elgg_view('input/submit', array('internalname' => 'execute', 'value' => elgg_echo('diagnostics:test:executeall')));
-
-	echo elgg_view('input/form', array('action' => $vars['url'] . "pg/diagnostics/tests/all", 'body' => $form_body));	
-?>
-\ No newline at end of file