Merge branch 'floxglove-3' into saravea

Conflicts:
	.gitmodules

10 files changed, 129 insertions, 129 deletions

diff --git a/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php b/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
index c910b2aa4..0439bd577 100644
--- a/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
+++ b/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
@@ -1,10 +1,10 @@
-<?php

-elgg_push_breadcrumb('First', "#");

-elgg_push_breadcrumb('Second', "#");

-elgg_push_breadcrumb('Third');

-

-echo elgg_view('navigation/breadcrumbs', array('class' => mts));

-

-elgg_pop_breadcrumb();

-elgg_pop_breadcrumb();

-elgg_pop_breadcrumb();

+<?php
+elgg_push_breadcrumb('First', "#");
+elgg_push_breadcrumb('Second', "#");
+elgg_push_breadcrumb('Third');
+
+echo elgg_view('navigation/breadcrumbs', array('class' => mts));
+
+elgg_pop_breadcrumb();
+elgg_pop_breadcrumb();
+elgg_pop_breadcrumb();
diff --git a/mod/developers/views/default/theme_preview/navigation/default.php b/mod/developers/views/default/theme_preview/navigation/default.php
index bfd26162f..6efcd8890 100644
--- a/mod/developers/views/default/theme_preview/navigation/default.php
+++ b/mod/developers/views/default/theme_preview/navigation/default.php
@@ -1,11 +1,11 @@
-<?php 

-

-$params = array();

-$params['menu'] = array();

-$params['menu']['default'] = array();

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

-	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");

-}

-$params['menu']['default'][2]->setSelected(true);

-

-echo elgg_view('navigation/menu/default', $params);

+<?php 
+
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['menu']['default'][2]->setSelected(true);
+
+echo elgg_view('navigation/menu/default', $params);
diff --git a/mod/developers/views/default/theme_preview/navigation/extras.php b/mod/developers/views/default/theme_preview/navigation/extras.php
index 43b19f8e3..01bc6d434 100644
--- a/mod/developers/views/default/theme_preview/navigation/extras.php
+++ b/mod/developers/views/default/theme_preview/navigation/extras.php
@@ -1,18 +1,18 @@
-<?php

-

-$params = array();

-$params['menu'] = array();

-$params['menu']['default'] = array();

-$params['menu']['default'][] = new ElggMenuItem(1, elgg_view_icon('push-pin-alt'), "#");

-$params['menu']['default'][] = new ElggMenuItem(2, elgg_view_icon('rss'), "#");

-$params['menu']['default'][] = new ElggMenuItem(3, elgg_view_icon('star-alt'), "#");

-$params['name'] = 'extras';

-$params['class'] = 'elgg-menu-hz';

-

-?>

-

-<div class="elgg-sidebar">

-<?php 

-	echo elgg_view('navigation/menu/default', $params);

-?>

+<?php
+
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+$params['menu']['default'][] = new ElggMenuItem(1, elgg_view_icon('push-pin-alt'), "#");
+$params['menu']['default'][] = new ElggMenuItem(2, elgg_view_icon('rss'), "#");
+$params['menu']['default'][] = new ElggMenuItem(3, elgg_view_icon('star-alt'), "#");
+$params['name'] = 'extras';
+$params['class'] = 'elgg-menu-hz';
+
+?>
+
+<div class="elgg-sidebar">
+<?php 
+	echo elgg_view('navigation/menu/default', $params);
+?>
 </div>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/navigation/filter.php b/mod/developers/views/default/theme_preview/navigation/filter.php
index ea1c8b033..70cd31d2a 100644
--- a/mod/developers/views/default/theme_preview/navigation/filter.php
+++ b/mod/developers/views/default/theme_preview/navigation/filter.php
@@ -1,13 +1,13 @@
-<?php 

-

-$params = array();

-$params['menu'] = array();

-$params['menu']['default'] = array();

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

-	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");

-}

-$params['menu']['default'][2]->setSelected(true);

-

-$params['name'] = 'filter';

-

-echo elgg_view('navigation/menu/default', $params); 

+<?php 
+
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['menu']['default'][2]->setSelected(true);
+
+$params['name'] = 'filter';
+
+echo elgg_view('navigation/menu/default', $params); 
diff --git a/mod/developers/views/default/theme_preview/navigation/horizontal.php b/mod/developers/views/default/theme_preview/navigation/horizontal.php
index f404f42c0..44e04cd7c 100644
--- a/mod/developers/views/default/theme_preview/navigation/horizontal.php
+++ b/mod/developers/views/default/theme_preview/navigation/horizontal.php
@@ -1,12 +1,12 @@
-<?php 

-

-$params = array();

-$params['menu'] = array();

-$params['menu']['default'] = array();

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

-	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");

-}

-$params['menu']['default'][2]->setSelected(true);

-$params['class'] = 'elgg-menu-hz';

-

-echo elgg_view('navigation/menu/default', $params);

