Werdna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/190428
Change subject: Move navigation out of drop down menu
......................................................................
Move navigation out of drop down menu
Change-Id: Ideb0af3cd6ef2d1b1434ba470183fa70346c0d29
---
M templates/Skin.php
M templates/sidebar.template
2 files changed, 15 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/LivingStyleGuide
refs/changes/28/190428/1
diff --git a/templates/Skin.php b/templates/Skin.php
index 932c68b..0527a90 100644
--- a/templates/Skin.php
+++ b/templates/Skin.php
@@ -194,18 +194,6 @@
<div id="off-navigation">
'.' <div class="dropdown">
- <button class="btn btn-default dropdown-toggle" type="button"
id="navigation" data-toggle="dropdown" aria-expanded="true">
- <span class="glyphicon glyphicon-th"></span>
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu" role="menu"
aria-labelledby="navigation">
-'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('sidebar','navigation')), $in, true, function($cx, $in) {return '
<li id="'.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('id')), ENT_QUOTES, 'UTF-8').'">
- <a
href="'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('href')),
ENT_QUOTES, 'UTF-8').'">'.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('text')), ENT_QUOTES, 'UTF-8').'</a>
- </li>
-';}).' </ul>
- </div>
-
- <div class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button"
id="account" data-toggle="dropdown" aria-expanded="true">
<span class="glyphicon glyphicon-user"></span>
<span class="caret"></span>
@@ -214,6 +202,12 @@
'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('personal_urls')), $in, true, function($cx, $in) {return '
<li><a href="'.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('href')), ENT_QUOTES, 'UTF-8').'"
class="'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('class')),
ENT_QUOTES, 'UTF-8').'">'.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('text')), ENT_QUOTES, 'UTF-8').'</a></li>
';}).' </ul>
</div>
+ <h2 id="navigation-header">Navigation</h2>
+ <ul aria-labelledby="navigation-header">
+'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('sidebar','navigation')), $in, true, function($cx, $in) {return '
<li id="'.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('id')), ENT_QUOTES, 'UTF-8').'">
+ <a
href="'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('href')),
ENT_QUOTES, 'UTF-8').'">'.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('text')), ENT_QUOTES, 'UTF-8').'</a>
+ </li>
+';}).' </ul>
'.' </div>
<div id="site-wrap">
@@ -276,4 +270,4 @@
</html>
';
}
-?>
+?>
\ No newline at end of file
diff --git a/templates/sidebar.template b/templates/sidebar.template
index f5d9b2e..8be93f0 100644
--- a/templates/sidebar.template
+++ b/templates/sidebar.template
@@ -1,17 +1,4 @@
<div class="dropdown">
- <button class="btn btn-default dropdown-toggle" type="button"
id="navigation" data-toggle="dropdown" aria-expanded="true">
- <span class="glyphicon glyphicon-th"></span>
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu" role="menu" aria-labelledby="navigation">
- {{#each sidebar.navigation}}
- <li id="{{id}}">
- <a href="{{href}}">{{text}}</a>
- </li>
- {{/each}}
- </ul>
-</div>
-<div class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button"
id="account" data-toggle="dropdown" aria-expanded="true">
<span class="glyphicon glyphicon-user"></span>
<span class="caret"></span>
@@ -22,3 +9,11 @@
{{/each}}
</ul>
</div>
+<h2 id="navigation-header">Navigation</h2>
+<ul aria-labelledby="navigation-header">
+ {{#each sidebar.navigation}}
+ <li id="{{id}}">
+ <a href="{{href}}">{{text}}</a>
+ </li>
+ {{/each}}
+</ul>
--
To view, visit https://gerrit.wikimedia.org/r/190428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ideb0af3cd6ef2d1b1434ba470183fa70346c0d29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/LivingStyleGuide
Gerrit-Branch: master
Gerrit-Owner: Werdna <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
