Merge branch 'floxglove-3' into saravea

Conflicts:
	.gitmodules

4 files changed, 41 insertions, 41 deletions

diff --git a/mod/developers/views/default/theme_preview/components/image_block.php b/mod/developers/views/default/theme_preview/components/image_block.php
index 0bb16428b..ecd35ac65 100644
--- a/mod/developers/views/default/theme_preview/components/image_block.php
+++ b/mod/developers/views/default/theme_preview/components/image_block.php
@@ -1,6 +1,6 @@
-<?php

-$ipsum = elgg_view('developers/ipsum');

-

-$user = new ElggUser();

-$image = elgg_view_entity_icon($user, 'small');

-echo elgg_view_image_block($image, "$ipsum $ipsum $ipsum $ipsum $ipsum $ipsum $ipsum");

+<?php
+$ipsum = elgg_view('developers/ipsum');
+
+$user = new ElggUser();
+$image = elgg_view_entity_icon($user, 'small');
+echo elgg_view_image_block($image, "$ipsum $ipsum $ipsum $ipsum $ipsum $ipsum $ipsum");
diff --git a/mod/developers/views/default/theme_preview/components/list.php b/mod/developers/views/default/theme_preview/components/list.php
index 8096bda04..fcb6f768a 100644
--- a/mod/developers/views/default/theme_preview/components/list.php
+++ b/mod/developers/views/default/theme_preview/components/list.php
@@ -1,19 +1,19 @@
-<?php

-

-$obj1 = new ElggObject();

-$obj1->title = "Object 1";

-$obj1->description = $ipsum;

-

-$obj2 = new ElggObject();

-$obj2->title = "Object 2";

-$obj2->description = $ipsum;

-

-$obj3 = new ElggObject();

-$obj3->title = "Object 3";

-$obj3->description = $ipsum;

-

-$obj4 = new ElggObject();

-$obj4->title = "Object 4";

-$obj4->description = $ipsum;

-

-echo elgg_view('page/components/list', array('items' => array($obj1, $obj2, $obj3, $obj4)));

+<?php
+
+$obj1 = new ElggObject();
+$obj1->title = "Object 1";
+$obj1->description = $ipsum;
+
+$obj2 = new ElggObject();
+$obj2->title = "Object 2";
+$obj2->description = $ipsum;
+
+$obj3 = new ElggObject();
+$obj3->title = "Object 3";
+$obj3->description = $ipsum;
+
+$obj4 = new ElggObject();
+$obj4->title = "Object 4";
+$obj4->description = $ipsum;
+
+echo elgg_view('page/components/list', array('items' => array($obj1, $obj2, $obj3, $obj4)));
diff --git a/mod/developers/views/default/theme_preview/components/messages.php b/mod/developers/views/default/theme_preview/components/messages.php
index ac4d2bfd7..a53255291 100644
--- a/mod/developers/views/default/theme_preview/components/messages.php
+++ b/mod/developers/views/default/theme_preview/components/messages.php
@@ -1,5 +1,5 @@
-<ul>

-	<li class="elgg-message elgg-state-success mas">Success message (.elgg-state-success)</li>

-	<li class="elgg-message elgg-state-error mas">Error message (.elgg-state-error)</li>

-	<li class="elgg-message elgg-state-notice mas">Notice message (.elgg-state-notice)</li>

-</ul>

+<ul>
+	<li class="elgg-message elgg-state-success mas">Success message (.elgg-state-success)</li>
+	<li class="elgg-message elgg-state-error mas">Error message (.elgg-state-error)</li>
+	<li class="elgg-message elgg-state-notice mas">Notice message (.elgg-state-notice)</li>
+</ul>
diff --git a/mod/developers/views/default/theme_preview/components/table.php b/mod/developers/views/default/theme_preview/components/table.php
index 8b8b13e76..7d619dcea 100644
--- a/mod/developers/views/default/theme_preview/components/table.php
+++ b/mod/developers/views/default/theme_preview/components/table.php
@@ -1,12 +1,12 @@
-<table class="<?php echo $vars['class']; ?>">

-<?php

-	echo "<thead><tr><th>column 1</th><th>column 2</th></tr></thead>";

-	for ($i = 1; $i < 5; $i++) {

-		echo '<tr>';

-		for ($j = 1; $j < 3; $j++) {

-			echo "<td>value $j</td>";

-		}

-		echo '</tr>';

-	}

-?>

+<table class="<?php echo $vars['class']; ?>">
+<?php
+	echo "<thead><tr><th>column 1</th><th>column 2</th></tr></thead>";
+	for ($i = 1; $i < 5; $i++) {
+		echo '<tr>';
+		for ($j = 1; $j < 3; $j++) {
+			echo "<td>value $j</td>";
+		}
+		echo '</tr>';
+	}
+?>
 </table>
\ No newline at end of file