[Fusionforge-commits] r8865 - in trunk: . gforge gforge/debian gforge/plugins/mediawiki/mediawiki-skin gforge/plugins/mediawiki/mediawiki-skin/fusionforge

Christian Bayle cbayle at libremir.placard.fr.eu.org
Wed Feb 24 21:19:55 CET 2010


Author: cbayle
Date: 2010-02-24 21:19:55 +0100 (Wed, 24 Feb 2010)
New Revision: 8865

Added:
   trunk/gforge/plugins/mediawiki/mediawiki-skin/FusionForge.php.patch
   trunk/gforge/plugins/mediawiki/mediawiki-skin/Makefile
   trunk/gforge/plugins/mediawiki/mediawiki-skin/README.beforemodifying
   trunk/gforge/plugins/mediawiki/mediawiki-skin/fusionforge/main.css.patch
Removed:
   trunk/gforge/plugins/mediawiki/mediawiki-skin/FusionForge.php
   trunk/gforge/plugins/mediawiki/mediawiki-skin/fusionforge/main.css
Modified:
   trunk/Makefile
   trunk/gforge/ChangeLog
   trunk/gforge/debian/changelog
Log:
Make mediawiki files FusionForge.php and fusionforge/main.css generated


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2010-02-24 16:38:57 UTC (rev 8864)
+++ trunk/Makefile	2010-02-24 20:19:55 UTC (rev 8865)
@@ -59,5 +59,9 @@
 	cd tests; phpunit --log-xml $(BUILDDIR)/reports/phpunit-selenium.xml TarCentos52Tests.php
 	cp $(BUILDDIR)/reports/phpunit-selenium.xml $(BUILDDIR)/reports/phpunit-selenium.xml.org; xalan -in $(BUILDDIR)/reports/phpunit-selenium.xml.org -xsl fix_phpunit.xslt -out $(BUILDDIR)/reports/phpunit-selenium.xml
 
-%:
+
+gforge/plugins/mediawiki/mediawiki-skin/FusionForge.php:
+	cd gforge/plugins/mediawiki/mediawiki-skin ; make
+
+%: gforge/plugins/mediawiki/mediawiki-skin/FusionForge.php
 	@make -f Makefile.$(DIST) $@

Modified: trunk/gforge/ChangeLog
===================================================================
--- trunk/gforge/ChangeLog	2010-02-24 16:38:57 UTC (rev 8864)
+++ trunk/gforge/ChangeLog	2010-02-24 20:19:55 UTC (rev 8865)
@@ -1,3 +1,7 @@
+2009-02-24  Christian Bayle <bayle at debian.org>
+	* Reorganized etc/httpd.d so you can run fusionforge without vhost
+  	You can use gforge-config with dovhost=false in gforge.conf
+
 2009-01-15  Roland Mas  <lolando at debian.org>
 
 	* common/tracker/ArtifactFactory.class.php: Fixed syntax of an SQL

Modified: trunk/gforge/debian/changelog
===================================================================
--- trunk/gforge/debian/changelog	2010-02-24 16:38:57 UTC (rev 8864)
+++ trunk/gforge/debian/changelog	2010-02-24 20:19:55 UTC (rev 8865)
@@ -1,4 +1,4 @@
-fusionforge (4.8.59-1) experimental; urgency=low
+fusionforge (4.8.60-1) experimental; urgency=low
 
   * New snapshot from upstream SVN (trunk).
   * Renamed source package.

