[Pkg-mediawiki-commits] r201 - in mediawiki-extensions/trunk/debian: . patches

Thorsten Glaser tg at alioth.debian.org
Fri Jul 16 15:07:40 UTC 2010 

Author: tg
Date: 2010-07-16 15:07:28 +0000 (Fri, 16 Jul 2010)
New Revision: 201

Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/patches/fix_createbox.patch
   mediawiki-extensions/trunk/debian/patches/fix_footnote.patch
   mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch
   mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch
   mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch
Log:
fix XHTML/1.0 Transitional validity of output

since Evolvis (FusionForge) has now gained the capability to test
the validity of pages while they?\226?\128?\153re being served and displaying
the result on the very same page (after validation) together with
the PHP errors/warnings raised, we want to keep the number of is-
sues shown small


Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================
--- mediawiki-extensions/trunk/debian/changelog	2010-07-03 13:06:10 UTC (rev 200)
+++ mediawiki-extensions/trunk/debian/changelog	2010-07-16 15:07:28 UTC (rev 201)
@@ -1,3 +1,9 @@
+mediawiki-extensions (2.4~beta+1) UNRELEASED; urgency=low
+
+  * Fix a few extensions’ bugs to achieve XHTML validity
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Fri, 16 Jul 2010 17:05:31 +0200
+
 mediawiki-extensions (2.3) unstable; urgency=low
 
   * debian/control: add Vcs-SVN and Vcs-Browser

Modified: mediawiki-extensions/trunk/debian/patches/fix_createbox.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_createbox.patch	2010-07-03 13:06:10 UTC (rev 200)
+++ mediawiki-extensions/trunk/debian/patches/fix_createbox.patch	2010-07-16 15:07:28 UTC (rev 201)
@@ -2,11 +2,12 @@
 
 Fix CreateBox extension:
 * API impropriety
+* XHTML/1.0 Transitional validity of output
 
-Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php
+Index: mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php
 ===================================================================
---- trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php	(revision 196)
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php	(working copy)
+--- mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php	(revision 200)
++++ mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php	(working copy)
 @@ -91,7 +91,7 @@
  	return $value;
  }
@@ -16,3 +17,22 @@
  	wfLoadExtensionMessages( 'CreateBox' );
  	global $wgRequest, $wgScript;
  	if( $wgRequest->getVal( 'action' ) == 'create' ) {
+@@ -113,15 +113,13 @@
+ 	$br = ( ( acGetOption( $input, 'break', 'no' ) == 'no' ) ? '' : '<br />' );
+ 	$label = acGetOption( $input, 'buttonlabel', wfMsgHtml( 'createbox-create' ) );
+ 	$output = <<<ENDFORM
+-<div class="createbox" align="{$align}">
+-<form name="createbox" action="{$submit}" method="get" class="createboxForm">
+-<input type='hidden' name="action" value="create">
++<div class="createbox" align="{$align}"><form name="createbox" action="{$submit}" method="get" class="createboxForm">
++<input type='hidden' name="action" value="create" />
+ <input type="hidden" name="prefix" value="{$prefix}" />
+ <input type="hidden" name="preload" value="{$preload}" />
+ <input type="hidden" name="editintro" value="{$editintro}" />
+ <input class="createboxInput" name="title" type="text" value="{$text}" size="{$width}"/>{$br}
+-<input type='submit' name="create" class="createboxButton" value="{$label}"/>
+-</form></div>
++<input type='submit' name="create" class="createboxButton" value="{$label}"/></form></div>
+ ENDFORM;
+ 	return $parser->replaceVariables( $output );
+ }

Modified: mediawiki-extensions/trunk/debian/patches/fix_footnote.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_footnote.patch	2010-07-03 13:06:10 UTC (rev 200)
+++ mediawiki-extensions/trunk/debian/patches/fix_footnote.patch	2010-07-16 15:07:28 UTC (rev 201)
@@ -2,12 +2,23 @@
 
 Fix FootNote extension:
 * API impropriety
+* XHTML/1.0 Transitional validity of output
 
-Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php
+Index: mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php
 ===================================================================
---- trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php	(revision 196)
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php	(working copy)
-@@ -71,7 +71,7 @@
+--- mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php	(revision 200)
++++ mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php	(working copy)
+@@ -56,8 +56,7 @@
+ 	
+ 	$ret = "" ;
+ 	foreach( $footnoteNotes AS $num => $entry ) {
+-		$x = " <a name='footnote{$num}'></a>\n";
+-		$x = $x . "<li>$entry <a href='#footnoteback{$num}'>&uarr;</a></li>\n" ;
++		$x = " <li id=\"footnote{$num}\">$entry <a href='#footnoteback{$num}'>&uarr;</a></li>\n" ;
+ 		$ret .= $x ;
+ 	}
+ 	$ret = "<hr /><ol>" . $ret . "</ol>" ;
+@@ -71,7 +70,7 @@
  	return true;
  }
  

Modified: mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch	2010-07-03 13:06:10 UTC (rev 200)
+++ mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch	2010-07-16 15:07:28 UTC (rev 201)
@@ -1,11 +1,13 @@
 $Id$
 
-Fix path to dot.
+Fix:
+* path to dot
+* XHTML/1.0 Transitional validity of output
 
-Index: trunk/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/Graphviz.php
+Index: mwe/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/Graphviz.php
 ===================================================================
---- trunk/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/Graphviz.php	(revision 196)
-+++ trunk/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/Graphviz.php	(working copy)
+--- mwe/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/Graphviz.php	(revision 200)
++++ mwe/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/Graphviz.php	(working copy)
 @@ -9,7 +9,7 @@
  	var $dotCommand;
  };
