diff options
| -rw-r--r-- | documentation/css/preview/forms.php | 17 | ||||
| -rw-r--r-- | documentation/css/preview/general.php | 3 | ||||
| -rw-r--r-- | documentation/css/preview/grid.php | 3 | ||||
| -rw-r--r-- | documentation/css/preview/icons.php (renamed from documentation/css/preview/images.php) | 7 | ||||
| -rw-r--r-- | documentation/css/preview/index.php | 3 | ||||
| -rw-r--r-- | documentation/css/preview/nav.php | 19 | ||||
| -rw-r--r-- | documentation/css/preview/objects.php | 3 | ||||
| -rw-r--r-- | documentation/css/preview/widgets.php | 3 |
8 files changed, 28 insertions, 30 deletions
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(); + ?> <body> - <div class="elgg-page" style="width: 800px; margin: 20px auto;"> - <h1 class="mbl"><?php echo $title; ?></h1> - <div class="mbl"><a href="index.php">return to index</a></div> + <div class="elgg-page mal"> + <h1 class="mbl"><a href="index.php">Index</a> > <?php echo $title; ?></h1> <h2>Form</h2> <form action="#"> <fieldset> @@ -162,7 +163,7 @@ require dirname(__FILE__) . '/head.php'; </p> <p> <?php echo elgg_view('output/url', array( - 'href' => '#', + 'href' => "$url#", 'text' => 'a.elgg-submit-button', 'class' => 'elgg-button elgg-submit-button', )); @@ -170,7 +171,7 @@ require dirname(__FILE__) . '/head.php'; </p> <p> <?php echo elgg_view('output/url', array( - 'href' => '#', + 'href' => "$url#", 'text' => 'submit button disabled', 'class' => 'elgg-button elgg-submit-button disabled', )); @@ -185,7 +186,7 @@ require dirname(__FILE__) . '/head.php'; </p> <p> <?php echo elgg_view('output/url', array( - 'href' => '#', + 'href' => "$url#", 'text' => 'a.elgg-cancel-button', 'class' => 'elgg-button elgg-cancel-button', )); @@ -193,7 +194,7 @@ require dirname(__FILE__) . '/head.php'; </p> <p> <?php echo elgg_view('output/url', array( - 'href' => '#', + 'href' => "$url#", 'text' => 'a.elgg-action-button', 'class' => 'elgg-action-button', )); @@ -201,7 +202,7 @@ require dirname(__FILE__) . '/head.php'; </p> <p> <?php echo elgg_view('output/url', array( - 'href' => '#', + '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'; ?> <body> <div class="elgg-page mal"> - <h1 class="mbl"><?php echo $title; ?></h1> - <div class="mbl"><a href="index.php">return to index</a></div> + <h1 class="mbl"><a href="index.php">Index</a> > <?php echo $title; ?></h1> <h2>Headings</h2> <div class="mbl"> <h1>Level 1 heading</h1> 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'; ?> <body> <div class="elgg-page mal"> - <h1 class="mbl"><?php echo $title; ?></h1> - <div class="mbl"><a href="index.php">return to index</a></div> + <h1 class="mbl"><a href="index.php">Index</a> > <?php echo $title; ?></h1> <style> h3 {text-align: center;} .preview-outline {border: 1px solid #cccccc; padding: 5px;} diff --git a/documentation/css/preview/images.php b/documentation/css/preview/icons.php index f798c926d..a7a50abd5 100644 --- a/documentation/css/preview/images.php +++ b/documentation/css/preview/icons.php @@ -1,9 +1,9 @@ <?php /** - * Images CSS + * Icons CSS */ -$title = 'Images'; +$title = 'Icons'; require dirname(__FILE__) . '/head.php'; @@ -11,8 +11,7 @@ require dirname(__FILE__) . '/head.php'; <style>li {margin: 10px; float: left;} ul {background-color: #e0e0e0;}</style> <body> <div class="elgg-page mal"> - <h1 class="mbl"><?php echo $title; ?></h1> - <div class="mbl"><a href="index.php">return to index</a></div> + <h1 class="mbl"><a href="index.php">Index</a> > <?php echo $title; ?></h1> <ul class="clearfix"> <li><span class="elgg-icon elgg-icon-settings"></span>Settings</li> <li><span class="elgg-icon elgg-icon-friends"></span>Friends</li> 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'; ?> <body> <div class="elgg-page mal"> + <h1 class="mbl"><a href="index.php">Index</a></h1> <ul class="mtl"> <li><a href="general.php">General CSS</a></li> <li><a href="nav.php">Navigation CSS</a></li> @@ -15,7 +16,7 @@ include dirname(__FILE__) . '/head.php'; <li><a href="objects.php">Lists, modules, image blocks CSS</a></li> <li><a href="grid.php">Grid CSS</a></li> <li><a href="widgets.php">Widgets CSS</a></li> - <li><a href="images.php">Images CSS</a></li> + <li><a href="icons.php">Icons CSS</a></li> </ul> </div> </body> 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'); ?> <body> <div class="elgg-page mal"> - <h1 class="mbl"><?php echo $title; ?></h1> - <div class="mbl"><a href="index.php">return to index</a></div> + <h1 class="mbl"><a href="index.php">Index</a> > <?php echo $title; ?></h1> <h2>Breadcrumbs</h2> <div class="mbl"> <?php echo elgg_view('navigation/breadcrumbs'); ?> @@ -24,9 +25,9 @@ elgg_push_breadcrumb('Third'); <div class="mbl"> <?php $tabs = array( - array('title' => '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'); <h2>Page Menu</h2> <div class="mbl pam" style="width: 200px; background-color: #cccccc;"> <?php - $m = new ElggMenuItem(10, "Child", '#'); + $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); 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'; ?> <body> <div class="elgg-page mal"> - <h1 class="mbl"><?php echo $title; ?></h1> - <div class="mbl"><a href="index.php">return to index</a></div> + <h1 class="mbl"><a href="index.php">Index</a> > <?php echo $title; ?></h1> <h2>Modules</h2> <div class="mbl clearfix"> <div class="elgg-col elgg-col-1of2"> 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() { ?> <body> <div class="elgg-page mal"> - <h1 class="mbl"><?php echo $title; ?></h1> - <div class="mbl"><a href="index.php">return to index</a></div> + <h1 class="mbl"><a href="index.php">Index</a> > <?php echo $title; ?></h1> <?php $w = array(); for ($i=1; $i<=6; $i++) { |