[MediaWiki-commits] [Gerrit] prevent non-content sections from being printed in print-onl... - change (mediawiki...Tempo)

2015-01-18 Thread Llbraughler (Code Review)
Llbraughler has submitted this change and it was merged.

Change subject: prevent non-content sections from being printed in print-only 
view
..


prevent non-content sections from being printed in print-only view

Change-Id: I02a626b2be6df58c4eb4ede26e4d14f12c04a8ae
---
M Tempo.php
M Tempo.skin.php
2 files changed, 12 insertions(+), 7 deletions(-)

Approvals:
  Llbraughler: Verified; Looks good to me, approved



diff --git a/Tempo.php b/Tempo.php
index 35a0b96..d229bcf 100755
--- a/Tempo.php
+++ b/Tempo.php
@@ -55,3 +55,10 @@
'skins/Tempo/resources/js/tempo.js'
)
 );
+
+// wtf?
+
+SkinFactory::getDefaultInstance()-register( 'tempo', 'Tempo', function(){
+   $config = ConfigFactory::getDefaultInstance()-makeConfig( 'tempo' );
+   return new SkinTempo( $config );
+} );
diff --git a/Tempo.skin.php b/Tempo.skin.php
index 36c70db..1f8992f 100755
--- a/Tempo.skin.php
+++ b/Tempo.skin.php
@@ -130,13 +130,11 @@
 
public function execute() {
$skin = $this-getSkin();
-
+   $this-html( 'headelement' );
 ?
-!DOCTYPE html
-   ?php echo $skin-getOutput()-headElement( $skin ); ?
body
div id=container
-   div id=top
+   div id=top class=noprint
div id=topnav
div id=logoimg src=?php 
$this-text( 'logopath' ) ? width=66 alt=?php $this-text( 'sitename' ) 
?//div
div id=topSearch?php echo 
$skin-getSearchForm() ?/div
@@ -147,7 +145,7 @@
/div
/div
 
-   div id=rail
+   div id=rail class=noprint
div id=sidebar
?php
foreach ( 
$this-getSidebar() as $boxName = $box ) { ?
@@ -182,7 +180,7 @@
?php
}
?
-   div id=navtabsul class=tabsleft
+   div id=navtabs class=noprintul 
class=tabsleft

?php foreach( $skin-getTabs( 'left' ) as $key = $item ) {

echo $this-makeListItem( $key, $item );

}
@@ -203,7 +201,7 @@
/article
/div
/div
-   div id=bottom
+   div id=bottom class=noprint
footer
?php
foreach ( 
$this-getFooterLinks() as $category = $links ) { ?

-- 
To view, visit https://gerrit.wikimedia.org/r/185798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I02a626b2be6df58c4eb4ede26e4d14f12c04a8ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Tempo
Gerrit-Branch: master
Gerrit-Owner: Llbraughler llbraugh...@gmail.com
Gerrit-Reviewer: Llbraughler llbraugh...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] prevent non-content sections from being printed in print-onl... - change (mediawiki...Tempo)

2015-01-18 Thread Llbraughler (Code Review)
Llbraughler has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/185798

Change subject: prevent non-content sections from being printed in print-only 
view
..

prevent non-content sections from being printed in print-only view

Change-Id: I02a626b2be6df58c4eb4ede26e4d14f12c04a8ae
---
M Tempo.php
M Tempo.skin.php
2 files changed, 12 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Tempo 
refs/changes/98/185798/1

diff --git a/Tempo.php b/Tempo.php
index 35a0b96..d229bcf 100755
--- a/Tempo.php
+++ b/Tempo.php
@@ -55,3 +55,10 @@
'skins/Tempo/resources/js/tempo.js'
)
 );
+
+// wtf?
+
+SkinFactory::getDefaultInstance()-register( 'tempo', 'Tempo', function(){
+   $config = ConfigFactory::getDefaultInstance()-makeConfig( 'tempo' );
+   return new SkinTempo( $config );
+} );
diff --git a/Tempo.skin.php b/Tempo.skin.php
index 36c70db..1f8992f 100755
--- a/Tempo.skin.php
+++ b/Tempo.skin.php
@@ -130,13 +130,11 @@
 
public function execute() {
$skin = $this-getSkin();
-
+   $this-html( 'headelement' );
 ?
-!DOCTYPE html
-   ?php echo $skin-getOutput()-headElement( $skin ); ?
body
div id=container
-   div id=top
+   div id=top class=noprint
div id=topnav
div id=logoimg src=?php 
$this-text( 'logopath' ) ? width=66 alt=?php $this-text( 'sitename' ) 
?//div
div id=topSearch?php echo 
$skin-getSearchForm() ?/div
@@ -147,7 +145,7 @@
/div
/div
 
-   div id=rail
+   div id=rail class=noprint
div id=sidebar
?php
foreach ( 
$this-getSidebar() as $boxName = $box ) { ?
@@ -182,7 +180,7 @@
?php
}
?
-   div id=navtabsul class=tabsleft
+   div id=navtabs class=noprintul 
class=tabsleft

?php foreach( $skin-getTabs( 'left' ) as $key = $item ) {

echo $this-makeListItem( $key, $item );

}
@@ -203,7 +201,7 @@
/article
/div
/div
-   div id=bottom
+   div id=bottom class=noprint
footer
?php
foreach ( 
$this-getFooterLinks() as $category = $links ) { ?

-- 
To view, visit https://gerrit.wikimedia.org/r/185798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02a626b2be6df58c4eb4ede26e4d14f12c04a8ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Tempo
Gerrit-Branch: master
Gerrit-Owner: Llbraughler llbraugh...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits