Refactor TimelessTemplate.php

Structure is generally the same. All html is rendered into a
single variable, output with a single unholy 'echo'.

getPortlet is now more general, and generally used.

Should generally address the issues raised in T158011.
Should also be technically compatible with VE (DOM), but
without styling, and requiring the user to edit
LocalSettings.php (hopefully that gets fixed soon).
Fixed a slight bug with the languages rendering on mobile.

Some randomly missing things were added back in. (Variants,
some hooks)

bug: T161428
bug: T158011
bug: T132005
Change-Id: I3b691c8bfe7aed4a544236d5ac031b77ec4e8337
isekai
Isarra 8 years ago
parent 10de923cd3
commit 8cb2458c99

File diff suppressed because it is too large Load Diff

@ -6,7 +6,7 @@ $( function() {
// Open the various menus // Open the various menus
$( '#user-tools h2' ).on( 'click', function( e ) { $( '#user-tools h2' ).on( 'click', function( e ) {
if ( $( window ).width() < 851 ) { if ( $( window ).width() < 851 ) {
$( '#p-personal-inner, #menus-cover' ).fadeToggle( toggleTime ); $( '#personal-inner, #menus-cover' ).fadeToggle( toggleTime );
} }
} ); } );
$( '#site-navigation h2' ).on( 'click', function( e ) { $( '#site-navigation h2' ).on( 'click', function( e ) {
@ -35,7 +35,7 @@ $( function() {
// Close menus on click outside // Close menus on click outside
$( document ).click( function( e ) { $( document ).click( function( e ) {
if ( $( e.target ).closest( '#menus-cover' ).length > 0 ) { if ( $( e.target ).closest( '#menus-cover' ).length > 0 ) {
$( '#p-personal-inner' ).fadeOut( toggleTime ); $( '#personal-inner' ).fadeOut( toggleTime );
$( '.sidebar-inner' ).fadeOut( toggleTime ); $( '.sidebar-inner' ).fadeOut( toggleTime );
$( '#menus-cover' ).fadeOut( toggleTime ); $( '#menus-cover' ).fadeOut( toggleTime );
} }
@ -44,10 +44,9 @@ $( function() {
// Include alternative closing method for ios // Include alternative closing method for ios
$( window ).on( 'swiperight', function( e ) { $( window ).on( 'swiperight', function( e ) {
if ( $( window ).width() < 851 ) { if ( $( window ).width() < 851 ) {
$( '#p-personal-inner' ).fadeOut( toggleTime ); $( '#personal-inner' ).fadeOut( toggleTime );
$( '.sidebar-inner' ).fadeOut( toggleTime ); $( '.sidebar-inner' ).fadeOut( toggleTime );
$( '#menus-cover' ).fadeOut( toggleTime ); $( '#menus-cover' ).fadeOut( toggleTime );
} }
} ); } );
} ); } );

@ -179,7 +179,7 @@ div.suggestions {
list-style: none; list-style: none;
padding: 0; padding: 0;
} }
#footer-icons { .footer-icons {
float: right; float: right;
margin: 0 0 0 1em; margin: 0 0 0 1em;
@ -187,10 +187,13 @@ div.suggestions {
margin: 0 0 1em 0; margin: 0 0 1em 0;
} }
} }
} .footer-places li {
#footer-places li { display: inline;
display: inline; padding-right: 1em;
padding-right: 1em; }
#lastmod {
display: block;
}
} }
/* Content */ /* Content */
@ -481,13 +484,13 @@ table.wikitable > * > tr > th {
/* Echo */ /* Echo */
#p-personal h2, #personal h2,
#p-personal-extra, #personal-extra,
#p-personal-extra ul, #personal-extra ul,
#p-personal-extra li { #personal-extra li {
display: inline-block; display: inline-block;
} }
#p-personal-extra { #personal-extra {
// Position and keep it from randomly overflowing massively for no apparent reason // Position and keep it from randomly overflowing massively for no apparent reason
margin: .7em 0 -2em 0; margin: .7em 0 -2em 0;

@ -104,7 +104,7 @@
// Personal menu // Personal menu
#p-personal { #personal {
float: right; float: right;
h2 span { h2 span {
@ -129,6 +129,6 @@
.extension-icons #p-search { .extension-icons #p-search {
margin-right: 11em; margin-right: 11em;
} }
#p-personal-extra { #personal-extra {
margin-left: -2.5em; margin-left: -2.5em;
} }

@ -66,7 +66,7 @@
display: none !important; display: none !important;
} }
#p-personal { #personal {
display: inline-block; display: inline-block;
position: relative; position: relative;
padding-left: 1.5em; padding-left: 1.5em;
@ -108,7 +108,7 @@
} }
/* Echo stuff */ /* Echo stuff */
#p-personal-extra { #personal-extra {
float: left; float: left;
margin-left: -4.5em; margin-left: -4.5em;
} }

@ -19,6 +19,7 @@
#mw-page-header-links #ca-view, #mw-page-header-links #ca-view,
#mw-header-nav-hack, #mw-header-nav-hack,
#page-tools h2, #page-tools h2,
#other-languages h2,
#p-logo { #p-logo {
display: none; display: none;
} }
@ -128,7 +129,7 @@
.mw-echo-ui-notificationBadgeButtonPopupWidget { .mw-echo-ui-notificationBadgeButtonPopupWidget {
z-index: 2; z-index: 2;
} }
#p-personal-extra { #personal-extra {
position: absolute; position: absolute;
top: .9em; top: .9em;
right: 11.75em; right: 11.75em;

Loading…
Cancel
Save