@@ -15,3 +17,14 @@
  
  $wgExtensionFunctions[] = "wfGraphVizExtension";
  
+@@ -75,8 +75,8 @@
+ 			$ext = "png";
+ 		}
+ 		
+-		$txt  = "<map name=\"$hash\">{$map}</map>".
+-		        "<img usemap=\"#{$hash}\" src=\"{$wgUploadPath}/graphviz/{$hash}.{$ext}\">";
++		$txt  = "<map id=\"map-$hash\" name=\"$hash\"><p>{$map}</p></map>".
++		        "<img alt=\"map-$hash\" usemap=\"#{$hash}\" src=\"{$wgUploadPath}/graphviz/{$hash}.{$ext}\" />";
+ 	}
+ 	return $txt;
+ }

Modified: mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch	2010-07-03 13:06:10 UTC (rev 200)
+++ mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch	2010-07-16 15:07:28 UTC (rev 201)
@@ -3,11 +3,12 @@
 Fix LanguageSelector extension:
 * API impropriety
 * $wgExtensionAssetsPath is new in MW 1.16
+* XHTML/1.0 Transitional validity of output
 
-Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php
+Index: mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php
 ===================================================================
---- trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php	(revision 196)
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php	(working copy)
+--- mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php	(revision 200)
++++ mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php	(working copy)
 @@ -185,6 +185,11 @@
  function wfLanguageSelectorBeforePageDisplay( &$out ) {
  	global $wgExtensionAssetsPath, $wgLanguageSelectorLocation, $wgLanguageSelectorFormUsed;
@@ -29,3 +30,21 @@
  	global $wgCookiePrefix;
  
  	$cookies[] = $wgCookiePrefix.'LanguageSelectorLanguage';
+@@ -396,7 +401,7 @@
+ 	$code = $wgLang->getCode();
+ 
+ 	$html = '';
+-	$html .= Xml::openElement( 'span', array(
++	$html .= Xml::openElement( 'div', array(
+ 		'id' => 'languageselector-box-' . $id,
+ 		'class' => 'languageselector ' . $class,
+ 		'style' => $style
+@@ -426,7 +431,7 @@
+ 	$html .= Xml::submitButton( wfMsg( 'languageselector-setlang' ),
+ 		array( 'id' => 'languageselector-commit-' . $id, 'style' => $buttonstyle ) );
+ 	$html .= Xml::closeElement( 'form' );
+-	$html .= Xml::closeElement( 'span' );
++	$html .= Xml::closeElement( 'div' );
+ 
+ 	return $html;
+ }

Modified: mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch	2010-07-03 13:06:10 UTC (rev 200)
+++ mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch	2010-07-16 15:07:28 UTC (rev 201)
@@ -6,14 +6,15 @@
 * add $egCacheDir which can be overridden by people who like to cache
 * fix rendering path to CSS
 * make work with PHP 5.3
+* XHTML/1.0 Transitional validity of output
 
 Also add documentation of these changes as README.Debian and point to
 upstream's documentation in form of a wikipage.
 
-Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php
+Index: mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php
 ===================================================================
---- trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php	(revision 196)
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php	(working copy)
+--- mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php	(revision 200)
++++ mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php	(working copy)
 @@ -22,10 +22,11 @@
  }
  
@@ -48,7 +49,7 @@
      $egCacheTimeMax, $egCache, $rssType, $egNoFollow, $egWidthMin,
      $egWidthMax;
  
-@@ -152,8 +155,11 @@
+@@ -152,12 +155,15 @@
        if ($argv["title"]=="off") $dispTitle = false;
      }
  
@@ -62,15 +63,31 @@
  
      if (!$width) {
        $output = '
-@@ -174,7 +180,7 @@
+-        <table  style="background: inherit;"; id="RSSMainBody">
++        <table style="background: inherit;" id="RSSMainBody">
+         <tr>
+       ';
+     } else {
+@@ -173,8 +179,8 @@
+     // Create cURLRSS or wikiRSS or lastRSS object
      $rss = new $rssType; //initialize an object of rssType
      // Set public variables
-     if (is_a($rssType, 'lastRSS') && $egCache) {
+-    if (is_a($rssType, 'lastRSS') && $egCache) {
 -      $rss->cache_dir = dirname( __FILE__ ).'/cache/'; //directory of cache
++    if (($rssType instanceof lastRSS) && $egCache) {
 +      $rss->cache_dir = $egCacheDir;
      }
      $rss->cache = $egCache; //cache attribute
      $rss->cache_time = $cacheTime; //refresh time in seconds
+@@ -183,7 +189,7 @@
+     foreach ($fields as $field) {
+       //table cell that contains a single RSS feed
+       $output .= '<td valign="top" style="width: '.$width.'%;">';
+-      if ($rssArray = $rss->get($field)){
++      if ($rssArray = $rss->get($field) && (isset($rssArray['link']) || isset($rssArray['title']) || isset($rssArray['description']))) {
+         if ($dispTitle) { //check if title should be displayed
+           $output .=
+             '<div class="RSSReader-head">'.
 --- /dev/null
 +++ mediawiki-extensions-2.3/dist/mediawiki-extensions-base/usr/share/doc/mediawiki-extensions/base/RSS_Reader/README.Debian	2010-06-25 15:44:30.000000000 +0200
 @@ -0,0 +1,10 @@

More information about the Pkg-mediawiki-commits mailing list