Deleted: trunk/gforge/plugins/mediawiki/mediawiki-skin/FusionForge.php
===================================================================
--- trunk/gforge/plugins/mediawiki/mediawiki-skin/FusionForge.php	2010-02-24 16:38:57 UTC (rev 8864)
+++ trunk/gforge/plugins/mediawiki/mediawiki-skin/FusionForge.php	2010-02-24 20:19:55 UTC (rev 8865)
@@ -1,409 +0,0 @@
-<?php
-/**
- * FusionForge nouveau
- *
- * Translated from gwicke's previous TAL template version to remove
- * dependency on PHPTAL.
- *
- * @todo document
- * @file
- * @ingroup Skins
- */
-
-if( !defined( 'MEDIAWIKI' ) )
-	die( -1 );
-
-/**
- * Inherit main code from SkinTemplate, set the CSS and template filter.
- * @todo document
- * @ingroup Skins
- */
-class SkinFusionForge extends SkinTemplate {
-	/** Using fusionforge. */
-	function initPage( OutputPage $out ) {
-		parent::initPage( $out );
-		$this->skinname  = 'fusionforge';
-		$this->stylename = 'fusionforge';
-		$this->template  = 'FusionForgeTemplate';
-
-	}
-
-	function setupSkinUserCss( OutputPage $out ) {
-		global $wgHandheldStyle;
-
-		parent::setupSkinUserCss( $out );
-
-		// Append to the default screen common & print styles...
-		$out->addStyle( 'fusionforge/main.css', 'screen' );
-		if( $wgHandheldStyle ) {
-			// Currently in testing... try 'chick/main.css'
-			$out->addStyle( $wgHandheldStyle, 'handheld' );
-		}
-
-		$out->addStyle( 'fusionforge/IE50Fixes.css', 'screen', 'lt IE 5.5000' );
-		$out->addStyle( 'fusionforge/IE55Fixes.css', 'screen', 'IE 5.5000' );
-		$out->addStyle( 'fusionforge/IE60Fixes.css', 'screen', 'IE 6' );
-		$out->addStyle( 'fusionforge/IE70Fixes.css', 'screen', 'IE 7' );
-
-		$out->addStyle( 'fusionforge/rtl.css', 'screen', '', 'rtl' );
-	}
-}
-
-/**
- * @todo document
- * @ingroup Skins
- */
-class FusionForgeTemplate extends QuickTemplate {
-	var $skin;
-	/**
-	 * Template filter callback for FusionForge skin.
-	 * Takes an associative array of data set from a SkinTemplate-based
-	 * class, and a wrapper for MediaWiki's localization database, and
-	 * outputs a formatted page.
-	 *
-	 * @access private
-	 */
-	function execute() {
-		global $wgRequest;
-		$this->skin = $skin = $this->data['skin'];
-		$action = $wgRequest->getText( 'action' );
-
-		// Suppress warnings to prevent notices about missing indexes in $this->data
-		wfSuppressWarnings();
-
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="<?php $this->text('xhtmldefaultnamespace') ?>" <?php
-	foreach($this->data['xhtmlnamespaces'] as $tag => $ns) {
-		?>xmlns:<?php echo "{$tag}=\"{$ns}\" ";
-	} ?>xml:lang="<?php $this->text('lang') ?>" lang="<?php $this->text('lang') ?>" dir="<?php $this->text('dir') ?>">
-	<head>
-		<meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" />
-		<?php $this->html('headlinks') ?>
-		<title><?php $this->text('pagetitle') ?></title>
-        	<!-- FUSIONFORGE Stylesheet BEGIN -->
-		<?php if (!$GLOBALS['sys_use_mwframe']){ $GLOBALS['HTML']->headerLink(); } ?>
-		<?php if (!$GLOBALS['sys_use_mwframe']){ $GLOBALS['HTML']->headerCSS(); } ?>
-        	<!-- FUSIONFORGE Stylesheet END -->
-		<?php $this->html('csslinks') ?>
-
-		<!--[if lt IE 7]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script>
-		<meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-
-		<?php print Skin::makeGlobalVariablesScript( $this->data ); ?>
-
-		<script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"><!-- wikibits js --></script>
-		<!-- Head Scripts -->
-<?php $this->html('headscripts') ?>
-<?php	if($this->data['jsvarurl']) { ?>
-		<script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl') ?>"><!-- site js --></script>
-<?php	} ?>
-<?php	if($this->data['pagecss']) { ?>
-		<style type="text/css"><?php $this->html('pagecss') ?></style>
-<?php	}
-		if($this->data['usercss']) { ?>
-		<style type="text/css"><?php $this->html('usercss') ?></style>
-<?php	}
-		if($this->data['userjs']) { ?>
-		<script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('userjs' ) ?>"></script>
-<?php	}
-		if($this->data['userjsprev']) { ?>
-		<script type="<?php $this->text('jsmimetype') ?>"><?php $this->html('userjsprev') ?></script>
-<?php	}
-		if($this->data['trackbackhtml']) print $this->data['trackbackhtml']; ?>
-	</head>
-<body id="mydoc" <?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
-<?php if($this->data['body_onload']) { ?> onload="<?php $this->text('body_onload') ?>"<?php } ?>
- class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
-        <!-- FUSIONFORGE BodyHeader BEGIN -->
-        <?php
-	if (!$GLOBALS['sys_use_mwframe']){
-        	$project=group_get_object_by_name($GLOBALS['fusionforgeproject']);
-        	if ($project) {
-			$GLOBALS['group_id']=$project->getID();
-                	$params['group']=$GLOBALS['group_id'];
-                	$params['toptab']='mediawiki';
-                	$GLOBALS['HTML']->bodyHeader($params);
-        	}
-	}
-        ?>
-        <!-- FUSIONFORGE BodyHeader END -->
-	<div id="globalWrapper">
-		<div id="column-content">
-	<div id="content">
-		<a name="top" id="top"></a>
-		<?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
-		<h1 id="firstHeading" class="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></h1>
-		<div id="bodyContent">
-			<h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
-			<div id="contentSub"><?php $this->html('subtitle') ?></div>
-			<?php if($this->data['undelete']) { ?><div id="contentSub2"><?php     $this->html('undelete') ?></div><?php } ?>
-			<?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk')  ?></div><?php } ?>
-			<?php if($this->data['showjumplinks']) { ?><div id="jump-to-nav"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div><?php } ?>
-			<!-- start content -->
-			<?php $this->html('bodytext') ?>
-			<?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
-			<!-- end content -->
-			<?php if($this->data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?>
-			<div class="visualClear"></div>
-		</div>
-	</div>
-		</div>
-		<div id="column-one">
-	<div id="p-cactions" class="portlet">
-		<h5><?php $this->msg('views') ?></h5>
-		<div class="pBody">
-			<ul>
-	<?php		foreach($this->data['content_actions'] as $key => $tab) {
-					echo '
-				 <li id="' . Sanitizer::escapeId( "ca-$key" ) . '"';
-					if( $tab['class'] ) {
-						echo ' class="'.htmlspecialchars($tab['class']).'"';
-					}
-					echo'><a href="'.htmlspecialchars($tab['href']).'"';
-					# We don't want to give the watch tab an accesskey if the
-					# page is being edited, because that conflicts with the
-					# accesskey on the watch checkbox.  We also don't want to
-					# give the edit tab an accesskey, because that's fairly su-
-					# perfluous and conflicts with an accesskey (Ctrl-E) often
-					# used for editing in Safari.
-				 	if( in_array( $action, array( 'edit', 'submit' ) )
-				 	&& in_array( $key, array( 'edit', 'watch', 'unwatch' ))) {
-				 		echo $skin->tooltip( "ca-$key" );
-				 	} else {
-				 		echo $skin->tooltipAndAccesskey( "ca-$key" );
-				 	}
-				 	echo '>'.htmlspecialchars($tab['text']).'</a></li>';
-				} ?>
-			</ul>
-		</div>
-	</div>
-	<div class="portlet" id="p-personal">
-		<h5><?php $this->msg('personaltools') ?></h5>
-		<div class="pBody">
-<?php			$put_ul = false;
- 			foreach($this->data['personal_urls'] as $key => $item) {
-				if (!$put_ul) {
-					echo "\t\t\t<ul>\n";
-					$put_ul = true;
-				} ?>
-				<li id="<?php echo Sanitizer::escapeId( "pt-$key" ) ?>"<?php
-					if ($item['active']) { ?> class="active"<?php } ?>><a href="<?php
-				echo htmlspecialchars($item['href']) ?>"<?php echo $skin->tooltipAndAccesskey('pt-'.$key) ?><?php
-				if(!empty($item['class'])) { ?> class="<?php
-				echo htmlspecialchars($item['class']) ?>"<?php } ?>><?php
-				echo htmlspecialchars($item['text']) ?></a></li>
-<?php			}
-			if ($put_ul) {
-				echo "\t\t\t</ul>\n";
-			} ?>
-		</div>
-	</div>
-	<div class="portlet" id="p-logo">
-		<a style="background-image: url(<?php $this->text('logopath') ?>);" <?php
-			?>href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"<?php
-			echo $skin->tooltipAndAccesskey('p-logo') ?>></a>
-	</div>
-	<script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script>
-<?php
-		$sidebar = $this->data['sidebar'];
-		if ( !isset( $sidebar['SEARCH'] ) ) $sidebar['SEARCH'] = true;
-		if ( !isset( $sidebar['TOOLBOX'] ) ) $sidebar['TOOLBOX'] = true;
-		if ( !isset( $sidebar['LANGUAGES'] ) ) $sidebar['LANGUAGES'] = true;
-		foreach ($sidebar as $boxName => $cont) {
-			if ( $boxName == 'SEARCH' ) {
-				$this->searchBox();
-			} elseif ( $boxName == 'TOOLBOX' ) {
-				$this->toolbox();
-			} elseif ( $boxName == 'LANGUAGES' ) {
-				$this->languageBox();
-			} else {
-				$this->customBox( $boxName, $cont );
-			}
-		}
-?>
-		</div><!-- end of the left (by default at least) column -->
-			<div class="visualClear"></div>
-			<div id="footer">
-<?php
-		if($this->data['poweredbyico']) { ?>
-				<div id="f-poweredbyico"><?php $this->html('poweredbyico') ?></div>
-<?php 	}
-		if($this->data['copyrightico']) { ?>
-				<div id="f-copyrightico"><?php $this->html('copyrightico') ?></div>
-<?php	}
-
-		// Generate additional footer links
-		$footerlinks = array(
-			'lastmod', 'viewcount', 'numberofwatchingusers', 'credits', 'copyright',
-			'privacy', 'about', 'disclaimer', 'tagline',
-		);
-		$validFooterLinks = array();
-		foreach( $footerlinks as $aLink ) {
-			if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
-				$validFooterLinks[] = $aLink;
-			}
-		}
-		if ( count( $validFooterLinks ) > 0 ) {
-?>			<ul id="f-list">
-<?php
-			foreach( $validFooterLinks as $aLink ) {
-				if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
-?>					<li id="<?php echo$aLink?>"><?php $this->html($aLink) ?></li>
-<?php 			}
-			}
-?>
-			</ul>
-<?php	}
-?>
-		</div>
-</div>
-<?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?>
-<?php $this->html('reporttime') ?>
-<?php if ( $this->data['debug'] ): ?>
-<!-- Debug output:
-<?php $this->text( 'debug' ); ?>
-
--->
-<?php endif; ?>
-        <!-- FUSIONFORGE Footer BEGIN -->
-<?php	if (!$GLOBALS['sys_use_mwframe']){
-		$GLOBALS['HTML']->footer($params);
-       	$GLOBALS['HTML']->bodyFooter($params);
-        } else { ?>
-    }
-</body></html>
-<?php	} ?>
-        <!-- FUSIONFORGE Footer BEGIN -->
-<?php
-	wfRestoreWarnings();
-	} // end of execute() method
-
-	/*************************************************************************************************/
-	function searchBox() {
-		global $wgUseTwoButtonsSearchForm;
-?>
-	<div id="p-search" class="portlet">
-		<h5><label for="searchInput"><?php $this->msg('search') ?></label></h5>
-		<div id="searchBody" class="pBody">
-			<form action="<?php $this->text('wgScript') ?>" id="searchform"><div>
-				<input type='hidden' name="title" value="<?php $this->text('searchtitle') ?>"/>
-				<input id="searchInput" name="search" type="text"<?php echo $this->skin->tooltipAndAccesskey('search');
-					if( isset( $this->data['search'] ) ) {
-						?> value="<?php $this->text('search') ?>"<?php } ?> />
-				<input type='submit' name="go" class="searchButton" id="searchGoButton"	value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> /><?php if ($wgUseTwoButtonsSearchForm) { ?>&nbsp;
-				<input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> /><?php } else { ?>
-
-				<div><a href="<?php $this->text('searchaction') ?>" rel="search"><?php $this->msg('powersearch-legend') ?></a></div><?php } ?>
-
-			</div></form>
-		</div>
-	</div>
-<?php
-	}
-
-	/*************************************************************************************************/
-	function toolbox() {
-?>
-	<div class="portlet" id="p-tb">
-		<h5><?php $this->msg('toolbox') ?></h5>
-		<div class="pBody">
-			<ul>
-<?php
-		if($this->data['notspecialpage']) { ?>
-				<li id="t-whatlinkshere"><a href="<?php
-				echo htmlspecialchars($this->data['nav_urls']['whatlinkshere']['href'])
-				?>"<?php echo $this->skin->tooltipAndAccesskey('t-whatlinkshere') ?>><?php $this->msg('whatlinkshere') ?></a></li>
-<?php
-			if( $this->data['nav_urls']['recentchangeslinked'] ) { ?>
-				<li id="t-recentchangeslinked"><a href="<?php
-				echo htmlspecialchars($this->data['nav_urls']['recentchangeslinked']['href'])
-				?>"<?php echo $this->skin->tooltipAndAccesskey('t-recentchangeslinked') ?>><?php $this->msg('recentchangeslinked') ?></a></li>
-<?php 		}
-		}
-		if(isset($this->data['nav_urls']['trackbacklink'])) { ?>
-			<li id="t-trackbacklink"><a href="<?php
-				echo htmlspecialchars($this->data['nav_urls']['trackbacklink']['href'])
-				?>"<?php echo $this->skin->tooltipAndAccesskey('t-trackbacklink') ?>><?php $this->msg('trackbacklink') ?></a></li>
-<?php 	}
-		if($this->data['feeds']) { ?>
-			<li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
-					?><a id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>" href="<?php
-					echo htmlspecialchars($feed['href']) ?>" rel="alternate" type="application/<?php echo $key ?>+xml" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;
-					<?php } ?></li><?php
-		}
-
-		foreach( array('contributions', 'log', 'blockip', 'emailuser', 'upload', 'specialpages') as $special ) {
-
-			if($this->data['nav_urls'][$special]) {
-				?><li id="t-<?php echo $special ?>"><a href="<?php echo htmlspecialchars($this->data['nav_urls'][$special]['href'])
-				?>"<?php echo $this->skin->tooltipAndAccesskey('t-'.$special) ?>><?php $this->msg($special) ?></a></li>
-<?php		}
-		}
-
-		if(!empty($this->data['nav_urls']['print']['href'])) { ?>
-				<li id="t-print"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['print']['href'])
-				?>" rel="alternate"<?php echo $this->skin->tooltipAndAccesskey('t-print') ?>><?php $this->msg('printableversion') ?></a></li><?php
-		}
-
-		if(!empty($this->data['nav_urls']['permalink']['href'])) { ?>
-				<li id="t-permalink"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['permalink']['href'])
-				?>"<?php echo $this->skin->tooltipAndAccesskey('t-permalink') ?>><?php $this->msg('permalink') ?></a></li><?php
-		} elseif ($this->data['nav_urls']['permalink']['href'] === '') { ?>
-				<li id="t-ispermalink"<?php echo $this->skin->tooltip('t-ispermalink') ?>><?php $this->msg('permalink') ?></li><?php
-		}
-
-		wfRunHooks( 'FusionForgeTemplateToolboxEnd', array( &$this ) );
-		wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this ) );
-?>
-			</ul>
-		</div>
-	</div>
-<?php
-	}
-
-	/*************************************************************************************************/
-	function languageBox() {
-		if( $this->data['language_urls'] ) {
-?>
-	<div id="p-lang" class="portlet">
-		<h5><?php $this->msg('otherlanguages') ?></h5>
-		<div class="pBody">
-			<ul>
-<?php		foreach($this->data['language_urls'] as $langlink) { ?>
-				<li class="<?php echo htmlspecialchars($langlink['class'])?>"><?php
-				?><a href="<?php echo htmlspecialchars($langlink['href']) ?>"><?php echo $langlink['text'] ?></a></li>
-<?php		} ?>
-			</ul>
-		</div>
-	</div>
-<?php
-		}
-	}
-
-	/*************************************************************************************************/
-	function customBox( $bar, $cont ) {
-?>
-	<div class='generated-sidebar portlet' id='<?php echo Sanitizer::escapeId( "p-$bar" ) ?>'<?php echo $this->skin->tooltip('p-'.$bar) ?>>
-		<h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
-		<div class='pBody'>
-<?php   if ( is_array( $cont ) ) { ?>
-			<ul>
-<?php 			foreach($cont as $key => $val) { ?>
-				<li id="<?php echo Sanitizer::escapeId($val['id']) ?>"<?php
-					if ( $val['active'] ) { ?> class="active" <?php }
-				?>><a href="<?php echo htmlspecialchars($val['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey($val['id']) ?>><?php echo htmlspecialchars($val['text']) ?></a></li>
-<?php			} ?>
-			</ul>
-<?php   } else {
-			# allow raw HTML block to be defined by extensions
-			print $cont;
-		}
-?>
-		</div>
-	</div>
-<?php
-	}
-
-} // end of class
-
-

