Major clean-up to make use of .jshintignore/.jshintrc

Extinct lint checks on:
+ formats/Exhibit
+ formats/JitGraph
+ formats/timeline/resources/SimileTimeline

Update:
+ jquery.tagcanvas.js 1.18 -> 1.20
+ jquery.responsiveslides.js v1.32 -> v1.53
+ jquery.sparkline.js 2.0 -. 2.1
+ d3.v2.min -> d3.v3.js

+ Update release notes
+ Delete SRF_Settings.php

Change-Id: I1eb72bb9773819cf2ea451579288d7a0287c292e

.jshintignore

@@ -0,0 +1,7 @@
+# jQuery third-party libs
+resources/jquery/
+
+# other third-party libs
+formats/Exhibit
+formats/JitGraph
+formats/timeline/resources/SimileTimeline

.jshintrc

@@ -0,0 +1,33 @@
+{
+	"predef": [
+		"mediaWiki",
+		"smw",
+		"srf",
+		"jQuery",
+		"QUnit"
+	],
+
+	"bitwise": false, // prohibits the use of bitwise operators such as ^ (XOR), | (OR)
+	"camelcase": false, // allows you to force all variable names to use either camelCase style
+	"curly": true, // requires you to always put curly braces around blocks in loops and conditionals
+	"eqeqeq": true, //  prohibits the use of == and != in favor of === and !==
+	"forin": false, //  requires all for in loops to filter object's items
+	"immed": true, // prohibits the use of immediate function invocations without wrapping them
+	"latedef": true, // prohibits the use of a variable before it was defined
+	"newcap": false, // requires you to capitalize names of constructor functions
+	"noarg": true, // prohibits the use of arguments.caller and arguments.callee
+	"noempty": true, // warns when you have an empty block in your code
+	"nonew": false, // prohibits the use of constructor functions for side-effects
+	"quotmark": "single", // enforces the consistency of quotation marks used throughout your code
+	"regexp": false, // prohibits the use of unsafe . in regular expressions
+	"undef": false, // prohibits the use of explicitly undeclared variables
+	"unused": false, // warns when you define and never use your variables
+	"strict": true, // requires all functions to run in EcmaScript 5's strict mode
+	"trailing": true, // makes it an error to leave a trailing whitespace in your code
+
+	"laxbreak": true, // suppresses most of the warnings about possibly unsafe line breakings
+	"smarttabs": true, // suppresses warnings about mixed tabs
+	"multistr": true, // suppresses warnings about multi-line strings
+
+	"browser": true // defines globals exposed by modern browsers
+}

RELEASE-NOTES

@@ -9,7 +9,31 @@ THIS IS NOT A RELEASE YET.
 Semantic Result Formats 1.9 is currently in alpha-quality and is not recommended for use in
 production until the actual release.
 
+; Compatibility changes
 
+* Changed minimum MediaWiki version from 1.17 to 1.19.
+* Changed minimum PHP version from 5.2.x. to 5.3.x.
+* Full compatibility with MediaWiki 1.19 and forward-compatibility with 1.21.
+* Deleted SRF_Settings.php entry point, the main entry point is SemanticResultFormats.php
+
+; New formats
+
+* format media (I8bc7a506)(mwjames)
+* format excel (I742699fe) (requires PHPExcel, disabled by default) (Kim Eik)
+
+; New features
+
+* (I3f7407a1) EventCalendar SMWAPI/Ajax integration
+
+; Other improvements and changes
+
+* jquery.tagcanvas increase from 1.18 to 1.20
+* jquery.responsiveslides increase from v1.32 to v1.53
+* jquery.sparkline increase from 2.0 to 2.1
+* d3 increase from d3.vs to d3.v3
+* Introduce PHP SRF\ namespaces
+
+; Bug fixes
 
 == SRF 1.8 ==
 
@@ -99,7 +123,7 @@ New formats in this version are:
 
 Released on September 18, 2011.
 
-* Fixed error in math printer when there are no numerical results. 
+* Fixed error in math printer when there are no numerical results.
 * Fixed vCard compatibility with SMW 1.6 and later.
 * Fixed array compatibility with SMW 1.6 and later.
 * Added median and product formats to the list of default enabled formats.
@@ -109,7 +133,7 @@ Released on September 18, 2011.
 Released on August 20, 2011.
 
 * Fixed rendering bug in the tagcloud format occuring for inline queries.
-* Fixed jqPlotBar and jqPlotPie rendering on Special:Ask and other special pages. 
+* Fixed jqPlotBar and jqPlotPie rendering on Special:Ask and other special pages.
 * Cleaned up the jqPlotBar format somewhat.
 * Dropped compatibility with SMW < 1.6 for the tagcloud format.
 
@@ -122,7 +146,7 @@ Changes in this version:
 * Rewrote math formats for efficiency, correct recursion and handling of multiple numerical properties.
 * Cleaned up the graph format.
 * Fixed division by zero issue (oh shii~) in the tagcloud format.
-* Added parameter descriptions to the graph and ploticus formats. 
+* Added parameter descriptions to the graph and ploticus formats.
 * Added support for SMW 1.6 style parameter handling to the tagcloud format.
 * Somewhat cleaned up the BibTeX format.
 * Fixed double HTML escaping issue in the tagcloud format.

Resources.php

@@ -61,42 +61,42 @@ $calendarMessages = array( 'messages' => array(
 return array(
 	//SRF common and non printer specific resources
 	'ext.jquery.easing' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.easing/jquery.easing-1.3.pack.js'
+		'scripts' => 'resources/jquery/jquery.easing.js'
 	),
 
 	// Fancybox
 	'ext.jquery.fancybox' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.fancybox/jquery.fancybox-1.3.4.pack.js',
-		'styles'  => 'resources/jquery.fancybox/jquery.fancybox-1.3.4.css',
+		'scripts' => 'resources/jquery/fancybox/jquery.fancybox-1.3.4.pack.js',
+		'styles'  => 'resources/jquery/fancybox/jquery.fancybox-1.3.4.css',
 		'dependencies' => 'ext.jquery.easing',
 	),
 
 	// blockUI plugin
 	'ext.jquery.blockUI' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.blockUI/jquery.blockUI.js'
+		'scripts' => 'resources/jquery/jquery.blockUI.js'
 	),
 
 	// jqgrid
 	'ext.jquery.jqgrid' => $moduleTemplate + array(
 		'scripts' => array(
-			'resources/jquery.jqgrid/jquery.jqGrid.4.4.0min.js',
-			'resources/jquery.jqgrid/grid.locale-en.js'
+			'resources/jquery/jqgrid/jquery.jqGrid.js',
+			'resources/jquery/jqgrid/grid.locale-en.js'
 		),
-		'styles' => 'resources/jquery.jqgrid/ui.jqgrid.css',
+		'styles' => 'resources/jquery/jqgrid/ui.jqgrid.css',
 		'dependencies' => 'jquery.ui.core'
 	),
 
 	// Flot
 	'ext.jquery.flot' => $moduleTemplate + array(
 		'scripts' => array(
-			'resources/jquery.flot/jquery.flot.js',
-			'resources/jquery.flot/jquery.flot.selection.js'
+			'resources/jquery/flot/jquery.flot.js',
+			'resources/jquery/flot/jquery.flot.selection.js'
 		)
 	),
 
 	// jStorage was added in MW 1.20 and for all other releases register as compat module
 	'ext.jquery.jStorage' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jstorage/jquery.jStorage.js',
+		'scripts' => 'resources/jquery/jquery.jStorage.js',
 		'dependencies' => 'jquery.json',
 	),
 
