aboutsummaryrefslogtreecommitdiff
path: root/mod/diagnostics/views/default
diff options
context:
space:
mode:
Diffstat (limited to 'mod/diagnostics/views/default')
-rw-r--r--mod/diagnostics/views/default/admin/administer_utilities/diagnostics.php17
-rw-r--r--mod/diagnostics/views/default/admin/utilities/diagnostics.php44
-rw-r--r--mod/diagnostics/views/default/diagnostics/forms/download.php10
-rw-r--r--mod/diagnostics/views/default/forms/diagnostics/download.php5
4 files changed, 17 insertions, 59 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 9b5da95f7..000000000
--- a/mod/diagnostics/views/default/admin/utilities/diagnostics.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-
-$diagnostics_title = elgg_echo('diagnostics:report');
-$diagnostics = elgg_echo('diagnostics:description');
-$diagnostics .= elgg_view('diagnostics/forms/download');
-
-// unit tests
-$unit_tests_title = elgg_echo('diagnostics:unittester');
-$unit_tests .= "<p>" . elgg_echo('diagnostics:unittester:description') . "</p>";
-$unit_tests .= "<p>" . elgg_echo('diagnostics:unittester:warning') . "</p>";
-
-if (elgg_get_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-button-submit',
- );
- $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
-<div class="elgg-module elgg-module-inline">
- <div class="elgg-head">
- <h3>$diagnostics_title</h3>
- </div>
- <div class="elgg-body">
- $diagnostics
- </div>
-</div>
-<div class="elgg-module elgg-module-inline">
- <div class="elgg-head">
- <h3>$unit_tests_title</h3>
- </div>
- <div class="elgg-body">
- $unit_tests
- </div>
-</div>
-HTML;
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 7f48a7608..000000000
--- a/mod/diagnostics/views/default/diagnostics/forms/download.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * Elgg diagnostics
- *
- * @package ElggDiagnostics
- */
-
-elgg_deprecated_notice("Use elgg_view_form('diagnostics/download') instead of elgg_view('diagnostics/forms/download')", 1.8);
-
-echo elgg_view_form("diagnostics/download");
diff --git a/mod/diagnostics/views/default/forms/diagnostics/download.php b/mod/diagnostics/views/default/forms/diagnostics/download.php
deleted file mode 100644
index b0abe8434..000000000
--- a/mod/diagnostics/views/default/forms/diagnostics/download.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-/**
- * Diagnostics download form
- */
-echo elgg_view('input/submit', array('value' => elgg_echo('diagnostics:download'))); \ No newline at end of file