From 383f4572b9ce1d48db168b3bdc42163e02d97657 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 5 Feb 2011 03:31:43 +0000 Subject: cleaned up navigation of the css preview documentation git-svn-id: http://code.elgg.org/elgg/trunk@8025 36083f99-b078-4883-b0ff-0f9b5a30f544 --- documentation/css/preview/forms.php | 17 +++++++++-------- documentation/css/preview/general.php | 3 +-- documentation/css/preview/grid.php | 3 +-- documentation/css/preview/icons.php | 28 ++++++++++++++++++++++++++++ documentation/css/preview/images.php | 29 ----------------------------- documentation/css/preview/index.php | 3 ++- documentation/css/preview/nav.php | 19 ++++++++++--------- documentation/css/preview/objects.php | 3 +-- documentation/css/preview/widgets.php | 3 +-- 9 files changed, 53 insertions(+), 55 deletions(-) create mode 100644 documentation/css/preview/icons.php delete mode 100644 documentation/css/preview/images.php diff --git a/documentation/css/preview/forms.php b/documentation/css/preview/forms.php index 8dd028dc5..b2be5b0bb 100644 --- a/documentation/css/preview/forms.php +++ b/documentation/css/preview/forms.php @@ -7,11 +7,12 @@ $title = 'Forms and Buttons'; require dirname(__FILE__) . '/head.php'; +$url = current_page_url(); + ?> -
-

-
return to index
+
+

Index >

Form

@@ -162,7 +163,7 @@ require dirname(__FILE__) . '/head.php';

'#', + 'href' => "$url#", 'text' => 'a.elgg-submit-button', 'class' => 'elgg-button elgg-submit-button', )); @@ -170,7 +171,7 @@ require dirname(__FILE__) . '/head.php';

'#', + 'href' => "$url#", 'text' => 'submit button disabled', 'class' => 'elgg-button elgg-submit-button disabled', )); @@ -185,7 +186,7 @@ require dirname(__FILE__) . '/head.php';

'#', + 'href' => "$url#", 'text' => 'a.elgg-cancel-button', 'class' => 'elgg-button elgg-cancel-button', )); @@ -193,7 +194,7 @@ require dirname(__FILE__) . '/head.php';

'#', + 'href' => "$url#", 'text' => 'a.elgg-action-button', 'class' => 'elgg-action-button', )); @@ -201,7 +202,7 @@ require dirname(__FILE__) . '/head.php';

'#', + 'href' => "$url#", 'text' => 'action button disabled', 'class' => 'elgg-action-button disabled', )); diff --git a/documentation/css/preview/general.php b/documentation/css/preview/general.php index 7bec26c41..e0e8c8a46 100644 --- a/documentation/css/preview/general.php +++ b/documentation/css/preview/general.php @@ -10,8 +10,7 @@ require dirname(__FILE__) . '/head.php'; ?>

-

-
return to index
+

Index >

Headings

Level 1 heading

diff --git a/documentation/css/preview/grid.php b/documentation/css/preview/grid.php index 39985f394..c59fb8380 100644 --- a/documentation/css/preview/grid.php +++ b/documentation/css/preview/grid.php @@ -10,8 +10,7 @@ require dirname(__FILE__) . '/head.php'; ?>
-

-
return to index
+

Index >

+ +
+

Index >

+
    +
  • Settings
    • +
  • Friends
    • +
  • Help
    • +
  • Delete
    • +
  • Likes
    • +
  • Liked
    • +
  • Following
    • +
  • RSS
    • +
  • Arrow S
    • +
+
+ + \ No newline at end of file diff --git a/documentation/css/preview/images.php b/documentation/css/preview/images.php deleted file mode 100644 index f798c926d..000000000 --- a/documentation/css/preview/images.php +++ /dev/null @@ -1,29 +0,0 @@ - - - -
-

-
return to index
-
    -
  • Settings
    • -
  • Friends
    • -
  • Help
    • -
  • Delete
    • -
  • Likes
    • -
  • Liked
    • -
  • Following
    • -
  • RSS
    • -
  • Arrow S
    • -
-
- - \ No newline at end of file diff --git a/documentation/css/preview/index.php b/documentation/css/preview/index.php index 6471a2c32..ce71d28df 100644 --- a/documentation/css/preview/index.php +++ b/documentation/css/preview/index.php @@ -8,6 +8,7 @@ include dirname(__FILE__) . '/head.php'; ?>
+

Index

diff --git a/documentation/css/preview/nav.php b/documentation/css/preview/nav.php index 3d218a66b..b3a12005f 100644 --- a/documentation/css/preview/nav.php +++ b/documentation/css/preview/nav.php @@ -7,15 +7,16 @@ $title = 'Navigation'; require dirname(__FILE__) . '/head.php'; -elgg_push_breadcrumb('First', '#'); -elgg_push_breadcrumb('Second', '#'); +$url = current_page_url(); + +elgg_push_breadcrumb('First', "$url#"); +elgg_push_breadcrumb('Second', "$url#"); elgg_push_breadcrumb('Third'); ?>
-

-
return to index
+

Index >

Breadcrumbs

@@ -24,9 +25,9 @@ elgg_push_breadcrumb('Third');
'First', 'url' => '#'), - array('title' => 'Second', 'url' => '#', 'selected' => true), - array('title' => 'Third', 'url' => '#'), + 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)); ?> @@ -50,7 +51,7 @@ elgg_push_breadcrumb('Third'); $params['menu'] = array(); $params['menu']['default'] = array(); for ($i=1; $i<=5; $i++) { - $params['menu']['default'][] = new ElggMenuItem($i, "Page $i", '#'); + $params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#"); } $params['menu']['default'][2]->setSelected(true); echo elgg_view('navigation/menu/site', $params); @@ -60,7 +61,7 @@ elgg_push_breadcrumb('Third');

Page Menu

setParent($params['menu']['default'][1]); $params['menu']['default'][1]->addChild($m); echo elgg_view('navigation/menu/page', $params); diff --git a/documentation/css/preview/objects.php b/documentation/css/preview/objects.php index fd0db277f..d9bffaf9b 100644 --- a/documentation/css/preview/objects.php +++ b/documentation/css/preview/objects.php @@ -10,8 +10,7 @@ require dirname(__FILE__) . '/head.php'; ?>
-

-
return to index
+

Index >

Modules

diff --git a/documentation/css/preview/widgets.php b/documentation/css/preview/widgets.php index 70e3d13b1..e98e95054 100644 --- a/documentation/css/preview/widgets.php +++ b/documentation/css/preview/widgets.php @@ -24,8 +24,7 @@ function css_permissions_override() { ?>
-

-
return to index
+

Index >