Refs #3041 adds footer and entity menu. Fixes several issues with other menus.

diff --git a/mod/developers/views/default/theme_preview/navigation.php b/mod/developers/views/default/theme_preview/navigation.php
index b80634317dc2028814f1486d92ba2346cceb017b..61f9392460c819ac4733d0e515c9667687bfce34 100644 (file)
--- a/mod/developers/views/default/theme_preview/navigation.php
+++ b/mod/developers/views/default/theme_preview/navigation.php
@@ -14,8 +14,10 @@ echo elgg_view_module('info', "Page Menu (.elgg-menu-page)", elgg_view('theme_pr
 
 echo elgg_view_module('info', "Filter Menu (.elgg-menu-filter)", elgg_view('theme_preview/navigation/filter'));
 
-echo elgg_view_module('info', "Extras Menu (.elgg-menu-extras)", elgg_view('theme_preview/navigation/extras'));
+echo elgg_view_module('info', "Extras Menu (.elgg-menu-extras and .elgg-menu-hz)", elgg_view('theme_preview/navigation/extras'));
+
+echo elgg_view_module('info', "Entity Menu (.elgg-menu-entity and .elgg-menu-hz)", elgg_view('theme_preview/navigation/entity'));
 
 echo elgg_view_module('info', "Owner Block Menu (.elgg-menu-owner-block)", elgg_view('theme_preview/navigation/owner_block'));
 
-?>
+echo elgg_view_module('info', "Footer Menu (.elgg-menu-footer)", elgg_view('theme_preview/navigation/footer'));

diff --git a/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php b/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
index eb3dd47a3d28fb1072c5f4788b65034b651a2b40..c910b2aa4b6f197e8c9dde394b1690631e7f6276 100644 (file)
--- 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', "#");\r
 elgg_push_breadcrumb('Third');\r
 \r
-echo elgg_view('navigation/breadcrumbs');\r
+echo elgg_view('navigation/breadcrumbs', array('class' => mts));\r
+\r
+elgg_pop_breadcrumb();\r
+elgg_pop_breadcrumb();\r
+elgg_pop_breadcrumb();\r

diff --git a/mod/developers/views/default/theme_preview/navigation/default.php b/mod/developers/views/default/theme_preview/navigation/default.php
index fd67b8094da258d7d7ad4ab1b40ffff9257a364a..bfd26162f3577d3b48abdf060d1363eb6cdf7ed3 100644 (file)
--- 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();\r
 $params['menu']['default'] = array();\r
 for ($i=1; $i<=5; $i++) {\r
-       $params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");\r
+       $params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");\r
 }\r
 $params['menu']['default'][2]->setSelected(true);\r
 \r

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 (file)
index 0000000..465585b
--- /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 6982cf57dc4b8c8caab6f714b229d2e4dc8dfb4f..43b19f8e3518f860194a56b7e8650136dcd18783 100644 (file)
--- 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();\r
 $params['menu'] = array();\r
 $params['menu']['default'] = array();\r
-for ($i=1; $i<=5; $i++) {\r
-       $params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");\r
-}\r
-$params['class'] = 'elgg-menu-extras';\r
-\r
+$params['menu']['default'][] = new ElggMenuItem(1, elgg_view_icon('push-pin-alt'), "#");\r
+$params['menu']['default'][] = new ElggMenuItem(2, elgg_view_icon('rss'), "#");\r
+$params['menu']['default'][] = new ElggMenuItem(3, elgg_view_icon('star-alt'), "#");\r
+$params['name'] = 'extras';\r
+$params['class'] = 'elgg-menu-hz';\r
 \r
 ?>\r
 \r

diff --git a/mod/developers/views/default/theme_preview/navigation/filter.php b/mod/developers/views/default/theme_preview/navigation/filter.php
index f27edf150d1eaf254421742b656125fa9586e82f..ea1c8b0330edf99ebaf38a075b17017ca5a5dfe3 100644 (file)
--- 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();\r
 $params['menu']['default'] = array();\r
 for ($i=1; $i<=5; $i++) {\r
-       $params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");\r
+       $params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");\r
 }\r
 $params['menu']['default'][2]->setSelected(true);\r
 \r

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 (file)
index 0000000..92a1bb4
--- /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 69e75c063ccc43ff96438cce5f19c6bcd31fb7a4..f404f42c0d7b5c154e93a845802ccc05c1591f65 100644 (file)
--- 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();\r
 $params['menu']['default'] = array();\r
 for ($i=1; $i<=5; $i++) {\r
-       $params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");\r
+       $params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");\r
 }\r
 $params['menu']['default'][2]->setSelected(true);\r
 $params['class'] = 'elgg-menu-hz';\r

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 6bf79fe7e0e326ea2da2af6abb3237f3d9710e01..20b93d16606d0dff2265a9b60674b25f5d798f0d 100644 (file)
--- 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();\r
 $params['menu']['default'] = array();\r
 for ($i=1; $i<=5; $i++) {\r
-       $params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");\r
+       $params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");\r
 }\r
 $params['menu']['default'][2]->setSelected(true);\r
-$params['class'] = 'elgg-menu-owner-block';\r
+$params['name'] = 'owner-block';\r
 \r
-echo elgg_view('navigation/menu/default', $params); 
\ No newline at end of file
+echo '<div class="elgg-sidebar">';\r
+echo elgg_view('navigation/menu/default', $params);\r
+echo '</div>';\r

diff --git a/mod/developers/views/default/theme_preview/navigation/page.php b/mod/developers/views/default/theme_preview/navigation/page.php
index fb3f075dc1248b52bdd27ce2fe1c36fc9f6044dc..a57edc2e2d3f8d4afff567e96164dc3e856ddded 100644 (file)
--- 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();\r
 for ($i=1; $i<=5; $i++) {\r
        $params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");\r
-       $params['menu']['alt'][] = new ElggMenuItem($i, "Page $i", "#");\r
 }\r
 $params['menu']['default'][2]->setSelected(true);\r
 \r
-$m = new ElggMenuItem(10, "Child", "$url#");\r
+$m = new ElggMenuItem(10, "Child", "#");\r
 $m->setParent($params['menu']['default'][1]);\r
 $params['menu']['default'][1]->addChild($m);\r
 ?>\r

diff --git a/mod/developers/views/default/theme_preview/navigation/site.php b/mod/developers/views/default/theme_preview/navigation/site.php
index df8dc1b70282de1c2a4de412f5e1cfd438099e0f..329036b80f9d0b73cbb4e582aa5d29a304187226 100644 (file)
--- 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();\r
 $params['menu']['default'] = array();\r
 for ($i=1; $i<=5; $i++) {\r
-       $params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");\r
+       $params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");\r
 }\r
 $params['menu']['default'][2]->setSelected(true);\r
 ?>\r

diff --git a/mod/developers/views/default/theme_preview/navigation/tabs.php b/mod/developers/views/default/theme_preview/navigation/tabs.php
index b2638bb37721e870d788d46aaac70bc18ecb2496..81fe4e66929d1a240ebb91034d3c92f290ef4cd7 100644 (file)
--- 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\r
 $params = array(\r
        'tabs' => array(\r
-               array('title' => 'First', 'url' => "$url#"),\r
-               array('title' => 'Second', 'url' => "$url#", 'selected' => true),\r
-               array('title' => 'Third', 'url' => "$url#"),\r
+               array('title' => 'First', 'url' => "#"),\r
+               array('title' => 'Second', 'url' => "#", 'selected' => true),\r
+               array('title' => 'Third', 'url' => "#"),\r
        )\r
 );\r
 \r