Added: trunk/gforge/plugins/mediawiki/mediawiki-skin/FusionForge.php.patch
===================================================================
--- trunk/gforge/plugins/mediawiki/mediawiki-skin/FusionForge.php.patch	                        (rev 0)
+++ trunk/gforge/plugins/mediawiki/mediawiki-skin/FusionForge.php.patch	2010-02-24 20:19:55 UTC (rev 8865)
@@ -0,0 +1,47 @@
+--- FusionForge.php.renamed	2010-02-24 20:26:14.000000000 +0100
++++ FusionForge.php	2010-02-24 20:26:14.000000000 +0100
+@@ -80,6 +80,10 @@
+ 		<meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" />
+ 		<?php $this->html('headlinks') ?>
+ 		<title><?php $this->text('pagetitle') ?></title>
++        	<!-- FUSIONFORGE Stylesheet BEGIN -->
++		<?php if (!$GLOBALS['sys_use_mwframe']){ $GLOBALS['HTML']->headerLink(); } ?>
++		<?php if (!$GLOBALS['sys_use_mwframe']){ $GLOBALS['HTML']->headerCSS(); } ?>
++        	<!-- FUSIONFORGE Stylesheet END -->
+ 		<?php $this->html('csslinks') ?>
+ 
+ 		<!--[if lt IE 7]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script>
+@@ -110,6 +114,19 @@
+ <body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
+ <?php if($this->data['body_onload']) { ?> onload="<?php $this->text('body_onload') ?>"<?php } ?>
+  class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
++        <!-- FUSIONFORGE BodyHeader BEGIN -->
++        <?php
++	if (!$GLOBALS['sys_use_mwframe']){
++        	$project=group_get_object_by_name($GLOBALS['fusionforgeproject']);
++        	if ($project) {
++			$GLOBALS['group_id']=$project->getID();
++                	$params['group']=$GLOBALS['group_id'];
++                	$params['toptab']='mediawiki';
++                	$GLOBALS['HTML']->bodyHeader($params);
++        	}
++	}
++        ?>
++        <!-- FUSIONFORGE BodyHeader END -->
+ 	<div id="globalWrapper">
+ 		<div id="column-content">
+ 	<div id="content">
+@@ -242,7 +259,13 @@
+ 
+ -->
+ <?php endif; ?>
++        <!-- FUSIONFORGE Footer BEGIN -->
++<?php	if (!$GLOBALS['sys_use_mwframe']){
++		$GLOBALS['HTML']->footer($params);
++	} else { ?>
+ </body></html>
++<?php	} ?>
++        <!-- FUSIONFORGE Footer END -->
+ <?php
+ 	wfRestoreWarnings();
+ 	} // end of execute() method

