Merge branch 'master' of github.com:Elgg/Elgg

3 files changed, 25 insertions, 1 deletions

diff --git a/mod/developers/languages/en.php b/mod/developers/languages/en.php
index a2db69bc4..53a9cd686 100644
--- a/mod/developers/languages/en.php
+++ b/mod/developers/languages/en.php
@@ -11,6 +11,7 @@ $english = array(
 	'admin:developers:preview' => 'Theming Preview',
 
 	// settings
+	'elgg_dev_tools:settings:explanation' => 'Control your development and debugging settings below. Some of these settings are also available on other admin pages.',
 	'developers:label:simple_cache' => 'Use simple cache',
 	'developers:help:simple_cache' => 'Turn off the file cache when developing. Otherwise, changes to your views (including css) will be ignored.',
 	'developers:label:view_path_cache' => 'Use view path cache',
@@ -26,6 +27,8 @@ $english = array(
 	'developers:debug:notice' => 'Notice',
 
 	// theme preview
+	'theme_preview:general' => 'Introduction',
+	'theme_preview:breakout' => 'Break out of iframe',
 	'theme_preview:buttons' => 'Buttons',
 	'theme_preview:components' => 'Components',
 	'theme_preview:forms' => 'Forms',
diff --git a/mod/developers/views/default/theme_preview/forms.php b/mod/developers/views/default/theme_preview/forms.php
index 60183ead9..efbe0b5a0 100644
--- a/mod/developers/views/default/theme_preview/forms.php
+++ b/mod/developers/views/default/theme_preview/forms.php
@@ -113,7 +113,6 @@
 			<?php echo elgg_view('input/userpicker', array(
 					'name' => 'f13',
 					'id' => 'f13',
-					'value' => array(new ElggUser(), new ElggUser(), new ElggUser()),
 					));
 			?>
 		</div>
diff --git a/mod/developers/views/default/theme_preview/general.php b/mod/developers/views/default/theme_preview/general.php
new file mode 100644
index 000000000..1a0b54c88
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/general.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Quick introduction to the theme preview
+ *
+ * @todo links to resources?
+ */
+?>
+
+<p>This theme preview provides a visual catalog for many of the theming elements
+	that Elgg uses. The primary css selector is listed with each theme element.
+	The preview is divided into sections that are listed in the page menu
+	(usually in the sidebar but depends on your current theme).
+</p>
+<p>
+<?php
+	echo elgg_view('output/url', array(
+		'text' => elgg_echo('theme_preview:breakout'),
+		'href' => current_page_url(),
+		'target' => '_parent',
+	));
+?>
+</p>