Werdna has uploaded a new change for review. https://gerrit.wikimedia.org/r/190425
Change subject: Fix FUOC issues and add some standard IDs ...................................................................... Fix FUOC issues and add some standard IDs Change-Id: I63741ecd49fbb894960d52422a71dd79bf35d4fb --- M LivingStyleGuide.php M src/SkinLivingStyleGuide.php M templates/Skin.php M templates/Skin.template 4 files changed, 19 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/LivingStyleGuide refs/changes/25/190425/1 diff --git a/LivingStyleGuide.php b/LivingStyleGuide.php index 6207825..d93a712 100644 --- a/LivingStyleGuide.php +++ b/LivingStyleGuide.php @@ -41,22 +41,28 @@ ), ); +$styleguideSkinResourceTemplate = array( + 'localBasePath' => __DIR__ . "/resources", + 'remoteSkinPath' => 'LivingStyleGuide/resources', + 'group' => 'skin.livingstyleguide', +); + $wgResourceModules += array( 'ext.bootstrap' => array( 'localBasePath' => __DIR__ . "/bower_components/bootstrap/dist", 'remoteSkinPath' => 'LivingStyleGuide/bower_components/bootstrap/dist', - 'group' => 'ext.lightncandyskin', + 'group' => 'skin.livingstyleguide', 'scripts' => 'js/bootstrap.min.js', 'styles' => 'css/bootstrap.min.css', ), - 'skin.styleguide' => array( - 'localBasePath' => __DIR__ . "/resources", - 'remoteSkinPath' => 'LivingStyleGuide/resources', - 'group' => 'ext.lightncandyskin', + 'skin.styleguide.styles' => array( 'styles' => 'master.less', + 'position' => 'top', + ) + $styleguideSkinResourceTemplate, + 'skin.styleguide' => array( 'scripts' => 'menu.js', 'dependencies' => 'ext.bootstrap' - ), + ) + $styleguideSkinResourceTemplate, ); require_once __DIR__."/autoload.php"; diff --git a/src/SkinLivingStyleGuide.php b/src/SkinLivingStyleGuide.php index e43e46e..03c0ed7 100755 --- a/src/SkinLivingStyleGuide.php +++ b/src/SkinLivingStyleGuide.php @@ -7,11 +7,11 @@ public function initPage( OutputPage $out ) { parent::initPage( $out ); - $out->addModules( array( 'skin.styleguide', 'ext.bootstrap' ) ); + $out->addModules( array( 'skin.styleguide' ) ); } public function setupSkinUserCss( OutputPage $out ) { parent::setupSkinUserCss( $out ); - $out->addModuleStyles( array( 'skin.styleguide', 'ext.bootstrap' ) ); + $out->addModuleStyles( array( 'skin.styleguide.styles', 'ext.bootstrap' ) ); } } diff --git a/templates/Skin.php b/templates/Skin.php index 932c68b..b6d8f14 100644 --- a/templates/Skin.php +++ b/templates/Skin.php @@ -204,7 +204,6 @@ </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> @@ -243,10 +242,10 @@ </div> </nav> - <div class="container"> + <div class="container" id="content"> <h1 class="firstHeading" id="firstHeading"> '.$cx['funcs']['v']($cx, $in, array('title')).' - <span class="content-actions"> + <span class="content-actions" id="p-cactions"> '.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in, array('content_navigation','views')), $in, true, function($cx, $in) {return ' <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').'" @@ -276,4 +275,4 @@ </html> '; } -?> +?> \ No newline at end of file diff --git a/templates/Skin.template b/templates/Skin.template index 93c6a6a..5ea337c 100755 --- a/templates/Skin.template +++ b/templates/Skin.template @@ -31,10 +31,10 @@ </div> </nav> - <div class="container"> + <div class="container" id="content"> <h1 class="firstHeading" id="firstHeading"> {{{title}}} - <span class="content-actions"> + <span class="content-actions" id="p-cactions"> {{#each content_navigation.views}} <a href="{{href}}" -- To view, visit https://gerrit.wikimedia.org/r/190425 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63741ecd49fbb894960d52422a71dd79bf35d4fb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/LivingStyleGuide Gerrit-Branch: master Gerrit-Owner: Werdna <agarr...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits