Merge tag '1.8.8' of git://github.com/Elgg/Elgg into lorea-preprod

Elgg 1.8.8 release

Conflicts:
	js/lib/languages.js

12 files changed, 45 insertions, 26 deletions

diff --git a/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php b/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
index eb3dd47a3..c910b2aa4 100644
--- a/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
+++ b/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
@@ -3,4 +3,8 @@ elgg_push_breadcrumb('First', "#");
 elgg_push_breadcrumb('Second', "#");

 elgg_push_breadcrumb('Third');

 

-echo elgg_view('navigation/breadcrumbs');

+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 fd67b8094..bfd26162f 100644
--- a/mod/developers/views/default/theme_preview/navigation/default.php
+++ b/mod/developers/views/default/theme_preview/navigation/default.php
@@ -4,7 +4,7 @@ $params = array();
 $params['menu'] = array();

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

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

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

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

 }

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

 

diff --git a/mod/developers/views/default/theme_preview/navigation/entity.php b/mod/developers/views/default/theme_preview/navigation/entity.php
new file mode 100644
index 000000000..465585b00
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/entity.php
@@ -0,0 +1,12 @@
+<?php
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+$params['menu']['default'][] = new ElggMenuItem(1, "Public", false);
+$params['menu']['default'][] = new ElggMenuItem(2, "Edit", "#");
+$params['menu']['default'][] = new ElggMenuItem(3, elgg_view_icon('thumbs-up'), "#");
+$params['name'] = 'entity';
+$params['class'] = 'elgg-menu-hz';
+
+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 6982cf57d..43b19f8e3 100644
--- a/mod/developers/views/default/theme_preview/navigation/extras.php
+++ b/mod/developers/views/default/theme_preview/navigation/extras.php
@@ -3,11 +3,11 @@
 $params = array();

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

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

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

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

-}

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

-

+$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';

 

 ?>

 

diff --git a/mod/developers/views/default/theme_preview/navigation/filter.php b/mod/developers/views/default/theme_preview/navigation/filter.php
index f27edf150..ea1c8b033 100644
--- a/mod/developers/views/default/theme_preview/navigation/filter.php
+++ b/mod/developers/views/default/theme_preview/navigation/filter.php
@@ -4,7 +4,7 @@ $params = array();
 $params['menu'] = array();

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

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

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

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

 }

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

 

diff --git a/mod/developers/views/default/theme_preview/navigation/footer.php b/mod/developers/views/default/theme_preview/navigation/footer.php
new file mode 100644
index 000000000..92a1bb43c
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/footer.php
@@ -0,0 +1,10 @@
+<?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['name'] = 'footer';
+
+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 69e75c063..f404f42c0 100644
--- a/mod/developers/views/default/theme_preview/navigation/horizontal.php
+++ b/mod/developers/views/default/theme_preview/navigation/horizontal.php
@@ -4,7 +4,7 @@ $params = array();
 $params['menu'] = array();

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

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

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

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

 }

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

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

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 6bf79fe7e..20b93d166 100644
--- a/mod/developers/views/default/theme_preview/navigation/owner_block.php
+++ b/mod/developers/views/default/theme_preview/navigation/owner_block.php
@@ -3,9 +3,11 @@ $params = array();
 $params['menu'] = array();

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

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

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

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

 }

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

-$params['class'] = 'elgg-menu-owner-block';

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

 

-echo elgg_view('navigation/menu/default', $params); 
\ No newline at end of file
+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 fb3f075dc..a57edc2e2 100644
--- a/mod/developers/views/default/theme_preview/navigation/page.php
+++ b/mod/developers/views/default/theme_preview/navigation/page.php
@@ -5,11 +5,10 @@ $params['menu'] = array();
 $params['menu']['default'] = array();

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

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

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

 }

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

 

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

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

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

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

 ?>

diff --git a/mod/developers/views/default/theme_preview/navigation/pagination.php b/mod/developers/views/default/theme_preview/navigation/pagination.php
deleted file mode 100644
index 90ae48edf..000000000
--- a/mod/developers/views/default/theme_preview/navigation/pagination.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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 df8dc1b70..329036b80 100644
--- a/mod/developers/views/default/theme_preview/navigation/site.php
+++ b/mod/developers/views/default/theme_preview/navigation/site.php
@@ -4,7 +4,7 @@ $params = array();
 $params['menu'] = array();

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

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

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

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

 }

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

 ?>

diff --git a/mod/developers/views/default/theme_preview/navigation/tabs.php b/mod/developers/views/default/theme_preview/navigation/tabs.php
index b2638bb37..81fe4e669 100644
--- a/mod/developers/views/default/theme_preview/navigation/tabs.php
+++ b/mod/developers/views/default/theme_preview/navigation/tabs.php
@@ -1,9 +1,9 @@
 <?php

 $params = array(

 	'tabs' => array(

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

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

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

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

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

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

 	)

 );