@@ -153,7 +153,7 @@ return array(
 
 	// Sparkline
 	'ext.jquery.sparkline' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.sparkline/jquery.sparkline.min.js'
+		'scripts' => 'resources/jquery/jquery.sparkline.js'
 	),
 	'ext.srf.sparkline' => $formatModule + array(
 		'scripts' => 'sparkline/resources/ext.srf.sparkline.js',
@@ -167,12 +167,12 @@ return array(
 
 	// Dygraphs
 	'ext.dygraphs.combined' => $moduleTemplate + array(
-		'scripts' => 'resources/dygraphs/dygraph-combined.js'
+		'scripts' => 'resources/jquery/dygraphs/dygraph-combined.js'
 	),
 	'ext.srf.dygraphs' => $formatModule + array(
 		'scripts' => array(
 			'dygraphs/resources/ext.srf.dygraphs.js',
-			'../resources/dygraphs/dygraph-combined.js'
+			'../resources/jquery/dygraphs/dygraph-combined.js'
 		),
 		'styles' => 'dygraphs/resources/ext.srf.dygraphs.css',
 		'dependencies' => array(
@@ -204,7 +204,7 @@ return array(
 
 	// pajinate
 	'ext.jquery.pajinate' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.pajinate/jquery.pajinate.js'
+		'scripts' => 'resources/jquery/jquery.pajinate.js'
 	),
 
 	// Listwidget
@@ -240,7 +240,7 @@ return array(
 
 	// Dynamiccarousel
 	'ext.jquery.dynamiccarousel' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.dynamiccarousel/plugin.js'
+		'scripts' => 'resources/jquery/jquery.dynamiccarousel.js'
 	),
 
 	// Pagewidget
@@ -262,86 +262,86 @@ return array(
 	// jqPlot
 	// jQuery plugin specific declarations
 	'ext.jquery.jqplot.core' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jqplot/jquery.jqplot.js',
-		'styles' => 'resources/jquery.jqplot/jquery.jqplot.css'
+		'scripts' => 'resources/jquery/jqplot/jquery.jqplot.js',
+		'styles' => 'resources/jquery/jqplot/jquery.jqplot.css'
 	),
 
 	// excanvas is required only for pre- IE 9 versions
 	'ext.jquery.jqplot.excanvas' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jqplot/excanvas.js'
+		'scripts' => 'resources/jquery/jqplot/excanvas.js'
 	),
 
 	// JSON data formatting according the the City Index API spec
 	'ext.jquery.jqplot.json' => $moduleTemplate + array(
 		'scripts' => array (
-			'resources/jquery.jqplot/jqplot.json2.js',
-			'resources/jquery.jqplot/jqplot.ciParser.js'
+			'resources/jquery/jqplot/jqplot.json2.js',
+			'resources/jquery/jqplot/jqplot.ciParser.js'
 		)
 	),
 
 	// Plugin class representing the cursor
 	'ext.jquery.jqplot.cursor' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jqplot/jqplot.cursor.js'
+		'scripts' => 'resources/jquery/jqplot/jqplot.cursor.js'
 	),
 
 	// Plugin class to render a logarithmic axis
 	'ext.jquery.jqplot.logaxisrenderer' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jqplot/jqplot.logAxisRenderer.js'
+		'scripts' => 'resources/jquery/jqplot/jqplot.logAxisRenderer.js'
 	),
 
 	// Plugin class to render a mekko style chart
 	'ext.jquery.jqplot.mekko' => $moduleTemplate + array(
 		'scripts' => array (
-			'resources/jquery.jqplot/jqplot.mekkoRenderer.js',
-			'resources/jquery.jqplot/jqplot.mekkoAxisRenderer.js'
+			'resources/jquery/jqplot/jqplot.mekkoRenderer.js',
+			'resources/jquery/jqplot/jqplot.mekkoAxisRenderer.js'
 		)
 	),
 
 	// Plugin class to render a bar/line style chart
 	'ext.jquery.jqplot.bar' => $moduleTemplate + array(
 		'scripts' => array(
-			'resources/jquery.jqplot/jqplot.canvasAxisTickRenderer.js',
-			'resources/jquery.jqplot/jqplot.canvasTextRenderer.js',
-			'resources/jquery.jqplot/jqplot.canvasAxisLabelRenderer.js',
-			'resources/jquery.jqplot/jqplot.categoryAxisRenderer.js',
-			'resources/jquery.jqplot/jqplot.barRenderer.js'
+			'resources/jquery/jqplot/jqplot.canvasAxisTickRenderer.js',
+			'resources/jquery/jqplot/jqplot.canvasTextRenderer.js',
+			'resources/jquery/jqplot/jqplot.canvasAxisLabelRenderer.js',
+			'resources/jquery/jqplot/jqplot.categoryAxisRenderer.js',
+			'resources/jquery/jqplot/jqplot.barRenderer.js'
 		),
 		'dependencies' => 'ext.jquery.jqplot.core',
 	),
 
 	// Plugin class to render a pie style chart
 	'ext.jquery.jqplot.pie' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jqplot/jqplot.pieRenderer.js',
+		'scripts' => 'resources/jquery/jqplot/jqplot.pieRenderer.js',
 		'dependencies' => 'ext.jquery.jqplot.core'
 	),
 
 	// Plugin class to render a bubble style chart
 	'ext.jquery.jqplot.bubble' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jqplot/jqplot.bubbleRenderer.js',
+		'scripts' => 'resources/jquery/jqplot/jqplot.bubbleRenderer.js',
 		'dependencies' => 'ext.jquery.jqplot.core'
 	),
 
 	// Plugin class to render a donut style chart
 	 'ext.jquery.jqplot.donut' => $moduleTemplate + array(
-		'scripts' =>'resources/jquery.jqplot/jqplot.donutRenderer.js',
+		'scripts' =>'resources/jquery/jqplot/jqplot.donutRenderer.js',
 		'dependencies' => 'ext.jquery.jqplot.pie'
 	),
 
 	'ext.jquery.jqplot.pointlabels' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jqplot/jqplot.pointLabels.js'