Added: trunk/gforge/plugins/mediawiki/mediawiki-skin/Makefile
===================================================================
--- trunk/gforge/plugins/mediawiki/mediawiki-skin/Makefile	                        (rev 0)
+++ trunk/gforge/plugins/mediawiki/mediawiki-skin/Makefile	2010-02-24 20:19:55 UTC (rev 8865)
@@ -0,0 +1,33 @@
+MWSKINPATH=/usr/share/mediawiki/skins
+
+all: FusionForge.php fusionforge/main.css
+
+FusionForge.php: FusionForge.php.renamed
+	@echo 'Building $@'
+	patch -p0 -o $@ FusionForge.php.renamed FusionForge.php.patch
+
+FusionForge.php.renamed: $(MWSKINPATH)
+	cp $(MWSKINPATH)/MonoBook.php FusionForge.php.reference
+	cat $(MWSKINPATH)/MonoBook.php | sed 's/MonoBook/FusionForge/g' | sed 's/monobook/fusionforge/g' > $@
+	
+
+fusionforge/main.css: fusionforge/main.css.renamed
+	@echo 'Building $@'
+	patch -p0 -o $@ fusionforge/main.css.renamed fusionforge/main.css.patch
+
+fusionforge/main.css.renamed: $(MWSKINPATH)
+	cp $(MWSKINPATH)/monobook/main.css fusionforge/main.css.reference
+	cat $(MWSKINPATH)/monobook/main.css | sed 's/MonoBook/FusionForge/g' | sed 's/monobook/fusionforge/g' > $@
+	
+
+$(MWSKINPATH):
+	echo 'You must install mediawiki to get reference files'
+
+clean:
+	rm -f FusionForge.php monobook/main.css \
+		FusionForge.php.renamed fusionforge/main.css.renamed \
+		FusionForge.php.patch2 fusionforge/main.css.patch2 
+
+patch: fusionforge/main.css.renamed FusionForge.php.renamed
+	-diff -uN fusionforge/main.css.renamed fusionforge/main.css > fusionforge/main.css.patch2
+	-diff -uN FusionForge.php.renamed FusionForge.php > FusionForge.php.patch2

Added: trunk/gforge/plugins/mediawiki/mediawiki-skin/README.beforemodifying
===================================================================
--- trunk/gforge/plugins/mediawiki/mediawiki-skin/README.beforemodifying	                        (rev 0)
+++ trunk/gforge/plugins/mediawiki/mediawiki-skin/README.beforemodifying	2010-02-24 20:19:55 UTC (rev 8865)
@@ -0,0 +1,12 @@
+The FusionForge.php and fusionforge/main.css are built
+from MonoBook.php and monobook/main.css mediawiki files
+2 things are done
+
+-Renaming monobook in fusionforge and MonoBook in FusionForge
+-Apply a minimal patch on the renamed patch
+
+It is highly recommended to touch these files as few as possible
+so mediawiki upgrade doesn't require too much update.
+Please don't apply mediawiki related bugs, rather provide the 
+patch to mediawiki developpers
+

