dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2227434)
Usability/accessibility: don't link in navigation if page is active
authorTom Gilder <tomgilder@users.mediawiki.org>
Tue, 11 Oct 2005 23:46:00 +0000 (23:46 +0000)
committerTom Gilder <tomgilder@users.mediawiki.org>
Tue, 11 Oct 2005 23:46:00 +0000 (23:46 +0000)
includes/Skin.php patch | blob | history
skins/MonoBook.php patch | blob | history
skins/monobook/main.css patch | blob | history

diff --git a/includes/Skin.php b/includes/Skin.php
index 27a8d22..e059ac1 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1312,7 +1312,10 @@ END;
         * @access private
         */
        function buildSidebar() {
+               global $wgTitle, $action;
+
                $fname = 'SkinTemplate::buildSidebar';
+               $pageurl = $wgTitle->getLocalURL();
                wfProfileIn( $fname );
 
                $bar = array();
@@ -1333,10 +1336,14 @@ END;
                                                $text = $line[1];
                                        if (wfEmptyMsg($line[0], $link))
                                                $link = $line[0];
+                                       $href = $this->makeInternalOrExternalUrl( $link );
+                                       $active = ( $pageurl == $href );
                                        $bar[$heading][] = array(
                                                'text' => $text,
-                                               'href' => $this->makeInternalOrExternalUrl( $link ),
+                                               'href' => $href,
                                                'id' => 'n-' . strtr($line[1], ' ', '-'),
+                                               'active' => $active,
+                                               'dolink' => ( !$active || ($action != 'view' && $action != 'purge' ) )
                                        );
                                } else { continue; }
                        }
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index bd60571..95e6cdd 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -48,6 +48,7 @@ class MonoBookTemplate extends QuickTemplate {
         */
        function execute() {
                // Suppress warnings to prevent notices about missing indexes in $this->data
+               global $action;
                wfSuppressWarnings();
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -97,11 +98,11 @@ class MonoBookTemplate extends QuickTemplate {
        <div id="p-cactions" class="portlet">
          <h5><?php $this->msg('views') ?></h5>
          <ul>
-           <?php foreach($this->data['content_actions'] as $key => $action) {
+           <?php foreach($this->data['content_actions'] as $key => $tab) {
               ?><li id="ca-<?php echo htmlspecialchars($key) ?>"
-              <?php if($action['class']) { ?>class="<?php echo htmlspecialchars($action['class']) ?>"<?php } ?>
-              ><a href="<?php echo htmlspecialchars($action['href']) ?>"><?php
-              echo htmlspecialchars($action['text']) ?></a></li><?php
+              <?php if($tab['class']) { ?>class="<?php echo htmlspecialchars($tab['class']) ?>"<?php } ?>
+              ><a href="<?php echo htmlspecialchars($tab['href']) ?>"><?php
+              echo htmlspecialchars($tab['text']) ?></a></li><?php
             } ?>
          </ul>
        </div>
@@ -130,9 +131,15 @@ class MonoBookTemplate extends QuickTemplate {
          <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
          <div class='pBody'>
            <ul>
-           <?php foreach($cont as $key => $val) { ?>
-             <li id="<?php echo htmlspecialchars($val['id']) ?>"><a href="<?php echo htmlspecialchars($val['href']) ?>"><?php echo htmlspecialchars($val['text'])?></a></li>
-            <?php } ?>
+           <?php foreach($cont as $key => $val) { 
+                               echo '<li id="' . htmlspecialchars($val['id']) . '">';
+                               if ( $val['active'] ) echo '<strong>';
+                               if ( $val['dolink'] ) echo '<a href="' . htmlspecialchars($val['href']) . '">';
+                               echo htmlspecialchars($val['text']); 
+                               if ( $val['active'] ) echo '</strong>';
+                               if ( $val['dolink'] ) echo '</a>';
+                               echo '</li>';
+                       } ?>
            </ul>
          </div>
        </div>
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index ffabcd0..ee7d454 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -682,6 +682,10 @@ special external link styling */
     z-index: 3;
 }
 
+#p-navigation strong {
+    font-weight: normal;
+}
+
 /*
 ** Search portlet
 */
Wiklou, le Wiki du Wiklou