+		'scripts' => 'resources/jquery/jqplot/jqplot.pointLabels.js'
 	),
 
 	'ext.jquery.jqplot.highlighter' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jqplot/jqplot.highlighter.js'
+		'scripts' => 'resources/jquery/jqplot/jqplot.highlighter.js'
 	),
 
 	'ext.jquery.jqplot.enhancedlegend' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jqplot/jqplot.enhancedLegendRenderer.js'
+		'scripts' => 'resources/jquery/jqplot/jqplot.enhancedLegendRenderer.js'
 	),
 
 	// Plugin class to render a trendline
 	'ext.jquery.jqplot.trendline' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jqplot/jqplot.trendline.js'
+		'scripts' => 'resources/jquery/jqplot/jqplot.trendline.js'
 	),
 
 	// General jqplot/SRF specific declarations
@@ -467,12 +467,12 @@ return array(
 
 	// D3
 	'ext.d3.core' => $moduleTemplate + array(
-		'scripts' => 'resources/d3/d3.v2.min.js'
+		'scripts' => 'resources/jquery/d3/d3.v3.js'
 	),
 
 	//
 	'ext.d3.layout.cloud' => $moduleTemplate + array(
-		'scripts' => 'resources/d3/d3.layout.cloud.js',
+		'scripts' => 'resources/jquery/d3/d3.layout.cloud.js',
 		'dependencies' => 'ext.d3.core'
 	),
 
@@ -530,12 +530,12 @@ return array(
 
 	// jcarousel
 	'ext.jquery.jcarousel' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jcarousel/jquery.jcarousel.min.js',
+		'scripts' => 'resources/jquery/jquery.jcarousel.js',
 	),
 
 	// responsiveslides
 	'ext.jquery.responsiveslides' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.responsiveslides/jquery.responsiveslides.1.32.min.js',
+		'scripts' => 'resources/jquery/jquery.responsiveslides.js',
 	),
 
 	//
@@ -593,19 +593,19 @@ return array(
 
 	// Eventcalendar
 	'ext.jquery.fullcalendar' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.fullcalendar/fullcalendar.js',
-		'styles' => 'resources/jquery.fullcalendar/fullcalendar.css',
+		'scripts' => 'resources/jquery/fullcalendar/fullcalendar.js',
+		'styles' => 'resources/jquery/fullcalendar/fullcalendar.css',
 	// If you have MW 1.20+ the definitions below will work but not for earlier
 	// MW installations
 	//	'styles' => array(
-	//		'resources/jquery.fullcalendar/fullcalendar.css' => array( 'media' => 'screen' ),
-	//		'resources/jquery.fullcalendar/fullcalendar.print.css' => array( 'media' => 'print' ),
+	//		'resources/jquery/fullcalendar/fullcalendar.css' => array( 'media' => 'screen' ),
+	//		'resources/jquery/fullcalendar/fullcalendar.print.css' => array( 'media' => 'print' ),
 	//	)
 	),
 
 	//
 	'ext.jquery.gcal' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.fullcalendar/gcal.js',
+		'scripts' => 'resources/jquery/fullcalendar/gcal.js',
 	),
 
 	//
@@ -703,12 +703,12 @@ return array(
 	// Tag cloud
 	// excanvas is only needed for pre-9.0 Internet Explorer compatibility
 	'ext.jquery.tagcanvas.excanvas' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.tagcanvas/excanvas.js'
+	//	'scripts' => 'resources/jquery.tagcanvas/excanvas.js'
 	),
 
 	//
 	'ext.jquery.tagcanvas' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.tagcanvas/jquery.tagcanvas.1.18.min.js'
+		'scripts' => 'resources/jquery/jquery.tagcanvas.js'
 	),
 
 	//
