]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Fixes #3042: Theme preview navs now match css/elements/*. Also did a major cleanup...
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 23 Apr 2011 00:30:17 +0000 (00:30 +0000)
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 23 Apr 2011 00:30:17 +0000 (00:30 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@9019 36083f99-b078-4883-b0ff-0f9b5a30f544

35 files changed:
mod/developers/languages/en.php
mod/developers/start.php
mod/developers/views/default/page/theme_preview.php
mod/developers/views/default/theme_preview/buttons.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/components.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/components/image_block.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/components/list.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/components/messages.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/components/table.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/forms.php
mod/developers/views/default/theme_preview/general.php [deleted file]
mod/developers/views/default/theme_preview/grid.php
mod/developers/views/default/theme_preview/icons.php
mod/developers/views/default/theme_preview/icons/avatars.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/icons/loader.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/icons/sprites.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/modules.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/modules/modules.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/modules/widgets.php [moved from mod/developers/views/default/theme_preview/widgets.php with 98% similarity]
mod/developers/views/default/theme_preview/navigation.php
mod/developers/views/default/theme_preview/navigation/breadcrumbs.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/navigation/default.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/navigation/extras.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/navigation/filter.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/navigation/horizontal.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/navigation/owner_block.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/navigation/page.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/navigation/pagination.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/navigation/site.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/navigation/tabs.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/objects.php [deleted file]
mod/developers/views/default/theme_preview/typography.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/typography/headings.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/typography/misc.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/typography/paragraph.php [new file with mode: 0644]

index 41bdcdddb7181249d53b9c1b629b2d4e126c53c6..a2db69bc423a1fce02d3162702e0a5aa22f514ff 100644 (file)
@@ -26,13 +26,14 @@ $english = array(
        'developers:debug:notice' => 'Notice',
 
        // theme preview
-       'theme_preview:general' => 'General',
-       'theme_preview:navigation' => 'Navigation',
+       'theme_preview:buttons' => 'Buttons',
+       'theme_preview:components' => 'Components',
        'theme_preview:forms' => 'Forms',
-       'theme_preview:objects' => 'Objects',
        'theme_preview:grid' => 'Grid',
-       'theme_preview:widgets' => 'Widgets',
        'theme_preview:icons' => 'Icons',
+       'theme_preview:modules' => 'Modules',
+       'theme_preview:navigation' => 'Navigation',
+       'theme_preview:typography' => 'Typography',
 );
 
 add_translation('en', $english);
index dc8e6f66eb050ac0fa10431bfafdc29a398669af..c05432e303c9753c6e884b4563af23a74fe435c4 100644 (file)
@@ -45,13 +45,14 @@ function developers_theme_preview_controller($page) {
        }
 
        $pages = array(
-               'general', 
-               'navigation', 
+               'buttons',
+               'components', 
                'forms', 
-               'objects', 
                'grid', 
-               'widgets', 
                'icons',
+               'modules', 
+               'navigation', 
+               'typography', 
        );
        
        foreach ($pages as $page_name) {
@@ -65,5 +66,10 @@ function developers_theme_preview_controller($page) {
        $title = elgg_echo("theme_preview:{$page[0]}");
        $body =  elgg_view("theme_preview/{$page[0]}");
 
-       echo elgg_view_page($title, $body, 'theme_preview');
+       $layout = elgg_view_layout('one_sidebar', array(
+               'title' => $title,
+               'content' => $body,
+       ));
+       
+       echo elgg_view_page($title, $layout, 'theme_preview');
 }
index 97df551ae1fd62a89686b5b163c50113afc545d3..5b31fd7891c009a72c03487d1d36aec88303ae53 100644 (file)
@@ -14,48 +14,18 @@ header("Content-type: text/html; charset=UTF-8");
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-       <title><?php echo $vars['title']; ?></title>
-       <link rel="stylesheet" href="<?php echo $elgg; ?>" 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]-->
-       <!--[if IE 6]>
-               <link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" />
-       <![endif]-->
-
-<?php
-foreach (elgg_get_loaded_js() as $script) {
-?>
-       <script type="text/javascript" src="<?php echo $script; ?>"></script>
-<?php
-}
-?>
-
+       <?php echo elgg_view('page/elements/head', $vars); ?>
 </head>
 <body>
-<div class="elgg-page">
+<div class="elgg-page elgg-page-default">
        <div class="elgg-page-header">
                <div class="elgg-inner">
-                       <?php echo elgg_view_menu('page'); ?>
+                       <h1 class="elgg-heading-site">Theme Preview</h1>
                </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 class="elgg-page-header">
-               <div class="elgg-inner">
-                       <?php echo elgg_view_menu('page'); ?>
+                       <?php echo elgg_view('page/elements/body', $vars); ?>
                </div>
        </div>
 </div>
diff --git a/mod/developers/views/default/theme_preview/buttons.php b/mod/developers/views/default/theme_preview/buttons.php
new file mode 100644 (file)
index 0000000..718d886
--- /dev/null
@@ -0,0 +1,41 @@
+<table class="elgg-table">
+       <thead>
+               <tr>
+                       <th></th>
+                       <th>Default</th>
+                       <th>Disabled (.elgg-state-disabled)</th>
+               </tr>
+       </thead>
+       <tbody>
+               <tr>
+                       <th>Base (.elgg-button)</th>
+                       <td><a href="#" class="elgg-button">anchor</a></td>
+                       <td><a href="#" class="elgg-button elgg-state-disabled">anchor</a></td>
+               </tr>
+               <tr>
+                       <th>Action (.elgg-button-action)</th>
+                       <td><a href="#" class="elgg-button elgg-button-action">anchor</a></td>
+                       <td><a href="#" class="elgg-button elgg-button-action elgg-state-disabled">anchor</a></td>
+               </tr>
+               <tr>
+                       <th>Cancel (.elgg-button-cancel)</th>
+                       <td><a href="#" class="elgg-button elgg-button-cancel">anchor</a></td>
+                       <td><a href="#" class="elgg-button elgg-button-cancel elgg-state-disabled">anchor</a></td>
+               </tr>
+               <tr>
+                       <th>Submit (.elgg-button-submit)</th>
+                       <td><a href="#" class="elgg-button elgg-button-submit">anchor</a></td>
+                       <td><a href="#" class="elgg-button elgg-button-submit elgg-state-disabled">anchor</a></td>
+               </tr>
+               <tr>
+                       <th>Special (.elgg-button-special)</th>
+                       <td><a href="#" class="elgg-button elgg-button-special">anchor</a></td>
+                       <td><a href="#" class="elgg-button elgg-button-special elgg-state-disabled">anchor</a></td>
+               </tr>
+               <tr>
+                       <th>Delete (.elgg-button-delete)</th>
+                       <td><a href="#" class="elgg-button elgg-button-delete">anchor</a></td>
+                       <td><a href="#" class="elgg-button elgg-button-delete elgg-state-disabled">anchor</a></td>
+               </tr>
+       </tbody>
+</table>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/components.php b/mod/developers/views/default/theme_preview/components.php
new file mode 100644 (file)
index 0000000..ab5a6e9
--- /dev/null
@@ -0,0 +1,12 @@
+<?php
+/**
+ * CSS Objects: list, module, image_block, table, messages
+ */
+
+echo elgg_view_module('info', 'Image Block (.elgg-image-block)', elgg_view('theme_preview/components/image_block'));
+
+echo elgg_view_module('info', 'List (.elgg-list)', elgg_view('theme_preview/components/list'));
+
+echo elgg_view_module('info', 'Table (.elgg-table)', elgg_view('theme_preview/components/table'));
+
+echo elgg_view_module('info', 'Messages (.elgg-message)', elgg_view('theme_preview/components/messages'));
diff --git a/mod/developers/views/default/theme_preview/components/image_block.php b/mod/developers/views/default/theme_preview/components/image_block.php
new file mode 100644 (file)
index 0000000..0bb1642
--- /dev/null
@@ -0,0 +1,6 @@
+<?php\r
+$ipsum = elgg_view('developers/ipsum');\r
+\r
+$user = new ElggUser();\r
+$image = elgg_view_entity_icon($user, 'small');\r
+echo elgg_view_image_block($image, "$ipsum $ipsum $ipsum $ipsum $ipsum $ipsum $ipsum");\r
diff --git a/mod/developers/views/default/theme_preview/components/list.php b/mod/developers/views/default/theme_preview/components/list.php
new file mode 100644 (file)
index 0000000..8096bda
--- /dev/null
@@ -0,0 +1,19 @@
+<?php\r
+\r
+$obj1 = new ElggObject();\r
+$obj1->title = "Object 1";\r
+$obj1->description = $ipsum;\r
+\r
+$obj2 = new ElggObject();\r
+$obj2->title = "Object 2";\r
+$obj2->description = $ipsum;\r
+\r
+$obj3 = new ElggObject();\r
+$obj3->title = "Object 3";\r
+$obj3->description = $ipsum;\r
+\r
+$obj4 = new ElggObject();\r
+$obj4->title = "Object 4";\r
+$obj4->description = $ipsum;\r
+\r
+echo elgg_view('page/components/list', array('items' => array($obj1, $obj2, $obj3, $obj4)));\r
diff --git a/mod/developers/views/default/theme_preview/components/messages.php b/mod/developers/views/default/theme_preview/components/messages.php
new file mode 100644 (file)
index 0000000..ac4d2bf
--- /dev/null
@@ -0,0 +1,5 @@
+<ul>\r
+       <li class="elgg-message elgg-state-success mas">Success message (.elgg-state-success)</li>\r
+       <li class="elgg-message elgg-state-error mas">Error message (.elgg-state-error)</li>\r
+       <li class="elgg-message elgg-state-notice mas">Notice message (.elgg-state-notice)</li>\r
+</ul>\r
diff --git a/mod/developers/views/default/theme_preview/components/table.php b/mod/developers/views/default/theme_preview/components/table.php
new file mode 100644 (file)
index 0000000..e9ef321
--- /dev/null
@@ -0,0 +1,12 @@
+<table class="elgg-table">\r
+<?php\r
+       echo "<thead><tr><th>column 1</th><th>column 2</th></tr></thead>";\r
+       for ($i = 1; $i < 5; $i++) {\r
+               echo '<tr>';\r
+               for ($j = 1; $j < 3; $j++) {\r
+                       echo "<td>value $j</td>";\r
+               }\r
+               echo '</tr>';\r
+       }\r
+?>\r
+</table>
\ No newline at end of file
index bf637d6f01a02ddb726df61e1838d91384876dd9..60183ead92cc6d1413f8c3191483bd1ded8127ad 100644 (file)
-<?php
-/**
- * Form CSS
- */
-
-$url = current_page_url();
-
-$ipsum = elgg_view('developers/ipsum');
-
-?>
-<style>
-       td, th {padding: 5px;}
-</style>
-<div class="elgg-page mal">
-       <?php echo elgg_view('theme_preview/header', $vars); ?>
-       <h2>Form</h2>
-       <form action="#">
-               <fieldset>
-                       <legend>Form legend</legend>
-                       <div>
-                               <label for="f1">Text input:</label>
-                               <?php echo elgg_view('input/text', array(
-                                               'name' => 'f1',
-                                               'id' => 'f1',
-                                               'value' => 'input text',
-                                               ));
-                               ?>
-                       </div>
-                       <div>
-                               <label for="f2">Password input:</label>
-                               <?php echo elgg_view('input/password', array(
-                                               'name' => 'f2',
-                                               'id' => 'f2',
-                                               'value' => 'password',
-                                               ));
-                               ?>
-                       </div>
-                       <div>
-                               <label for="f3">Radio input:</label><br />
-                               <?php echo elgg_view('input/radio', array(
-                                               'name' => 'f3',
-                                               'id' => 'f3',
-                                               'options' => array('a' => 1, 'b' => 2),
-                                               ));
-                               ?>
-                       </div>
-                       <div>
-                               <label for="f4">Checkboxes input:</label><br />
-                               <?php echo elgg_view('input/checkboxes', array(
-                                               'name' => 'f4',
-                                               'id' => 'f4',
-                                               'options' => array('a' => 1, 'b' => 2),
-                                               ));
-                               ?>
-                       </div>
-                       <div>
-                               <label for="f5">Dropdown input:</label><br />
-                               <?php echo elgg_view('input/dropdown', array(
-                                               'name' => 'f5',
-                                               'id' => 'f5',
-                                               'options' => array('option 1', 'option 2'),
-                                               ));
-                               ?>
-                       </div>
-                       <div>
-                               <label for="f6">Access input:</label>
-                               <?php echo elgg_view('input/access', array(
-                                               'name' => 'f6',
-                                               'id' => 'f6',
-                                               'value' => ACCESS_PUBLIC,
-                                               ));
-                               ?>
-                       </div>
-                       <div>
-                               <label for="f7">File input:</label>
-                               <?php echo elgg_view('input/file', array(
-                                               'name' => 'f7',
-                                               'id' => 'f7',
-                                               ));
-                               ?>
-                       </div>
-                       <div>
-                               <label for="f8">URL input:</label>
-                               <?php echo elgg_view('input/url', array(
-                                               'name' => 'f8',
-                                               'id' => 'f8',
-                                               'value' => 'http://elgg.org/',
-                                               ));
-                               ?>
-                       </div>
-                       <div>
-                               <label for="f9">Tags input:</label>
-                               <?php echo elgg_view('input/tags', array(
-                                               'name' => 'f9',
-                                               'id' => 'f9',
-                                               'value' => 'one, two, three',
-                                               ));
-                               ?>
-                       </div>
-                       <div>
-                               <label for="f10">Email input:</label>
-                               <?php echo elgg_view('input/email', array(
-                                               'name' => 'f10',
-                                               'id' => 'f10',
-                                               'value' => 'noone@elgg.org',
-                                               ));
-                               ?>
-                       </div>
-                       <div>
-                               <label for="f11">Autocomplete input:</label>
-                               <?php echo elgg_view('input/autocomplete', array(
-                                               'name' => 'f11',
-                                               'id' => 'f11',
-                                               'match_on' => 'users',
-                                               ));
-                               ?>
-                       </div>
-                       <div>
-                               <label for="f12">Date picker input:</label>
-                               <?php echo elgg_view('input/datepicker', array(
-                                               'name' => 'f12',
-                                               'id' => 'f12',
-                                               ));
-                               ?>
-                       </div>
-                       <div>
-                               <label for="f13">User picker input:</label>
-                               <?php echo elgg_view('input/userpicker', array(
-                                               'name' => 'f13',
-                                               'id' => 'f13',
-                                               ));
-                               ?>
-                       </div>
-                       <div>
-                               <label for="f14">Long text input:</label>
-                               <?php echo elgg_view('input/longtext', array(
-                                               'name' => 'f14',
-                                               'id' => 'f14',
-                                               'value' => $ipsum,
-                                               ));
-                               ?>
-                       </div>
-                       <div>
-                               <label for="f15">Plain text input:</label>
-                               <?php echo elgg_view('input/plaintext', array(
-                                               'name' => 'f15',
-                                               'id' => 'f15',
-                                               'value' => $ipsum,
-                                               ));
-                               ?>
-                       </div>
-               </fieldset>
-       </form>
-
-       <div class="mtl">
-               <h2>Buttons</h2>
-               <table>
-                       <thead>
-                               <tr>
-                                       <th>Anchors</th>
-                                       <th>Default</th>
-                                       <th>Hover</th>
-                                       <th>Focus</th>
-                                       <th>Active</th>
-                                       <th>Disabled</th>
-                                       <th>Selected</th>
-                               </tr>
-                       </thead>
-                       <tbody>
-                               <tr>
-                                       <th>Default</th>
-                                       <td><a href="#" class="elgg-button">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-state-hover">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-state-focus">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-state-active">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-state-disabled">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-state-selected">anchor</a></td>
-                               </tr>
-                               <tr>
-                                       <th>Action</th>
-                                       <td><a href="#" class="elgg-button elgg-button-action">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-action elgg-state-hover">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-action elgg-state-focus">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-action elgg-state-active">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-action elgg-state-disabled">anchor</a></td>
-                               </tr>
-                               <tr>
-                                       <th>Cancel</th>
-                                       <td><a href="#" class="elgg-button elgg-button-cancel">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-cancel elgg-state-hover">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-cancel elgg-state-focus">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-cancel elgg-state-active">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-cancel elgg-state-disabled">anchor</a></td>
-                               </tr>
-                               <tr>
-                                       <th>Submit</th>
-                                       <td><a href="#" class="elgg-button elgg-button-submit">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-submit elgg-state-hover">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-submit elgg-state-focus">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-submit elgg-state-active">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-submit elgg-state-disabled">anchor</a></td>
-                               </tr>
-                               <tr>
-                                       <th>Special</th>
-                                       <td><a href="#" class="elgg-button elgg-button-special">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-special elgg-state-hover">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-special elgg-state-focus">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-special elgg-state-active">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-special elgg-state-disabled">anchor</a></td>
-                               </tr>
-                               <tr>
-                                       <th>Delete</th>
-                                       <td><a href="#" class="elgg-button elgg-button-delete">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-delete elgg-state-hover">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-delete elgg-state-focus">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-delete elgg-state-active">anchor</a></td>
-                                       <td><a href="#" class="elgg-button elgg-button-delete elgg-state-disabled">anchor</a></td>
-                               </tr>
-                       </tbody>
-               </table>
-       </div>
-</div>
+<form action="#">
+       <fieldset>
+               <legend>Fieldset Legend</legend>
+               <div>
+                       <label for="f1">Text input (.elgg-input-text):</label>
+                       <?php echo elgg_view('input/text', array(
+                                       'name' => 'f1',
+                                       'id' => 'f1',
+                                       'value' => 'input text',
+                                       ));
+                       ?>
+               </div>
+               <div>
+                       <label for="f2">Password input (.elgg-input-password):</label>
+                       <?php echo elgg_view('input/password', array(
+                                       'name' => 'f2',
+                                       'id' => 'f2',
+                                       'value' => 'password',
+                                       ));
+                       ?>
+               </div>
+               <div>
+                       <label for="f3">Radio input (.elgg-input-radio):</label><br />
+                       <?php echo elgg_view('input/radio', array(
+                                       'name' => 'f3',
+                                       'id' => 'f3',
+                                       'options' => array('a' => 1, 'b' => 2),
+                                       ));
+                       ?>
+               </div>
+               <div>
+                       <label for="f4">Checkboxes input (.elgg-input-checkboxes):</label><br />
+                       <?php echo elgg_view('input/checkboxes', array(
+                                       'name' => 'f4',
+                                       'id' => 'f4',
+                                       'options' => array('a (.elgg-input-checkbox)' => 1, 'b (.elgg-input-checkbox)' => 2),
+                                       ));
+                       ?>
+               </div>
+               <div>
+                       <label for="f5">Dropdown input (.elgg-input-dropdown):</label><br />
+                       <?php echo elgg_view('input/dropdown', array(
+                                       'name' => 'f5',
+                                       'id' => 'f5',
+                                       'options' => array('option 1', 'option 2'),
+                                       ));
+                       ?>
+               </div>
+               <div>
+                       <label for="f6">Access input (.elgg-input-access):</label><br />
+                       <?php echo elgg_view('input/access', array(
+                                       'name' => 'f6',
+                                       'id' => 'f6',
+                                       'value' => ACCESS_PUBLIC,
+                                       ));
+                       ?>
+               </div>
+               <div>
+                       <label for="f7">File input (.elgg-input-file):</label>
+                       <?php echo elgg_view('input/file', array(
+                                       'name' => 'f7',
+                                       'id' => 'f7',
+                                       ));
+                       ?>
+               </div>
+               <div>
+                       <label for="f8">URL input (.elgg-input-url):</label>
+                       <?php echo elgg_view('input/url', array(
+                                       'name' => 'f8',
+                                       'id' => 'f8',
+                                       'value' => 'http://elgg.org/',
+                                       ));
+                       ?>
+               </div>
+               <div>
+                       <label for="f9">Tags input (.elgg-input-tags):</label>
+                       <?php echo elgg_view('input/tags', array(
+                                       'name' => 'f9',
+                                       'id' => 'f9',
+                                       'value' => 'one, two, three',
+                                       ));
+                       ?>
+               </div>
+               <div>
+                       <label for="f10">Email input (.elgg-input-email):</label>
+                       <?php echo elgg_view('input/email', array(
+                                       'name' => 'f10',
+                                       'id' => 'f10',
+                                       'value' => 'noone@elgg.org',
+                                       ));
+                       ?>
+               </div>
+               <div>
+                       <label for="f11">Autocomplete input (.elgg-input-autocomplete):</label>
+                       <?php echo elgg_view('input/autocomplete', array(
+                                       'name' => 'f11',
+                                       'id' => 'f11',
+                                       'match_on' => 'users',
+                                       ));
+                       ?>
+               </div>
+               <div>
+                       <label for="f12">Date input (.elgg-input-date):</label>
+                       <?php echo elgg_view('input/date', array(
+                                       'name' => 'f12',
+                                       'id' => 'f12',
+                                       'value' => '12/12/2012'
+                                       ));
+                       ?>
+               </div>
+               <div>
+                       <label for="f13">User picker input (.elgg-user-picker):</label>
+                       <?php echo elgg_view('input/userpicker', array(
+                                       'name' => 'f13',
+                                       'id' => 'f13',
+                                       'value' => array(new ElggUser(), new ElggUser(), new ElggUser()),
+                                       ));
+                       ?>
+               </div>
+               <div>
+                       <label for="f15">Plain textarea input (.elgg-input-plaintext):</label>
+                       <?php echo elgg_view('input/plaintext', array(
+                                       'name' => 'f15',
+                                       'id' => 'f15',
+                                       'value' => $ipsum,
+                                       ));
+                       ?>
+               </div>
+               <div>
+                       <label for="f14">Long textarea input (.elgg-input-longtext):</label>
+                       <?php echo elgg_view('input/longtext', array(
+                                       'name' => 'f14',
+                                       'id' => 'f14',
+                                       'value' => $ipsum,
+                                       ));
+                       ?>
+               </div>
+       </fieldset>
+</form>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/general.php b/mod/developers/views/default/theme_preview/general.php
deleted file mode 100644 (file)
index bd11b35..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * General CSS
- */
-
-$ipsum = elgg_view('developers/ipsum');
-
-?>
-
-<div class="elgg-page mal">
-       <?php echo elgg_view('theme_preview/header', $vars); ?>
-       <h2>Headings</h2>
-       <div class="mbl">
-               <h1>Level 1 heading</h1>
-               <h2>Level 2 heading</h2>
-               <h3>Level 3 heading</h3>
-               <h4>Level 4 heading</h4>
-               <h5>Level 5 heading</h5>
-               <h6>Level 6 heading</h6>
-       </div>
-       <h2>Paragraph</h2>
-       <div class="mbl">
-       <p>Lorem ipsum dolor sit amet, <a href="#" title="test link">test link</a>
-  adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec
-  faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero
-  nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent
-  mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu
-  volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus
-  eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem,
-  consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue
-  quis tellus.</p>
-
-  <p>Lorem ipsum dolor sit amet, <em>emphasis</em>
-  consectetuer
-  adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec
-  faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero
-  nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent
-  mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu
-  volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus
-  eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem,
-  consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue
-  quis tellus.</p>
-       </div>
-       <h2>Misc</h2>
-                       <p>
-                               I am <a href="?abc123">the a tag</a> example<br />
-                               I am <abbr title="test">the abbr tag</abbr> example<br />
-                               I am <acronym>the acronym tag</acronym> example<br />
-                               I am <b>the b tag</b> example<br />
-                               I am <code>the code tag</code> example<br />
-                               I am <del>the del tag</del> example<br />
-                               I am <em>the em tag</em> example<br />
-                               I am <i>the i tag</i> example<br />
-                               I am <strong>the strong tag</strong> example<br />
-                       </p>
-                       <blockquote><p>Paragraph inside Blockquote: <?php echo $ipsum; ?></p></blockquote>
-                       <pre><strong>Preformated:</strong>Testing one row
-                        and another</pre>
-</div>
index 95e14cfd50bdf3bb3142cb24c93004d20f93c80b..030e752e7bad6143b206cb59791068afde754808 100644 (file)
@@ -4,16 +4,13 @@
  */
 
 ?>
-<div class="elgg-page mal">
-       <?php echo elgg_view('theme_preview/header', $vars); ?>
-
 <style>
 h3 {text-align: center;}
-.preview-outline {border: 1px solid #cccccc; padding: 5px;}
+.elgg-col > .elgg-inner {border: 1px solid #cccccc; padding: 5px;}
 </style>
 
 <div class="elgg-col elgg-col-1of5">
-       <div class="preview-outline">
+       <div class="elgg-inner">
                <h3>1/5</h3>
                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
@@ -21,44 +18,44 @@ h3 {text-align: center;}
        </div>
 </div>
 <div class="elgg-col elgg-col-3of5">
-       <div class="preview-outline clearfix">
+       <div class="elgg-inner clearfix">
                <h3>3/5</h3>
                <div class="elgg-col elgg-col-1of2">
-                       <div class="preview-outline">
+                       <div class="elgg-inner">
                                <h3>1/2</h3>
                                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
                        </div>
                </div>
                <div class="elgg-col elgg-col-1of2">
-                       <div class="preview-outline">
+                       <div class="elgg-inner">
                                <h3>1/2</h3>
                                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
                        </div>
                </div>
                <div class="elgg-col elgg-col-1of3">
-                       <div class="preview-outline">
+                       <div class="elgg-inner">
                                <h3>1/3</h3>
                                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
                                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
                        </div>
                </div>
                <div class="elgg-col elgg-col-2of3">
-                       <div class="preview-outline">
+                       <div class="elgg-inner">
                                <h3>2/3</h3>
                                <div class="elgg-col elgg-col-1of2">
-                                       <div class="preview-outline">
+                                       <div class="elgg-inner">
                                                <h3>1/2</h3>
                                                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
                                        </div>
                                </div>
                                <div class="elgg-col elgg-col-1of2">
-                                       <div class="preview-outline">
+                                       <div class="elgg-inner">
                                                <h3>1/2</h3>
                                                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
                                        </div>
                                </div>
                                <div class="elgg-col elgg-col-1of1">
-                                       <div class="preview-outline">
+                                       <div class="elgg-inner">
                                                <h3>1</h3>
                                                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
                                        </div>
@@ -68,7 +65,7 @@ h3 {text-align: center;}
        </div>
 </div>
 <div class="elgg-col elgg-col-1of5 elgg-col-last">
-       <div class="preview-outline">
+       <div class="elgg-inner">
                <h3>1/5</h3>
                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
index 8178a9da7ea111dcde94d4671cabaf286708fc36..e1684c110e7ca12e849c283dec41e8774704ac67 100644 (file)
@@ -3,56 +3,8 @@
  * Icons CSS
  */
 
-?>
-<style>li {margin: 10px; float: left;} ul {background-color: #e0e0e0;}</style>
-<div class="elgg-page mal">
-       <?php echo elgg_view('theme_preview/header', $vars); ?>
-       <h2>Icon Sprites</h2>
-       <ul class="mbl clearfix">
-       <?php 
-               $icons = array(
-                       'settings' => 'Settings', 
-                       'friends' => 'Friends', 
-                       'help' => 'Help', 
-                       'delete' => 'Delete', 
-                       'thumbs-up' => 'Thumbs Up',
-                       'thumbs-up-alt' => 'Thumbs Up Alternate',
-                       'following' => 'Following', 
-                       'dragger' => 'Dragger', 
-                       'rss' => 'RSS', 
-                       'arrow-s' => 'Arrow S', 
-                       'hover-menu' => 'Hover Menu',
-               );
-               
-               foreach ($icons as $icon_id => $icon_label) {
-                       echo "<li>" . elgg_view_icon($icon_id) . $icon_label . "</li>";
-               }
-       
-       ?>
-       </ul>
-       <h2>Ajax loader</h2>
-       <div class="mbl">
-               <?php echo elgg_view('graphics/ajax_loader', array('hidden' => false)); ?>
-       </div>
-       <h2>Avatars</h2>
-       <div class="mbl">
-               <?php
-                       $user = new ElggUser();
-                       $sizes = array('large', 'medium', 'small', 'tiny');
-                       echo '<table>';
-                       echo '<tr>';
-                       foreach ($sizes as $size) {
-                               echo "<td class=\"center\"><h4>$size</h4></td>";
-                       }
-                       echo '</tr>';
-                       echo '<tr>';
-                       foreach ($sizes as $size) {
-                               echo '<td class="phs">';
-                               echo elgg_view_entity_icon($user, $size, array('hover' => false));
-                               echo '</td>';
-                       }
-                       echo '</tr>';
-                       echo '</table>';
-               ?>
-       </div>
-</div>
+echo elgg_view_module('info', 'Icon Sprites (.elgg-icon)', elgg_view('theme_preview/icons/sprites'));
+
+echo elgg_view_module('info', 'Ajax Loader (.elgg-ajax-loader)', elgg_view('theme_preview/icons/loader'));
+
+echo elgg_view_module('info', 'Avatars (.elgg-avatar)', elgg_view('theme_preview/icons/avatars'));
diff --git a/mod/developers/views/default/theme_preview/icons/avatars.php b/mod/developers/views/default/theme_preview/icons/avatars.php
new file mode 100644 (file)
index 0000000..cbce5bc
--- /dev/null
@@ -0,0 +1,36 @@
+<?php\r
+       $user = new ElggUser();\r
+       $group = new ElggGroup();\r
+       \r
+       $sizes = array('large', 'medium', 'small', 'tiny');\r
+?>\r
+<table class="elgg-table">\r
+       <tr>\r
+               <th></th>\r
+               <?php\r
+                       foreach ($sizes as $size) {\r
+                               echo "<th>$size</th>";\r
+                       }\r
+               ?>\r
+       </tr>\r
+       <tr>\r
+               <th>User</th>\r
+               <?php\r
+                       foreach ($sizes as $size) {\r
+                               echo '<td>';\r
+                               echo elgg_view_entity_icon($user, $size, array('hover' => false));\r
+                               echo '</td>';\r
+                       }\r
+               ?>\r
+       </tr>\r
+       <tr>\r
+               <th>Group</th>\r
+               <?php\r
+                       foreach ($sizes as $size) {\r
+                               echo '<td>';\r
+                               echo elgg_view_entity_icon($group, $size, array('hover' => false));\r
+                               echo '</td>';\r
+                       }\r
+               ?>\r
+       </tr>\r
+</table>\r
diff --git a/mod/developers/views/default/theme_preview/icons/loader.php b/mod/developers/views/default/theme_preview/icons/loader.php
new file mode 100644 (file)
index 0000000..e542da2
--- /dev/null
@@ -0,0 +1 @@
+<?php echo elgg_view('graphics/ajax_loader', array('hidden' => false)); ?>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/icons/sprites.php b/mod/developers/views/default/theme_preview/icons/sprites.php
new file mode 100644 (file)
index 0000000..134dd9a
--- /dev/null
@@ -0,0 +1,61 @@
+<?php \r
+$icons = array(\r
+       'arrow-left',\r
+       'arrow-right',\r
+       'arrow-two-head',\r
+       'calendar',\r
+       'checkmark',\r
+       'clip',\r
+       'cursor-drag-arrow',\r
+       'delete-alt',\r
+       'delete',\r
+       'download',\r
+       'facebook',\r
+       'home',\r
+       'hover-menu',\r
+       'link',\r
+       'mail-alt',\r
+       'mail',\r
+       'print-alt',\r
+       'print',\r
+       'push-pin-alt',\r
+       'push-pin',\r
+       'redo',\r
+       'refresh',\r
+       'round-arrow-left',\r
+       'round-arrow-right',\r
+       'round-checkmark',\r
+       'round-minus',\r
+       'round-plus',\r
+       'rss',\r
+       'search-focus',\r
+       'search',\r
+       'settings-alt',\r
+       'settings',\r
+       'share',\r
+       'shop-cart',\r
+       'speech-bubble-alt',\r
+       'speech-bubble',\r
+       'star-alt',\r
+       'star-empty',\r
+       'star',\r
+       'tag',\r
+       'thumbs-down-alt',\r
+       'thumbs-down',\r
+       'thumbs-up-alt',\r
+       'thumbs-up',\r
+       'trash',\r
+       'twitter',\r
+       'undo',\r
+       'user',\r
+       'users',\r
+);\r
+?>\r
+\r
+<ul class="elgg-gallery">\r
+<?php \r
+       foreach ($icons as $icon) {\r
+               echo "<li title=\".elgg-icon-$icon\" style=\"margin:10px\">" . elgg_view_icon($icon) . "</li>";\r
+       }\r
+?>\r
+</ul>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/modules.php b/mod/developers/views/default/theme_preview/modules.php
new file mode 100644 (file)
index 0000000..3e0acb3
--- /dev/null
@@ -0,0 +1,6 @@
+<?php
+
+echo elgg_view_module('info', 'Modules (.elgg-module)', elgg_view('theme_preview/modules/modules'));
+
+echo elgg_view_module('info', 'Widgets (.elgg-widget)', elgg_view('theme_preview/modules/widgets'));
+
diff --git a/mod/developers/views/default/theme_preview/modules/modules.php b/mod/developers/views/default/theme_preview/modules/modules.php
new file mode 100644 (file)
index 0000000..e0d39c0
--- /dev/null
@@ -0,0 +1,23 @@
+<?php \r
+\r
+$ipsum = elgg_view('developers/ipsum');\r
+\r
+?>\r
+<div class="elgg-grid">\r
+       <div class="elgg-col elgg-col-1of2">\r
+               <div class="pam">\r
+                       <?php\r
+                               echo elgg_view_module('aside', 'Aside (.elgg-module-aside)', $ipsum);\r
+                               echo elgg_view_module('popup', 'Popup (.elgg-module-popup)', $ipsum);\r
+                       ?>\r
+               </div>\r
+       </div>\r
+       <div class="elgg-col elgg-col-1of2">\r
+               <div class="pam">\r
+                       <?php\r
+                               echo elgg_view_module('info', 'Info (.elgg-module-info)', $ipsum);\r
+                               echo elgg_view_module('featured', 'Featured (.elgg-module-featured)', $ipsum);\r
+                       ?>\r
+               </div>\r
+       </div>\r
+</div>
\ No newline at end of file
similarity index 98%
rename from mod/developers/views/default/theme_preview/widgets.php
rename to mod/developers/views/default/theme_preview/modules/widgets.php
index eafbcef6f775ea328719afba454c208d7169e631..8c9fd6483d72c1bc3d4e74b39454bb9ad5afd1c9 100644 (file)
@@ -50,7 +50,7 @@ for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
 </div>
 <script type="text/javascript">
        // widgets do not have guids so we override the edit toggle and delete button
-       $(document).ready(function() {
+       $(function() {
                $('.elgg-widget-edit-button').unbind('click');
                $('.elgg-widget-edit-button').click(function() {
                        $(this).closest('.elgg-module-widget').find('.elgg-widget-edit').slideToggle('medium');
index 10cffd23079b36357882e7dc51b590a3dc07a5c4..b80634317dc2028814f1486d92ba2346cceb017b 100644 (file)
@@ -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>
diff --git a/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php b/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
new file mode 100644 (file)
index 0000000..eb3dd47
--- /dev/null
@@ -0,0 +1,6 @@
+<?php\r
+elgg_push_breadcrumb('First', "#");\r
+elgg_push_breadcrumb('Second', "#");\r
+elgg_push_breadcrumb('Third');\r
+\r
+echo elgg_view('navigation/breadcrumbs');\r
diff --git a/mod/developers/views/default/theme_preview/navigation/default.php b/mod/developers/views/default/theme_preview/navigation/default.php
new file mode 100644 (file)
index 0000000..fd67b80
--- /dev/null
@@ -0,0 +1,11 @@
+<?php \r
+\r
+$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['menu']['default'][2]->setSelected(true);\r
+\r
+echo elgg_view('navigation/menu/default', $params);\r
diff --git a/mod/developers/views/default/theme_preview/navigation/extras.php b/mod/developers/views/default/theme_preview/navigation/extras.php
new file mode 100644 (file)
index 0000000..6982cf5
--- /dev/null
@@ -0,0 +1,18 @@
+<?php\r
+\r
+$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
+\r
+?>\r
+\r
+<div class="elgg-sidebar">\r
+<?php \r
+       echo elgg_view('navigation/menu/default', $params);\r
+?>\r
+</div>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/navigation/filter.php b/mod/developers/views/default/theme_preview/navigation/filter.php
new file mode 100644 (file)
index 0000000..f27edf1
--- /dev/null
@@ -0,0 +1,13 @@
+<?php \r
+\r
+$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['menu']['default'][2]->setSelected(true);\r
+\r
+$params['name'] = 'filter';\r
+\r
+echo elgg_view('navigation/menu/default', $params); \r
diff --git a/mod/developers/views/default/theme_preview/navigation/horizontal.php b/mod/developers/views/default/theme_preview/navigation/horizontal.php
new file mode 100644 (file)
index 0000000..69e75c0
--- /dev/null
@@ -0,0 +1,12 @@
+<?php \r
+\r
+$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['menu']['default'][2]->setSelected(true);\r
+$params['class'] = 'elgg-menu-hz';\r
+\r
+echo elgg_view('navigation/menu/default', $params);\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
new file mode 100644 (file)
index 0000000..6bf79fe
--- /dev/null
@@ -0,0 +1,11 @@
+<?php\r
+$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['menu']['default'][2]->setSelected(true);\r
+$params['class'] = 'elgg-menu-owner-block';\r
+\r
+echo elgg_view('navigation/menu/default', $params); 
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/navigation/page.php b/mod/developers/views/default/theme_preview/navigation/page.php
new file mode 100644 (file)
index 0000000..fb3f075
--- /dev/null
@@ -0,0 +1,21 @@
+<?php\r
+\r
+$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", "#");\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->setParent($params['menu']['default'][1]);\r
+$params['menu']['default'][1]->addChild($m);\r
+?>\r
+\r
+<div class="elgg-sidebar">\r
+<?php \r
+       echo elgg_view('navigation/menu/page', $params);\r
+?>\r
+</div>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/navigation/pagination.php b/mod/developers/views/default/theme_preview/navigation/pagination.php
new file mode 100644 (file)
index 0000000..90ae48e
--- /dev/null
@@ -0,0 +1,8 @@
+<?php\r
+$params = array(\r
+       'count' => 1000,\r
+       'limit' => 10,\r
+       'offset' => 230,\r
+);\r
+\r
+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
new file mode 100644 (file)
index 0000000..df8dc1b
--- /dev/null
@@ -0,0 +1,18 @@
+<?php \r
+\r
+$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['menu']['default'][2]->setSelected(true);\r
+?>\r
+\r
+<div class="elgg-page-header">\r
+       <div class="elgg-inner">\r
+       <?php \r
+               echo elgg_view('navigation/menu/site', $params); \r
+       ?>\r
+       </div>\r
+</div>\r
diff --git a/mod/developers/views/default/theme_preview/navigation/tabs.php b/mod/developers/views/default/theme_preview/navigation/tabs.php
new file mode 100644 (file)
index 0000000..b2638bb
--- /dev/null
@@ -0,0 +1,10 @@
+<?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
+       )\r
+);\r
+\r
+echo elgg_view('navigation/tabs', $params);
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/objects.php b/mod/developers/views/default/theme_preview/objects.php
deleted file mode 100644 (file)
index c67348c..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * CSS Objects: list, module, image_block
- */
-
-$url = current_page_url();
-
-$ipsum = elgg_view('developers/ipsum');
-
-?>
-
-<div class="elgg-page mal">
-       <?php echo elgg_view('theme_preview/header', $vars); ?>
-       <h2>Modules</h2>
-       <div class="mbl clearfix">
-               <div class="elgg-col elgg-col-1of2">
-                       <div class="pam">
-                       <?php
-                               echo elgg_view_module('aside', 'elgg-module-aside', $ipsum);
-                               echo elgg_view_module('popup', 'elgg-module-popup', $ipsum);
-                       ?>
-                       </div>
-               </div>
-               <div class="elgg-col elgg-col-1of2">
-                       <div class="pam">
-                       <?php
-                               echo elgg_view_module('info', 'elgg-module-info', $ipsum);
-                               echo elgg_view_module('featured', 'elgg-module-featured', $ipsum);
-                       ?>
-                       </div>
-               </div>
-       </div>
-       <h2>Image Block</h2>
-       <div class="mbl clearfix">
-       <?php
-               $user = new ElggUser();
-               $image = elgg_view_entity_icon($user, 'small');
-               echo elgg_view_image_block($image, $ipsum);
-       ?>
-       </div>
-       <h2>List</h2>
-       <div class="mbl clearfix">
-       <?php
-               $obj1 = new ElggObject();
-               $obj1->title = "Object 1";
-               $obj1->description = $ipsum;
-               $obj2 = new ElggObject();
-               $obj2->title = "Object 2";
-               $obj2->description = $ipsum;
-               echo elgg_view('page/components/list', array('items' => array($obj1, $obj2)));
-       ?>
-       </div>
-       <h2>Table</h2>
-       <div class="mbl clearfix">
-               <table class="elgg-table">
-               <?php
-                       echo "<thead><tr><th>column 1</th><th>column 2</th></tr></thead>";
-                       for ($i = 1; $i < 5; $i++) {
-                               echo '<tr>';
-                               for ($j = 1; $j < 3; $j++) {
-                                       echo "<td>value $j</td>";
-                               }
-                               echo '</tr>';
-                       }
-               ?>
-               </table>
-       </div>
-       <h2>Messages</h2>
-       <div class="mbl clearfix">
-               <ul>
-                       <li class="elgg-message elgg-state-success mas">Success message</li>
-                       <li class="elgg-message elgg-state-error mas">Error message</li>
-                       <li class="elgg-message elgg-state-notice mas">Notice message</li>
-               </ul>
-       </div>
-</div>
diff --git a/mod/developers/views/default/theme_preview/typography.php b/mod/developers/views/default/theme_preview/typography.php
new file mode 100644 (file)
index 0000000..6662a9a
--- /dev/null
@@ -0,0 +1,10 @@
+<?php
+/**
+ * General CSS
+ */
+
+echo elgg_view_module('info', "Headings", elgg_view('theme_preview/typography/headings'));
+
+echo elgg_view_module('info', "Paragraph", elgg_view('theme_preview/typography/paragraph'));
+
+echo elgg_view_module('info', "Misc", elgg_view('theme_preview/typography/misc'));
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/typography/headings.php b/mod/developers/views/default/theme_preview/typography/headings.php
new file mode 100644 (file)
index 0000000..1eb96c7
--- /dev/null
@@ -0,0 +1,6 @@
+<h1>Level 1 heading</h1>\r
+<h2>Level 2 heading</h2>\r
+<h3>Level 3 heading</h3>\r
+<h4>Level 4 heading</h4>\r
+<h5>Level 5 heading</h5>\r
+<h6>Level 6 heading</h6>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/typography/misc.php b/mod/developers/views/default/theme_preview/typography/misc.php
new file mode 100644 (file)
index 0000000..93a279c
--- /dev/null
@@ -0,0 +1,16 @@
+<ul>\r
+       <li>I am <a href="?abc123">the a tag</a> example</li>\r
+       <li>I am <abbr title="test">the abbr tag</abbr> example</li>\r
+       <li>I am <acronym>the acronym tag</acronym> example</li>\r
+       <li>I am <b>the b tag</b> example</li>\r
+       <li>I am <code>the code tag</code> example</li>\r
+       <li>I am <del>the del tag</del> example</li>\r
+       <li>I am <em>the em tag</em> example</li>\r
+       <li>I am <i>the i tag</i> example</li>\r
+       <li>I am <strong>the strong tag</strong> example</li>\r
+</ul>\r
+<blockquote><p>Paragraph inside Blockquote: <?php echo $ipsum; ?></p></blockquote>\r
+<pre>\r
+       <strong>Preformated:</strong>Testing one row\r
+       and another\r
+</pre>\r
diff --git a/mod/developers/views/default/theme_preview/typography/paragraph.php b/mod/developers/views/default/theme_preview/typography/paragraph.php
new file mode 100644 (file)
index 0000000..54d548f
--- /dev/null
@@ -0,0 +1,19 @@
+<p>Lorem ipsum dolor sit amet, <a href="#" title="test link">test link</a>\r
+adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec\r
+faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero\r
+nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent\r
+mattis, massa quis luctus <strong>strong</strong>, turpis mi volutpat justo, eu\r
+volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus\r
+eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem,\r
+consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue\r
+quis tellus.</p>\r
+\r
+<p>Lorem ipsum dolor sit amet, <em>emphasis</em> consectetuer\r
+adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec\r
+faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero\r
+nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent\r
+mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu\r
+volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus\r
+eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem,\r
+consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue\r
+quis tellus.</p>
\ No newline at end of file