+<?php 
+
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['menu']['default'][2]->setSelected(true);
+$params['class'] = 'elgg-menu-hz';
+
+echo elgg_view('navigation/menu/default', $params);
diff --git a/mod/developers/views/default/theme_preview/navigation/owner_block.php b/mod/developers/views/default/theme_preview/navigation/owner_block.php
index 20b93d166..f5f203947 100644
--- a/mod/developers/views/default/theme_preview/navigation/owner_block.php
+++ b/mod/developers/views/default/theme_preview/navigation/owner_block.php
@@ -1,13 +1,13 @@
-<?php

-$params = array();

-$params['menu'] = array();

-$params['menu']['default'] = array();

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

-	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");

-}

-$params['menu']['default'][2]->setSelected(true);

-$params['name'] = 'owner-block';

-

-echo '<div class="elgg-sidebar">';

-echo elgg_view('navigation/menu/default', $params);

-echo '</div>';

+<?php
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['menu']['default'][2]->setSelected(true);
+$params['name'] = 'owner-block';
+
+echo '<div class="elgg-sidebar">';
+echo elgg_view('navigation/menu/default', $params);
+echo '</div>';
diff --git a/mod/developers/views/default/theme_preview/navigation/page.php b/mod/developers/views/default/theme_preview/navigation/page.php
index a57edc2e2..1da6a1fd9 100644
--- a/mod/developers/views/default/theme_preview/navigation/page.php
+++ b/mod/developers/views/default/theme_preview/navigation/page.php
@@ -1,20 +1,20 @@
-<?php

-

-$params = array();

-$params['menu'] = array();

-$params['menu']['default'] = array();

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

-	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");

-}

-$params['menu']['default'][2]->setSelected(true);

-

-$m = new ElggMenuItem(10, "Child", "#");

-$m->setParent($params['menu']['default'][1]);

-$params['menu']['default'][1]->addChild($m);

-?>

-

-<div class="elgg-sidebar">

-<?php 

-	echo elgg_view('navigation/menu/page', $params);

-?>

+<?php
+
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['menu']['default'][2]->setSelected(true);
+
+$m = new ElggMenuItem(10, "Child", "#");
+$m->setParent($params['menu']['default'][1]);
+$params['menu']['default'][1]->addChild($m);
+?>
+
+<div class="elgg-sidebar">
+<?php 
+	echo elgg_view('navigation/menu/page', $params);
+?>
 </div>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/navigation/pagination.php b/mod/developers/views/default/theme_preview/navigation/pagination.php
index 90ae48edf..f5e1b632d 100644
--- a/mod/developers/views/default/theme_preview/navigation/pagination.php
+++ b/mod/developers/views/default/theme_preview/navigation/pagination.php
@@ -1,8 +1,8 @@
-<?php

-$params = array(

-	'count' => 1000,

-	'limit' => 10,

-	'offset' => 230,

-);

-

+<?php
+$params = array(
+	'count' => 1000,
+	'limit' => 10,
+	'offset' => 230,
+);
+
 echo elgg_view('navigation/pagination', $params);
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/navigation/site.php b/mod/developers/views/default/theme_preview/navigation/site.php
index 329036b80..90bb8ff46 100644
--- a/mod/developers/views/default/theme_preview/navigation/site.php
+++ b/mod/developers/views/default/theme_preview/navigation/site.php
@@ -1,18 +1,18 @@
-<?php 

-

-$params = array();

-$params['menu'] = array();

-$params['menu']['default'] = array();

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

-	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");

-}

-$params['menu']['default'][2]->setSelected(true);

-?>

-

-<div class="elgg-page-header">

-	<div class="elgg-inner">

-	<?php 

-		echo elgg_view('navigation/menu/site', $params); 

-	?>

-	</div>

-</div>

+<?php 
+
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['menu']['default'][2]->setSelected(true);
+?>
+
+<div class="elgg-page-header">
+	<div class="elgg-inner">
+	<?php 
+		echo elgg_view('navigation/menu/site', $params); 
+	?>
+	</div>
+</div>
diff --git a/mod/developers/views/default/theme_preview/navigation/tabs.php b/mod/developers/views/default/theme_preview/navigation/tabs.php
index 81fe4e669..dd282dc83 100644
--- a/mod/developers/views/default/theme_preview/navigation/tabs.php
+++ b/mod/developers/views/default/theme_preview/navigation/tabs.php
@@ -1,10 +1,10 @@
-<?php

-$params = array(

-	'tabs' => array(

-		array('title' => 'First', 'url' => "#"),

-		array('title' => 'Second', 'url' => "#", 'selected' => true),

-		array('title' => 'Third', 'url' => "#"),

-	)

-);

-

+<?php
+$params = array(
+	'tabs' => array(
+		array('title' => 'First', 'url' => "#"),
+		array('title' => 'Second', 'url' => "#", 'selected' => true),
+		array('title' => 'Third', 'url' => "#"),
+	)
+);
+
 echo elgg_view('navigation/tabs', $params);
\ No newline at end of file