From: ewinslow Date: Sat, 23 Apr 2011 00:30:17 +0000 (+0000) Subject: Fixes #3042: Theme preview navs now match css/elements/*. Also did a major cleanup... X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d4139ca10963001c830a72c0f70f2c2dd8edec57;p=lorea%2Felgg.git Fixes #3042: Theme preview navs now match css/elements/*. Also did a major cleanup of the presentation. git-svn-id: http://code.elgg.org/elgg/trunk@9019 36083f99-b078-4883-b0ff-0f9b5a30f544 --- diff --git a/mod/developers/languages/en.php b/mod/developers/languages/en.php index 41bdcdddb..a2db69bc4 100644 --- a/mod/developers/languages/en.php +++ b/mod/developers/languages/en.php @@ -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); diff --git a/mod/developers/start.php b/mod/developers/start.php index dc8e6f66e..c05432e30 100644 --- a/mod/developers/start.php +++ b/mod/developers/start.php @@ -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'); } diff --git a/mod/developers/views/default/page/theme_preview.php b/mod/developers/views/default/page/theme_preview.php index 97df551ae..5b31fd789 100644 --- a/mod/developers/views/default/page/theme_preview.php +++ b/mod/developers/views/default/page/theme_preview.php @@ -14,48 +14,18 @@ header("Content-type: text/html; charset=UTF-8"); - - <?php echo $vars['title']; ?> - - - - - - - - - + -
+
- +

Theme Preview

- - -
-
-
-
- +
diff --git a/mod/developers/views/default/theme_preview/buttons.php b/mod/developers/views/default/theme_preview/buttons.php new file mode 100644 index 000000000..718d88617 --- /dev/null +++ b/mod/developers/views/default/theme_preview/buttons.php @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DefaultDisabled (.elgg-state-disabled)
Base (.elgg-button)anchoranchor
Action (.elgg-button-action)anchoranchor
Cancel (.elgg-button-cancel)anchoranchor
Submit (.elgg-button-submit)anchoranchor
Special (.elgg-button-special)anchoranchor
Delete (.elgg-button-delete)anchoranchor
\ 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 index 000000000..ab5a6e941 --- /dev/null +++ b/mod/developers/views/default/theme_preview/components.php @@ -0,0 +1,12 @@ +title = "Object 1"; +$obj1->description = $ipsum; + +$obj2 = new ElggObject(); +$obj2->title = "Object 2"; +$obj2->description = $ipsum; + +$obj3 = new ElggObject(); +$obj3->title = "Object 3"; +$obj3->description = $ipsum; + +$obj4 = new ElggObject(); +$obj4->title = "Object 4"; +$obj4->description = $ipsum; + +echo elgg_view('page/components/list', array('items' => array($obj1, $obj2, $obj3, $obj4))); 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 index 000000000..ac4d2bfd7 --- /dev/null +++ b/mod/developers/views/default/theme_preview/components/messages.php @@ -0,0 +1,5 @@ + 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 index 000000000..e9ef32143 --- /dev/null +++ b/mod/developers/views/default/theme_preview/components/table.php @@ -0,0 +1,12 @@ + +"; + for ($i = 1; $i < 5; $i++) { + echo ''; + for ($j = 1; $j < 3; $j++) { + echo ""; + } + echo ''; + } +?> +
column 1column 2
value $j
\ 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 bf637d6f0..60183ead9 100644 --- a/mod/developers/views/default/theme_preview/forms.php +++ b/mod/developers/views/default/theme_preview/forms.php @@ -1,222 +1,139 @@ - - -
- -

Form

-
-
- Form legend -
- - 'f1', - 'id' => 'f1', - 'value' => 'input text', - )); - ?> -
-
- - 'f2', - 'id' => 'f2', - 'value' => 'password', - )); - ?> -
-
-
- 'f3', - 'id' => 'f3', - 'options' => array('a' => 1, 'b' => 2), - )); - ?> -
-
-
- 'f4', - 'id' => 'f4', - 'options' => array('a' => 1, 'b' => 2), - )); - ?> -
-
-
- 'f5', - 'id' => 'f5', - 'options' => array('option 1', 'option 2'), - )); - ?> -
-
- - 'f6', - 'id' => 'f6', - 'value' => ACCESS_PUBLIC, - )); - ?> -
-
- - 'f7', - 'id' => 'f7', - )); - ?> -
-
- - 'f8', - 'id' => 'f8', - 'value' => 'http://elgg.org/', - )); - ?> -
-
- - 'f9', - 'id' => 'f9', - 'value' => 'one, two, three', - )); - ?> -
-
- - 'f10', - 'id' => 'f10', - 'value' => 'noone@elgg.org', - )); - ?> -
-
- - 'f11', - 'id' => 'f11', - 'match_on' => 'users', - )); - ?> -
-
- - 'f12', - 'id' => 'f12', - )); - ?> -
-
- - 'f13', - 'id' => 'f13', - )); - ?> -
-
- - 'f14', - 'id' => 'f14', - 'value' => $ipsum, - )); - ?> -
-
- - 'f15', - 'id' => 'f15', - 'value' => $ipsum, - )); - ?> -
-
-
- -
-

