Merging All Changes Into Master for Release (#354)

* Merging in changes to address issues and compatability, see CHANGELOG.md

* Set version to 2.2.1dev for develop branch

* More changes to CSS for issue #342

* Fix license visibility on GitHub

* Duh, need License in top line too

* Fixing extra bracket in CSS and moving some code to select attribute

* Fix for issue #345 and other improvements, notes in CHANGELOG.md

* Fixed issue with annoying "->" in top bar. (#350)

In my use of Foreground, I don't need the left dropdown menu in the top bar. Disabling it revealed a bug in which an annoying "->" appears in the top bar. It is caused by a missing "</li>" tag and unbalanced PHP curly brackets. This change fixes the problem.

* Bump version for bug fix

* Prep for Version Release (#351)

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Bump version for bug fix

*  Replace usge of long deprecated and removed wfSuppressWarnings and wfRestoreWarnings (#352)

*  Replace usge of long deprecated and removed wfSuppressWarnings

* Update Foreground.skin.php

* Update Foreground.skin.php

Thanks @paladox

* Prep for Version Bump, merge to master for release

Co-authored-by: Kai Özer <[email protected]>
Co-authored-by: paladox <[email protected]>

CHANGELOG.md

@@ -1,3 +1,17 @@
+## Version 2.2.3
+* [bug, compatibility] PR #352 Replace usge of wfSuppressWarnings and wfRestoreWarnings MW 1.34 compatibility
+
+
+## Version 2.2.2
+* [bug] PR #350 Coding fix for missing </li> close
+
+## Version 2.2.1
+* [bug, CSS] Addressing Issue #342 Search Button Alignment
+* [bug, compatibility] Removing fastclick.js as all modern touch devices handle delay now Issue #336
+* [code] Removing unused js from `/assets/scripts/vendor`
+* [CSS, enhancement] Images MW way which fixes Issue #345
+* [bug, js] Fix to foreground.js script, edit icon (temporary as a long term edit vs visual editor is needed with CSS)
+
 ## Version 2.2
 * [bug][compatibility] Fix for MW version 1.32 - wfRunHooks() to Hooks::run() 
 

COPYING

@@ -1,3 +1,5 @@
+BSD 2-Clause License
+
 Copyright (c) 2013, Garrick Van Buren, Jamie Thingelstad, Tom Hutchison.
 All rights reserved.
 

Foreground.skin.php

@@ -60,7 +60,7 @@ class foregroundTemplate extends BaseTemplate {
 	public function execute() {
 		global $wgUser;
 		global $wgForegroundFeatures;
-		wfSuppressWarnings();
+		Wikimedia\AtEase\AtEase::suppressWarnings();
 		$this->html('headelement');
 		switch ($wgForegroundFeatures['enableTabs']) {
 			case true:
@@ -124,15 +124,16 @@ public function execute() {
 
 			<ul id="top-bar-left" class="left">
 				<li class="divider show-for-small"></li>
-					<?php foreach ( $this->getSidebar() as $boxName => $box ) { if ( ($box['header'] != wfMessage( 'toolbox' )->text())  ) { ?>
-				<li class="has-dropdown active"  id='<?php echo Sanitizer::escapeId( $box['id'] ) ?>'<?php echo Linker::tooltip( $box['id'] ) ?>>
-					<a href="#"><?php echo htmlspecialchars( $box['header'] ); ?></a>
+				<?php foreach ( $this->getSidebar() as $boxName => $box ) { if ( ($box['header'] != wfMessage( 'toolbox' )->text())  ) { ?>
+					<li class="has-dropdown active"  id='<?php echo Sanitizer::escapeId( $box['id'] ) ?>'<?php echo Linker::tooltip( $box['id'] ) ?>>
+						<a href="#"><?php echo htmlspecialchars( $box['header'] ); ?></a>
 						<?php if ( is_array( $box['content'] ) ) { ?>
 							<ul class="dropdown">
 								<?php foreach ( $box['content'] as $key => $item ) { echo $this->makeListItem( $key, $item ); } ?>
 							</ul>
-								<?php } } ?>
 						<?php } ?>
+					</li>
+				<?php } } ?>
 			</ul>
 
 			<ul id="top-bar-right" class="right">
@@ -277,7 +278,7 @@ public function execute() {
 		</html>
 
 <?php
-		wfRestoreWarnings();
+		Wikimedia\AtEase\AtEase::suppressWarnings( true );
 	}
 }
 ?>

assets/scripts/foreground.js

@@ -16,6 +16,7 @@ jQuery(document).ready(function() {
   // Append font-awesome icons
   jQuery('[id^=ca-nstab] a').prepend('<div class="drop-icon"><i class="fa fa-file fa-fw"></i></div>')
   jQuery('li#ca-talk a').prepend('<div class="drop-icon"><i class="fa fa-comments-o fa-fw"></i></div>')
+  jQuery('li#ca-edit a').prepend('<div class="drop-icon"><i class="fa fa-pencil-square-o fa-fw"></i></div>')
   jQuery('li#ca-form_edit a').prepend('<div class="drop-icon"><i class="fa fa-pencil-square fa-fw"></i></div>')
   jQuery('li#ca-formedit a').prepend('<div class="drop-icon"><i class="fa fa-pencil-square fa-fw"></i></div>')
   jQuery('li#ca-history a').prepend('<div class="drop-icon"><i class="fa fa-history fa-fw"></i></div>')