From 51229ebc6691f8edb17a5f15328aa626eabc09fc Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 1 Jan 2012 14:05:31 -0500
Subject: Fixes #4137 moves test UI to developers plugin

---
 .../default/admin/develop_utilities/diagnostics.php | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php')

diff --git a/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
index 89e235279..c7ff3d5fc 100644
--- a/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
+++ b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
@@ -14,25 +14,4 @@ $params = array(
 );
 $diagnostics .= '<p>' . elgg_view('output/url', $params) . '</p>';
 
-// 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' => 'engine/tests/suite.php',
-		'class' => 'elgg-button elgg-button-submit',
-		'is_trusted' => true,
-	);
-	$unit_tests .= '<p>' . elgg_view('output/url', $params) . '</p>';
-} else {
-	// no tests when not in debug mode
-	$unit_tests .= elgg_echo('diagnostics:unittester:debug');
-}
-
-// display admin body
 echo elgg_view_module('inline', $diagnostics_title, $diagnostics, array('class' => 'elgg-form-settings'));
-echo elgg_view_module('inline', $unit_tests_title, $unit_tests, array('class' => 'elgg-form-settings'));
-- 
cgit v1.2.3


From 25d11f6cdcc200ae00332197c9bd86858e3620b8 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sun, 1 Jan 2012 19:42:53 -0500
Subject: moved diagnostics to administer utilities menu area rather than
 developers

---
 mod/diagnostics/languages/en.php                        |  4 ++--
 mod/diagnostics/start.php                               |  2 +-
 .../default/admin/administer_utilities/diagnostics.php  | 17 +++++++++++++++++
 .../default/admin/develop_utilities/diagnostics.php     | 17 -----------------
 4 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 mod/diagnostics/views/default/admin/administer_utilities/diagnostics.php
 delete mode 100644 mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php

(limited to 'mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php')

diff --git a/mod/diagnostics/languages/en.php b/mod/diagnostics/languages/en.php
index 3619b2ee1..54859941d 100644
--- a/mod/diagnostics/languages/en.php
+++ b/mod/diagnostics/languages/en.php
@@ -6,10 +6,10 @@
  */
 
 $english = array(
-	'admin:develop_utilities:diagnostics' => 'System Diagnostics',
+	'admin:administer_utilities:diagnostics' => 'System Diagnostics',
 	'diagnostics' => 'System diagnostics',
 	'diagnostics:report' => 'Diagnostics Report',
-	'diagnostics:description' => 'The following diagnostic report is useful for diagnosing any problems with Elgg, and should be attached to any bug reports you file.',
+	'diagnostics:description' => 'The following diagnostic report can be useful for diagnosing problems with Elgg. The developers of Elgg may request that you attach it to a bug report.',
 	'diagnostics:download' => 'Download',
 	'diagnostics:header' => '========================================================================
 Elgg Diagnostic Report
diff --git a/mod/diagnostics/start.php b/mod/diagnostics/start.php
index 0bcc08bd9..55842800a 100644
--- a/mod/diagnostics/start.php
+++ b/mod/diagnostics/start.php
@@ -13,7 +13,7 @@ elgg_register_event_handler('init', 'system', 'diagnostics_init');
 function diagnostics_init() {
 
 	// Add admin menu item
-	elgg_register_admin_menu_item('develop', 'diagnostics', 'develop_utilities');
+	elgg_register_admin_menu_item('administer', 'diagnostics', 'administer_utilities');
 
 	// Register some actions
 	$file = elgg_get_plugins_path() . "diagnostics/actions/download.php";
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/develop_utilities/diagnostics.php b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
deleted file mode 100644
index c7ff3d5fc..000000000
--- a/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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'));
-- 
cgit v1.2.3