Refs #2903 navigation updated for theme preview

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

diff --git a/mod/developers/start.php b/mod/developers/start.php
index 5763d5d34d7b4a7f82562bae728456b9a475b411..e8e2b850643cbd6110c5fa3904f4fd0709480e8b 100644 (file)
--- a/mod/developers/start.php
+++ b/mod/developers/start.php
@@ -34,8 +34,16 @@ function developers_theme_preview_controller($page) {
                $page[0] = 'index';
        }
 
+       $pages = array('general', 'nav', 'forms', 'objects', 'grid', 'widgets', 'icons');
+
+       elgg_set_config('tp_ipsum', "Sed scelerisque sagittis lorem. Phasellus sodales.
+               Nulla urna justo, vehicula in, suscipit nec, molestie sed, tellus.");
+
        $title = elgg_echo("theme_preview:{$page[0]}");
-       $page =  elgg_view("theme_preview/{$page[0]}");
+       $page =  elgg_view("theme_preview/{$page[0]}", array(
+               'pages' => $pages,
+               'page' => $page[0],
+       ));
 
        echo elgg_view_page($title, $page, 'theme_preview');
-}
\ No newline at end of file
+}

diff --git a/mod/developers/views/default/admin/developers/preview.php b/mod/developers/views/default/admin/developers/preview.php
index 59e403bf72f0e385ced62bb0d57760cc7fd37344..3d16e5a42c3c260e54af4c583d9c0b57356d10cf 100644 (file)
--- a/mod/developers/views/default/admin/developers/preview.php
+++ b/mod/developers/views/default/admin/developers/preview.php
@@ -3,6 +3,6 @@
  * CSS Preview
  */
 
-$url = elgg_get_site_url() . 'documentation/theming/preview/index.php';
+$url = elgg_get_site_url() . 'pg/theme_preview/';
 ?>
 <iframe id="developers-iframe" src="<?php echo $url; ?>"></iframe>
\ No newline at end of file

diff --git a/mod/developers/views/default/theme_preview/forms.php b/mod/developers/views/default/theme_preview/forms.php
index 90cc5dcc816368abb18965f9852fe3ce885705bf..621f71b33ab3be5ddfcc853f0c07d7fd926c580c 100644 (file)
--- a/mod/developers/views/default/theme_preview/forms.php
+++ b/mod/developers/views/default/theme_preview/forms.php
@@ -5,14 +5,11 @@
 
 $url = current_page_url();
 
+$ipsum = elgg_get_config('tp_ipsum');
+
 ?>
 <div class="elgg-page mal">
-       <h1 class="mbs">
-               <a href="index.php">Index</a> > <a href="<?php echo $url; ?>"><?php echo $title; ?></a>
-       </h1>
-       <div class="mbl">
-               <a href="nav.php">< previous</a>&nbsp;&nbsp;<a href="objects.php">next ></a>
-       </div>
+       <?php echo elgg_view('theme_preview/header', $vars); ?>
        <h2>Form</h2>
        <form action="#">
                <fieldset>

diff --git a/mod/developers/views/default/theme_preview/general.php b/mod/developers/views/default/theme_preview/general.php
index e64a60748e6f8ee182237921de705b51fb8ff7c0..52400ab1d09757c614338e7faba984d3e6f11b22 100644 (file)
--- a/mod/developers/views/default/theme_preview/general.php
+++ b/mod/developers/views/default/theme_preview/general.php
@@ -3,15 +3,12 @@
  * General CSS
  */
 
+$ipsum = elgg_get_config('tp_ipsum');
+
 ?>
 
 <div class="elgg-page mal">
-       <h1 class="mbs">
-               <a href="index.php">Index</a> > <a href="<?php echo $url; ?>"><?php echo $title; ?></a>
-       </h1>
-       <div class="mbl">
-               < previous&nbsp;&nbsp;<a href="nav.php">next ></a>
-       </div>
+       <?php echo elgg_view('theme_preview/header', $vars); ?>
        <h2>Headings</h2>
        <div class="mbl">
                <h1>Level 1 heading</h1>

diff --git a/mod/developers/views/default/theme_preview/grid.php b/mod/developers/views/default/theme_preview/grid.php
index 8e85d5c7294a3cf170ee31fc7e74d655fa3ba43a..95e14cfd50bdf3bb3142cb24c93004d20f93c80b 100644 (file)
--- a/mod/developers/views/default/theme_preview/grid.php
+++ b/mod/developers/views/default/theme_preview/grid.php
@@ -5,12 +5,7 @@
 
 ?>
 <div class="elgg-page mal">
-       <h1 class="mbs">
-               <a href="index.php">Index</a> > <a href="<?php echo $url; ?>"><?php echo $title; ?></a>
-       </h1>
-       <div class="mbl">
-               <a href="objects.php">< previous</a>&nbsp;&nbsp;<a href="widgets.php">next ></a>
-       </div>
+       <?php echo elgg_view('theme_preview/header', $vars); ?>
 
 <style>
 h3 {text-align: center;}

