From 4766f36a4d74924f21ff329c4318ce4e069ffa04 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 3 Mar 2010 17:53:05 +0000
Subject: Pulled in the interface changes.

git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/diagnostics/index.php        | 18 +++++++++---------
 mod/diagnostics/languages/en.php |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'mod/diagnostics')

diff --git a/mod/diagnostics/index.php b/mod/diagnostics/index.php
index 0cae3743c..324790f29 100644
--- a/mod/diagnostics/index.php
+++ b/mod/diagnostics/index.php
@@ -14,15 +14,15 @@ set_context('admin');
 
 // system diagnostics
 $body = elgg_view_title(elgg_echo('diagnostics'));
-$body .= elgg_view('page_elements/contentwrapper', array('body' =>
-	elgg_echo('diagnostics:description') . elgg_view('diagnostics/forms/download'))
+$body .= "<div class='admin_settings diagnostics'>";
+$body .= elgg_view('page_elements/elgg_content', array('body' =>
+	"<h3>".elgg_echo('diagnostics:report')."</h3>".elgg_echo('diagnostics:description') . elgg_view('diagnostics/forms/download'))
 );
 
 // unit tests
-$body .= elgg_view_title(elgg_echo('diagnostics:unittester'));
-
-$test_body = '<p>' . elgg_echo('diagnostics:unittester:description') . '</p>';
-$test_body .= '<h3>' . elgg_echo('diagnostics:unittester:warning') . '</h3>';
+$body .= "<h3>".elgg_echo('diagnostics:unittester')."</h3>";
+$test_body = "<p>" . elgg_echo('diagnostics:unittester:description') . "</p>";
+$test_body .= "<p>" . elgg_echo('diagnostics:unittester:warning') . "</p>";
 
 if (isset($CONFIG->debug)) {
 	// create a button to run tests
@@ -34,9 +34,9 @@ if (isset($CONFIG->debug)) {
 	$test_body .= elgg_echo('diagnostics:unittester:debug');
 }
 
-$body .= elgg_view('page_elements/contentwrapper', array(
+$body .= elgg_view('page_elements/elgg_content', array(
 	'body' => $test_body)
 );
-
+$body .= "</div>";
 // create page
-page_draw(elgg_echo('diagnostics'), elgg_view_layout("two_column_left_sidebar", '', $body));
+page_draw(elgg_echo('diagnostics'), elgg_view_layout("one_column_with_sidebar", '', $body));
diff --git a/mod/diagnostics/languages/en.php b/mod/diagnostics/languages/en.php
index ae72564d7..c195da672 100644
--- a/mod/diagnostics/languages/en.php
+++ b/mod/diagnostics/languages/en.php
@@ -10,6 +10,7 @@
 	$english = array(
 
 			'diagnostics' => 'System diagnostics',
+			'diagnostics:report' => 'Diagnostics Report',
 			'diagnostics:unittester' => 'Unit Tests',
 
 			'diagnostics:description' => 'The following diagnostic report is useful for diagnosing any problems with Elgg, and should be attached to any bug reports you file.',
@@ -17,7 +18,7 @@
 
 			'diagnostics:unittester:description' => 'Unit tests check Elgg Core for broken or buggy APIs.',
 			'diagnostics:unittester:debug' => 'The site must be in debug mode to run unit tests.',
-			'diagnostics:unittester:warning' => 'WARNING: These tests can leave behind debugging objects in your database.  DO NOT USE ON A PRODUCTION SITE!',
+			'diagnostics:unittester:warning' => 'WARNING: These tests can leave behind debugging objects in your database.<br />DO NOT USE ON A PRODUCTION SITE!',
 
 			'diagnostics:test:executetest' => 'Execute test',
 			'diagnostics:test:executeall' => 'Execute All',
-- 
cgit v1.2.3