@@ -753,28 +753,28 @@ return array(
 
 	// Register the jplayer js
 	'ext.jquery.jplayer' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jplayer/jquery.jplayer.min.js',
+		'scripts' => 'resources/jquery/jplayer/jquery.jplayer.min.js',
 	),
 
 	// Register the jplayer skin
 	'ext.jquery.jplayer.skin.blue.monday' => $moduleTemplate + array(
-		'styles' => 'resources/jquery.jplayer/skin/blue.monday/jplayer.blue.monday.css',
+		'styles' => 'resources/jquery/jplayer/skin/blue.monday/jplayer.blue.monday.css',
 	),
 
 	// Register the jplayer skin
 	'ext.jquery.jplayer.skin.morning.light' => $moduleTemplate + array(
-		'styles' => 'resources/jquery.jplayer/skin/morning.light/jplayer.morning.light.css',
+		'styles' => 'resources/jquery/jplayer/skin/morning.light/jplayer.morning.light.css',
 	),
 
 	// Register the jplayer playlist js
 	'ext.jquery.jplayer.playlist' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jplayer/add-on/jplayer.playlist.min.js',
+		'scripts' => 'resources/jquery/jplayer/add-on/jplayer.playlist.min.js',
 		'dependencies' => 'ext.jquery.jplayer',
 	),
 
 	// Register the jplayer inspector js
 	'ext.jquery.jplayer.inspector' => $moduleTemplate + array(
-		'scripts' => 'resources/jquery.jplayer/add-on/jquery.jplayer.inspector.js',
+		'scripts' => 'resources/jquery/jplayer/add-on/jquery.jplayer.inspector.js',
 		'dependencies' => 'ext.jquery.jplayer',
 	),
 

SRF_Settings.php

@@ -1,19 +0,0 @@
-<?php
-
-/**
- * File for backward compatibility with pre SRF 1.8.
- *
- * @file
- * @ingroup SRF
- *
- * @author mwjames
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-  die( "This file is part of the Semantic MediaWiki extension. It is not a valid entry point.\n" );
-}
-
-// Could be promoted to Warning one version before really removing this file
-trigger_error( 'Outdated SRF entry point. Use SemanticResultFormats/SemanticResultFormats.php instead of SemanticResultFormats/SRF_Settings.php', E_USER_NOTICE );
-
-require_once dirname( __FILE__ ) . '/SemanticResultFormats.settings.php';

formats/d3/resources/ext.srf.d3.chart.treemap.js

@@ -69,7 +69,7 @@
 
 				// Create an ordinal color array and set formatting
 				var color = d3.scale.ordinal().range( colors ),
-					format  = d3.format( ",d" );
+					format  = d3.format( ',d' );
 
 				// Data array definition
 				var treeArray = [];
@@ -84,32 +84,32 @@
 					.size([ width , height ])
 					.value( function( d ) { return d.value; } );
 
-				var svg = d3.select( "#" + d3ID ).append( "svg" )
-					.attr( "width", width )
-					.attr( "height", height )
-					.append( "g" )
-					.attr( "transform", "translate(-.5,-.5)" );
+				var svg = d3.select( '#' + d3ID ).append( 'svg' )
+					.attr( 'width', width )
+					.attr( 'height', height )
+					.append( 'g' )
+					.attr( 'transform', 'translate(-.5,-.5)' );
 
-				var cell = svg.data( treeArray ).selectAll( "g" )
+				var cell = svg.data( treeArray ).selectAll( 'g' )
 					.data( treemap )
-					.enter().append( "g" )
-					.attr( "class", "cell" )
-					.attr( "transform", function( d ) { return "translate(" + d.x + "," + d.y + ")"; } );
+					.enter().append( 'g' )
+					.attr( 'class', 'cell' )
+					.attr( 'transform', function( d ) { return 'translate(' + d.x + ',' + d.y + ')'; } );
 
-				cell.append( "title" )
-					.text( function( d ) { return d.data.label + ( d.children ? "" : ": " + format( d.data.value ) ); } );
+				cell.append( 'title' )
+					.text( function( d ) { return d.label + ( d.children ? '' : ': ' + format( d.value ) ); } );
 
-				cell.append( "rect" )
-					.attr( "width", function( d ) { return d.dx; } )
-					.attr( "height", function( d ) { return d.dy; } )
-					.style( "fill", function( d ) { return d.label ? color( d.data.label ) :  color( d.data.label ); } );
+				cell.append( 'rect' )
+					.attr( 'width', function( d ) { return d.dx; } )
+					.attr( 'height', function( d ) { return d.dy; } )
+					.style( 'fill', function( d ) { return d.label ? color( d.label ) :  color( d.label ); } );
 
-				cell.append( "text" )
-					.attr( "x", function( d ) { return d.dx / 2; } )
-					.attr( "y", function( d ) { return d.dy / 2; } )
-					.attr( "dy", ".35em" )
-					.attr( "text-anchor", "middle" )
-					.text( function( d ) { return d.children ? null : datalabels === 'value' ? d.data.value : d.data.label ; } );
+				cell.append( 'text' )
+					.attr( 'x', function( d ) { return d.dx / 2; } )
+					.attr( 'y', function( d ) { return d.dy / 2; } )
+					.attr( 'dy', '.35em' )
+					.attr( 'text-anchor', 'middle' )
+					.text( function( d ) { return d.children ? null : datalabels === 'value' ? d.value : d.label ; } );
 		} );
 		}
 	};

formats/gallery/resources/ext.srf.gallery.overlay.js

@@ -90,7 +90,7 @@
 
 				// Formatting the title
 				function formatTitle( title, currentArray, currentIndex /*,currentOpts*/ ) {
-					return '<div class="srf-fancybox-title"><span class="button"><a href="javascript:;" onclick="$.fancybox.close();"><img src=' +  srfPath + '/resources/jquery.fancybox/closelabel.gif' + '></a></span>' + (title && title.length ? '<b>' + title : '' ) + '<span class="count"> (' +  mw.msg( 'srf-gallery-overlay-count', (currentIndex + 1) , currentArray.length ) + ')</span></div>';
+					return '<div class="srf-fancybox-title"><span class="button"><a href="javascript:;" onclick="$.fancybox.close();"><img src=' +  srfPath + '/resources/jquery/fancybox/closelabel.gif' + '></a></span>' + (title && title.length ? '<b>' + title : '' ) + '<span class="count"> (' +  mw.msg( 'srf-gallery-overlay-count', (currentIndex + 1) , currentArray.length ) + ')</span></div>';
 				}
 
 				// Display all images related to a group

formats/media/resources/ext.srf.mediaplayer.js

@@ -14,7 +14,7 @@
 ( function( $, mw, srf ) {
 	'use strict';
 
-	/*global mw:true jPlayerPlaylist:true*/
+	/*global jPlayerPlaylist:true*/
 
 	/**
 	 * Default values
@@ -29,11 +29,11 @@
 	var defaults = {
 		posterImage: scriptPath + '/formats/media/resources/images/audio.auto.cover.png',
 		size:{
-			'270p' : { width: '480', height: '270', cssClass: "jp-video-270p" },
-			'360p' : { width: '640', height: '360', cssClass: "jp-video-360p" }
+			'270p' : { width: '480', height: '270', cssClass: 'jp-video-270p' },
+			'360p' : { width: '640', height: '360', cssClass: 'jp-video-360p' }
 		},
 		jplayer : {
-			swfPath: scriptPath + '/resources/jquery.jplayer/Jplayer.swf',
+			swfPath: scriptPath + '/resources/jquery/jplayer/Jplayer.swf',
 			backgroundColor: '#FFFFFF',
 			solution: 'html, flash',
 			wmode: 'window'

resources/LICENSE

@@ -0,0 +1,3 @@
+See [1] the license for the specific language governing permissions and limitations under which each third party plug-in operates.
+
+[1] http://www.semantic-mediawiki.org/wiki/Help:Plug-ins

resources/d3/LICENSE D3

@@ -1,26 +0,0 @@
-Copyright (c) 2012, Michael Bostock
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* The name Michael Bostock may not be used to endorse or promote products
-  derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

resources/d3/LICENSE D3 cloud

@@ -1,26 +0,0 @@
-Copyright (c) 2012, Jason Davies.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
-  * The name Jason Davies may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL JASON DAVIES BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

resources/jquery.easing/jquery.easing-1.3.pack.js

@@ -1,72 +0,0 @@
-/*
- * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
- *
- * Uses the built in easing capabilities added In jQuery 1.1
- * to offer multiple easing options
- *
- * TERMS OF USE - jQuery Easing
- * 
- * Open source under the BSD License. 
- * 
- * Copyright © 2008 George McGinley Smith
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
- * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list 
- * of conditions and the following disclaimer in the documentation and/or other materials 
- * provided with the distribution.
- * 
- * Neither the name of the author nor the names of contributors may be used to endorse 
- * or promote products derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
- * OF THE POSSIBILITY OF SUCH DAMAGE. 
- *
-*/
-
-// t: current time, b: begInnIng value, c: change In value, d: duration
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('h.i[\'1a\']=h.i[\'z\'];h.O(h.i,{y:\'D\',z:9(x,t,b,c,d){6 h.i[h.i.y](x,t,b,c,d)},17:9(x,t,b,c,d){6 c*(t/=d)*t+b},D:9(x,t,b,c,d){6-c*(t/=d)*(t-2)+b},13:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t+b;6-c/2*((--t)*(t-2)-1)+b},X:9(x,t,b,c,d){6 c*(t/=d)*t*t+b},U:9(x,t,b,c,d){6 c*((t=t/d-1)*t*t+1)+b},R:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t+b;6 c/2*((t-=2)*t*t+2)+b},N:9(x,t,b,c,d){6 c*(t/=d)*t*t*t+b},M:9(x,t,b,c,d){6-c*((t=t/d-1)*t*t*t-1)+b},L:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t*t+b;6-c/2*((t-=2)*t*t*t-2)+b},K:9(x,t,b,c,d){6 c*(t/=d)*t*t*t*t+b},J:9(x,t,b,c,d){6 c*((t=t/d-1)*t*t*t*t+1)+b},I:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t*t*t+b;6 c/2*((t-=2)*t*t*t*t+2)+b},G:9(x,t,b,c,d){6-c*8.C(t/d*(8.g/2))+c+b},15:9(x,t,b,c,d){6 c*8.n(t/d*(8.g/2))+b},12:9(x,t,b,c,d){6-c/2*(8.C(8.g*t/d)-1)+b},Z:9(x,t,b,c,d){6(t==0)?b:c*8.j(2,10*(t/d-1))+b},Y:9(x,t,b,c,d){6(t==d)?b+c:c*(-8.j(2,-10*t/d)+1)+b},W:9(x,t,b,c,d){e(t==0)6 b;e(t==d)6 b+c;e((t/=d/2)<1)6 c/2*8.j(2,10*(t-1))+b;6 c/2*(-8.j(2,-10*--t)+2)+b},V:9(x,t,b,c,d){6-c*(8.o(1-(t/=d)*t)-1)+b},S:9(x,t,b,c,d){6 c*8.o(1-(t=t/d-1)*t)+b},Q:9(x,t,b,c,d){e((t/=d/2)<1)6-c/2*(8.o(1-t*t)-1)+b;6 c/2*(8.o(1-(t-=2)*t)+1)+b},P:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d)==1)6 b+c;e(!p)p=d*.3;e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);6-(a*8.j(2,10*(t-=1))*8.n((t*d-s)*(2*8.g)/p))+b},H:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d)==1)6 b+c;e(!p)p=d*.3;e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);6 a*8.j(2,-10*t)*8.n((t*d-s)*(2*8.g)/p)+c+b},T:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d/2)==2)6 b+c;e(!p)p=d*(.3*1.5);e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);e(t<1)6-.5*(a*8.j(2,10*(t-=1))*8.n((t*d-s)*(2*8.g)/p))+b;6 a*8.j(2,-10*(t-=1))*8.n((t*d-s)*(2*8.g)/p)*.5+c+b},F:9(x,t,b,c,d,s){e(s==u)s=1.l;6 c*(t/=d)*t*((s+1)*t-s)+b},E:9(x,t,b,c,d,s){e(s==u)s=1.l;6 c*((t=t/d-1)*t*((s+1)*t+s)+1)+b},16:9(x,t,b,c,d,s){e(s==u)s=1.l;e((t/=d/2)<1)6 c/2*(t*t*(((s*=(1.B))+1)*t-s))+b;6 c/2*((t-=2)*t*(((s*=(1.B))+1)*t+s)+2)+b},A:9(x,t,b,c,d){6 c-h.i.v(x,d-t,0,c,d)+b},v:9(x,t,b,c,d){e((t/=d)<(1/2.k)){6 c*(7.q*t*t)+b}m e(t<(2/2.k)){6 c*(7.q*(t-=(1.5/2.k))*t+.k)+b}m e(t<(2.5/2.k)){6 c*(7.q*(t-=(2.14/2.k))*t+.11)+b}m{6 c*(7.q*(t-=(2.18/2.k))*t+.19)+b}},1b:9(x,t,b,c,d){e(t<d/2)6 h.i.A(x,t*2,0,c,d)*.5+b;6 h.i.v(x,t*2-d,0,c,d)*.5+c*.5+b}});',62,74,'||||||return||Math|function|||||if|var|PI|jQuery|easing|pow|75|70158|else|sin|sqrt||5625|asin|||undefined|easeOutBounce|abs||def|swing|easeInBounce|525|cos|easeOutQuad|easeOutBack|easeInBack|easeInSine|easeOutElastic|easeInOutQuint|easeOutQuint|easeInQuint|easeInOutQuart|easeOutQuart|easeInQuart|extend|easeInElastic|easeInOutCirc|easeInOutCubic|easeOutCirc|easeInOutElastic|easeOutCubic|easeInCirc|easeInOutExpo|easeInCubic|easeOutExpo|easeInExpo||9375|easeInOutSine|easeInOutQuad|25|easeOutSine|easeInOutBack|easeInQuad|625|984375|jswing|easeInOutBounce'.split('|'),0,{}))
-
-/*
- *
- * TERMS OF USE - EASING EQUATIONS
- * 
- * Open source under the BSD License. 
- * 
- * Copyright © 2001 Robert Penner
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
- * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list 
- * of conditions and the following disclaimer in the documentation and/or other materials 
- * provided with the distribution.
- * 
- * Neither the name of the author nor the names of contributors may be used to endorse 
- * or promote products derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
- * OF THE POSSIBILITY OF SUCH DAMAGE. 
- *
- */

resources/jquery.responsiveslides/jquery.responsiveslides.1.32.min.js

@@ -1,6 +0,0 @@
-/*! http://responsiveslides.com v1.32 by @viljamis */
-(function(d,D,v){d.fn.responsiveSlides=function(h){var b=d.extend({auto:!0,speed:1E3,timeout:4E3,pager:!1,nav:!1,random:!1,pause:!1,pauseControls:!1,prevText:"Previous",nextText:"Next",maxwidth:"",controls:"",namespace:"rslides",before:function(){},after:function(){}},h);return this.each(function(){v++;var e=d(this),n,p,i,k,l,m=0,f=e.children(),w=f.size(),q=parseFloat(b.speed),x=parseFloat(b.timeout),r=parseFloat(b.maxwidth),c=b.namespace,g=c+v,y=c+"_nav "+g+"_nav",s=c+"_here",j=g+"_on",z=g+"_s",
-o=d("<ul class='"+c+"_tabs "+g+"_tabs' />"),A={"float":"left",position:"relative"},E={"float":"none",position:"absolute"},t=function(a){b.before();f.stop().fadeOut(q,function(){d(this).removeClass(j).css(E)}).eq(a).fadeIn(q,function(){d(this).addClass(j).css(A);b.after();m=a})};b.random&&(f.sort(function(){return Math.round(Math.random())-0.5}),e.empty().append(f));f.each(function(a){this.id=z+a});e.addClass(c+" "+g);h&&h.maxwidth&&e.css("max-width",r);f.hide().eq(0).addClass(j).css(A).show();if(1<
-f.size()){if(x<q+100)return;if(b.pager){var u=[];f.each(function(a){a=a+1;u=u+("<li><a href='#' class='"+z+a+"'>"+a+"</a></li>")});o.append(u);l=o.find("a");h.controls?d(b.controls).append(o):e.after(o);n=function(a){l.closest("li").removeClass(s).eq(a).addClass(s)}}b.auto&&(p=function(){k=setInterval(function(){f.stop(true,true);var a=m+1<w?m+1:0;b.pager&&n(a);t(a)},x)},p());i=function(){if(b.auto){clearInterval(k);p()}};b.pause&&e.hover(function(){clearInterval(k)},function(){i()});b.pager&&(l.bind("click",
-function(a){a.preventDefault();b.pauseControls||i();a=l.index(this);if(!(m===a||d("."+j+":animated").length)){n(a);t(a)}}).eq(0).closest("li").addClass(s),b.pauseControls&&l.hover(function(){clearInterval(k)},function(){i()}));if(b.nav){c="<a href='#' class='"+y+" prev'>"+b.prevText+"</a><a href='#' class='"+y+" next'>"+b.nextText+"</a>";h.controls?d(b.controls).append(c):e.after(c);var c=d("."+g+"_nav"),B=d("."+g+"_nav.prev");c.bind("click",function(a){a.preventDefault();if(!d("."+j+":animated").length){var c=
-f.index(d("."+j)),a=c-1,c=c+1<w?m+1:0;t(d(this)[0]===B[0]?a:c);b.pager&&n(d(this)[0]===B[0]?a:c);b.pauseControls||i()}});b.pauseControls&&c.hover(function(){clearInterval(k)},function(){i()})}}if("undefined"===typeof document.body.style.maxWidth&&h.maxwidth){var C=function(){e.css("width","100%");e.width()>r&&e.css("width",r)};C();d(D).bind("resize",function(){C()})}})}})(jQuery,this,0);

resources/jquery.tagcanvas/LICENSE-2.0

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.