From: larsk Date: Thu, 27 Jun 2013 11:08:11 +0000 (+0100) Subject: Added latest html skin from contractor and deleted zip file added by mistake X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b9ff578af860852ffbcccc1bd92d06caf4ef5b55;p=people%2Flarsk%2Fxenproject-org-websites.git Added latest html skin from contractor and deleted zip file added by mistake --- diff --git a/html-xenbits-xenproject-org/T.zip b/html-xenbits-xenproject-org/T.zip deleted file mode 100644 index 8375789..0000000 Binary files a/html-xenbits-xenproject-org/T.zip and /dev/null differ diff --git a/skin-mediawiki.xenproject.org/mediawiki/mycss/base.css b/skin-mediawiki.xenproject.org/mediawiki/mycss/base.css index 50ba8d2..fe95ca4 100644 --- a/skin-mediawiki.xenproject.org/mediawiki/mycss/base.css +++ b/skin-mediawiki.xenproject.org/mediawiki/mycss/base.css @@ -1,10 +1,20 @@ /* Copyright (C) YOOtheme GmbH, http://www.gnu.org/licenses/gpl.html GNU/GPL */ -@import url(../warp/css/base.css); + /* New style-related Base Values ----------------------------------------------------------------------------------------------------*/ +body { +font: normal 14px/20px Arial, Helvetica, sans-serif; +color: #444; +} + +/* Fonts look too big on the blog */ +h1 { font-size: 26px; line-height: 30px; } +h2 { font-size: 20px; line-height: 22px; } +h3 { font-size: 18px; line-height: 20px; } +h4, h5, h6 { font-size: 16px; line-height: 17px; } body { font: normal 14px/20px Arial, Helvetica, sans-serif; diff --git a/skin-mediawiki.xenproject.org/mediawiki/mycss/menus1.css b/skin-mediawiki.xenproject.org/mediawiki/mycss/menus1.css index 2f56a5c..a4d2feb 100644 --- a/skin-mediawiki.xenproject.org/mediawiki/mycss/menus1.css +++ b/skin-mediawiki.xenproject.org/mediawiki/mycss/menus1.css @@ -1,6 +1,6 @@ /* Copyright (C) YOOtheme GmbH, http://www.gnu.org/licenses/gpl.html GNU/GPL */ -@import url(../warp/css/menus.css); + /* Mega Drop-Down Menu diff --git a/skin-mediawiki.xenproject.org/mediawiki/skins/MonoBook.php b/skin-mediawiki.xenproject.org/mediawiki/skins/MonoBook.php index 7ce7f31..fe3f572 100644 --- a/skin-mediawiki.xenproject.org/mediawiki/skins/MonoBook.php +++ b/skin-mediawiki.xenproject.org/mediawiki/skins/MonoBook.php @@ -1,25 +1,10 @@ skinname = 'monobook'; + $this->stylename = 'monobook'; + $this->template = 'MonoBookTemplate'; + + } - /** - * @param $out OutputPage - */ function setupSkinUserCss( OutputPage $out ) { global $wgHandheldStyle; - parent::setupSkinUserCss( $out ); - $out->addModuleStyles( 'skins.monobook' ); + parent::setupSkinUserCss( $out ); - // Ugh. Can't do this properly because $wgHandheldStyle may be a URL + // Append to the default screen common & print styles... + $out->addStyle( 'monobook/main.css', 'screen' ); if( $wgHandheldStyle ) { // Currently in testing... try 'chick/main.css' $out->addStyle( $wgHandheldStyle, 'handheld' ); } - // TODO: Migrate all of these + $out->addStyle( 'monobook/IE50Fixes.css', 'screen', 'lt IE 5.5000' ); + $out->addStyle( 'monobook/IE55Fixes.css', 'screen', 'IE 5.5000' ); $out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' ); $out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' ); + $out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' ); } } @@ -64,8 +53,8 @@ class SkinMonoBook extends SkinTemplate { * @todo document * @ingroup Skins */ -class MonoBookTemplate extends BaseTemplate { - +class MonoBookTemplate extends QuickTemplate { + var $skin; /** * Template filter callback for MonoBook skin. * Takes an associative array of data set from a SkinTemplate-based @@ -75,12 +64,52 @@ class MonoBookTemplate extends BaseTemplate { * @access private */ function execute() { + global $wgRequest; + $this->skin = $skin = $this->data['skin']; + $action = $wgRequest->getText( 'action' ); + // Suppress warnings to prevent notices about missing indexes in $this->data wfSuppressWarnings(); - $this->html( 'headelement' ); -?> - +?> +data['xhtmlnamespaces'] as $tag => $ns) { + ?>xmlns:xml:lang="text('lang') ?>" lang="text('lang') ?>" dir="text('dir') ?>"> + + + html('headlinks') ?> + <?php $this->text('pagetitle') ?> + html('csslinks') ?> + + + + data ); ?> + + + +html('headscripts') ?> +data['jsvarurl']) { ?> + + +data['pagecss']) { ?> + +data['usercss']) { ?> + +data['userjs']) { ?> + +data['userjsprev']) { ?> + +data['trackbackhtml']) print $this->data['trackbackhtml']; ?> + +data['body_ondblclick']) { ?> ondblclick="text('body_ondblclick') ?>" +data['body_onload']) { ?> onload="text('body_onload') ?>" + class="mediawiki text('dir') ?> text('pageclass') ?> text('skinnameclass') ?>"> @@ -99,7 +128,7 @@ class MonoBookTemplate extends BaseTemplate {
- +
@@ -109,90 +138,130 @@ class MonoBookTemplate extends BaseTemplate { -
-
- - data['sitenotice']) { ?>
html('sitenotice') ?>
- -

html('title') ?>

-
-
msg('tagline') ?>
-
html('userlangattributes') ?>>html('subtitle') ?>
-data['undelete']) { ?> -
html('undelete') ?>
-data['newtalk'] ) { ?> -
html('newtalk') ?>
-data['showjumplinks']) { ?> -
msg('jumpto') ?> msg('jumptonavigation') ?>msg( 'comma-separator' ) ?>msg('jumptosearch') ?>
- - -html('bodytext') ?> - data['catlinks']) { $this->html('catlinks'); } ?> - - data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?> -
+
+
+
+ + data['sitenotice']) { ?>
html('sitenotice') ?>
+

data['displaytitle']!=""?$this->html('title'):$this->text('title') ?>

+
+

msg('tagline') ?>

+
html('subtitle') ?>
+ data['undelete']) { ?>
html('undelete') ?>
+ data['newtalk'] ) { ?>
html('newtalk') ?>
+ data['showjumplinks']) { ?> + + html('bodytext') ?> + data['catlinks']) { $this->html('catlinks'); } ?> + + data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?> +
+
+
+
+
+
+
msg('views') ?>
+
+ +
-
-
html('userlangattributes') ?>> -cactions(); ?>
msg('personaltools') ?>
- html('userlangattributes') ?>> -getPersonalTools() as $key => $item) { ?> - makeListItem($key, $item); ?> - - +
+ renderPortals( $this->data['sidebar'] ); + $sidebar = $this->data['sidebar']; + if ( !isset( $sidebar['SEARCH'] ) ) $sidebar['SEARCH'] = true; + if ( !isset( $sidebar['TOOLBOX'] ) ) $sidebar['TOOLBOX'] = true; + if ( !isset( $sidebar['LANGUAGES'] ) ) $sidebar['LANGUAGES'] = true; + foreach ($sidebar as $boxName => $cont) { + if ( $boxName == 'SEARCH' ) { + $this->searchBox(); + } elseif ( $boxName == 'TOOLBOX' ) { + $this->toolbox(); + } elseif ( $boxName == 'LANGUAGES' ) { + $this->languageBox(); + } else { + $this->customBox( $boxName, $cont ); + } + } ?> -
-
+
+
+