]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Refs #3617. Added misc section for developer's theme preview.
authorBrett Profitt <brett.profitt@gmail.com>
Fri, 4 Jan 2013 19:44:55 +0000 (14:44 -0500)
committerBrett Profitt <brett.profitt@gmail.com>
Fri, 4 Jan 2013 19:45:15 +0000 (14:45 -0500)
15 files changed:
mod/developers/languages/en.php
mod/developers/start.php
mod/developers/views/default/developers/css.php
mod/developers/views/default/forms/developers/settings.php
mod/developers/views/default/page/theme_preview.php
mod/developers/views/default/theme_preview/components.php
mod/developers/views/default/theme_preview/general.php
mod/developers/views/default/theme_preview/miscellaneous.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/miscellaneous/lightbox.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/miscellaneous/popup.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/miscellaneous/site_menu.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/miscellaneous/system_messages.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/miscellaneous/toggle.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/miscellaneous/user_hover_menu.php [new file with mode: 0644]
mod/developers/views/default/theme_preview/modules.php

index 262759e23bed7f72b76cb8337d3a2412c4fa2b73..856efe008e555e7349ef26e6b35e12d0c133c984 100644 (file)
@@ -54,6 +54,7 @@ $english = array(
        'theme_preview:modules' => 'Modules',
        'theme_preview:navigation' => 'Navigation',
        'theme_preview:typography' => 'Typography',
+       'theme_preview:miscellaneous' => 'Miscellaneous',
 
        // unit tests
        'developers:unit_tests:description' => 'Elgg has unit and integration tests for detecting bugs in its core classes and functions.',
index d77a96b366371eac383544d69a6ee62ed9fce2d7..413a8ed9b6c28f57a7f5a1255c4e3c165679590d 100644 (file)
@@ -176,6 +176,7 @@ function developers_theme_preview_controller($page) {
                'modules',
                'navigation',
                'typography',
+               'miscellaneous'
        );
        
        foreach ($pages as $page_name) {
index 4690945a9792281bca0df181fb54bbeb303ff487..b4f59fdec65fbbb08aa008dec90ecd59ddd7cf32 100644 (file)
@@ -21,3 +21,7 @@
        color: #666;
        padding: 20px;
 }
+
+.developers-content-thin {
+       max-width: 600px;
+}
\ No newline at end of file
index 584f6af30fb05b7ffc465d2ffaf73446dcf80f81..78e1372de8aa284b4a1854a4dc242d24c659e307 100644 (file)
@@ -10,20 +10,22 @@ echo '<p>' . elgg_echo('elgg_dev_tools:settings:explanation') . '</p>';
 foreach ($vars['data'] as $name => $info) {
        echo '<div>';
        if ($info['type'] == 'checkbox') {
+               echo '<label>';
                echo elgg_view("input/checkbox", array(
                        'name' => $name,
                        'value' => $info['value'],
                        'checked' => $info['checked'],
                ));
-               echo '<label>' . elgg_echo("developers:label:$name") . '</label>';
+               echo elgg_echo("developers:label:$name") . '</label>';
                echo '<span class="elgg-text-help">' . elgg_echo("developers:help:$name") . '</span>';
        } else {
-               echo '<label>' . elgg_echo("developers:label:$name") . '</label>';
+               echo '<label>' . elgg_echo("developers:label:$name");
                echo elgg_view("input/{$info['type']}", array(
                        'name' => $name,
                        'value' => $info['value'],
                        'options_values' => $info['options_values'],
                ));
+               echo '</label>';
                echo '<span class="elgg-text-help">' . elgg_echo("developers:help:$name") . '</span>';
        }
        echo '</div>';
index 584387ec1684871166d5f8c6ecd1937310f7a28c..ee2bc0c0f19de96b43dabff860018ef965cb75a2 100644 (file)
@@ -18,9 +18,19 @@ header("Content-type: text/html; charset=UTF-8");
 </head>
 <body>
 <div class="elgg-page elgg-page-default">
+       <div class="elgg-page-messages">
+               <ul class="elgg-system-messages">
+                       <li class="hidden"></li>
+               </ul>
+       </div>
        <div class="elgg-page-header">
                <div class="elgg-inner">
                        <h1 class="elgg-heading-site">Theme Sandbox</h1>
+                       <?php
+                               if (get_input("site_menu", false)) {
+                                       echo elgg_view_menu('site');
+                               }
+                       ?>
                </div>
        </div>
        <div class="elgg-page-body">
index 2f414cd881e136bb5ac4d2f503f975aa9fc642be..50c155b14207623767b6629601050f87e34d0416 100644 (file)
@@ -22,4 +22,4 @@ $body = elgg_view('theme_preview/components/tags');
 echo elgg_view_module('info', 'Tags (.elgg-tag)', $body);
 
 $body = elgg_view('theme_preview/components/messages');
-echo elgg_view_module('info', 'Messages (.elgg-message)', $body);
+echo elgg_view_module('info', 'Messages (.elgg-message)', $body);
\ No newline at end of file
index 6294628732f55288521788890de4de091bfaf4b2..7d98d4443c00099659fb2bb9507460b61cf64b11 100644 (file)
        The preview is divided into sections that are listed in the page menu
        (usually in the sidebar but depends on your current theme).
 </p>
+<?php
+$simple_cache = elgg_get_config('simplecache_enabled');
+$system_cache = elgg_get_config('system_cache_enabled');
+
+if ($simple_cache || $system_cache) {
+       $advanced = elgg_view('output/url', array(
+               'text' => 'Advanced Settings',
+               'href' => 'admin/settings/advanced',
+               'is_trusted' => true
+       ));
+       $developers = elgg_view('output/url', array(
+               'text' => 'Developers\' Plugin Settings',
+               'href' => 'admin/developers/settings',
+               'is_trusted' => true
+       ));
+       
+       $body = "Caches are enabled. Changes you make to CSS and views might not appear. It is
+       always recommended to disable caches while developing themes and plugins. To
+       disable caches, visit the $advanced or $developers pages.";
+
+       echo elgg_view_module('info', 'Warning', $body);
+}
+?>
 <p>
 <?php
        echo elgg_view('output/url', array(
diff --git a/mod/developers/views/default/theme_preview/miscellaneous.php b/mod/developers/views/default/theme_preview/miscellaneous.php
new file mode 100644 (file)
index 0000000..2f4ee4a
--- /dev/null
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Miscellaneous and complex components
+ */
+
+$body = elgg_view('theme_preview/miscellaneous/lightbox');
+echo elgg_view_module('info', 'Lightbox (.elgg-lightbox)', $body);
+
+$body = elgg_view('theme_preview/miscellaneous/popup');
+echo elgg_view_module('info', 'Popup (rel=popup)', $body);
+
+$body = elgg_view('theme_preview/miscellaneous/toggle');
+echo elgg_view_module('info', 'Toggle (rel=toggle)', $body);
+
+$body = elgg_view('theme_preview/miscellaneous/system_messages');
+echo elgg_view_module('info', 'System Messages and Errors', $body);
+
+$body = elgg_view('theme_preview/miscellaneous/site_menu');
+echo elgg_view_module('info', 'Site Menu', $body);
+
+$body = elgg_view('theme_preview/miscellaneous/user_hover_menu');
+echo elgg_view_module('info', 'User Icon with Hover Menu', $body);
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/miscellaneous/lightbox.php b/mod/developers/views/default/theme_preview/miscellaneous/lightbox.php
new file mode 100644 (file)
index 0000000..b673c4e
--- /dev/null
@@ -0,0 +1,19 @@
+<?php
+
+elgg_load_js('lightbox');
+elgg_load_css('lightbox');
+
+$ipsum = elgg_view('developers/ipsum');
+
+$link = elgg_view('output/url', array(
+       'text' => 'Open lighbox',
+       'href' => "#elgg-lightbox-test",
+       'class' => 'elgg-lightbox'
+));
+
+echo $link;
+echo '<div class="hidden">';
+echo elgg_view_module('aside', 'Lightbox Test', $ipsum, array(
+       'id' => 'elgg-lightbox-test'
+));
+echo '</div>';
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/miscellaneous/popup.php b/mod/developers/views/default/theme_preview/miscellaneous/popup.php
new file mode 100644 (file)
index 0000000..b711bb7
--- /dev/null
@@ -0,0 +1,15 @@
+<?php
+
+$ipsum = elgg_view('developers/ipsum');
+
+$link = elgg_view('output/url', array(
+       'text' => 'Popup content',
+       'href' => "#elgg-popup-test",
+       'rel' => 'popup'
+));
+
+echo $link;
+echo elgg_view_module('popup', 'Popup Test', $ipsum, array(
+       'id' => 'elgg-popup-test',
+       'class' => 'hidden clearfix developers-content-thin',
+));
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/miscellaneous/site_menu.php b/mod/developers/views/default/theme_preview/miscellaneous/site_menu.php
new file mode 100644 (file)
index 0000000..e2384b9
--- /dev/null
@@ -0,0 +1,15 @@
+<?php
+
+if (!get_input('site_menu')) {
+       echo elgg_view('output/url', array(
+               'text' => 'Show Site Menu',
+               'href' => elgg_http_add_url_query_elements(current_page_url(), array('site_menu' => 1)),
+               'is_trusted' => true
+       ));
+} else {
+       echo elgg_view('output/url', array(
+               'text' => 'Hide Site Menu',
+               'href' => elgg_http_remove_url_query_element(current_page_url(), 'site_menu'),
+               'is_trusted' => true
+       ));
+}
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/miscellaneous/system_messages.php b/mod/developers/views/default/theme_preview/miscellaneous/system_messages.php
new file mode 100644 (file)
index 0000000..a6663a3
--- /dev/null
@@ -0,0 +1,35 @@
+<?php
+
+// can't use the ipsum because it includes html when wrapping views.
+$message = elgg_view('output/url', array(
+       'text' => 'Show system message (system_message())',
+       'is_trusted' => true,
+       'href' => '#',
+       'id' => 'developers-system-message',
+//     'onclick' => "elgg.system_message('Elgg System Message');"
+));
+
+$error = elgg_view('output/url', array(
+       'text' => 'Show error message (register_error())',
+       'is_trusted' => true,
+       'href' => '#',
+       'id' => 'developers-error-message',
+));
+
+?>
+<script type="text/javascript">
+       $(function() {
+               $('#developers-system-message').click(function() {
+                       elgg.system_message('Elgg System Message');
+               })
+
+               $('#developers-error-message').click(function() {
+                       elgg.register_error('Elgg Error Message');
+               })
+       });
+</script>
+
+<ul>
+       <li><?php echo $message; ?></li>
+       <li><?php echo $error; ?></li>
+</ul>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/miscellaneous/toggle.php b/mod/developers/views/default/theme_preview/miscellaneous/toggle.php
new file mode 100644 (file)
index 0000000..abe39dd
--- /dev/null
@@ -0,0 +1,15 @@
+<?php
+
+$ipsum = elgg_view('developers/ipsum');
+
+$link = elgg_view('output/url', array(
+       'text' => 'Toggle content',
+       'href' => "#elgg-toggle-test",
+       'rel' => 'toggle'
+));
+
+echo $link;
+echo elgg_view_module('featured', 'Toggle Test', $ipsum, array(
+       'id' => 'elgg-toggle-test',
+       'class' => 'hidden clearfix developers-content-thin',
+));
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/miscellaneous/user_hover_menu.php b/mod/developers/views/default/theme_preview/miscellaneous/user_hover_menu.php
new file mode 100644 (file)
index 0000000..45331b6
--- /dev/null
@@ -0,0 +1,16 @@
+<?php
+
+$me = elgg_get_logged_in_user_entity();
+echo elgg_view_entity_icon($me);
+
+// show another user if available
+$users = elgg_get_entities(array(
+       'type' => 'user',
+       'wheres' => array("guid != {$me->getGUID()}"),
+       'limit' => 1
+));
+
+if (is_array($users) && count($users) > 0) {
+       echo elgg_view_entity_icon($users[0]);
+}
+
index 3e0acb3a5223a0f69599ba3b7f92744eb3a3da9a..c46c94296c999ec422a3a969e486132b96298463 100644 (file)
@@ -2,5 +2,5 @@
 
 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'));
+echo elgg_view_module('info', 'Widgets (.elgg-module-widget)', elgg_view('theme_preview/modules/widgets'));