Deleted: trunk/gforge/plugins/mediawiki/mediawiki-skin/fusionforge/main.css
===================================================================
--- trunk/gforge/plugins/mediawiki/mediawiki-skin/fusionforge/main.css	2010-02-24 16:38:57 UTC (rev 8864)
+++ trunk/gforge/plugins/mediawiki/mediawiki-skin/fusionforge/main.css	2010-02-24 20:19:55 UTC (rev 8865)
@@ -1,1560 +0,0 @@
-/*
-** MediaWiki 'monobook' style sheet for CSS2-capable browsers.
-** Copyright Gabriel Wicke - http://wikidev.net/
-** License: GPL (http://www.gnu.org/copyleft/gpl.html)
-**
-** Loosely based on http://www.positioniseverything.net/ordered-floats.html by Big John
-** and the Plone 2.0 styles, see http://plone.org/ (Alexander Limi,Joe Geldart & Tom Croucher,
-** Michael Zeltner and Geir Bækholt)
-** All you guys rock :)
-*/
-
-#column-content {
-	width: 100%;
-	float: right;
-	margin: 0 0 .6em -12.2em;
-	padding: 0;
-}
-#content {
-	margin: 2.8em 0 0 12.2em;
-	padding: 0 1em 1em 1em;
-	position: relative;
-	z-index: 2;
-}
-#column-one {
-	padding-top: 160px;
-}
-#content {
-	background: white;
-	color: black;
-	border: 1px solid #aaa;
-	border-right: none;
-	line-height: 1.5em;
-}
-/* the left column width is specified in class .portlet */
-
-/* Font size:
-** We take advantage of keyword scaling- browsers won't go below 9px
-** More at http://www.w3.org/2003/07/30-font-size
-** http://style.cleverchimp.com/font_size_intervals/altintervals.html
-*/
-
-td.mainCanvas {
-	background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat;
-}
-
-body {
-}
-
-/* scale back up to a sane default */
-#globalWrapper {
-	position: relative;
-	/*font-size: 127%;*/
-	width: 100%;
-	margin: 0;
-	padding: 0;
-}
-.visualClear {
-	clear: both;
-}
-
-/* general styles */
-
-table {
-	/*font-size: 100%;*/
-	color: black;
-	/* we don't want the bottom borders of <h2>s to be visible through
-	   floated tables */
-	//background-color: white;
-}
-fieldset table {
-	/* but keep table layouts in forms clean... */
-	background: none;
-}
-a {
-	text-decoration: none;
-	color: #002bb8;
-	background: none;
-}
-a:visited {
-	color: #5a3696;
-}
-a:active {
-	color: #faa700;
-}
-a:hover {
-	text-decoration: underline;
-}
-a.stub {
-	color: #772233;
-}
-a.new, #p-personal a.new {
-	color: #ba0000;
-}
-a.new:visited, #p-personal a.new:visited {
-	color: #a55858;
-}
-
-img {
-	border: none;
-	vertical-align: middle;
-}
-p {
-	margin: .4em 0 .5em 0;
-	line-height: 1.5em;
-}
-p img {
-	margin: 0;
-}
-
-hr {
-	height: 1px;
-	color: #aaa;
-	background-color: #aaa;
-	border: 0;
-	margin: .2em 0 .2em 0;
-}
-
-h1, h2, h3, h4, h5, h6 {
-	color: black;
-	background: none;
-	font-weight: normal;
-	margin: 0;
-	padding-top: .5em;
-	padding-bottom: .17em;
-	border-bottom: 1px solid #aaa;
-}
-h1 { font-size: 189%; }
-h1 .editsection { font-size: 77%; }
-h2 { font-size: 153.9%; }
-h2 .editsection { font-size: 85%; }
-h3, h4, h5, h6 {
-	border-bottom: none;
-	font-weight: bold;
-}
-h3 { font-size: 131%; }
-h3 .editsection { font-size: 93%; font-weight: normal; }
-h4 { font-size: 116%; }
-h4 .editsection { font-size: 100%; font-weight: normal; }
-h5 { font-size: 100%; }
-h5 .editsection { font-weight: normal; }
-h6 { font-size: 85%;  }
-h6 .editsection { font-size: 123.1%; font-weight: normal; }
-
-ul {
-	line-height: 1.5em;
-	list-style-type: square;
-	margin: .3em 0 0 1.5em;
-	padding: 0;
-	list-style-image: url(bullet.gif);
-}
-ol {
-	line-height: 1.5em;
-	margin: .3em 0 0 3.2em;
-	padding: 0;
-	list-style-image: none;
-}
-li {
-	margin-bottom: .1em;
-}
-dt {
-	font-weight: bold;
-	margin-bottom: .1em;
-}
-dl {
-	margin-top: .2em;
-	margin-bottom: .5em;
-}
-dd {
-	line-height: 1.5em;
-	margin-left: 2em;
-	margin-bottom: .1em;
-}
-
-fieldset {
-	border: 1px solid #2f6fab;
-	margin: 1em 0 1em 0;
-	padding: 0 1em 1em;
-	line-height: 1.5em;
-}
-fieldset.nested {
-	margin: 0 0 0.5em 0;
-	padding: 0 0.5em 0.5em;
-}
-legend {
-	padding: .5em;
-	font-size: 93%;
-}
-form {
-	border: none;
-	margin: 0;
-}
-
-textarea {
-	width: 100%;
-	padding: .1em;
-}
-
-input.historysubmit {
-	padding: 0 .3em .3em .3em !important;
-	font-size: 93%;
-	cursor: pointer;
-	height: 1.7em !important;
-	margin-left: 1.6em;
-}
-select {
-	vertical-align: top;
-}
-abbr, acronym, .explain {
-	border-bottom: 1px dotted black;
-	color: black;
-	background: none;
-	cursor: help;
-}
-q {
-	font-family: Times, "Times New Roman", serif;
-	font-style: italic;
-}
-/* disabled for now
-blockquote {
-	font-family: Times, "Times New Roman", serif;
-	font-style: italic;
-}*/
-code {
-	background-color: #f9f9f9;
-}
-pre {
-	padding: 1em;
-	border: 1px dashed #2f6fab;
-	color: black;
-	background-color: #f9f9f9;
-	line-height: 1.1em;
-}
-
-/*
-** the main content area
-*/
-
-#siteSub {
-	display: none;
-}
-#jump-to-nav {
-	display: none;
-}
-
-#contentSub, #contentSub2 {
-	font-size: 85%;
-	line-height: 1.2em;
-	margin: 0 0 1.4em 1em;
-	color: #7d7d7d;
-	width: auto;
-}
-span.subpages {
-	display: block;
-}
-
-/* Some space under the headers in the content area */
-#bodyContent h1, #bodyContent h2 {
-	margin-bottom: .6em;
-}
-#bodyContent h3, #bodyContent h4, #bodyContent h5 {
-	margin-bottom: .3em;
-}
-#firstHeading {
-	margin-bottom: .1em;
-	/* These two rules hack around bug 2013 (fix for more limited bug 11325).
-	   When bug 2013 is fixed properly, they should be removed. */
-	line-height: 1.2em;
-	padding-bottom: 0;
-}
-
-/* user notification thing */
-.usermessage {
-	background-color: #ffce7b;
-	border: 1px solid #ffa500;
-	color: black;
-	font-weight: bold;
-	margin: 2em 0 1em;
-	padding: .5em 1em;
-	vertical-align: middle;
-}
-#siteNotice {
-	text-align: center;
-	font-size: 93%;
-	padding: 0 .9em;
-}
-#siteNotice p {
-	margin: 0;
-	padding: 0;
-}
-.success {
-	color: green;
-	font-size: 123.1%;
-}
-.error {
-	color: red;
-	font-size: 123.1%;
-}
-.errorbox, .successbox {
-	font-size: 123.1%;
-	border: 2px solid;
-	padding: .5em 1em;
-	float: left;
-	margin-bottom: 2em;
-	color: #000;
-}
-.errorbox {
-	border-color: red;
-	background-color: #fff2f2;
-}
-.successbox {
-	border-color: green;
-	background-color: #dfd;
-}
-.errorbox h2, .successbox h2 {
-	font-size: 123.1%;
-	font-weight: bold;
-	display: inline;
-	margin: 0 .5em 0 0;
-	border: none;
-}
-
-.catlinks {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	margin-top: 1em;
-	clear: both;
-}
-/* currently unused, intended to be used by a metadata box
-in the bottom-right corner of the content area */
-.documentDescription {
-	/* The summary text describing the document */
-	font-weight: bold;
-	display: block;
-	margin: 1em 0;
-	line-height: 1.5em;
-}
-.documentByLine {
-	text-align: right;
-	font-size: 93%;
-	clear: both;
-	font-weight: normal;
-	color: #76797c;
-}
-
-/* emulate center */
-.center {
-	width: 100%;
-	text-align: center;
-}
-*.center * {
-	margin-left: auto;
-	margin-right: auto;
-}
-/* small for tables and similar */
-.small, .small * {
-	font-size: 93%;
-}
-table.small {
-	font-size: 100%;
-}
-
-/*
-** content styles
-*/
-
-#toc,
-.toc,
-.mw-warning {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 93%;
-}
-#toc h2,
-.toc h2 {
-	display: inline;
-	border: none;
-	padding: 0;
-	font-size: 100%;
-	font-weight: bold;
-}
-#toc #toctitle,
-.toc #toctitle,
-#toc .toctitle,
-.toc .toctitle {
-	text-align: center;
-}
-#toc ul,
-.toc ul {
-	list-style-type: none;
-	list-style-image: none;
-	margin-left: 0;
-	padding-left: 0;
-	text-align: left;
-}
-#toc ul ul,
-.toc ul ul {
-	margin: 0 0 0 2em;
-}
-#toc .toctoggle,
-.toc .toctoggle {
-	font-size: 93%;
-}
-
-.mw-warning {
-	margin-left: 50px;
-	margin-right: 50px;
-	text-align: center;
-}
-
-/* images */
-div.floatright, table.floatright {
-	clear: right;
-	float: right;
-	position: relative;
-	margin: 0 0 .5em .5em;
-	border: 0;
-/*
-	border: .5em solid white;
-	border-width: .5em 0 .8em 1.4em;
-*/
-}
-div.floatright p { font-style: italic; }
-div.floatleft, table.floatleft {
-	float: left;
-	clear: left;
-	position: relative;
-	margin: 0 .5em .5em 0;
-	border: 0;
-/*
-	margin: .3em .5em .5em 0;
-	border: .5em solid white;
-	border-width: .5em 1.4em .8em 0;
-*/
-}
-div.floatleft p { font-style: italic; }
-/* thumbnails */
-div.thumb {
-	margin-bottom: .5em;
-	border-style: solid;
-	border-color: white;
-	width: auto;
-}
-div.thumbinner {
-	border: 1px solid #ccc;
-	padding: 3px !important;
-	background-color: #f9f9f9;
-	font-size: 93%;
-	text-align: center;
-	overflow: hidden;
-}
-html .thumbimage {
-	border: 1px solid #ccc;
-}
-html .thumbcaption {
-	border: none;
-	text-align: left;
-	line-height: 1.4em;
-	padding: 3px !important;
-	font-size: 93%;
-}
-div.magnify {
-	float: right;
-	border: none !important;
-	background: none !important;
-}
-div.magnify a, div.magnify img {
-	display: block;
-	border: none !important;
-	background: none !important;
-}
-div.tright {
-	clear: right;
-	float: right;
-	border-width: .5em 0 .8em 1.4em;
-}
-div.tleft {
-	float: left;
-	clear: left;
-	margin-right: .5em;
-	border-width: .5em 1.4em .8em 0;
-}
-img.thumbborder {
-	border: 1px solid #dddddd;
-}
-.hiddenStructure {
-	display: none;
-}
-
-/*
-** classes for special content elements like town boxes
-** intended to be referenced directly from the wiki src
-*/
-
-/*
-** User styles
-*/
-/* table standards */
-table.rimage {
-	float: right;
-	position: relative;
-	margin-left: 1em;
-	margin-bottom: 1em;
-	text-align: center;
-}
-.toccolours {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 93%;
-}
-
-/*
-** edit views etc
-*/
-.special li {
-	line-height: 1.4em;
-	margin: 0;
-	padding: 0;
-}
-
-/*
-** keep the whitespace in front of the ^=, hides rule from konqueror
-** this is css3, the validator doesn't like it when validating as css2
-*/
-#bodyContent a.external,
-#bodyContent a[href ^="gopher://"] {
-	background: url(external.png) center right no-repeat;
-	padding: 0 13px;
-}
-.rtl #bodyContent a.external,
-.rtl #bodyContent a[href ^="gopher://"] {
-	background-image: url(external-rtl.png);
-}
-#bodyContent a[href ^="https://"],
-.link-https {
-	background: url(lock_icon.gif) center right no-repeat;
-	padding: 0 16px;
-}
-#bodyContent a[href ^="mailto:"],
-.link-mailto {
-	background: url(mail_icon.gif) center right no-repeat;
-	padding: 0 18px;
-}
-#bodyContent a[href ^="news://"] {
-	background: url(news_icon.png) center right no-repeat;
-	padding: 0 18px;
-}
-#bodyContent a[href ^="ftp://"],
-.link-ftp {
-	background: url(file_icon.gif) center right no-repeat;
-	padding: 0 18px;
-}
-#bodyContent a[href ^="irc://"],
-#bodyContent a.extiw[href ^="irc://"],
-.link-irc {
-	background: url(discussionitem_icon.gif) center right no-repeat;
-	padding: 0 18px;
-}
-#bodyContent a.external[href $=".ogg"], #bodyContent a.external[href $=".OGG"],
-#bodyContent a.external[href $=".mid"], #bodyContent a.external[href $=".MID"],
-#bodyContent a.external[href $=".midi"], #bodyContent a.external[href $=".MIDI"],
-#bodyContent a.external[href $=".mp3"], #bodyContent a.external[href $=".MP3"],
-#bodyContent a.external[href $=".wav"], #bodyContent a.external[href $=".WAV"],
-#bodyContent a.external[href $=".wma"], #bodyContent a.external[href $=".WMA"],
-.link-audio {
-	background: url("audio.png") center right no-repeat;
-	padding: 0 13px;
-}
-#bodyContent a.external[href $=".ogm"], #bodyContent a.external[href $=".OGM"],
-#bodyContent a.external[href $=".avi"], #bodyContent a.external[href $=".AVI"],
-#bodyContent a.external[href $=".mpeg"], #bodyContent a.external[href $=".MPEG"],
-#bodyContent a.external[href $=".mpg"], #bodyContent a.external[href $=".MPG"],
-.link-video {
-	background: url("video.png") center right no-repeat;
-	padding: 0 13px;
-}
-#bodyContent a.external[href $=".pdf"], #bodyContent a.external[href $=".PDF"],
-#bodyContent a.external[href *=".pdf#"], #bodyContent a.external[href *=".PDF#"],
-#bodyContent a.external[href *=".pdf?"], #bodyContent a.external[href *=".PDF?"],
-.link-document {
-	background: url("document.png") center right no-repeat;
-	padding: 0 12px;
-}
-
-/* for rtl wikis */
-.rtl #bodyContent a.external {
-	background-position: left;
-	padding-right: 0;
-}
-.rtl a.feedlink {
-	background-position: right;
-	padding-right: 16px;
-	padding-left: 0;
-}
-
-/* correction for ltr wikis */
-.ltr #bodyContent a.external {
-	padding-left: 0;
-}
-
-/* disable interwiki styling */
-#bodyContent a.extiw,
-#bodyContent a.extiw:active {
-	color: #36b;
-	background: none;
-	padding: 0;
-}
-#bodyContent a.external {
-	color: #36b;
-}
-/* this can be used in the content area to switch off
-special external link styling */
-#bodyContent .plainlinks a {
-	background: none !important;
-	padding: 0 !important;
-}
-/*
-** Structural Elements
-*/
-
-/*
-** general portlet styles (elements in the quickbar)
-*/
-.portlet {
-	border: none;
-	margin: 0 0 .5em;
-	padding: 0;
-	float: none;
-	width: 11.6em;
-	overflow: hidden;
-}
-.portlet h4 {
-	font-size: 93%;
-	font-weight: normal;
-	white-space: nowrap;
-}
-.portlet h5 {
-	background: transparent;
-	padding: 0 1em 0 .5em;
-	display: inline;
-	height: 1em;
-	text-transform: lowercase;
-	font-size: 93%;
-	font-weight: normal;
-	white-space: nowrap;
-}
-.portlet h6 {
-	background: #ffae2e;
-	border: 1px solid #2f6fab;
-	border-style: solid solid none solid;
-	padding: 0 1em 0 1em;
-	text-transform: lowercase;
-	display: block;
-	font-size: 100%;
-	height: 1.2em;
-	font-weight: normal;
-	white-space: nowrap;
-}
-.pBody {
-	font-size: 93%;
-	background-color: white;
-	color: black;
-	border-collapse: collapse;
-	border: 1px solid #aaa;
-	padding: 0 .8em .3em .5em;
-}
-.portlet h1,
-.portlet h2,
-.portlet h3,
-.portlet h4 {
-	margin: 0;
-	padding: 0;
-}
-.portlet ul {
-	line-height: 1.5em;
-	list-style-type: square;
-	list-style-image: url(bullet.gif);
-	font-size: 93%;
-}
-.portlet li {
-	padding: 0;
-	margin: 0;
-}
-
-/*
-** Logo properties
-*/
-
-#p-logo {
-	top: 0;
-	left: 0;
-	position: absolute; /*needed to use z-index */
-	z-index: 3;
-	height: 155px;
-	width: 12em;
-	overflow: visible;
-}
-#p-logo h5 {
-	display: none;
-}
-#p-logo a,
-#p-logo a:hover {
-	display: block;
-	height: 155px;
-	width: 12.2em;
-	background-repeat: no-repeat;
-	background-position: 35% 50% !important;
-	text-decoration: none;
-}
-
-/*
-** Search portlet
-*/
-#p-search {
-	position: relative;
-	z-index: 3;
-}
-input.searchButton {
-	margin-top: 1px;
-	font-size: 93%;
-}
-#searchGoButton {
-	padding-left: .5em;
-	padding-right: .5em;
-	font-weight: bold;
-}
-#searchInput {
-	width: 10.9em;
-	margin: 0;
-	font-size: 93%;
-}
-#p-search .pBody {
-	padding: .5em .4em .4em .4em;
-	text-align: center;
-}
-#p-search #searchform div div {
-	margin-top: .4em;
-	font-size: 93%;
-}
-/*
-** the personal toolbar
-*/
-#p-personal {
-	position: absolute;
-	left: 0;
-	top: 0;
-	z-index: 0;
-}
-#p-personal {
-	width: 100%;
-	white-space: nowrap;
-	padding: 0;
-	margin: 0;
-	border: none;
-	background: none;
-	overflow: visible;
-	line-height: 1.2em;
-}
-#p-personal h5 {
-	display: none;
-}
-#p-personal .portlet,
-#p-personal .pBody {
-	z-index: 0;
-	padding: 0;
-	margin: 0;
-	border: none;
-	overflow: visible;
-	background: none;
-}
-/* this is the ul contained in the portlet */
-#p-personal ul {
-	border: none;
-	line-height: 1.4em;
-	color: #2f6fab;
-	padding: 0 2em 0 3em;
-	margin: 0;
-	text-align: right;
-	list-style: none;
-	z-index: 0;
-	background: none;
-	cursor: default;
-}
-#p-personal li {
-	z-index: 0;
-	border: none;
-	padding: 0;
-	display: inline;
-	color: #2f6fab;
-	margin-left: 1em;
-	line-height: 1.2em;
-	background: none;
-}
-#p-personal li a {
-	text-decoration: none;
-	color: #005896;
-	padding-bottom: .2em;
-	background: none;
-}
-#p-personal li a:hover {
-	background-color: white;
-	padding-bottom: .2em;
-	text-decoration: none;
-}
-#p-personal li.active a:hover {
-	background-color: transparent;
-}
-/* the icon in front of the user name, single quotes
-in bg url to hide it from iemac */
-li#pt-userpage,
-li#pt-anonuserpage,
-li#pt-login {
-	background: url(user.gif) top left no-repeat;
-	padding-left: 20px;
-	text-transform: none;
-}
-#p-personal ul {
-	text-transform: lowercase;
-}
-#p-personal li.active {
-	font-weight: bold;
-}
-/*
-** the page-related actions- page/talk, edit etc
-*/
-#p-cactions {
-	position: absolute;
-	top: 1.3em;
-	left: 11.5em;
-	margin: 0;
-	white-space: nowrap;
-	width: 76%;
-	line-height: 1.1em;
-	overflow: visible;
-	background: none;
-	border-collapse: collapse;
-	padding-left: 1em;
-	list-style: none;
-	font-size: 93%;
-}
-#p-cactions ul {
-	list-style: none;
-}
-#p-cactions li {
-	display: inline;
-	border: 1px solid #aaa;
-	border-bottom: none;
-	padding: 0 0 .1em 0;
-	margin: 0 .3em 0 0;
-	overflow: visible;
-	background: white;
-}
-#p-cactions li.selected {
-	border-color: #fabd23;
-	padding: 0 0 .2em 0;
-	font-weight: bold;
-}
-#p-cactions li a {
-	background-color: #fbfbfb;
-	color: #002bb8;
-	border: none;
-	padding: 0 .8em .3em;
-	position: relative;
-	z-index: 0;
-	margin: 0;
-	text-decoration: none;
-}
-#p-cactions li.selected a {
-	z-index: 3;
-	padding: 0 1em .2em!important;
-	background-color: white;
-}
-#p-cactions .new a {
-	color: #ba0000;
-}
-#p-cactions li a:hover {
-	z-index: 3;
-	text-decoration: none;
-	background-color: white;
-}
-#p-cactions h5 {
-	display: none;
-}
-#p-cactions li.istalk {
-	margin-right: 0;
-}
-#p-cactions li.istalk a {
-	padding-right: .5em;
-}
-#p-cactions #ca-addsection a {
-	padding-left: .4em;
-	padding-right: .4em;
-}
-/* offsets to distinguish the tab groups */
-li#ca-talk {
-	margin-right: 1.6em;
-}
-li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print {
-	margin-left: 1.6em;
-}
-#p-cactions .pBody {
-	font-size: 100%;
-	background-color: transparent;
-	color: inherit;
-	border-collapse: inherit;
-	border: 0;
-	padding: 0;
-}
-#p-cactions .hiddenStructure {
-	display: none;
-}
-#p-cactions li a {
-	text-transform: lowercase;
-}
-
-#p-lang {
-	position: relative;
-	z-index: 3;
-}
-
-/* TODO: #t-iscite is only used by the Cite extension, come up with some
- * system which allows extensions to add to this file on the fly
- */
-#t-ispermalink, #t-iscite {
-	color: #999;
-}
-/*
-** footer
-*/
-#footer {
-	background-color: white;
-	border-top: 1px solid #fabd23;
-	border-bottom: 1px solid #fabd23;
-	margin: .6em 0 1em 0;
-	padding: .4em 0 1.2em 0;
-	text-align: center;
-	font-size: 93%;
-}
-#footer li {
-	display: inline;
-	margin: 0 1.3em;
-}
-#f-poweredbyico, #f-copyrightico {
-	margin: 0 8px;
-	position: relative;
-	top: -2px; /* Bump it up just a tad */
-}
-#f-poweredbyico {
-	float: right;
-	height: 1%;
-}
-#f-copyrightico {
-	float: left;
-	height: 1%;
-}
-
-/* js pref toc */
-#preftoc {
-	margin: 0;
-	padding: 0;
-	width: 100%;
-	clear: both;
-}
-#preftoc li {
-	background-color: #f0f0f0;
-	color: #000;
-}
-#preftoc li {
-	margin: 1px -2px 1px 2px;
-	float: left;
-	padding: 2px 0 3px 0;
-	border: 1px solid #fff;
-	border-right-color: #716f64;
-	border-bottom: 0;
-	position: relative;
-	white-space: nowrap;
-	list-style-type: none;
-	list-style-image: none;
-	z-index: 3;
-}
-#preftoc li.selected {
-	font-weight: bold;
-	background-color: #f9f9f9;
-	border: 1px solid #aaa;
-	border-bottom: none;
-	cursor: default;
-	top: 1px;
-	padding-top: 2px;
-	margin-right: -3px;
-}
-#preftoc > li.selected {
-	top: 2px;
-}
-#preftoc a,
-#preftoc a:active {
-	display: block;
-	color: #000;
-	padding: 0 .7em;
-	position: relative;
-	text-decoration: none;
-}
-#preftoc li.selected a {
-	cursor: default;
-	text-decoration: none;
-}
-#prefcontrol {
-	padding-top: 2em;
-	clear: both;
-}
-#preferences {
-	margin: 0;
-	border: 1px solid #aaa;
-	clear: both;
-	padding: 1.5em;
-	background-color: #F9F9F9;
-}
-.prefsection {
-	border: none;
-	padding: 0;
-	margin: 0;
-}
-.prefsection fieldset {
-	border: 1px solid #aaa;
-	float: left;
-	margin-right: 2em;
-}
-.prefsection legend {
-	font-weight: bold;   
-}
-.prefsection table, .prefsection legend {
-	background-color: #F9F9F9;
-}
-.mainLegend {
-	display: none;
-}
-div.prefsectiontip {
-	font-size: 85%;
-	padding: .2em 2em;
-	color: #666;
-}
-.btnSavePrefs {
-	font-weight: bold;
-	padding-left: .3em;
-	padding-right: .3em;
-}
-
-.preferences-login {
-	clear: both;
-	margin-bottom: 1.5em;
-}
-
-.prefcache {
-	font-size: 93%;
-	margin-top: 2em;
-}
-
-div#userloginForm form,
-div#userlogin form#userlogin2 {
-	margin: 0 3em 1em 0;
-	border: 1px solid #aaa;
-	clear: both;
-	padding: 1.5em 2em;
-	background-color: #f9f9f9;
-	float: left;
-}
-.rtl div#userloginForm form,
-.rtl div#userlogin form#userlogin2 {
-	float: right;
-}
-
-div#userloginForm table,
-div#userlogin form#userlogin2 table {
-	background-color: #f9f9f9;
-}
-
-div#userloginForm h2,
-div#userlogin form#userlogin2 h2 {
-	padding-top: 0;
-}
-
-div#userlogin .captcha,
-div#userloginForm .captcha {
-	border: 1px solid #bbb;
-	padding: 1.5em 2em;
-	background-color: white;
-}
-
-#loginend, #signupend {
-	clear: both;
-}
-
-#userloginprompt, #languagelinks {
-	font-size: 85%;
-}
-
-#login-sectiontip {
-	font-size: 85%;
-	line-height: 1.2;
-	padding-top: 2em;
-}
-
-#userlogin .loginText, #userlogin .loginPassword {
-	width: 12em;
-}
-
-#userloginlink a, #wpLoginattempt, #wpCreateaccount {
-	font-weight: bold;
-}
-
-/*
-** IE/Mac fixes, hope to find a validating way to move this
-** to a separate stylesheet. This would work but doesn't validate:
-** @import("IEMacFixes.css");
-*/
-/* tabs: border on the a, not the div */
-* > html #p-cactions li { border: none; }
-* > html #p-cactions li a {
-	border: 1px solid #aaa;
-	border-bottom: none;
-}
-* > html #p-cactions li.selected a { border-color: #fabd23; }
-/* footer icons need a fixed width */
-* > html #f-poweredbyico,
-* > html #f-copyrightico { width: 88px; }
-* > html #bodyContent,
-* > html #bodyContent pre {
-	overflow-x: auto;
-	width: 100%;
-	padding-bottom: 25px;
-}
-
-/* more IE fixes */
-/* float/negative margin brokenness */
-* html #footer {margin-top: 0;}
-* html #column-content {
-	display: inline;
-	margin-bottom: 0;
-}
-* html div.editsection { font-size: 100%; }
-#pagehistory li.selected { position: relative; }
-
-/* Mac IE 5.0 fix; floated content turns invisible */
-* > html #column-content {
-	float: none;
-}
-* > html #column-one {
-	position: absolute;
-	left: 0;
-	top: 0;
-}
-* > html #footer {
-	margin-left: 13.2em;
-}
-.redirectText {
-	font-size: 153.9%;
-	margin: 5px;
-}
-
-.printfooter {
-	display: none;
-}
-
-.not-patrolled {
-	background-color: #ffa;
-}
-div.patrollink {
-	clear: both;
-	font-size: 77%;
-	text-align: right;
-}
-span.newpage, span.minor, span.bot {
-	font-weight: bold;
-}
-span.unpatrolled {
-	font-weight: bold;
-	color: red;
-}
-
-.sharedUploadNotice {
-	font-style: italic;
-}
-
-span.updatedmarker {
-	color: black;
-	background-color: #0f0;
-}
-
-table.gallery {
-	border: 1px solid #ccc;
-	margin: 2px;
-	padding: 2px;
-	background-color: white;
-}
-
-table.gallery tr {
-	vertical-align: top;
-}
-
-table.gallery td {
-	vertical-align: top;
-	background-color: #f9f9f9;
-	border: solid 2px white;
-}
-/* Keep this temporarily so that cached pages will display right */
-table.gallery td.galleryheader {
-    text-align: center;
-	font-weight: bold;
-}
-table.gallery caption {
-	font-weight: bold;
-}
-
-div.gallerybox {
-	margin: 2px;
-}
-
-div.gallerybox div.thumb {
-	text-align: center;
-	border: 1px solid #ccc;
-	margin: 2px;
-}
-
-div.gallerytext {
-	overflow: hidden;
-	font-size: 93%;
-	padding: 2px 4px;
-}
-
-span.comment {
-	font-style: italic;
-}
-
-span.changedby {
-	font-size: 93%;
-}
-
-.previewnote {
-	text-indent: 3em;
-	color: #c00;
-	border-bottom: 1px solid #aaa;
-	padding-bottom: 1em;
-	margin-bottom: 1em;
-}
-
-.previewnote p {
-	margin: 0;
-	padding: 0;
-}
-
-.editExternally {
-	border: 1px solid gray;
-	background-color: #ffffff;
-	padding: 3px;
-	margin-top: 0.5em;
-	float: left;
-	font-size: 93%;
-	text-align: center;
-}
-.editExternallyHelp {
-	font-style: italic;
-	color: gray;
-}
-
-.toggle {
-	margin-left: 2em;
-	text-indent: -2em;
-}
-
-/* Classes for EXIF data display */
-table.mw_metadata {
-	font-size: 85%;
-	margin-left: 0.5em;
-	margin-bottom: 0.5em;
-	width: 300px;
-}
-
-table.mw_metadata caption {
-	font-weight: bold;
-}
-
-table.mw_metadata th {
-	font-weight: normal;
-}
-
-table.mw_metadata td {
-	padding: 0.1em;
-}
-
-table.mw_metadata {
-	border: none;
-	border-collapse: collapse;
-}
-
-table.mw_metadata td, table.mw_metadata th {
-	text-align: center;
-	border: 1px solid #aaaaaa;
-	padding-left: 0.1em;
-	padding-right: 0.1em;
-}
-
-table.mw_metadata th {
-	background-color: #f9f9f9;
-}
-
-table.mw_metadata td {
-	background-color: #fcfcfc;
-}
-
-table.collapsed tr.collapsable {
-	display: none;
-}
-
-
-/* filetoc */
-ul#filetoc {
-	text-align: center;
-	border: 1px solid #aaaaaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 93%;
-	margin-bottom: 0.5em;
-	margin-left: 0;
-	margin-right: 0;
-}
-
-#filetoc li {
-	display: inline;
-	list-style-type: none;
-	padding-right: 2em;
-}
-
-input#wpSummary {
-	width: 80%;
-}
-
-/* @bug 1714 */
-input#wpSave, input#wpDiff {
-	margin-right: 0.33em;
-}
-
-#wpSave {
-	font-weight: bold;
-}
-
-/* Classes for article validation */
-
-table.revisionform_default {
-	border: 1px solid #000000;
-}
-
-table.revisionform_focus {
-	border: 1px solid #000000;
-	background-color:#00BBFF;
-}
-
-tr.revision_tr_default {
-	background-color:#EEEEEE;
-}
-
-tr.revision_tr_first {
-	background-color:#DDDDDD;
-}
-
-p.revision_saved {
-	color: green;
-	font-weight:bold;
-}
-
-#mw_trackbacks {
-	border: solid 1px #bbbbff;
-	background-color: #eeeeff;
-	padding: 0.2em;
-}
-
-
-/* Allmessages table */
-
-#allmessagestable th {
-	background-color: #b2b2ff;
-}
-
-#allmessagestable tr.orig {
-	background-color: #ffe2e2;
-}
-
-#allmessagestable tr.new {
-	background-color: #e2ffe2;
-}
-
-#allmessagestable tr.def {
-	background-color: #f0f0ff;
-}
-
-
-/* noarticletext */
-div.noarticletext {
-	border: 1px solid #ccc;
-	background: #fff;
-	padding: .2em 1em;
-	color: #000;
-}
-
-div#searchTargetContainer {
-	left:       10px;
-	top:        10px;
-	width:      90%;
-	background: white;
-}
-
-div#searchTarget {
-	padding:    3px;
-	margin:     5px;
-	background: #F0F0F0;
-	border:     solid 1px blue;
-}
-
-div#searchTarget ul li {
-	list-style: none;
-}
-
-div#searchTarget ul li:before {
-	color: orange;
-	content: "\00BB \0020";
-}
-
-div#searchTargetHide {
-	float:right;
-	border:solid 1px black;
-	background:#DCDCDC;
-	padding:2px;
-}
-
-#powersearch p {
-	margin-top:0px;
-}
-
-div.multipageimagenavbox {
-   border: solid 1px silver;
-   padding: 4px;
-   margin: 1em;
-   background: #f0f0f0;
-}
-
-div.multipageimagenavbox div.thumb {
-   border: none;
-   margin-left: 2em;
-   margin-right: 2em;
-}
-
-div.multipageimagenavbox hr {
-   margin: 6px;
-}
-
-table.multipageimage td {
-   text-align: center;
-}
-
-/** Special:Version */
-
-table#sv-ext, table#sv-hooks, table#sv-software {
-	margin: 1em;
-	padding:0em;
-}
-
-#sv-ext td, #sv-hooks td, #sv-software td,
-#sv-ext th, #sv-hooks th, #sv-software th {
-	border: 1px solid #A0A0A0;
-	padding: 0 0.15em 0 0.15em;
-}
-#sv-ext th, #sv-hooks th, #sv-software th {
-	background-color: #F0F0F0;
-	color: black;
-	padding: 0 0.15em 0 0.15em;
-}
-tr.sv-space{
-	height: 0.8em;
-	border:none;
-}
-tr.sv-space td { display: none; }
-
-/*
-  Table pager (e.g. Special:Imagelist)
-  - remove underlines from the navigation link
-  - collapse borders
-  - set the borders to outsets (similar to Special:Allmessages)
-  - remove line wrapping for all td and th, set background color
-  - restore line wrapping for the last two table cells (description and size)
-*/
-.TablePager { min-width: 80%; }
-.TablePager_nav a { text-decoration: none; }
-.TablePager { border-collapse: collapse; }
-.TablePager, .TablePager td, .TablePager th { 
-	border: 1px solid #aaaaaa;
-	padding: 0 0.15em 0 0.15em;
-}
-.TablePager th { background-color: #eeeeff }
-.TablePager td { background-color: #ffffff }
-.TablePager tr:hover td { background-color: #eeeeff }
-
-.imagelist td, .imagelist th { white-space: nowrap }
-.imagelist .TablePager_col_links { background-color: #eeeeff }
-.imagelist .TablePager_col_img_description { white-space: normal }
-.imagelist th.TablePager_sort { background-color: #ccccff }
-
-.templatesUsed { margin-top: 1.5em; }
-
-.mw-summary-preview {
-	margin: 0.1em 0;
-}
-
-/* Friendlier slave lag warnings */
-div.mw-lag-warn-normal,
-div.mw-lag-warn-high {
-	padding: 3px;
-	text-align: center;
-	margin: 3px auto;
-}
-div.mw-lag-warn-normal {
-	border: 1px solid #FFCC66;
-	background-color: #FFFFCC;
-}
-div.mw-lag-warn-high {
-	font-weight: bold;
-	border: 2px solid #FF0033;
-	background-color: #FFCCCC;
-}
-
-.MediaTransformError {
-	background-color: #ccc;
-	padding: 0.1em;
-}
-.MediaTransformError td {
-	text-align: center;
-	vertical-align: middle;
-	font-size: 93%;
-}
-
-/** Special:Search stuff */
-div#mw-search-interwiki-caption {
-	text-align: center;
-	font-weight: bold;
-	font-size: 93%;
-}
-
-.mw-search-interwiki-project {
-	font-size: 100%;
-	text-align: left;
-	padding-left: 0.2em;
-	padding-right: 0.15em;
-	padding-bottom: 0.2em;
-	padding-top: 0.15em;
-	background: #cae8ff;
-}
-
-/* God-damned hack for the crappy layout */
-.os-suggest {
-	font-size: 123.1%;
-}

Added: trunk/gforge/plugins/mediawiki/mediawiki-skin/fusionforge/main.css.patch
===================================================================
--- trunk/gforge/plugins/mediawiki/mediawiki-skin/fusionforge/main.css.patch	                        (rev 0)
+++ trunk/gforge/plugins/mediawiki/mediawiki-skin/fusionforge/main.css.patch	2010-02-24 20:19:55 UTC (rev 8865)
@@ -0,0 +1,33 @@
+--- fusionforge/main.css.renamed	2010-02-24 20:26:14.000000000 +0100
++++ fusionforge/main.css	2010-02-24 20:26:14.000000000 +0100
+@@ -39,9 +39,12 @@
+ ** http://style.cleverchimp.com/font_size_intervals/altintervals.html
+ */
+ 
++td.mainCanvas {
++	background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat;
++}
++
+ body {
+ 	font: x-small sans-serif;
+-	background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat;
+ 	color: black;
+ 	margin: 0;
+ 	padding: 0;
+@@ -49,6 +52,7 @@
+ 
+ /* scale back up to a sane default */
+ #globalWrapper {
++	position: relative;
+ 	font-size: 127%;
+ 	width: 100%;
+ 	margin: 0;
+@@ -65,7 +69,7 @@
+ 	color: black;
+ 	/* we don't want the bottom borders of <h2>s to be visible through
+ 	   floated tables */
+-	background-color: white;
++	//background-color: white;
+ }
+ fieldset table {
+ 	/* but keep table layouts in forms clean... */




More information about the Fusionforge-commits mailing list