Buttons

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
AnchorsDefaultHoverFocusActiveDisabledSelected
Defaultanchoranchoranchoranchoranchoranchor
Actionanchoranchoranchoranchoranchor
Cancelanchoranchoranchoranchoranchor
Submitanchoranchoranchoranchoranchor
Specialanchoranchoranchoranchoranchor
Deleteanchoranchoranchoranchoranchor
-
-
+
+
+ Fieldset Legend +
+ + 'f1', + 'id' => 'f1', + 'value' => 'input text', + )); + ?> +
+
+ + 'f2', + 'id' => 'f2', + 'value' => 'password', + )); + ?> +
+
+
+ 'f3', + 'id' => 'f3', + 'options' => array('a' => 1, 'b' => 2), + )); + ?> +
+
+
+ 'f4', + 'id' => 'f4', + 'options' => array('a (.elgg-input-checkbox)' => 1, 'b (.elgg-input-checkbox)' => 2), + )); + ?> +
+
+
+ 'f5', + 'id' => 'f5', + 'options' => array('option 1', 'option 2'), + )); + ?> +
+
+
+ 'f6', + 'id' => 'f6', + 'value' => ACCESS_PUBLIC, + )); + ?> +
+
+ + 'f7', + 'id' => 'f7', + )); + ?> +
+
+ + 'f8', + 'id' => 'f8', + 'value' => 'http://elgg.org/', + )); + ?> +
+
+ + 'f9', + 'id' => 'f9', + 'value' => 'one, two, three', + )); + ?> +
+
+ + 'f10', + 'id' => 'f10', + 'value' => 'noone@elgg.org', + )); + ?> +
+
+ + 'f11', + 'id' => 'f11', + 'match_on' => 'users', + )); + ?> +
+
+ + 'f12', + 'id' => 'f12', + 'value' => '12/12/2012' + )); + ?> +
+
+ + 'f13', + 'id' => 'f13', + 'value' => array(new ElggUser(), new ElggUser(), new ElggUser()), + )); + ?> +
+
+ + 'f15', + 'id' => 'f15', + 'value' => $ipsum, + )); + ?> +
+
+ + 'f14', + 'id' => 'f14', + 'value' => $ipsum, + )); + ?> +
+
+
\ 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 index bd11b35db..000000000 --- a/mod/developers/views/default/theme_preview/general.php +++ /dev/null @@ -1,59 +0,0 @@ - - -
- -

Headings

-
-

Level 1 heading

-

Level 2 heading

-

Level 3 heading

-

Level 4 heading

-
Level 5 heading
-
Level 6 heading
-
-

Paragraph

-
-

Lorem ipsum dolor sit amet, test link - 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.

- -

Lorem ipsum dolor sit amet, emphasis - 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.

-
-

Misc

-

- I am the a tag example
- I am the abbr tag example
- I am the acronym tag example
- I am the b tag example
- I am the code tag example
- I am the del tag example
- I am the em tag example
- I am the i tag example
- I am the strong tag example
-

-

Paragraph inside Blockquote:

- 
Preformated:Testing one row
-			 and another
-
diff --git a/mod/developers/views/default/theme_preview/grid.php b/mod/developers/views/default/theme_preview/grid.php index 95e14cfd5..030e752e7 100644 --- a/mod/developers/views/default/theme_preview/grid.php +++ b/mod/developers/views/default/theme_preview/grid.php @@ -4,16 +4,13 @@ */ ?> -
- -
-
+

1/5

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.

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.

@@ -21,44 +18,44 @@ h3 {text-align: center;}
-
+

3/5

-
+

1/2

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.

-
+

1/2

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.

-
+

1/3

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.

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.

-
+

2/3

-
+

1/2

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.

-
+

1/2

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.

-
+

1

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.

@@ -68,7 +65,7 @@ h3 {text-align: center;}
-
+

1/5

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.

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.

diff --git a/mod/developers/views/default/theme_preview/icons.php b/mod/developers/views/default/theme_preview/icons.php index 8178a9da7..e1684c110 100644 --- a/mod/developers/views/default/theme_preview/icons.php +++ b/mod/developers/views/default/theme_preview/icons.php @@ -3,56 +3,8 @@ * Icons CSS */ -?> - -
- -

Icon Sprites

-
    - '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 "
  • " . elgg_view_icon($icon_id) . $icon_label . "
    • "; - } - - ?> -
-

Ajax loader

-
- false)); ?> -
-

Avatars

-
- '; - echo ''; - foreach ($sizes as $size) { - echo "

$size

"; - } - echo ''; - echo ''; - foreach ($sizes as $size) { - echo ''; - echo elgg_view_entity_icon($user, $size, array('hover' => false)); - echo ''; - } - echo ''; - echo ''; - ?> -
-
+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 index 000000000..cbce5bc7d --- /dev/null +++ b/mod/developers/views/default/theme_preview/icons/avatars.php @@ -0,0 +1,36 @@ + + + + + $size"; + } + ?> + + + + '; + echo elgg_view_entity_icon($user, $size, array('hover' => false)); + echo ''; + } + ?> + + + + '; + echo elgg_view_entity_icon($group, $size, array('hover' => false)); + echo ''; + } + ?> + +
User
Group
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 index 000000000..e542da27c --- /dev/null +++ b/mod/developers/views/default/theme_preview/icons/loader.php @@ -0,0 +1 @@ + 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 index 000000000..134dd9aca --- /dev/null +++ b/mod/developers/views/default/theme_preview/icons/sprites.php @@ -0,0 +1,61 @@ + + +
    +" . elgg_view_icon($icon) . ""; + } +?> +
\ 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 index 000000000..3e0acb3a5 --- /dev/null +++ b/mod/developers/views/default/theme_preview/modules.php @@ -0,0 +1,6 @@ + +
+
+
+ +
+
+
+
+ +
+
+
\ No newline at end of file diff --git a/mod/developers/views/default/theme_preview/widgets.php b/mod/developers/views/default/theme_preview/modules/widgets.php 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 eafbcef6f..8c9fd6483 100644 --- a/mod/developers/views/default/theme_preview/widgets.php +++ b/mod/developers/views/default/theme_preview/modules/widgets.php @@ -50,7 +50,7 @@ for ($column_index = 1; $column_index <= $num_columns; $column_index++) {