Rolling in all changes see CHANGELOG.md for list of fixes and improvements

.travis.yml

@@ -2,8 +2,8 @@ language: php
 
 php:
   - 7
-  - 5.6
+  - 7.1
-  - hhvm
+  - 7.2
   - nightly
   
 sudo: false

CHANGELOG.md

@@ -1,3 +1,12 @@
+## Version 2.1.0
+
+* [bug fix, compatibility] Replace wfRunHooks with Hooks::run PR #74 issue #75
+* [bug fix, enhancement] Always adds the server name to the h1 tag issue #76 SEO related
+* [CSS] Search Input alignment fix
+* [CSS] Improvements and fixes after issue #76 was fixed
+* [bug-fix, compatibility] Code loading changes, $out->addModuleScripts() to $out->addModules() issue #78
+* [compatibility] Removal of fastclick.js as mobile browsers now deal with touch delay automatically
+
 ## Version 2.0.0
 
 * [bug fix] Addressed serveral W3C validation errors with HTML output.

Pivot.skin.php

@@ -10,15 +10,6 @@
 
 class SkinPivot extends SkinTemplate {
 	public $skinname = 'pivot', $stylename = 'pivot', $template = 'pivotTemplate', $useHeadElement = true;
-
-	public function initPage(OutputPage $out) {
-        parent::initPage($out);
-		global $wgLocalStylePath;
-
-		$viewport_meta = 'width=device-width, user-scalable=yes, initial-scale=1.0';
-		$out->addMeta('viewport', $viewport_meta);
-		$out->addModuleScripts('skins.pivot.js');
-	}
 	
 	public function setupSkinUserCss(OutputPage $out) {
 		parent::setupSkinUserCss($out);
@@ -44,10 +35,22 @@ class SkinPivot extends SkinTemplate {
 				$wgPivotFeatures[$fgOption] = $fgOptionValue;
 			}
 		}
-		$out->addModuleStyles('skins.pivot.styles');
+		
 		if ( $wgPivotFeatures['preloadFontAwesome'] ) {
 			$out->addHeadItem('font', '<link rel="preload" href="'.$wgLocalStylePath.'/pivot/assets/fonts/fontawesome-webfont.woff2?v=4.7.0" as="font" type="font/woff2" crossorigin="anonymous" />');
 		}
+		
+		$out->addModuleStyles('skins.pivot.styles');
+
+	}
+	
+	public function initPage(OutputPage $out) {
+		global $wgLocalStylePath;
+		parent::initPage($out);
+
+		$viewport_meta = 'width=device-width, user-scalable=yes, initial-scale=1.0';
+		$out->addMeta('viewport', $viewport_meta);
+		$out->addModules('skins.pivot.js');
 	}
 
 }
@@ -91,21 +94,21 @@ class pivotTemplate extends BaseTemplate {
 				<?php if ($wgPivotFeatures['fixedNavBar'] != false) echo "<div class='fixed'>"; ?>
 				<nav class="tab-bar hide-for-print">
 					<section id="left-nav-aside" class="left-small show-for-small">
-						<a class="left-off-canvas-toggle"><span id="menu-user"><i class="fa fa-navicon fa-lg"></i></span></a>
+						<a href="#" class="left-off-canvas-toggle"><span id="menu-user"><i class="fa fa-navicon fa-lg"></i></span></a>
 					</section>
 					
 					<section id="middle-nav" class="middle tab-bar-section">
-						<h1 class="title"><a href="<?php echo $this->data['nav_urls']['mainpage']['href']; ?>">
+						<div class="title"><a href="<?php echo $this->data['nav_urls']['mainpage']['href']; ?>">
 					<span class="show-for-medium-up"><?php echo $wgPivotFeatures['wikiNameDesktop']; ?></span>
 						<span class="show-for-small-only">
 						<?php if ($wgPivotFeatures['navbarIcon'] != false) { ?>
 							<img alt="<?php echo $this->text('sitename'); ?>" src="<?php echo $this->text('logopath'); ?>" style="max-width: 64px;height:auto; max-height:36px; display: inline-block; vertical-align:middle;">
 								<?php } ?>
-						<?php echo $wgPivotFeatures['wikiName']; ?></span></a></h1>
+						<?php echo $wgPivotFeatures['wikiName']; ?></span></a></div>
 					</section>
 					
 					<section id="right-nav-aside" class="right-small">
-					<a class="right-off-canvas-toggle"><span id="menu-user"><i class="fa <?php if ($wgUser->isLoggedIn()): ?>fa-user<?php else: ?>fa-navicon<?php endif; ?> fa-lg"></i></span></a>
+					<a href="#" class="right-off-canvas-toggle"><span id="menu-user"><i class="fa <?php if ($wgUser->isLoggedIn()): ?>fa-user<?php else: ?>fa-navicon<?php endif; ?> fa-lg"></i></span></a>
 					</section>
 				</nav>
 				<?php if ($wgPivotFeatures['fixedNavBar'] != false) echo "</div>"; ?>
@@ -210,7 +213,7 @@ class pivotTemplate extends BaseTemplate {
 										$displaytitle = str_replace($pagetitle, $newtitle, $displaytitle);
 									?><h4 class="namespace label"><?php print $namespace; ?></h4><?php } ?>
 									<div id="content">
-									<h2 class="title"><?php print $displaytitle; ?></h2>
+									<h1 class="title"><?php print $displaytitle; ?></h1>
 											<?php if ($wgPivotFeatures['useAddThisShare'] !== '') { ?>
 											<!-- Go to www.addthis.com/dashboard to customize your tools -->
 											<div class="<?php echo $wgPivotFeatures['useAddThisShare']; ?> hide-for-print"></div>

assets/scripts/vendor/jquery.cookie.js

@@ -1,8 +0,0 @@
-/*!
- * jQuery Cookie Plugin v1.4.1
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2013 Klaus Hartl
- * Released under the MIT license
- */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports?require("jquery"):jQuery)}(function(a){function b(a){return h.raw?a:encodeURIComponent(a)}function c(a){return h.raw?a:decodeURIComponent(a)}function d(a){return b(h.json?JSON.stringify(a):String(a))}function e(a){0===a.indexOf('"')&&(a=a.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return a=decodeURIComponent(a.replace(g," ")),h.json?JSON.parse(a):a}catch(b){}}function f(b,c){var d=h.raw?b:e(b);return a.isFunction(c)?c(d):d}var g=/\+/g,h=a.cookie=function(e,g,i){if(void 0!==g&&!a.isFunction(g)){if(i=a.extend({},h.defaults,i),"number"==typeof i.expires){var j=i.expires,k=i.expires=new Date;k.setTime(+k+864e5*j)}return document.cookie=[b(e),"=",d(g),i.expires?"; expires="+i.expires.toUTCString():"",i.path?"; path="+i.path:"",i.domain?"; domain="+i.domain:"",i.secure?"; secure":""].join("")}for(var l=e?void 0:{},m=document.cookie?document.cookie.split("; "):[],n=0,o=m.length;o>n;n++){var p=m[n].split("="),q=c(p.shift()),r=p.join("=");if(e&&e===q){l=f(r,g);break}e||void 0===(r=f(r))||(l[q]=r)}return l};h.defaults={},a.removeCookie=function(b,c){return void 0===a.cookie(b)?!1:(a.cookie(b,"",a.extend({},c,{expires:-1})),!a.cookie(b))}});

