Isarra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/251187
Change subject: Add ids to footer lists and some sanitisation functions
......................................................................
Add ids to footer lists and some sanitisation functions
Clear and relative the content
ids
ids
ids
Also use the same data[] thing for the content as vector so random changes will
be less dangerous maybe? I dunno. It just seems like vector is the most likely
skin to actually be supported in light of cataclysm.
Change-Id: I483a4f69c75ad1035c0e9968538ef3d5628599e4
---
M ExampleTemplate.php
M resources/screen-common.less
2 files changed, 45 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Example
refs/changes/87/251187/1
diff --git a/ExampleTemplate.php b/ExampleTemplate.php
index caaf197..236e426 100644
--- a/ExampleTemplate.php
+++ b/ExampleTemplate.php
@@ -51,7 +51,15 @@
</div>
<?php
- $this->html( 'bodytext' );
+ $this->html( 'bodycontent' );
+ $this->clear();
+ if ( $this->data['printfooter'] ) {
+ ?>
+ <div class="printfooter">
+ <?php $this->html(
'printfooter' ); ?>
+ </div>
+ <?php
+ }
$this->html( 'catlinks' );
$this->html( 'dataAfterContent' );
?>
@@ -73,27 +81,11 @@
</div>
<div id="mw-footer">
- <?php
- foreach ( $this->getFooterLinks() as $category
=> $links ) {
- ?>
- <ul role="contentinfo">
- <?php
- foreach ( $links as $key ) {
- ?>
- <li><?php $this->html(
$key ) ?></li>
- <?php
- }
- ?>
- </ul>
- <?php
- }
- ?>
-
- <ul role="contentinfo">
+ <ul id="footer-icons" role="contentinfo">
<?php
foreach ( $this->getFooterIcons(
'icononly' ) as $blockName => $footerIcons ) {
?>
- <li>
+ <li id="footer-<?php echo
htmlspecialchars( $blockName ); ?>ico">
<?php
foreach ( $footerIcons
as $icon ) {
echo
$this->getSkin()->makeFooterIcon( $icon );
@@ -104,6 +96,22 @@
}
?>
</ul>
+ <?php
+ foreach ( $this->getFooterLinks() as $category
=> $links ) {
+ ?>
+ <ul id="footer-<?php echo $category ?>"
role="contentinfo">
+ <?php
+ foreach ( $links as $key ) {
+ ?>
+ <li id="footer-<?php echo
$category ?>-<?php echo $key ?>"><?php $this->html( $key ) ?></li>
+ <?php
+ }
+ ?>
+ </ul>
+ <?php
+ }
+ $this->clear();
+ ?>
</div>
</div>
@@ -254,4 +262,8 @@
'content' => $this->getPersonalTools(),
) );
}
+
+ private function clear() {
+ echo '<div class="visual-clear"></div>';
+ }
}
diff --git a/resources/screen-common.less b/resources/screen-common.less
index 7216f6f..e8fb72d 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -28,6 +28,9 @@
background-position: 50% 50%;
}
}
+.mw-body {
+ position: relative;
+}
/* Some content stuff */
.firstHeading {
@@ -36,6 +39,9 @@
.mw-indicators {
float: right;
margin: 1.5em 0 0 1em;
+}
+.visual-clear {
+ clear: both;
}
/* Splatter the menus and tools at the bottom */
@@ -64,7 +70,14 @@
#mw-footer {
clear: both;
border-top: 1px solid @border;
- padding-top: 1em;
+
+ ul {
+ margin-top: 1em;
+ }
+}
+#footer-icons {
+ float: right;
+ margin: 0 0 1em 1em;
}
/* hidden stuff */
--
To view, visit https://gerrit.wikimedia.org/r/251187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I483a4f69c75ad1035c0e9968538ef3d5628599e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Example
Gerrit-Branch: master
Gerrit-Owner: Isarra <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
