Fixes #3042: Theme preview navs now match css/elements/*. Also did a major cleanup of the presentation.

git-svn-id: http://code.elgg.org/elgg/trunk@9019 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 13 insertions, 57 deletions

diff --git a/mod/developers/views/default/theme_preview/navigation.php b/mod/developers/views/default/theme_preview/navigation.php
index 10cffd230..b80634317 100644
--- a/mod/developers/views/default/theme_preview/navigation.php
+++ b/mod/developers/views/default/theme_preview/navigation.php
@@ -2,64 +2,20 @@
 /**
  * Navigation CSS
  */
+echo elgg_view_module('info', "Tabs", elgg_view('theme_preview/navigation/tabs'));
 
-$url = current_page_url();
+echo elgg_view_module('info', "Pagination", elgg_view('theme_preview/navigation/pagination'));
 
-elgg_push_breadcrumb('First', "$url#");
-elgg_push_breadcrumb('Second', "$url#");
-elgg_push_breadcrumb('Third');
+echo elgg_view_module('info', "Site Menu (.elgg-menu-site)", elgg_view('theme_preview/navigation/site'));
+
+echo elgg_view_module('info', "Breadcrumbs (.elgg-breadcrumbs)", elgg_view('theme_preview/navigation/breadcrumbs'));
+
+echo elgg_view_module('info', "Page Menu (.elgg-menu-page)", elgg_view('theme_preview/navigation/page'));
+
+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', "Owner Block Menu (.elgg-menu-owner-block)", elgg_view('theme_preview/navigation/owner_block'));
 
 ?>
-<div class="elgg-page mal">
-	<?php echo elgg_view('theme_preview/header', $vars); ?>
-	<h2>Breadcrumbs</h2>
-	<div class="mbl">
-		<?php echo elgg_view('navigation/breadcrumbs'); ?>
-	</div>
-	<h2>Tabs</h2>
-	<div class="mbl">
-		<?php
-		$tabs = array(
-			array('title' => 'First', 'url' => "$url#"),
-			array('title' => 'Second', 'url' => "$url#", 'selected' => true),
-			array('title' => 'Third', 'url' => "$url#"),
-		);
-		echo elgg_view('navigation/tabs', array('tabs' => $tabs));
-		?>
-	</div>
-	<h2>Pagination</h2>
-	<div class="mbl">
-		<?php
-		$params = array(
-			'count' => 1000,
-			'limit' => 10,
-			'offset' => 230,
-		);
-		echo elgg_view('navigation/pagination', $params);
-		?>
-	</div>
-	<h2>Site Menu</h2>
-	<div class="mbl">
-		<div class="elgg-page-header" style="height: 40px;">
-	<?php
-		$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'][2]->setSelected(true);
-		echo elgg_view('navigation/menu/site', $params);
-	?>
-		</div>
-	</div>
-	<h2>Page Menu</h2>
-	<div class="mbl pam" style="width: 200px; background-color: #ccc;">
-	<?php
-		$m = new ElggMenuItem(10, "Child", "$url#");
-		$m->setParent($params['menu']['default'][1]);
-		$params['menu']['default'][1]->addChild($m);
-		echo elgg_view('navigation/menu/page', $params);
-	?>
-	</div>
-</div>