assets/stylesheets/pivot.css

@@ -43,9 +43,6 @@ a:hover {
 	text-decoration: underline;
 }
 
-h1.title a {
-    text-decoration: none;
-}
 
 /* ULS Override to force no display of background image */
 .uls-trigger {
@@ -162,10 +159,6 @@ h2 span {
   display: inline;
 }
 
-h2.title {
-  margin-bottom: 0.1em;
-}
-
 h3#tagline {
   font-style: italic;
   font-size: small;
@@ -527,7 +520,6 @@ button.ui-button-icon-only {
 
 select {width:auto;}
 
-
 input[type="checkbox"].createboxInput {
   width: auto;
 }
@@ -597,6 +589,10 @@ button, .button {
   z-index: 100;
 }
 
+input[type="search"] {
+    margin: 0;
+}
+
 input[type="submit"] {
     background-color: #5da423;
     border-color: #457a1a;
@@ -871,10 +867,29 @@ h4.namespace.label {
     overflow: hidden;
 }
 
-h2.title {
+.tab-bar .title {
- font-size:1.65em;
+    color: #FFFFFF;
- padding-bottom: 0em;
+    line-height: 2.8125rem;
- margin-top:.5em;
+    margin: 0;
+    font-weight:400;
+    font-size:1.5rem;
+}
+
+h1.title {
+    font-size: 1.8rem;
+    padding-bottom: 0em;
+    margin-top: .5em;
+    margin-bottom: 0.1rem;
+}
+
+section#middle-nav .title a {
+    text-decoration: none;
+}
+
+@media only screen and (min-width: 40.0625em){
+h1.title {
+    font-size: 1.9rem;
+}
 }
 
 h1, h2, h3, h4, h5, h6 { line-height: 1.4; }
@@ -900,7 +915,6 @@ h2 { font-size: 1.55em; }
 h3 { font-size: 1.40em; }
 h4 { font-size: 1.24em; }
 h5 { font-size: 1.16em; }
-h2.title { font-size:1.8em; }
 }
 
 /* Preferences Fixes */
@@ -1058,6 +1072,7 @@ ul[class*="block-grid"] {
 
 .mw-indicators {
 	float: right;
+	font-family: "Helvetica Neue",Helvetica,Roboto,Arial,sans-serif;
 	line-height: 1.6;
 	font-size: 0.875em;
 	position: relative;

skin.json

@@ -1,6 +1,6 @@
 {
 	"name": "Pivot",
-	"version": "2.0.0",
+	"version": "2.1.0",
 	"author": [
 		"Tom Hutchison",
 		"..."
@@ -33,7 +33,7 @@
 			]
 		},
 		"skins.pivot.modernizr": {
-			"position": "bottom",
+			"position": "top",
 			"scripts": [
 				"assets/scripts/vendor/modernizr.js"
 			]
@@ -41,8 +41,6 @@
 		"skins.pivot.js": {
 			"position": "bottom",
 			"scripts": [
-				"assets/scripts/vendor/jquery.cookie.js",
-				"assets/scripts/vendor/fastclick.js",
 				"assets/scripts/vendor/placeholder.js",
 				"assets/scripts/foundation/foundation.js",
 				"assets/scripts/foundation/foundation.topbar.js",