]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8f5c54b)
theme_preview is using more familiar/correct page handling practices
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 19 Feb 2011 00:32:08 +0000 (00:32 +0000)
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 19 Feb 2011 00:32:08 +0000 (00:32 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8300 36083f99-b078-4883-b0ff-0f9b5a30f544

mod/developers/languages/en.php patch | blob | history
mod/developers/start.php patch | blob | history
mod/developers/views/default/page/shells/theme_preview.php patch | blob | history
mod/developers/views/default/theme_preview/header.php [deleted file] patch | blob | history
mod/developers/views/default/theme_preview/index.php [deleted file] patch | blob | history
mod/developers/views/default/theme_preview/navigation.php [moved from mod/developers/views/default/theme_preview/nav.php with 100% similarity] patch | blob | history

diff --git a/mod/developers/languages/en.php b/mod/developers/languages/en.php
index 5a8b8fdb01427f26b2175dc4042bcc4c2d85fde1..98adcb1eabff59577f85f84ede94c985d067b14b 100644 (file)
--- a/mod/developers/languages/en.php
+++ b/mod/developers/languages/en.php
@@ -20,7 +20,7 @@ $english = array(
 
        // theme preview
        'theme_preview:general' => 'General',
-       'theme_preview:nav' => 'Navigation',
+       'theme_preview:navigation' => 'Navigation',
        'theme_preview:forms' => 'Forms',
        'theme_preview:objects' => 'Objects',
        'theme_preview:grid' => 'Grid',
diff --git a/mod/developers/start.php b/mod/developers/start.php
index e6f4d46b57758bcb01a67970eb8aaf6836d52fb4..9e1d0236197084497ef833daa3ded1ba69c4fb4c 100644 (file)
--- a/mod/developers/start.php
+++ b/mod/developers/start.php
@@ -31,16 +31,29 @@ function developers_setup_menu() {
  */
 function developers_theme_preview_controller($page) {
        if (!isset($page[0])) {
-               $page[0] = 'index';
+               forward('pg/theme_preview/general');
        }
 
-       $pages = array('general', 'nav', 'forms', 'objects', 'grid', 'widgets', 'icons');
+       $pages = array(
+               'general', 
+               'navigation', 
+               'forms', 
+               'objects', 
+               'grid', 
+               'widgets', 
+               'icons',
+       );
+       
+       foreach ($pages as $page_name) {
+               elgg_register_menu_item('page', array(
+                       'name' => $page_name,
+                       'title' => elgg_echo("theme_preview:$page_name"),
+                       'url' => "pg/theme_preview/$page_name",
+               ));
+       }
 
        $title = elgg_echo("theme_preview:{$page[0]}");
-       $page =  elgg_view("theme_preview/{$page[0]}", array(
-               'pages' => $pages,
-               'page' => $page[0],
-       ));
+       $body =  elgg_view("theme_preview/{$page[0]}");
 
-       echo elgg_view_page($title, $page, 'theme_preview');
+       echo elgg_view_page($title, $body, 'theme_preview');
 }
diff --git a/mod/developers/views/default/page/shells/theme_preview.php b/mod/developers/views/default/page/shells/theme_preview.php
index 6652c609a69bb7ae928ad7d6accf4328a5ad3679..e986a3965eddf9efce767407848f393a7e49320d 100644 (file)
--- a/mod/developers/views/default/page/shells/theme_preview.php
+++ b/mod/developers/views/default/page/shells/theme_preview.php
@@ -17,6 +17,13 @@ header("Content-type: text/html; charset=UTF-8");
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
        <title><?php echo $vars['title']; ?></title>
        <link rel="stylesheet" href="<?php echo $screen; ?>" type="text/css" />
+       <style>
+               .elgg-page-body { margin: 20px }
+               .elgg-page-header:after {content:'.'; display:block; clear:both; height:0; visibility: hidden}
+               .elgg-page-header .elgg-menu-page > li {float:left; padding: 5px}
+               .elgg-page-header .elgg-menu-page > li > a {padding: 2px 4px}
+               .elgg-page-header .elgg-menu-page > li.elgg-state-selected > a {background-color:#0054A7;}
+       </style>
        <!--[if gt IE 6]>
                <link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" />
        <![endif]-->
@@ -34,8 +41,18 @@ foreach (elgg_get_js() as $script) {
 
 </head>
 <body>
-<?php
-echo $vars['body'];
-?>
+<div class="elgg-page">
+       <div class="elgg-page-header">
+               <div class="elgg-inner">
+                       <?php echo elgg_view_menu('page'); ?>
+               </div>
+       </div>
+       <div class="elgg-page-body">
+               <div class="elgg-inner">
+                       <?php echo elgg_view_title($vars['title']); ?>
+                       <?php echo $vars['body']; ?>
+               </div>
+       </div>
+</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/header.php b/mod/developers/views/default/theme_preview/header.php
deleted file mode 100644 (file)
index 8a4a804..0000000
--- a/mod/developers/views/default/theme_preview/header.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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']);
-
-$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/index.php b/mod/developers/views/default/theme_preview/index.php
deleted file mode 100644 (file)
index 5bb554d..0000000
--- a/mod/developers/views/default/theme_preview/index.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Main index for theme preview
- */
-
-$url = "pg/theme_preview";
-$url = elgg_normalize_url($url);
-
-echo <<<HTML
-<div class="elgg-page mal">
-       <h1 class="mbl"><a href="$url/index">Index</a></h1>
-       <ul class="mtl">
-               <li><a href="$url/general">General CSS</a></li>
-               <li><a href="$url/nav">Navigation CSS</a></li>
-               <li><a href="$url/forms">Form CSS</a></li>
-               <li><a href="$url/objects">Lists, modules, image blocks CSS</a></li>
-               <li><a href="$url/grid">Grid CSS</a></li>
-               <li><a href="$url/widgets">Widgets CSS</a></li>
-               <li><a href="$url/icons">Icons CSS</a></li>
-       </ul>
-</div>
-HTML;
Social Networking Engine