Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

5 files changed, 17 insertions, 18 deletions

diff --git a/mod/diagnostics/languages/en.php b/mod/diagnostics/languages/en.php
index 6d71945e3..c4e337b50 100644
--- a/mod/diagnostics/languages/en.php
+++ b/mod/diagnostics/languages/en.php
@@ -7,7 +7,7 @@
 
 	$english = array(
 
-			'admin:utilities:diagnostics' => 'System Diagnostics',
+			'admin:develop_utilities:diagnostics' => 'System Diagnostics',
 			'diagnostics' => 'System diagnostics',
 			'diagnostics:report' => 'Diagnostics Report',
 			'diagnostics:unittester' => 'Unit Tests',
diff --git a/mod/diagnostics/manifest.xml b/mod/diagnostics/manifest.xml
index e85b19aef..21e847d22 100644
--- a/mod/diagnostics/manifest.xml
+++ b/mod/diagnostics/manifest.xml
@@ -9,10 +9,9 @@
 	<description>Elgg diagnostics tool</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/diagnostics/start.php b/mod/diagnostics/start.php
index c55b10483..0bcc08bd9 100644
--- a/mod/diagnostics/start.php
+++ b/mod/diagnostics/start.php
@@ -12,11 +12,8 @@ elgg_register_event_handler('init', 'system', 'diagnostics_init');
  */
 function diagnostics_init() {
 
-	// Register a page handler, so we can have nice URLs
-	elgg_register_page_handler('diagnostics','diagnostics_page_handler');
-
 	// Add admin menu item
-	elgg_register_admin_menu_item('develop', 'diagnostics', 'utilities');
+	elgg_register_admin_menu_item('develop', 'diagnostics', 'develop_utilities');
 
 	// Register some actions
 	$file = elgg_get_plugins_path() . "diagnostics/actions/download.php";
diff --git a/mod/diagnostics/views/default/admin/utilities/diagnostics.php b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
index 76f12b0ae..89e235279 100644
--- a/mod/diagnostics/views/default/admin/utilities/diagnostics.php
+++ b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
@@ -4,8 +4,15 @@
  */
 
 $diagnostics_title = elgg_echo('diagnostics:report');
-$diagnostics = elgg_echo('diagnostics:description');
-$diagnostics .= elgg_view_form('diagnostics/download');
+$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>';
 
 // unit tests
 $unit_tests_title = elgg_echo('diagnostics:unittester');
@@ -18,6 +25,7 @@ if (elgg_get_config('debug')) {
 		'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 {
@@ -26,5 +34,5 @@ if (elgg_get_config('debug')) {
 }
 
 // display admin body
-echo elgg_view_module('inline', $diagnostics_title, $diagnostics);
-echo elgg_view_module('inline', $unit_tests_title, $unit_tests);
+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'));
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