Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

7 files changed, 10 insertions, 8 deletions

diff --git a/mod/developers/views/default/admin/developers/inspect.php b/mod/developers/views/default/admin/develop_tools/inspect.php
index cfa3de2ea..cfa3de2ea 100644
--- a/mod/developers/views/default/admin/developers/inspect.php
+++ b/mod/developers/views/default/admin/develop_tools/inspect.php
diff --git a/mod/developers/views/default/admin/developers/preview.php b/mod/developers/views/default/admin/develop_tools/preview.php
index 920047d98..920047d98 100644
--- a/mod/developers/views/default/admin/developers/preview.php
+++ b/mod/developers/views/default/admin/develop_tools/preview.php
diff --git a/mod/developers/views/default/admin/developers/settings.php b/mod/developers/views/default/admin/developers/settings.php
index 287f4d99e..dcc0a3e4f 100644
--- a/mod/developers/views/default/admin/developers/settings.php
+++ b/mod/developers/views/default/admin/developers/settings.php
@@ -58,6 +58,6 @@ $data = array(
 	),
 );
 
-$form_vars = array('id' => 'developer-settings-form');
+$form_vars = array('id' => 'developer-settings-form', 'class' => 'elgg-form-settings');
 $body_vars = array('data' => $data);
 echo elgg_view_form('developers/settings', $form_vars, $body_vars);
diff --git a/mod/developers/views/default/js/developers/developers.php b/mod/developers/views/default/js/developers/developers.php
index e6c249eb1..6e82295aa 100644
--- a/mod/developers/views/default/js/developers/developers.php
+++ b/mod/developers/views/default/js/developers/developers.php
@@ -8,7 +8,7 @@ elgg.provide('elgg.dev');
 
 elgg.dev.init = function() {
 	$('.developers-form-inspect').live('submit', elgg.dev.inspectSubmit);
-}
+};
 
 /**
  * Submit the inspect form through Ajax
@@ -23,6 +23,7 @@ elgg.dev.inspectSubmit = function(event) {
 	$("#developers-ajax-loader").show();
 	
 	$(this).ajaxSubmit({
+		dataType : 'json',
 		success  : function(response) {
 			if (response) {
 				$("#developers-inspect-results").html(response.output);
@@ -38,6 +39,6 @@ elgg.dev.inspectSubmit = function(event) {
 	});
 
 	event.preventDefault();
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.dev.init);
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/forms.php b/mod/developers/views/default/theme_preview/forms.php
index efbe0b5a0..ffb77f3a9 100644
--- a/mod/developers/views/default/theme_preview/forms.php
+++ b/mod/developers/views/default/theme_preview/forms.php
@@ -20,11 +20,11 @@
 			?>
 		</div>
 		<div>
-			<label for="f3">Radio input (.elgg-input-radio):</label><br />
+			<label for="f3">Radio input (.elgg-input-radios):</label><br />
 			<?php echo elgg_view('input/radio', array(
 					'name' => 'f3',
 					'id' => 'f3',
-					'options' => array('a' => 1, 'b' => 2),
+					'options' => array('a (.elgg-input-radio)' => 1, 'b (.elgg-input-radio)' => 2),
 					));
 			?>
 		</div>
@@ -104,7 +104,7 @@
 			<?php echo elgg_view('input/date', array(
 					'name' => 'f12',
 					'id' => 'f12',
-					'value' => '12/12/2012'
+					'value' => '2012-12-31',
 					));
 			?>
 		</div>
diff --git a/mod/developers/views/default/theme_preview/general.php b/mod/developers/views/default/theme_preview/general.php
index 1a0b54c88..35d8ccbfd 100644
--- a/mod/developers/views/default/theme_preview/general.php
+++ b/mod/developers/views/default/theme_preview/general.php
@@ -17,6 +17,7 @@
 		'text' => elgg_echo('theme_preview:breakout'),
 		'href' => current_page_url(),
 		'target' => '_parent',
+		'is_trusted' => true,
 	));
 ?>
 </p>
diff --git a/mod/developers/views/default/theme_preview/icons/avatars.php b/mod/developers/views/default/theme_preview/icons/avatars.php
index cbce5bc7d..f50a6b70d 100644
--- a/mod/developers/views/default/theme_preview/icons/avatars.php
+++ b/mod/developers/views/default/theme_preview/icons/avatars.php
@@ -18,7 +18,7 @@
 		<?php

 			foreach ($sizes as $size) {

 				echo '<td>';

-				echo elgg_view_entity_icon($user, $size, array('hover' => false));

+				echo elgg_view_entity_icon($user, $size, array('use_hover' => false));

 				echo '</td>';

 			}

 		?>

@@ -28,7 +28,7 @@
 		<?php

 			foreach ($sizes as $size) {

 				echo '<td>';

-				echo elgg_view_entity_icon($group, $size, array('hover' => false));

+				echo elgg_view_entity_icon($group, $size, array('use_hover' => false));

 				echo '</td>';

 			}

 		?>