diff --git a/mod/developers/views/default/theme_preview/header.php b/mod/developers/views/default/theme_preview/header.php
new file mode 100644 (file)
index 0000000..0aa1234
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/header.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Header for theme preview pages
+ *
+ * @uses $vars['title']
+ * @uses $vars['page']
+ * @uses $vars['pages']
+ */
+$index_url = 'pg/theme_preview/';
+$index_url = elgg_normalize_url($index_url);
+
+$url = current_page_url();
+
+$title = elgg_echo("theme_preview:{$vars['page']}");
+
+$index = array_search($vars['page'], $vars['pages']);
+echo $index;
+
+$previous = '< previous';
+if ($index > 0) {
+       $previous = elgg_view('output/url', array(
+               'href' => "pg/theme_preview/{$vars['pages'][$index - 1]}",
+               'text' => $previous,
+       ));
+}
+
+$next = 'next >';
+if ($index < (count($vars['pages']) - 1)) {
+       $next = elgg_view('output/url', array(
+               'href' => "pg/theme_preview/{$vars['pages'][$index + 1]}",
+               'text' => $next,
+       ));
+}
+
+echo <<<HTML
+<h1 class="mbs">
+       <a href="$index_url">Index</a> >
+       <a href="$url">$title</a>
+</h1>
+<div class="mbl">
+       $previous&nbsp;&nbsp;$next
+</div>
+HTML;

diff --git a/mod/developers/views/default/theme_preview/icons.php b/mod/developers/views/default/theme_preview/icons.php
index 792818e3123b85ed0560611c4f8d4167f1f732cc..89aa8cbc6dc6bd92aeb6c12f9667520a81558470 100644 (file)
--- a/mod/developers/views/default/theme_preview/icons.php
+++ b/mod/developers/views/default/theme_preview/icons.php
@@ -6,12 +6,7 @@
 ?>
 <style>li {margin: 10px; float: left;} ul {background-color: #e0e0e0;}</style>
 <div class="elgg-page mal">
-       <h1 class="mbs">
-               <a href="index.php">Index</a> > <a href="<?php echo $url; ?>"><?php echo $title; ?></a>
-       </h1>
-       <div class="mbl">
-               <a href="widgets.php">< previous</a>&nbsp;&nbsp;next >
-       </div>
+       <?php echo elgg_view('theme_preview/header', $vars); ?>
        <h2>Icon Sprites</h2>
        <ul class="mbl clearfix">
                <li><span class="elgg-icon elgg-icon-settings"></span>Settings</li>

diff --git a/mod/developers/views/default/theme_preview/nav.php b/mod/developers/views/default/theme_preview/nav.php
index 7fdf49a8ee3046ce94cf4ee9ba819faac6b62d78..4e6f4d3d66e2466428693fe053193bf223c93ef9 100644 (file)
--- a/mod/developers/views/default/theme_preview/nav.php
+++ b/mod/developers/views/default/theme_preview/nav.php
@@ -11,12 +11,7 @@ elgg_push_breadcrumb('Third');
 
 ?>
 <div class="elgg-page mal">
-       <h1 class="mbs">
-               <a href="index.php">Index</a> > <a href="<?php echo $url; ?>"><?php echo $title; ?></a>
-       </h1>
-       <div class="mbl">
-               <a href="general.php">< previous</a>&nbsp;&nbsp;<a href="forms.php">next ></a>
-       </div>
+       <?php echo elgg_view('theme_preview/header', $vars); ?>
        <h2>Breadcrumbs</h2>
        <div class="mbl">
                <?php echo elgg_view('navigation/breadcrumbs'); ?>

diff --git a/mod/developers/views/default/theme_preview/objects.php b/mod/developers/views/default/theme_preview/objects.php
index fc773afb99281c319d107fde6bde1cbfd2fee78d..d385fcdc062a1a90e2a25e19586c2f07e7a88259 100644 (file)
--- a/mod/developers/views/default/theme_preview/objects.php
+++ b/mod/developers/views/default/theme_preview/objects.php
@@ -5,15 +5,12 @@
 
 $url = current_page_url();
 
+$ipsum = elgg_get_config('tp_ipsum');
+
 ?>
 
 <div class="elgg-page mal">
-       <h1 class="mbs">
-               <a href="index.php">Index</a> > <a href="<?php echo $url; ?>"><?php echo $title; ?></a>
-       </h1>
-       <div class="mbl">
-               <a href="forms.php">< previous</a>&nbsp;&nbsp;<a href="grid.php">next ></a>
-       </div>
+       <?php echo elgg_view('theme_preview/header', $vars); ?>
        <h2>Modules</h2>
        <div class="mbl clearfix">
                <div class="elgg-col elgg-col-1of2">

diff --git a/mod/developers/views/default/theme_preview/widgets.php b/mod/developers/views/default/theme_preview/widgets.php
index 7f3fc938c297a4f65d5a4d4972585015ce53d22f..32ee487c82dfae39a15a6e8b09c94a7fde63776b 100644 (file)
--- a/mod/developers/views/default/theme_preview/widgets.php
+++ b/mod/developers/views/default/theme_preview/widgets.php
@@ -10,8 +10,7 @@ elgg_register_plugin_hook_handler('view', 'widgets/friends/edit', 'css_widget_co
 elgg_register_plugin_hook_handler('permissions_check', 'all', 'css_permissions_override');
 
 function css_widget_content() {
-       global $ipsum;
-       return $ipsum;
+       return elgg_get_config('tp_ipsum');
 }
 
 function css_permissions_override() {
@@ -21,12 +20,7 @@ function css_permissions_override() {
 
 ?>
 <div class="elgg-page mal">
-       <h1 class="mbs">
-               <a href="index.php">Index</a> > <a href="<?php echo $url; ?>"><?php echo $title; ?></a>
-       </h1>
-       <div class="mbl">
-               <a href="grid.php">< previous</a>&nbsp;&nbsp;<a href="icons.php">next ></a>
-       </div>
+       <?php echo elgg_view('theme_preview/header', $vars); ?>
 <?php
 $w = array();
 for ($i=1; $i<=6; $i++) {