[Fusionforge-commits] r10384 - in trunk/src/plugins/wiki: common www www/config www/doc www/lib www/lib/WikiUser www/lib/nusoap www/lib/plugin www/lib/wikilens www/pgsrc www/themes www/themes/MonoBook/templates www/themes/Sidebar/templates www/themes/default/templates www/themes/fusionforge www/themes/fusionforge/pgsrc www/themes/fusionforge/templates

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Wed Sep 1 20:20:01 CEST 2010


Author: vargenau
Date: 2010-09-01 20:19:59 +0200 (Wed, 01 Sep 2010)
New Revision: 10384

Added:
   trunk/src/plugins/wiki/www/lib/WikiUser/FusionForge.php
   trunk/src/plugins/wiki/www/pgsrc/AllPagesByAcl
   trunk/src/plugins/wiki/www/themes/fusionforge/
   trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-autonumbering-min.css
   trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-autonumbering.css
   trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-fullscreen-min.css
   trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-fullscreen.css
   trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-min.css
   trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print-min.css
   trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print.css
   trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-rereading-min.css
   trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-rereading.css
   trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge.css
   trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
   trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple
Removed:
   trunk/src/plugins/wiki/www/lib/WikiUser/GForge.php
   trunk/src/plugins/wiki/www/themes/fusionforge/gforge-autonumbering-min.css
   trunk/src/plugins/wiki/www/themes/fusionforge/gforge-autonumbering.css
   trunk/src/plugins/wiki/www/themes/fusionforge/gforge-fullscreen-min.css
   trunk/src/plugins/wiki/www/themes/fusionforge/gforge-fullscreen.css
   trunk/src/plugins/wiki/www/themes/fusionforge/gforge-min.css
   trunk/src/plugins/wiki/www/themes/fusionforge/gforge-print-min.css
   trunk/src/plugins/wiki/www/themes/fusionforge/gforge-print.css
   trunk/src/plugins/wiki/www/themes/fusionforge/gforge-rereading-min.css
   trunk/src/plugins/wiki/www/themes/fusionforge/gforge-rereading.css
   trunk/src/plugins/wiki/www/themes/fusionforge/gforge.css
   trunk/src/plugins/wiki/www/themes/gforge/
Modified:
   trunk/src/plugins/wiki/common/WikiPlugin.class.php
   trunk/src/plugins/wiki/www/TODO
   trunk/src/plugins/wiki/www/config/config-dist.ini
   trunk/src/plugins/wiki/www/configurator.php
   trunk/src/plugins/wiki/www/doc/CREDITS
   trunk/src/plugins/wiki/www/doc/HISTORY
   trunk/src/plugins/wiki/www/doc/phpwiki.doxygen
   trunk/src/plugins/wiki/www/g
   trunk/src/plugins/wiki/www/lib/CachedMarkup.php
   trunk/src/plugins/wiki/www/lib/EditToolbar.php
   trunk/src/plugins/wiki/www/lib/IniConfig.php
   trunk/src/plugins/wiki/www/lib/MailNotify.php
   trunk/src/plugins/wiki/www/lib/PageList.php
   trunk/src/plugins/wiki/www/lib/PagePerm.php
   trunk/src/plugins/wiki/www/lib/SemanticWeb.php
   trunk/src/plugins/wiki/www/lib/WikiTheme.php
   trunk/src/plugins/wiki/www/lib/WikiUserNew.php
   trunk/src/plugins/wiki/www/lib/loadsave.php
   trunk/src/plugins/wiki/www/lib/main.php
   trunk/src/plugins/wiki/www/lib/nusoap/nusoap.php
   trunk/src/plugins/wiki/www/lib/plugin/PluginManager.php
   trunk/src/plugins/wiki/www/lib/plugin/RecentChanges.php
   trunk/src/plugins/wiki/www/lib/plugin/RedirectTo.php
   trunk/src/plugins/wiki/www/lib/plugin/UpLoad.php
   trunk/src/plugins/wiki/www/lib/plugin/UserPreferences.php
   trunk/src/plugins/wiki/www/lib/plugin/WatchPage.php
   trunk/src/plugins/wiki/www/lib/plugin/WikiAdminChmod.php
   trunk/src/plugins/wiki/www/lib/plugin/WikiAdminSetAcl.php
   trunk/src/plugins/wiki/www/lib/upgrade.php
   trunk/src/plugins/wiki/www/lib/wikilens/RatingsUser.php
   trunk/src/plugins/wiki/www/pgsrc/Help%2FPageList
   trunk/src/plugins/wiki/www/pgsrc/Help%2FRecentChangesPlugin
   trunk/src/plugins/wiki/www/pgsrc/PhpWikiAdministration
   trunk/src/plugins/wiki/www/pgsrc/PhpWikiAdministration%2FSetAclSimple
   trunk/src/plugins/wiki/www/pgsrc/ReleaseNotes
   trunk/src/plugins/wiki/www/pgsrc/SetGlobalAccessRights
   trunk/src/plugins/wiki/www/pgsrc/SetGlobalAccessRightsSimple
   trunk/src/plugins/wiki/www/pgsrc/SpecialPages
   trunk/src/plugins/wiki/www/themes/Makefile
   trunk/src/plugins/wiki/www/themes/Makefile.global
   trunk/src/plugins/wiki/www/themes/MonoBook/templates/info.tmpl
   trunk/src/plugins/wiki/www/themes/Sidebar/templates/navbar.tmpl
   trunk/src/plugins/wiki/www/themes/default/templates/info.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/Makefile
   trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration
   trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/SpecialPages
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/html.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/themeinfo.php
   trunk/src/plugins/wiki/www/themes/fusionforge/wikilens-min.js
   trunk/src/plugins/wiki/www/themes/fusionforge/wikilens.js
   trunk/src/plugins/wiki/www/wikiadmin.php
Log:
Rename Phpwiki theme from "gforge" to "fusionforge"

Modified: trunk/src/plugins/wiki/common/WikiPlugin.class.php
===================================================================
--- trunk/src/plugins/wiki/common/WikiPlugin.class.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/common/WikiPlugin.class.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -185,11 +185,11 @@
 		} elseif ($hookname == 'cssfile') {
 			if (strncmp(preg_replace('/^\/+/', '/', $_SERVER['REQUEST_URI']), '/wiki/', 6) == 0) {
 				echo '<link rel="alternate" type="application/x-wiki" title="Edit this page!" href="'.$_SERVER['PHP_SELF'].'?action=edit" />';
-				echo '<link rel="stylesheet" type="text/css" href="/wiki/themes/gforge/gforge.css" />';
-				echo "\n".'<link rel="alternate stylesheet" type="text/css" href="/wiki/themes/gforge/gforge-fullscreen.css" media="screen" title="Fullscreen" />';
-				echo "\n".'<link rel="alternate stylesheet" type="text/css" href="/wiki/themes/gforge/gforge-autonumbering.css" title="Autonumbering" />';
-				echo "\n".'<link rel="alternate stylesheet" type="text/css" href="/wiki/themes/gforge/gforge-rereading.css" title="Rereading Mode" />';
-				echo "\n".'<link rel="stylesheet" type="text/css" href="/wiki/themes/gforge/gforge-print.css" media="print" />';
+				echo '<link rel="stylesheet" type="text/css" href="/wiki/themes/fusionforge/fusionforge.css" />';
+				echo "\n".'<link rel="alternate stylesheet" type="text/css" href="/wiki/themes/fusionforge/fusionforge-fullscreen.css" media="screen" title="Fullscreen" />';
+				echo "\n".'<link rel="alternate stylesheet" type="text/css" href="/wiki/themes/fusionforge/fusionforge-autonumbering.css" title="Autonumbering" />';
+				echo "\n".'<link rel="alternate stylesheet" type="text/css" href="/wiki/themes/fusionforge/fusionforge-rereading.css" title="Rereading Mode" />';
+				echo "\n".'<link rel="stylesheet" type="text/css" href="/wiki/themes/fusionforge/fusionforge-print.css" media="print" />';
 				echo "\n".'<base href="'.PHPWIKI_BASE_URL.'" />';
 				echo "\n";
 			}

Modified: trunk/src/plugins/wiki/www/TODO
===================================================================
--- trunk/src/plugins/wiki/www/TODO	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/TODO	2010-09-01 18:19:59 UTC (rev 10384)
@@ -11,7 +11,6 @@
 ** in MonoBook, IEFixes.js cannot be minimized, yuicompressor-2.4.2 gives syntax errors
 * plugin Video does not work
 
-
 short-term TODO:
 * rename should check existing subpages and rename these also.
 * Sidebar: merge AVL theme (internal MonoBook derivate with customizable 
@@ -161,7 +160,7 @@
 
     * change remove_page in WikiDb API, so that RecentChanges displays it.
       (just purge all revisions?)
-    * rename global $Theme to $WikiTheme (gforge nameclash) (100%)
+    * rename global $Theme to $WikiTheme (Gforge nameclash) (100%)
 
 1.4.0 Goals:
 

Modified: trunk/src/plugins/wiki/www/config/config-dist.ini
===================================================================
--- trunk/src/plugins/wiki/www/config/config-dist.ini	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/config/config-dist.ini	2010-09-01 18:19:59 UTC (rev 10384)
@@ -626,7 +626,8 @@
 ;   LDAP:          Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN
 ;   IMAP:          Authenticate against IMAP_AUTH_HOST (email account)
 ;   POP3:          Authenticate against POP3_AUTH_HOST (email account)
-;   Session:       Get username and level from a PHP session variable. (e.g. for gforge)
+;   Session:       Get username and level from a PHP session variable
+;                  (e.g. for FusionForge)
 ;   File:          Store username:crypted-passwords in .htaccess like files. 
 ;                  Use Apache's htpasswd to manage this file.
 ;   HttpAuth:      Use the protection by the webserver (.htaccess/.htpasswd)

Modified: trunk/src/plugins/wiki/www/configurator.php
===================================================================
--- trunk/src/plugins/wiki/www/configurator.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/configurator.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id: configurator.php 7568 2010-06-24 14:45:19Z vargenau $
+<?php // -*-php-*- $Id: configurator.php 7664 2010-08-31 15:42:34Z vargenau $
 /*
  * Copyright 2002,2003,2005,2008-2010 $ThePhpWikiProgrammingTeam
  * Copyright 2002 Martin Geisler <gimpster at gimpster.com> 
@@ -163,7 +163,7 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<!-- $Id: configurator.php 7568 2010-06-24 14:45:19Z vargenau $ -->
+<!-- $Id: configurator.php 7664 2010-08-31 15:42:34Z vargenau $ -->
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>Configuration tool for PhpWiki <?php echo $config_file ?></title>
 <style type="text/css" media="screen">
@@ -889,7 +889,7 @@
 <dt>POP3</dt>
 	<dd>Authenticate against POP3_AUTH_HOST (email account)</dd>
 <dt>Session</dt>
-	<dd>Get username and level from a PHP session variable. (e.g. for gforge)</dd>
+	<dd>Get username and level from a PHP session variable. (e.g. for FusionForge)</dd>
 <dt>File</dt>
 	<dd>Store username:crypted-passwords in .htaccess like files. 
          Use Apache's htpasswd to manage this file.</dd>

Modified: trunk/src/plugins/wiki/www/doc/CREDITS
===================================================================
--- trunk/src/plugins/wiki/www/doc/CREDITS	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/doc/CREDITS	2010-09-01 18:19:59 UTC (rev 10384)
@@ -23,8 +23,8 @@
 ! Developers
 
 ;[ Marc-Etienne Vargenau | mailto:vargenau at users.sourceforge.net ] :
-;: Chief of gforge integration, WikiCreole integration, 
-;: html conformity, documentation, ...
+;: Chief of FusionForge integration, WikiCreole integration, 
+;: HTML conformity, documentation, ...
 
 ;Sabri Labbenes
 ;: Wikiwyg
@@ -217,7 +217,7 @@
 Michael Heilemann (Kubrick css)
 Gabriel Wicke (MonoBook layout, CSS and js)
 Chris Snyder (RawHtml safe mode)
-Martin Langhoff <martin at catalyst.net.nz> (gforge integration)
+Martin Langhoff <martin at catalyst.net.nz> (Gforge integration)
 Ry4an Brase (IRC gateway)
 Sara von Mosch (Word to wiki converter)
 </pre>
@@ -230,4 +230,4 @@
 * Grant Morgan http://c2.com/cgi-bin/wiki?GrantMorgan,
 * and especially Clifford A. Adams: http://c2.com/cgi-bin/wiki?CliffordAdams
 
- $Id: CREDITS 7556 2010-06-23 13:13:12Z rurban $
+ $Id: CREDITS 7664 2010-08-31 15:42:34Z vargenau $

Modified: trunk/src/plugins/wiki/www/doc/HISTORY
===================================================================
--- trunk/src/plugins/wiki/www/doc/HISTORY	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/doc/HISTORY	2010-09-01 18:19:59 UTC (rev 10384)
@@ -81,7 +81,7 @@
 * brought WikiUser (old) uptodate
 * added owner and acl fields to dumps
 * import GOOGLE_LICENSE_KEY and FORTUNE_DIR from config.ini
-* renamed global $Theme to $WikiTheme (gforge nameclash)
+* renamed global $Theme to $WikiTheme (Gforge nameclash)
 
 new:
 * new ENABLE_EDIT_TOOLBAR (from mediawiki), JS_SEARCHREPLACE currently broken.
@@ -596,4 +596,4 @@
 Prior to 0.02, there were no numbered releases, and in fact there
 was only one release, so I guess that would be 0.01 :-)
 
-$Id: HISTORY 6718 2009-03-26 12:47:00Z vargenau $
+$Id: HISTORY 7665 2010-08-31 15:54:37Z vargenau $

Modified: trunk/src/plugins/wiki/www/doc/phpwiki.doxygen
===================================================================
--- trunk/src/plugins/wiki/www/doc/phpwiki.doxygen	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/doc/phpwiki.doxygen	2010-09-01 18:19:59 UTC (rev 10384)
@@ -563,7 +563,7 @@
 # and error messages should be written. If left blank the output is written
 # to stderr.
 
-WARN_LOGFILE           = ../apidocs/phpwiki/output.log
+WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
@@ -574,7 +574,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = gforge/plugins/wiki/www/lib
+INPUT                  = www/wiki/lib
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -773,7 +773,7 @@
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = ../apidocs/phpwiki
+HTML_OUTPUT            = ../../apidocs/phpwiki
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank

Modified: trunk/src/plugins/wiki/www/g
===================================================================
--- trunk/src/plugins/wiki/www/g	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/g	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id: g 7645 2010-08-13 14:22:15Z vargenau $
+<?php // -*-php-*- $Id: g 7666 2010-08-31 16:02:45Z vargenau $
 
 /*
  * Copyright (C) 2008-2010 Alcatel-Lucent
@@ -66,17 +66,17 @@
     define('VIRTUAL_PATH', '/wiki/g/'.$group_name);
     define('PAGE_PREFIX', '_g'.$group_id.'_');
 
-    define('THEME', 'gforge');
+    define('THEME', 'fusionforge');
 
-    // For Gforge, we create some specific pages, located in the theme
+    // For FusionForge, we create some specific pages, located in the theme
     // except for project "help"
     if ($group_name == "help") {
         define('WIKI_PGSRC', 'pgsrc');
     } else {
-        define('WIKI_PGSRC', 'themes/gforge/pgsrc');
+        define('WIKI_PGSRC', 'themes/fusionforge/pgsrc');
     }
 
-    define('GFORGE', true);
+    define('FUSIONFORGE', true);
 
     define('PATH_INFO_PREFIX', '/'.$group_name . '/');
     define('USE_PATH_INFO', true);
@@ -102,7 +102,7 @@
     // Get the maximum upload filesize from PHP config
     define('MAX_UPLOAD_SIZE', octets(ini_get('upload_max_filesize')));
 
-    // Disable access log (already in apache & gforge).
+    // Disable access log (already in Apache & FusionForge).
     define('ACCESS_LOG_SQL', 0);
 
     define('DEBUG', ($sys_install_type != 'production'));
@@ -115,7 +115,7 @@
     // Disable VACUUM (they are performed every night)
     define('DATABASE_OPTIMISE_FREQUENCY', 0);
 
-    // TBD: the name should be taken from Gforge
+    // TBD: the name should be taken from FusionForge
     // define('ADMIN_USER', 'ACOS Forge Administrator');
     define('ADMIN_USER', 'The PhpWiki programming team');
     // Dummy value
@@ -160,9 +160,9 @@
     // Do not allow fake user
     define('ALLOW_BOGO_LOGIN', false);
 
-    // A dedicated auth has been created to get auth from GForge
-    $USER_AUTH_ORDER = array("GForge");
-    define('USER_AUTH_ORDER', 'GForge');
+    // A dedicated auth has been created to get auth from FusionForge
+    $USER_AUTH_ORDER = array("FusionForge");
+    define('USER_AUTH_ORDER', 'FusionForge');
     define('USER_AUTH_POLICY', 'strict');
 
     define('EXTERNAL_LINK_TARGET', '_top');
@@ -171,7 +171,7 @@
     $LANG='en'; $LC_ALL='en_US';
 
     // We use a local interwiki map file
-    define('INTERWIKI_MAP_FILE', 'themes/gforge/interwiki.map');
+    define('INTERWIKI_MAP_FILE', 'themes/fusionforge/interwiki.map');
 
     define('DEFAULT_WIKI_PAGES', "");
 

Modified: trunk/src/plugins/wiki/www/lib/CachedMarkup.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/CachedMarkup.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/CachedMarkup.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: CachedMarkup.php 7638 2010-08-11 11:58:40Z vargenau $');
+// rcs_id('$Id: CachedMarkup.php 7664 2010-08-31 15:42:34Z vargenau $');
 /* Copyright (C) 2002 Geoffrey T. Dairiki <dairiki at dairiki.org>
  * Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -37,13 +37,13 @@
 
     function pack() {
 
-        // Gforge hack
+        // FusionForge hack
         // This causes a strange bug when a comment containing
         // a single quote is entered in the Summary box:
         // - the history is wrong (user and comment missing)
         // - the table of contents plugin no longer works
         global $WikiTheme;
-        if (isa($WikiTheme, 'WikiTheme_gforge')) {
+        if (isa($WikiTheme, 'WikiTheme_fusionforge')) {
             return serialize($this);
         }
 

Modified: trunk/src/plugins/wiki/www/lib/EditToolbar.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/EditToolbar.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/EditToolbar.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: EditToolbar.php 7473 2010-06-07 10:59:48Z rurban $');
+// rcs_id('$Id: EditToolbar.php 7659 2010-08-31 14:55:29Z vargenau $');
 /* Copyright 2004-2010 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
  *
@@ -114,7 +114,7 @@
 
         if (ENABLE_EDIT_TOOLBAR) {
             $username = $request->_user->UserName();
-            if (GFORGE or DISABLE_MARKUP_WIKIWORD or (!isWikiWord($username))) {
+            if (FUSIONFORGE or DISABLE_MARKUP_WIKIWORD or (!isWikiWord($username))) {
                 $username = '[['.$username.']]';
             }
 	    $signature = " ––".$username." ".CTime();
@@ -302,7 +302,7 @@
             $categories = array();
             while ($p = $pages->next()) {
 		$page = $p->getName();
-                if (GFORGE) {
+                if (FUSIONFORGE) {
                     $categories[] = "['$page', '%0A----%0A%5B%5B".$page."%5D%5D']";
 		} else if (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) {
 		    $categories[] = "['$page', '%0A%5B".$page."%5D']";

Modified: trunk/src/plugins/wiki/www/lib/IniConfig.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/IniConfig.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/IniConfig.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,10 +1,10 @@
 <?php
-// rcs_id('$Id: IniConfig.php 7644 2010-08-13 13:34:26Z vargenau $');
+// rcs_id('$Id: IniConfig.php 7666 2010-08-31 16:02:45Z vargenau $');
 /**
  * A configurator intended to read its config from a PHP-style INI file,
  * instead of a PHP file.
  *
- * Pass a filename to the IniConfig() function and it will read all it's
+ * Pass a filename to the IniConfig() function and it will read all its
  * definitions from there, all by itself, and proceed to do a mass-define
  * of all valid PHPWiki config items.  In this way, we can hopefully be
  * totally backwards-compatible with the old index.php method, while still
@@ -44,7 +44,7 @@
  * - Old-style index.php => config/config.ini converter.
  *
  * - Don't use too much globals for easier integration into other projects
- *   (namespace pollution). (gforge, phpnuke, postnuke, phpBB2, carolina, ...)
+ *   (namespace pollution). (FusionForge, phpnuke, postnuke, phpBB2, carolina, ...)
  *   Use one global $phpwiki object instead which holds the cfg vars, constants
  *   and all other globals.
  *     (global $FieldSeparator, $charset, $WikiNameRegexp, $KeywordLinkRegexp;
@@ -194,7 +194,7 @@
          'DISABLE_HTTP_REDIRECT',
          'PLUGIN_CACHED_USECACHE', 'PLUGIN_CACHED_FORCE_SYNCMAP',
          'BLOG_DEFAULT_EMPTY_PREFIX', 'DATABASE_PERSISTENT',
-         'GFORGE',
+         'FUSIONFORGE',
          'ENABLE_DISCUSSION_LINK', 'ENABLE_CAPTCHA',
          'ENABLE_WYSIWYG', 'WYSIWYG_DEFAULT_PAGETYPE_HTML',
          'DISABLE_MARKUP_WIKIWORD', 'ENABLE_MARKUP_COLOR', 'ENABLE_MARKUP_TEMPLATE',
@@ -620,8 +620,8 @@
       .'UserRatings:' // UserRatings works only in wikilens derived themes
       .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect');
 
-    // The GFORGE theme omits them
-    if (!GFORGE) {
+    // The FUSIONFORGE theme omits them
+    if (!FUSIONFORGE) {
        // Add some some action pages depending on configuration
        if (DEBUG) {
           $ActionPages[] = 'DebugInfo';
@@ -708,8 +708,8 @@
     $AllAllowedPlugins[] = 'WikiPoll';
     $AllAllowedPlugins[] = 'YouTube';
 
-    // The GFORGE theme omits them
-    if (!GFORGE) {
+    // The FUSIONFORGE theme omits them
+    if (!FUSIONFORGE) {
         $AllAllowedPlugins[] = 'AddComment';
         $AllAllowedPlugins[] = 'AnalyseAccessLogSql';
         $AllAllowedPlugins[] = 'AsciiMath';
@@ -743,18 +743,19 @@
         $AllAllowedPlugins[] = '_WikiTranslation';
     }
 
-    // Used by SetupWiki to pull in required pages, if not translated, then in english.
+    // Used by SetupWiki to pull in required pages, if not translated, then in English.
     // Also used by _WikiTranslation. Really important are only those which return pagelists
     // or contain basic functionality.
     $AllActionPages = $ActionPages;
     $AllActionPages[] = 'AllPagesCreatedByMe';
     $AllActionPages[] = 'AllPagesLastEditedByMe';
     $AllActionPages[] = 'AllPagesOwnedByMe';
+    $AllActionPages[] = 'AllPagesByAcl';
     $AllActionPages[] = 'AllUserPages';
     $AllActionPages[] = 'FullRecentChanges';
     $AllActionPages[] = 'LeastPopular';
     $AllActionPages[] = 'LockedPages';
-    $AllActionPages[] = 'MyRatings'; // MyRatings works only in wikilens derived themes
+    $AllActionPages[] = 'MyRatings'; // MyRatings works only in wikilens-derived themes
     $AllActionPages[] = 'MyRecentEdits';
     $AllActionPages[] = 'MyRecentChanges';
     $AllActionPages[] = 'PhpWikiAdministration';
@@ -772,8 +773,8 @@
     $AllActionPages[] = 'SetGlobalAccessRightsSimple';
     $AllActionPages[] = 'UserContribs';
 
-    // The GFORGE theme omits them
-    if (!GFORGE) {
+    // The FUSIONFORGE theme omits them
+    if (!FUSIONFORGE) {
        // Add some some action pages depending on configuration
        if (DEBUG) {
           $AllActionPages[] = 'PhpWikiAdministration/Chmod';
@@ -781,7 +782,7 @@
        $AllActionPages[] = 'PhpWikiAdministration/Markup';
     }
 
-    if (GFORGE) {
+    if (FUSIONFORGE) {
        if (ENABLE_EXTERNAL_PAGES) {
           $AllAllowedPlugins[] = 'WikiAdminSetExternal';
           $AllActionPages[] = 'ExternalPages';
@@ -917,8 +918,8 @@
     if (!defined('DEFAULT_LANGUAGE'))   // not needed anymore
         define('DEFAULT_LANGUAGE', ''); // detect from client
 
-    // Gforge hack
-    if (!GFORGE) {
+    // FusionForge hack
+    if (!FUSIONFORGE) {
         // Disable update_locale because Zend Debugger crash
         if(! extension_loaded('Zend Debugger')) {
             update_locale(isset($LANG) ? $LANG : DEFAULT_LANGUAGE);

Modified: trunk/src/plugins/wiki/www/lib/MailNotify.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/MailNotify.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/MailNotify.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: MailNotify.php 7566 2010-06-23 19:43:46Z rurban $');
+// rcs_id('$Id: MailNotify.php 7666 2010-08-31 16:02:45Z vargenau $');
 /* Copyright (C) 2006-2007,2009 Reini Urban
  * Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent
  *
@@ -61,7 +61,7 @@
 
     function fromId() {
         global $request;
-        if (GFORGE) {
+        if (FUSIONFORGE) {
             return $request->_user->getId();
         } else {
             return $request->_user->getId() . '@' .  $request->get('REMOTE_HOST');
@@ -72,7 +72,7 @@
         global $request;
 
         // Disable verification of emails for corporate env.
-        if (GFORGE) {
+        if (FUSIONFORGE) {
             $doverify = false;
         }
 
@@ -187,8 +187,8 @@
         $encoded_subject = $this->subject_encode($subject);
         $emails = $this->emails;
         $from = $this->from;
-        // Do not send if modification is from Gforge admin
-        if (GFORGE and $from == ADMIN_USER) {
+        // Do not send if modification is from FusionForge admin
+        if (FUSIONFORGE and $from == ADMIN_USER) {
             return;
         }
         if (!$notice) $notice = _("PageChange Notification of %s");

Modified: trunk/src/plugins/wiki/www/lib/PageList.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/PageList.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/PageList.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php
-//rcs_id('$Id: PageList.php 7638 2010-08-11 11:58:40Z vargenau $');
+//rcs_id('$Id: PageList.php 7659 2010-08-31 14:55:29Z vargenau $');
 /* Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
  *
@@ -22,43 +22,9 @@
 
 /**
  * List a number of pagenames, optionally as table with various columns.
- * This library relieves some work for these plugins:
  *
- * AllPages, BackLinks, LikePages, MostPopular, TitleSearch, WikiAdmin* and more
+ * See pgsrc/Help%2FPageList for arguments and details
  *
- * It also allows dynamic expansion of those plugins to include more
- * columns in their output.
- *
- * Column 'info=' arguments:
- *
- * 'pagename' _("Page Name")
- * 'mtime'    _("Last Modified")
- * 'hits'     _("Hits")
- * 'summary'  _("Last Summary")
- * 'version'  _("Version")),
- * 'author'   _("Last Author")),
- * 'locked'   _("Locked"), _("locked")
- * 'minor'    _("Minor Edit"), _("minor")
- * 'markup'   _("Markup")
- * 'size'     _("Size")
- * 'creator'  _("Creator")
- * 'owner'    _("Owner")
- * 'checkbox'  selectable checkbox at the left.
- * 'content'
- *
- * Special, custom columns: Either theme or plugin (WikiAdmin*) specific.
- * 'remove'   _("Remove")   
- * 'perm'     _("Permission Mask")
- * 'acl'      _("ACL")
- * 'renamed_pagename'   _("Rename to")
- * 'ratingwidget', ... wikilens theme specific.
- * 'custom'   See plugin/_WikiTranslation
- *
- * Symbolic 'info=' arguments:
- * 'all'       All columns except the special columns
- * 'most'      pagename, mtime, author, size, hits, ...
- * 'some'      pagename, mtime, author
- *
  * FIXME: In this refactoring I (Jeff) have un-implemented _ctime, _cauthor, and
  * number-of-revision.  Note the _ctime and _cauthor as they were implemented
  * were somewhat flawed: revision 1 of a page doesn't have to exist in the
@@ -546,6 +512,35 @@
     }
 };
 
+class _PageList_Column_perm extends _PageList_Column {
+    function _getValue ($page_handle, &$revision_handle) {
+        $perm_array = pagePermissions($page_handle->_pagename);
+        return pagePermissionsSimpleFormat($perm_array,
+                                           $page_handle->get('author'),
+                                           $page_handle->get('group'));
+    }
+};
+
+class _PageList_Column_acl extends _PageList_Column {
+    function _getValue ($page_handle, &$revision_handle) {
+        $perm_tree = pagePermissions($page_handle->_pagename);
+
+        list($type, $perm) = pagePermissionsAcl($perm_tree[0], $perm_tree);
+        if ($type == 'inherited') {
+            $type = sprintf(_("page permission inherited from %s"), $perm_tree[1][0]);
+        } elseif ($type == 'page') {
+            $type = _("individual page permission");
+        } elseif ($type == 'default') {
+            $type = _("default page permission");
+        }
+        $result = HTML::span();
+        $result->pushContent($type);
+        $result->pushContent(HTML::br());
+        $result->pushContent($perm->asAclLines());
+        return $result;
+    }
+};
+
 class PageList {
     var $_group_rows = 3;
     var $_columns = array();
@@ -1176,11 +1171,11 @@
                   // initialised by the plugin
                   'renamed_pagename'
                   => new _PageList_Column_renamed_pagename('rename', _("Rename to")),
+                  */
                   'perm'
                   => new _PageList_Column_perm('perm', _("Permission")),
                   'acl'
                   => new _PageList_Column_acl('acl', _("ACL")),
-                  */
                   'checkbox'
                   => new _PageList_Column_checkbox('p', _("All")),
                   'pagename'
@@ -1287,7 +1282,7 @@
                 trigger_error(sprintf("%s: Bad column", $column), E_USER_NOTICE);
             return false;
         }
-        if (!GFORGE) {
+        if (!FUSIONFORGE) {
             // FIXME: anon users might rate and see ratings also.
             // Defer this logic to the plugin.
             if ($column == 'rating' and !$GLOBALS['request']->_user->isSignedIn()) {

Modified: trunk/src/plugins/wiki/www/lib/PagePerm.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/PagePerm.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/PagePerm.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PagePerm.php 7634 2010-08-09 15:30:20Z vargenau $');
+// rcs_id('$Id: PagePerm.php 7659 2010-08-31 14:55:29Z vargenau $');
 /*
  * Copyright 2004,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -236,7 +236,7 @@
     $page = $request->getPage($pagename);
 
     // Exceptions:
-    if (GFORGE) {
+    if (FUSIONFORGE) {
     	if ($pagename != '.' && isset($request->_user->_is_external) && $request->_user->_is_external && ! $page->get('external')) {
     		$permcache[$pagename][$access] = 0;
     		return 0;
@@ -705,32 +705,6 @@
         return $s;
     }
 
-    // Print ACL as group followed by actions allowed for the group
-    function asAclGroupLines() {
-
-        $s = '';
-        $perm =& $this->perm;
-        $actions = array("view", "edit", "create", "list", "remove", "purge", "dump", "change");
-        $groups = array(ACL_EVERY, ACL_ANONYMOUS, ACL_BOGOUSER, ACL_HASHOMEPAGE, ACL_SIGNED, ACL_AUTHENTICATED, ACL_ADMIN, ACL_OWNER, ACL_CREATOR);
-
-        foreach ($groups as $group) {
-            $none = true;
-            foreach ($actions as $action) {
-                if (isset($perm[$action][$group])) {
-                    if ($none) {
-                        $none = false;
-                        $s .= "$group:";
-                    }
-                    $s .= (($perm[$action][$group] ? " " : " -") . $action);
-                }
-            }
-            if (!($none)) {
-                $s .= "; ";
-            }
-        }
-        return $s;
-    }
-
     // This is just a bad hack for testing.
     // Simplify the ACL to a unix-like "rwx------+" string
     // See getfacl(8)

Modified: trunk/src/plugins/wiki/www/lib/SemanticWeb.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/SemanticWeb.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/SemanticWeb.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: SemanticWeb.php 7641 2010-08-11 13:00:46Z vargenau $');
+<?php // rcs_id('$Id: SemanticWeb.php 7663 2010-08-31 15:23:17Z vargenau $');
 /**
  * What to do on ?format=rdf  What to do on ?format=owl
  *
@@ -77,7 +77,7 @@
  *   http://phpwiki.org/SemanticWeb,
  *   http://en.wikipedia.org/wiki/Knowledge_representation
  *   http://www.ontoweb.org/
- *   http://www.semwebcentral.org/ (OWL on top of GForge)
+ *   http://www.semwebcentral.org/ (OWL on top of FusionForge)
  *
  *
  * Author: Reini Urban <rurban at x-ray.at>

Modified: trunk/src/plugins/wiki/www/lib/WikiTheme.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/WikiTheme.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/WikiTheme.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: WikiTheme.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // rcs_id('$Id: WikiTheme.php 7666 2010-08-31 16:02:45Z vargenau $');
 /* Copyright (C) 2002,2004,2005,2006,2008,2009,2010 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
@@ -223,8 +223,8 @@
             return;
         }
         $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikicommon.js"))));
-        if (!GFORGE) {
-            // Gforge already loads this
+        if (!FUSIONFORGE) {
+            // FusionForge already loads this
             $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("sortable.js"))));
         }
         // by pixels

Copied: trunk/src/plugins/wiki/www/lib/WikiUser/FusionForge.php (from rev 10383, trunk/src/plugins/wiki/www/lib/WikiUser/GForge.php)
===================================================================
--- trunk/src/plugins/wiki/www/lib/WikiUser/FusionForge.php	                        (rev 0)
+++ trunk/src/plugins/wiki/www/lib/WikiUser/FusionForge.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -0,0 +1,108 @@
+<?php //-*-php-*-
+// rcs_id('$Id: FusionForge.php 7663 2010-08-31 15:23:17Z vargenau $');
+/*
+ * Copyright (C) 2006 Alain Peyrat
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/** Call the FusionForge functions to get the username
+ *
+ */
+class _FusionForgePassUser extends _PassUser {
+
+    var $_is_external = 0;
+
+    function _FusionForgePassUser($UserName='',$prefs=false) {
+        if ($prefs) $this->_prefs = $prefs;
+        if (!isset($this->_prefs->_method))
+           _PassUser::_PassUser($UserName);
+        if ($UserName) $this->_userid = $UserName;
+        $this->_authmethod = 'FusionForge';
+
+        // Is this double check really needed?
+        // It is not expensive so we keep it for now.
+        if ($this->userExists())
+            return $this;
+        else
+            return $GLOBALS['ForbiddenUser'];
+    }
+
+    function userExists() {
+            global $group_id;
+
+        // Mapping (PhpWiki vs FusionForge) performed is:
+        //     ANON  for non logged or non member
+        //     USER  for member of the project.
+        //     ADMIN for member having admin rights
+        if (session_loggedin()){
+
+            // Get project object (if error => ANON)
+            $project =& group_get_object($group_id);
+
+            if (!$project || !is_object($project)) {
+                $this->_level = WIKIAUTH_ANON;
+                return false;
+            } elseif ($project->isError()) {
+                $this->_level = WIKIAUTH_ANON;
+                return false;
+            }
+
+            $member = false ;
+            $user = session_get_user();
+            $perm =& $project->getPermission($user);
+            if (!$perm || !is_object($perm)) {
+                $this->_level = WIKIAUTH_ANON;
+                return false;
+            } elseif (!$perm->isError()) {
+                $member = $perm->isMember();
+            }
+
+            if ($member) {
+                $this->_userid = $user->getRealName();
+                $this->_is_external = $user->getIsExternal();
+                if ($perm->isAdmin()) {
+                    $this->_level = WIKIAUTH_ADMIN;
+                } else {
+                    $this->_level = WIKIAUTH_USER;
+                }
+                return $this;
+            }
+        }
+               $this->_level = WIKIAUTH_ANON;
+               return false;
+    }
+
+    function checkPass($submitted_password) {
+        return $this->userExists()
+            ? ($this->isAdmin() ? WIKIAUTH_ADMIN : WIKIAUTH_USER)
+            : WIKIAUTH_ANON;
+    }
+
+    function mayChangePass() {
+        return false;
+    }
+}
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
+?>

Deleted: trunk/src/plugins/wiki/www/lib/WikiUser/GForge.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/WikiUser/GForge.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/WikiUser/GForge.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,108 +0,0 @@
-<?php //-*-php-*-
-// rcs_id('$Id: GForge.php 7640 2010-08-11 12:33:25Z vargenau $');
-/*
- * Copyright (C) 2006 Alain Peyrat
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/** Call the gforge functions to get the username
- *
- */
-class _GForgePassUser extends _PassUser {
-
-    var $_is_external = 0;
-
-    function _GForgePassUser($UserName='',$prefs=false) {
-        if ($prefs) $this->_prefs = $prefs;
-        if (!isset($this->_prefs->_method))
-           _PassUser::_PassUser($UserName);
-        if ($UserName) $this->_userid = $UserName;
-        $this->_authmethod = 'GForge';
-
-        // Is this double check really needed?
-        // It is not expensive so we keep it for now.
-        if ($this->userExists())
-            return $this;
-        else
-            return $GLOBALS['ForbiddenUser'];
-    }
-
-    function userExists() {
-            global $group_id;
-
-        // Mapping (phpWiki vs GForge) performed is:
-        //     ANON  for non logged or non member
-        //     USER  for member of the project.
-        //     ADMIN for member having admin rights
-        if (session_loggedin()){
-
-            // Get project object (if error => ANON)
-            $project =& group_get_object($group_id);
-
-            if (!$project || !is_object($project)) {
-                $this->_level = WIKIAUTH_ANON;
-                return false;
-            } elseif ($project->isError()) {
-                $this->_level = WIKIAUTH_ANON;
-                return false;
-            }
-
-            $member = false ;
-            $user = session_get_user();
-            $perm =& $project->getPermission($user);
-            if (!$perm || !is_object($perm)) {
-                $this->_level = WIKIAUTH_ANON;
-                return false;
-            } elseif (!$perm->isError()) {
-                $member = $perm->isMember();
-            }
-
-            if ($member) {
-                $this->_userid = $user->getRealName();
-                $this->_is_external = $user->getIsExternal();
-                if ($perm->isAdmin()) {
-                    $this->_level = WIKIAUTH_ADMIN;
-                } else {
-                    $this->_level = WIKIAUTH_USER;
-                }
-                return $this;
-            }
-        }
-               $this->_level = WIKIAUTH_ANON;
-               return false;
-    }
-
-    function checkPass($submitted_password) {
-        return $this->userExists()
-            ? ($this->isAdmin() ? WIKIAUTH_ADMIN : WIKIAUTH_USER)
-            : WIKIAUTH_ANON;
-    }
-
-    function mayChangePass() {
-        return false;
-    }
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:
-?>

Modified: trunk/src/plugins/wiki/www/lib/WikiUserNew.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/WikiUserNew.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/WikiUserNew.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-//rcs_id('$Id: WikiUserNew.php 7506 2010-06-09 10:06:37Z vargenau $');
+//rcs_id('$Id: WikiUserNew.php 7666 2010-08-31 16:02:45Z vargenau $');
 /* Copyright (C) 2004,2005,2006,2007,2009,2010 $ThePhpWikiProgrammingTeam
 * Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
 * Copyright (C) 2009-2010 Roger Guignard, Alcatel-Lucent
@@ -563,7 +563,7 @@
     function isValidName ($userid = false) {
         if (!$userid) $userid = $this->_userid;
         if (!$userid) return false;
-        if (GFORGE) {
+        if (FUSIONFORGE) {
             return true;
         }
         return preg_match("/^[\-\w\.@ ]+$/U", $userid) and strlen($userid) < 32;
@@ -1775,8 +1775,8 @@
 extends _UserPreference
 {
     function get($name) {
-        // get email address from Gforge
-        if (GFORGE && session_loggedin()) {
+        // get e-mail address from FusionForge
+        if (FUSIONFORGE && session_loggedin()) {
             $user = session_get_user();
             return $user->getEmail();
         } else {
@@ -1785,8 +1785,8 @@
     }
 
     function sanify($value) {
-        // email address is already checked by Gforge
-        if (GFORGE) return $value;
+        // e-mail address is already checked by FusionForge
+        if (FUSIONFORGE) return $value;
         // check for valid email address
         if ($this->get('email') == $value and $this->getraw('emailVerified'))
             return $value;
@@ -1807,8 +1807,8 @@
      * For true verification (value = 2), we'd need a mailserver hook.
      */
     function update($value) {
-        // email address is already checked by Gforge
-        if (GFORGE) return $value;
+        // e-mail address is already checked by FusionForge
+        if (FUSIONFORGE) return $value;
     	if (!empty($this->_init)) return;
         $verified = $this->getraw('emailVerified');
         // hack!
@@ -1982,9 +1982,9 @@
                     );
 
         // This should be probably be done with $customUserPreferenceColumns
-        // For now, we use GFORGE define
-        if (GFORGE) {
-            $gforgeprefs = array(
+        // For now, we use FUSIONFORGE define
+        if (FUSIONFORGE) {
+            $fusionforgeprefs = array(
                     'pageTrail'     => new _UserPreference_bool(),
                     'diffMenuItem' => new _UserPreference_bool(),
                     'pageInfoMenuItem' => new _UserPreference_bool(),
@@ -2002,7 +2002,7 @@
                     'likePagesMenuItem' => new _UserPreference_bool(),
                     'specialPagesMenuItem' => new _UserPreference_bool(),
                     );
-            $this->_prefs = array_merge($this->_prefs, $gforgeprefs);
+            $this->_prefs = array_merge($this->_prefs, $fusionforgeprefs);
         }
 
         // add custom theme-specific pref types:
@@ -2161,7 +2161,7 @@
             }
         }
 
-        if (GFORGE) {
+        if (FUSIONFORGE) {
             // Merge current notifyPages with notifyPagesAll
             // notifyPages are pages to notify in the current project
             // while $notifyPagesAll is used to store all the monitored pages.
@@ -2210,7 +2210,7 @@
             }
         }
         
-        if (GFORGE) {
+        if (FUSIONFORGE) {
             // Restore notifyPages from notifyPagesAll
             // notifyPages are pages to notify in the current project
             // while $notifyPagesAll is used to store all the monitored pages.

Modified: trunk/src/plugins/wiki/www/lib/loadsave.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/loadsave.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/loadsave.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: loadsave.php 7641 2010-08-11 13:00:46Z vargenau $');
+// rcs_id('$Id: loadsave.php 7664 2010-08-31 15:42:34Z vargenau $');
 
 /*
  * Copyright 1999,2000,2001,2002,2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
@@ -113,7 +113,7 @@
     PrintXML(HTML::p(HTML::strong(_("Complete."))),
              HTML::p(fmt("Return to %s", $pagelink)));
     // Ugly hack to get valid XHTML code
-    if (isa($WikiTheme, 'WikiTheme_gforge')) {
+    if (isa($WikiTheme, 'WikiTheme_fusionforge')) {
         echo "</div>\n";
         echo "</td></tr>\n";
         echo "</table>\n";
@@ -1527,7 +1527,7 @@
     // Ensure that all mandatory pages are loaded
     $finder = new FileFinder;
 
-    if (!GFORGE) {
+    if (!FUSIONFORGE) {
         $mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
     } else if (WIKI_NAME == "help") {
         $mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');

Modified: trunk/src/plugins/wiki/www/lib/main.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/main.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/main.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: main.php 7644 2010-08-13 13:34:26Z vargenau $');
+// rcs_id('$Id: main.php 7664 2010-08-31 15:42:34Z vargenau $');
 /*
  * Copyright 1999-2008 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -115,7 +115,7 @@
                 if (isset($this->_user) and
                      ( ! isa($this->_user, WikiUserClassname())
                        or (strtolower(get_class($this->_user)) == '_passuser')
-                       or (strtolower(get_class($this->_user)) == '_gforgepassuser')))
+                       or (strtolower(get_class($this->_user)) == '_fusionforgepassuser')))
                 {
                     $this->_user = WikiUser($userid, $this->_user->_prefs);
                 }
@@ -954,7 +954,7 @@
             // Switched auth between sessions.
             // Note: There's no way to demandload a missing class-definition
             // afterwards! Stupid php.
-            if (defined('GFORGE') and GFORGE) {
+            if (defined('FUSIONFORGE') and FUSIONFORGE) {
                 if (empty($HTTP_SERVER_VARS['PHP_AUTH_USER'])) {
                     return false;
                 }
@@ -1413,11 +1413,14 @@
     $request->finish();
 }
 
-//$x = error_reporting();  // DEBUG: why is it 1 here? should be E_ALL
-if (defined('E_STRICT') and (E_ALL & E_STRICT)) // strict php5?
-	error_reporting(E_ALL & ~E_STRICT);         // exclude E_STRICT
-else
-	error_reporting(E_ALL); // php4
+if ((!FUSIONFORGE) || (forge_get_config('installation_environment') != 'production')) {
+    if (defined('E_STRICT') and (E_ALL & E_STRICT)) // strict php5?
+        error_reporting(E_ALL & ~E_STRICT);         // exclude E_STRICT
+    else
+        error_reporting(E_ALL); // php4
+} else {
+    error_reporting(E_ERROR);
+}
 
 // don't run the main loop for special requests (test, getimg, xmlrpc, soap, ...)
 if (!defined('PHPWIKI_NOMAIN') or !PHPWIKI_NOMAIN)

Modified: trunk/src/plugins/wiki/www/lib/nusoap/nusoap.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/nusoap/nusoap.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/nusoap/nusoap.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -3632,7 +3632,7 @@
 * @version  v 0.6.3
 * @access   public
 */
-class pwsoapclient extends nusoap_base  {
+class soapclient extends nusoap_base  {
 
     var $username = '';
     var $password = '';

Modified: trunk/src/plugins/wiki/www/lib/plugin/PluginManager.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/plugin/PluginManager.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/plugin/PluginManager.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PluginManager.php 7417 2010-05-19 12:57:42Z vargenau $');
+// rcs_id('$Id: PluginManager.php 7659 2010-08-31 14:55:29Z vargenau $');
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -120,7 +120,7 @@
             // make a link if an actionpage exists
             $pluginNamelink = $pluginName;
             $pluginDocPageName = _("Help")."/" . $pluginName . "Plugin";
-            if (defined('GFORGE') and GFORGE) {
+            if (defined('FUSIONFORGE') and FUSIONFORGE) {
                 $pluginDocPageName = _("Help").":" . $pluginName . "Plugin";
             }
 
@@ -148,7 +148,7 @@
                     $pluginDocPageNamelink = WikiLink($pluginDocPageName,'if_known');
             }
 
-            if (defined('GFORGE') and GFORGE) {
+            if (defined('FUSIONFORGE') and FUSIONFORGE) {
                 $pluginDocPageNamelink = WikiLink($pluginDocPageName, 'known');
             }
 

Modified: trunk/src/plugins/wiki/www/lib/plugin/RecentChanges.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/plugin/RecentChanges.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/plugin/RecentChanges.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RecentChanges.php 7638 2010-08-11 11:58:40Z vargenau $');
+// rcs_id('$Id: RecentChanges.php 7664 2010-08-31 15:42:34Z vargenau $');
 /**
  * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -494,7 +494,7 @@
             $linkorname = $this->pageLink($rev);
         }
 
-        if ((isa($WikiTheme, 'WikiTheme_MonoBook')) or (isa($WikiTheme, 'WikiTheme_gforge'))) {
+        if ((isa($WikiTheme, 'WikiTheme_MonoBook')) or (isa($WikiTheme, 'WikiTheme_fusionforge'))) {
             $line->pushContent(
                                $args['historylinks'] ? '' : $this->historyLink($rev),
                                ' . . ', $linkorname, '; ',

Modified: trunk/src/plugins/wiki/www/lib/plugin/RedirectTo.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/plugin/RedirectTo.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/plugin/RedirectTo.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RedirectTo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// rcs_id('$Id: RedirectTo.php 7653 2010-08-30 10:41:28Z vargenau $');
 /*
  * Copyright 2002 $ThePhpWikiProgrammingTeam
  *
@@ -59,14 +59,14 @@
         $href = $args['href'];
         $page = $args['page'];
         if ($href) {
-            /*
-             * Use quotes on the href argument value, like:
-             *   <<RedirectTo href="http://funky.com/a b \" c.htm" ?>
-             *
-             * Do we want some checking on href to avoid malicious
-             * uses of the plugin? Like stripping tags or hexcode.
-             */
-            $url = preg_replace('/%\d\d/','',strip_tags($href));
+            // If URL is urlencoded, decode it.
+            if (strpos('%', $href) !== false) {
+                $href = urldecode($href);
+            }
+            $url = strip_tags($href);
+            if ($url != $href) { // URL contains tags
+                return $this->disabled(_("Illegal characters in external URL."));
+            }
             $thispage = $request->getPage();
             if (! $thispage->get('locked')) {
                 return $this->disabled(_("Redirect to an external URL is only allowed in locked pages."));

Modified: trunk/src/plugins/wiki/www/lib/plugin/UpLoad.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/plugin/UpLoad.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/plugin/UpLoad.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: UpLoad.php 7638 2010-08-11 11:58:40Z vargenau $');
+// rcs_id('$Id: UpLoad.php 7659 2010-08-31 14:55:29Z vargenau $');
 /*
  * Copyright 2003,2004,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -174,7 +174,7 @@
             // Make sure that the user is logged in.
             $user = $request->getUser();
             if (!$user->isAuthenticated()) {
-                if (defined('GFORGE') and GFORGE) {
+                if (defined('FUSIONFORGE') and FUSIONFORGE) {
                     $message->pushContent(HTML::div(array('class' => 'error'),
                                             HTML::p(_("You cannot upload files.")),
                                             HTML::ul(

Modified: trunk/src/plugins/wiki/www/lib/plugin/UserPreferences.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/plugin/UserPreferences.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/plugin/UserPreferences.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: UserPreferences.php 7638 2010-08-11 11:58:40Z vargenau $');
+// rcs_id('$Id: UserPreferences.php 7659 2010-08-31 14:55:29Z vargenau $');
 /**
  * Copyright (C) 2001,2002,2003,2004,2005 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -68,7 +68,7 @@
         $user->_request = $request;
         if (isa($request,'MockRequest'))
             return '';
-        if (defined('GFORGE') and GFORGE) {
+        if (defined('FUSIONFORGE') and FUSIONFORGE) {
             if (!($user->isAuthenticated())) {
                 return HTML::div(array('class' => 'errors'),
                                  _("Error: You are not logged in, cannot display UserPreferences."));

Modified: trunk/src/plugins/wiki/www/lib/plugin/WatchPage.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/plugin/WatchPage.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/plugin/WatchPage.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WatchPage.php 7638 2010-08-11 11:58:40Z vargenau $');
+// rcs_id('$Id: WatchPage.php 7666 2010-08-31 16:02:45Z vargenau $');
 /**
  * Copyright (C) 2006 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -104,8 +104,8 @@
         $page = $args['page'];
         if (!$user->isAuthenticated() or empty($userid)) {
             // wrong or unauthenticated user
-            if (defined('GFORGE') and GFORGE) {
-                // No login banner for Gforge
+            if (defined('FUSIONFORGE') and FUSIONFORGE) {
+                // No login banner for FusionForge
                 return HTML::div(array('class' => 'error'),
                                  HTML::p(_("You must sign in to watch pages.")));
             }
@@ -113,7 +113,7 @@
         } else {
             $pref = &$request->_prefs;
             $messages = "";
-            if (!defined('GFORGE') or !GFORGE) {
+            if (!defined('FUSIONFORGE') or !FUSIONFORGE) {
                 $email = $pref->get("email");
                 if (empty($email)) {
                     return HTML::div(

Modified: trunk/src/plugins/wiki/www/lib/plugin/WikiAdminChmod.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/plugin/WikiAdminChmod.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/plugin/WikiAdminChmod.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiAdminChmod.php 7448 2010-05-31 12:01:38Z vargenau $');
+// rcs_id('$Id: WikiAdminChmod.php 7647 2010-08-23 15:10:10Z vargenau $');
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -188,16 +188,6 @@
     }
 }
 
-// conflicts with WikiAdminSetAcl
-class _PageList_Column_chmod_perm extends _PageList_Column {
-    function _getValue ($page_handle, &$revision_handle) {
-        $perm_array = pagePermissions($page_handle->_pagename);
-        return pagePermissionsSimpleFormat($perm_array,
-                                           $page_handle->get('author'),
-                                           $page_handle->get('group'));
-    }
-};
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/src/plugins/wiki/www/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/plugin/WikiAdminSetAcl.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/plugin/WikiAdminSetAcl.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiAdminSetAcl.php 7637 2010-08-10 12:30:47Z vargenau $');
+// rcs_id('$Id: WikiAdminSetAcl.php 7651 2010-08-24 14:24:17Z vargenau $');
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -95,9 +95,9 @@
                     $result->pushContent(HTML::p(fmt("ACL changed for page '%s'",
                                                      $pagename)));
                     $result->pushContent(HTML::p(fmt("from '%s'",
-                                                     $oldperm ? $oldperm->asAclGroupLines() : "None")));
+                                                     $oldperm ? $oldperm->asAclLines() : "None")));
                     $result->pushContent(HTML::p(fmt("to '%s'.",
-                                                     $perm->asAclGroupLines())));
+                                                     $perm->asAclLines())));
 
                     // Create new revision so that ACL change appears in history.
                     $current = $page->getCurrentRevision();
@@ -106,8 +106,8 @@
                     $text = $current->getPackedContent();
                     $meta['summary'] = sprintf(_("ACL changed for page '%s' from '%s' to '%s'."),
                                                $pagename,
-                                               $oldperm ? $oldperm->asAclGroupLines() : "None",
-                                               $perm->asAclGroupLines());
+                                               $oldperm ? $oldperm->asAclLines() : "None",
+                                               $perm->asAclLines());
                     $meta['is_minor_edit'] = 1;
                     $meta['author'] =  $request->_user->UserName();
                     unset($meta['mtime']); // force new date
@@ -242,7 +242,7 @@
         elseif ($type == 'default')
             $type = _("default page permission");
         $header->pushContent(HTML::strong(_("Type").': '), HTML::tt($type),HTML::br());
-        $header->pushContent(HTML::strong(_("ACL").': '), HTML::tt($perm->asAclGroupLines()),HTML::br());
+        $header->pushContent(HTML::strong(_("ACL").': '), HTML::tt($perm->asAclLines()),HTML::br());
 
         $header->pushContent(HTML::p(HTML::strong(_("Description").': '),
                                      _("Selected Grant checkboxes allow access, unselected checkboxes deny access."),
@@ -278,35 +278,6 @@
     }
 }
 
-class _PageList_Column_acl extends _PageList_Column {
-    function _getValue ($page_handle, &$revision_handle) {
-        $perm_tree = pagePermissions($page_handle->_pagename);
-
-        list($type, $perm) = pagePermissionsAcl($perm_tree[0], $perm_tree);
-        if ($type == 'inherited') {
-            $type = sprintf(_("page permission inherited from %s"), $perm_tree[1][0]);
-        } elseif ($type == 'page') {
-            $type = _("individual page permission");
-        } elseif ($type == 'default') {
-            $type = _("default page permission");
-        }
-        $result = HTML::span();
-        $result->pushContent($type);
-        $result->pushContent(HTML::br());
-        $result->pushContent($perm->asAclGroupLines());
-        return $result;
-    }
-};
-
-class _PageList_Column_perm extends _PageList_Column {
-    function _getValue ($page_handle, &$revision_handle) {
-        $perm_array = pagePermissions($page_handle->_pagename);
-        return pagePermissionsSimpleFormat($perm_array,
-                                           $page_handle->get('author'),
-                                           $page_handle->get('group'));
-    }
-};
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/src/plugins/wiki/www/lib/upgrade.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/upgrade.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/upgrade.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: upgrade.php 7638 2010-08-11 11:58:40Z vargenau $');
+// rcs_id('$Id: upgrade.php 7664 2010-08-31 15:42:34Z vargenau $');
 /*
  * Copyright 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -146,7 +146,7 @@
 
     // see loadsave.php for saving new pages.
     function CheckPgsrcUpdate() {
-        // Check some theme specific pgsrc files (blog, wikilens, gforge, custom).
+        // Check some theme specific pgsrc files (blog, wikilens, fusionforge, custom).
         // We check theme specific pgsrc first in case the page is present in both
         // theme specific and global pgsrc
         global $WikiTheme;

Modified: trunk/src/plugins/wiki/www/lib/wikilens/RatingsUser.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/wikilens/RatingsUser.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/lib/wikilens/RatingsUser.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: RatingsUser.php 7417 2010-05-19 12:57:42Z vargenau $');
+// rcs_id('$Id: RatingsUser.php 7659 2010-08-31 14:55:29Z vargenau $');
 /* Copyright (C) 2004 Dan Frankowski
  * Copyright (C) 2010 Roger Guignard, Alcatel-Lucent
  *
@@ -363,7 +363,7 @@
 
             while($rating = $rating_iter->next())
             {
-                if (defined('GFORGE') and GFORGE) {
+                if (defined('FUSIONFORGE') and FUSIONFORGE) {
                     $rating['pagename'] = preg_replace('/^'.PAGE_PREFIX.'/', '', $rating['pagename']);
                 }
                 $this->_num_ratings++;

Added: trunk/src/plugins/wiki/www/pgsrc/AllPagesByAcl
===================================================================
--- trunk/src/plugins/wiki/www/pgsrc/AllPagesByAcl	                        (rev 0)
+++ trunk/src/plugins/wiki/www/pgsrc/AllPagesByAcl	2010-09-01 18:19:59 UTC (rev 10384)
@@ -0,0 +1,16 @@
+Date: Tue, 24 Aug 2010 12:00:09 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id: AllPagesByAcl 7650 2010-08-24 10:06:49Z vargenau $
+Content-Type: application/x-phpwiki;
+  pagename=AllPagesByAcl;
+  flags=PAGE_LOCKED;
+  markup=2;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+Here is the list of **all pages** on this Wiki, sorted by ACL (Access Control List).
+
+<<AllPages info||=acl sortby||=acl>>
+
+----
+[[CategoryActionPage]]

Modified: trunk/src/plugins/wiki/www/pgsrc/Help%FPageList
===================================================================
--- trunk/src/plugins/wiki/www/pgsrc/Help%2FPageList	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/pgsrc/Help%2FPageList	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,6 +1,6 @@
-Date: Tue,  1 Jun 2010 17:01:57 +0000
+Date: Tue, 24 Aug 2010 17:10:44 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: Help%2FPageList 7461 2010-06-01 15:08:17Z vargenau $
+X-Rcs-Id: $Id: Help%2FPageList 7652 2010-08-24 15:11:11Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPageList;
   flags="";
@@ -54,7 +54,7 @@
 |-
 | **limit**
 | number of rows 
-| 5000
+| 50
 |-
 | **paging**
 | auto (top + bottom rows if applicable) \\ top (top only if applicable) \\ bottom (bottom only if applicable) \\ none (don't page at all)
@@ -111,11 +111,11 @@
 |= owner     | Owner
 |= checkbox  | Selectable checkbox at the left
 |= content   | Page content
+|= perm      | Permission Mask
+|= acl       | ACL
 
 Special, custom columns, either theme or plugin (~WikiAdmin*) specific:
 |= remove              | Remove
-|= perm                | Permission Mask
-|= acl                 | ACL
 |= renamed_pagename    | Rename to
 |= ratingwidget        | wikilens theme specific.
 |= custom              | See plugin/_WikiTranslation

Modified: trunk/src/plugins/wiki/www/pgsrc/Help%FRecentChangesPlugin
===================================================================
--- trunk/src/plugins/wiki/www/pgsrc/Help%2FRecentChangesPlugin	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/pgsrc/Help%2FRecentChangesPlugin	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,6 +1,6 @@
 Date: Wed, 19 May 2010 18:15:54 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: Help%2FRecentChangesPlugin 7419 2010-05-19 16:49:33Z vargenau $
+X-Rcs-Id: $Id: Help%2FRecentChangesPlugin 7666 2010-08-31 16:02:45Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRecentChangesPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -78,7 +78,7 @@
 |-
 | **historylinks**
 | Show history links
-| false (true for Monobook and Gforge)
+| false (true for Monobook and FusionForge)
 |-
 | **caption**
 | Custom caption

Modified: trunk/src/plugins/wiki/www/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/src/plugins/wiki/www/pgsrc/PhpWikiAdministration	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/pgsrc/PhpWikiAdministration	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,6 +1,6 @@
-Date: Fri, 13 Aug 2010 15:31:59 +0000
+Date: Tue, 31 Aug 2010 11:36:04 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: PhpWikiAdministration 7644 2010-08-13 13:34:26Z vargenau $
+X-Rcs-Id: $Id: PhpWikiAdministration 7654 2010-08-31 09:41:22Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
   flags=PAGE_LOCKED;
@@ -24,6 +24,8 @@
 
 == Global Access Rights ==
 
+These action pages will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
 * [[SetGlobalAccessRightsSimple]]
 * [[SetGlobalAccessRights]]
 

Modified: trunk/src/plugins/wiki/www/pgsrc/PhpWikiAdministration%FSetAclSimple
===================================================================
--- trunk/src/plugins/wiki/www/pgsrc/PhpWikiAdministration%2FSetAclSimple	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/pgsrc/PhpWikiAdministration%2FSetAclSimple	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,6 +1,6 @@
-Date: Fri, 13 Aug 2010 15:31:59 +0000
+Date: Tue, 31 Aug 2010 11:36:04 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: PhpWikiAdministration%2FSetAclSimple 7644 2010-08-13 13:34:26Z vargenau $
+X-Rcs-Id: $Id: PhpWikiAdministration%2FSetAclSimple 7654 2010-08-31 09:41:22Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration%2FSetAclSimple;
   flags=PAGE_LOCKED;
@@ -12,6 +12,17 @@
 
 ----
 
+//Liberal Access Rights// means //Everyone can edit//.
+
+view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
+
+
+//Restrictive Access Rights// means //Only logged users can see the page//.
+
+view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
+
+----
+
 <<WikiAdminSetAclSimple>>
 
 ----

Modified: trunk/src/plugins/wiki/www/pgsrc/ReleaseNotes
===================================================================
--- trunk/src/plugins/wiki/www/pgsrc/ReleaseNotes	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/pgsrc/ReleaseNotes	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,6 +1,6 @@
 Date: Tue,  8 Jun 2010 17:22:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: ReleaseNotes 7514 2010-06-10 06:35:13Z rurban $
+X-Rcs-Id: $Id: ReleaseNotes 7665 2010-08-31 15:54:37Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
   flags=PAGE_LOCKED;
@@ -25,8 +25,8 @@
 Improved dumping, pageset handling for format= with ~ActionPages.
 e.g. dump pagesets or multi-page pdf's.
 
-The Sidebar theme is now an extension of the Monobook theme (known from wikipedia), 
-the new gforge theme is to be used together with gforge (the successor of Sourceforge).
+The Sidebar theme is now an extension of the Monobook theme (known from Wikipedia), 
+the new fusionforge theme is to be used together with FusionForge (the successor of Gforge).
 
 === Fixes ===
 * fix ~PagePerm for multiple groups: not a member and undecided: check other groups
@@ -535,7 +535,7 @@
 * brought ~WikiUser (old) uptodate
 * added owner and acl fields to dumps
 * import GOOGLE_LICENSE_KEY and FORTUNE_DIR from config.ini
-* renamed global $Theme to $~WikiTheme (gforge nameclash)
+* renamed global $Theme to $~WikiTheme (Gforge nameclash)
 * aggressive WikiDB and cache memory optimization: don't cache %content
   and _cached_html if not needed.
 * PageDump added format=backup: dump all revisions.

Modified: trunk/src/plugins/wiki/www/pgsrc/SetGlobalAccessRights
===================================================================
--- trunk/src/plugins/wiki/www/pgsrc/SetGlobalAccessRights	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/pgsrc/SetGlobalAccessRights	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,6 +1,6 @@
-Date: Fri, 13 Aug 2010 15:31:59 +0000
+Date: Tue, 31 Aug 2010 11:36:04 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: SetGlobalAccessRights 7644 2010-08-13 13:34:26Z vargenau $
+X-Rcs-Id: $Id: SetGlobalAccessRights 7654 2010-08-31 09:41:22Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=SetGlobalAccessRights;
   flags=PAGE_LOCKED;
@@ -8,6 +8,9 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
+This action page will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
+
 <<WikiAdminSetAcl s=. info=pagename>>
 
 ----

Modified: trunk/src/plugins/wiki/www/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/src/plugins/wiki/www/pgsrc/SetGlobalAccessRightsSimple	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/pgsrc/SetGlobalAccessRightsSimple	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,6 +1,6 @@
-Date: Fri, 13 Aug 2010 15:31:59 +0000
+Date: Tue, 31 Aug 2010 11:36:04 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: SetGlobalAccessRightsSimple 7644 2010-08-13 13:34:26Z vargenau $
+X-Rcs-Id: $Id: SetGlobalAccessRightsSimple 7655 2010-08-31 11:37:18Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=SetGlobalAccessRightsSimple;
   flags=PAGE_LOCKED;
@@ -8,6 +8,20 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
+This action page will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
+
+----
+
+//Liberal Access Rights// means //Everyone can edit//.
+
+view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
+
+
+//Restrictive Access Rights// means //Only logged users can see the page//.
+
+view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
+
 <<WikiAdminSetAclSimple s=. info=pagename>>
 
 ----

Modified: trunk/src/plugins/wiki/www/pgsrc/SpecialPages
===================================================================
--- trunk/src/plugins/wiki/www/pgsrc/SpecialPages	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/pgsrc/SpecialPages	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,6 +1,6 @@
-Date: Wed, 19 May 2010 18:15:54 +0000
+Date: Tue, 24 Aug 2010 12:00:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: SpecialPages 7419 2010-05-19 16:49:33Z vargenau $
+X-Rcs-Id: $Id: SpecialPages 7649 2010-08-24 10:03:52Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=SpecialPages;
   flags=EXTERNAL_PAGE;
@@ -21,6 +21,7 @@
 * [[AllPagesCreatedByMe]]
 * [[AllPagesOwnedByMe]]
 * [[AllPagesLastEditedByMe]]
+* [[AllPagesByAcl]]
 * [[NewPagesPerUser]]
 * [[LockedPages]]
 * [[OrphanedPages]]

Modified: trunk/src/plugins/wiki/www/themes/Makefile
===================================================================
--- trunk/src/plugins/wiki/www/themes/Makefile	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/Makefile	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,4 +1,4 @@
-# $Id: Makefile 7353 2010-04-27 02:12:12Z vargenau $
+# $Id: Makefile 7664 2010-08-31 15:42:34Z vargenau $
 #
 # themes/Makefile
 #
@@ -7,7 +7,7 @@
 
 .PHONY: all css js
 
-THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX gforge \
+THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX fusionforge \
 	Portland shamino_com Crao Wordpress smaller Hawaiian
 
 # http://developer.yahoo.com/yui/compressor/

Modified: trunk/src/plugins/wiki/www/themes/Makefile.global
===================================================================
--- trunk/src/plugins/wiki/www/themes/Makefile.global	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/Makefile.global	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,4 +1,4 @@
-# $Id: Makefile.global 7353 2010-04-27 02:12:12Z vargenau $
+# $Id: Makefile.global 7664 2010-08-31 15:42:34Z vargenau $
 #
 # themes/Makefile.global
 #
@@ -6,7 +6,7 @@
 
 .PHONY: all css js
 
-THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX gforge
+THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX fusionforge
 
 # http://developer.yahoo.com/yui/compressor/
 YUICOMPRESSOR = java -jar ../default/yuicompressor-2.4.2.jar

Modified: trunk/src/plugins/wiki/www/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/MonoBook/templates/info.tmpl	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/MonoBook/templates/info.tmpl	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: info.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: info.tmpl 7651 2010-08-24 14:24:17Z vargenau $');
 ?>
 <?php
 if (empty($revision)) $revision = $page->getCurrentRevision(false);
@@ -148,7 +148,7 @@
   </tr>
   <tr>
     <td align="right" valign="top" class="pageinfo">ACL</td>
-    <td><?php echo $perm->asAclGroupLines() ?></td>
+    <td><?php echo $perm->asAclLines() ?></td>
   </tr>
 <?php } ?>
 

Modified: trunk/src/plugins/wiki/www/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/Sidebar/templates/navbar.tmpl	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/Sidebar/templates/navbar.tmpl	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: navbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: navbar.tmpl 7667 2010-08-31 16:13:53Z vargenau $');
 ?>
 <?php
 // With MonoBook it is similar to Sidebar, named boxes at the left.
@@ -23,8 +23,8 @@
   <h5><?php echo _("Main Categories")?></h5>
   <div class="pBody">
     <ul>
-      <li><?php echo WikiLink("TroubleShooting") ?></li>
-      <li><?php echo WikiLink("HowTo") ?></li>
+      <li><?php echo WikiLink("CategoryWikiPlugin") ?></li>
+      <li><?php echo WikiLink("CategoryActionPage") ?></li>
     </ul>
   </div>
 </div>

Modified: trunk/src/plugins/wiki/www/themes/default/templates/info.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/default/templates/info.tmpl	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/default/templates/info.tmpl	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: info.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: info.tmpl 7651 2010-08-24 14:24:17Z vargenau $');
 ?>
 <?php
 if (empty($revision)) $revision = $page->getCurrentRevision(false);
@@ -140,7 +140,7 @@
   </tr>
   <tr>
     <td align="right" valign="top" class="pageinfo">ACL</td>
-    <td><?php echo $perm->asAclGroupLines() ?></td>
+    <td><?php echo $perm->asAclLines() ?></td>
   </tr>
 <?php } ?>
 

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/Makefile
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/Makefile	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/Makefile	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,11 +1,11 @@
-# $Id: Makefile 7442 2010-05-21 10:11:55Z vargenau $
+# $Id: Makefile 7662 2010-08-31 15:12:14Z vargenau $
 #
-# themes/gforge/Makefile
+# themes/fusionforge/Makefile
 #
 # minify CSS and JS
 #
 
-CSS_SRC = gforge.css gforge-print.css gforge-autonumbering.css gforge-rereading.css gforge-fullscreen.css
+CSS_SRC = fusionforge.css fusionforge-print.css fusionforge-autonumbering.css fusionforge-rereading.css fusionforge-fullscreen.css
 MAIN = wikilens
 JS_MAIN = wikilens.js
 

Copied: trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-autonumbering-min.css (from rev 10383, trunk/src/plugins/wiki/www/themes/gforge/gforge-autonumbering-min.css)
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-autonumbering-min.css	                        (rev 0)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-autonumbering-min.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -0,0 +1 @@
+ at import url(fusionforge.css);body{counter-reset:chapter;}h2:before{content:counter(chapter) ". ";counter-increment:chapter;}h2{counter-reset:section;}h3:before{content:counter(chapter) "." counter(section) " ";counter-increment:section;}h3{counter-reset:subsection;}h4:before{content:counter(chapter) "." counter(section) "." counter(subsection) " ";counter-increment:subsection;}h4{counter-reset:subsection2;}h5:before{content:counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) " ";counter-increment:subsection2;}h5{counter-reset:subsection3;}h6:before{content:counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) "." counter(subsection3) " ";counter-increment:subsection3;}
\ No newline at end of file

Copied: trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-autonumbering.css (from rev 10383, trunk/src/plugins/wiki/www/themes/gforge/gforge-autonumbering.css)
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-autonumbering.css	                        (rev 0)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-autonumbering.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -0,0 +1,81 @@
+/**
+ * $Id: fusionforge-autonumbering.css 7662 2010-08-31 15:12:14Z vargenau $
+ *
+ * Copyright (C) 2008 Alcatel-Lucent
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The Style Sheet ("Contribution") has not been tested and/or
+ * validated for release as or in products, combinations with products or
+ * other commercial use. Any use of the Contribution is entirely made at
+ * the user's own responsibility and the user can not rely on any features,
+ * functionalities or performances Alcatel-Lucent has attributed to the
+ * Contribution.
+ *
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
+ * ALONE BASIS."
+ */
+
+ at import url(fusionforge.css);
+
+body {
+    counter-reset: chapter;      /* Create a chapter counter scope */
+}
+h2:before {
+    content: counter(chapter) ". ";
+    counter-increment: chapter;  /* Add 1 to chapter */
+}
+h2 {
+    counter-reset: section;      /* Set section to 0 */
+}
+h3:before {
+    content: counter(chapter) "." counter(section) " ";
+    counter-increment: section;
+}
+h3 {
+    counter-reset: subsection;   /* Set subsection to 0 */
+}
+h4:before {
+    content: counter(chapter) "." counter(section) "." counter(subsection) " ";
+    counter-increment: subsection;
+}
+h4 {
+    counter-reset: subsection2;      /* Set section to 0 */
+}
+h5:before {
+    content: counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) " ";
+    counter-increment: subsection2;
+}
+h5 {
+    counter-reset: subsection3;      /* Set subsection to 0 */
+}
+h6:before {
+    content: counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) "." counter(subsection3) " ";
+    counter-increment: subsection3;
+}

Copied: trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-fullscreen-min.css (from rev 10383, trunk/src/plugins/wiki/www/themes/gforge/gforge-fullscreen-min.css)
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-fullscreen-min.css	                        (rev 0)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-fullscreen-min.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -0,0 +1 @@
+#topbar{display:none;}#horiznavbar{display:none;}#leftnav{display:none;}.toolpalettes{display:none;}div.toc{border:1px solid black;padding:5px;}div.toc ul{list-style:none;}blockquote.mail-style-quote{margin:0;margin-bottom:1em;border:1px solid #284;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;border-style:none;border-left:medium solid #284;padding:0;padding-left:.5em;}div.wikitext pre{font-family:monospace;border-width:1px;border-style:dashed;padding:.5em;}h1,h2,h3,h4,h5,h6{padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid black;}#content{background:white;}
\ No newline at end of file

Copied: trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-fullscreen.css (from rev 10383, trunk/src/plugins/wiki/www/themes/gforge/gforge-fullscreen.css)
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-fullscreen.css	                        (rev 0)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-fullscreen.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -0,0 +1,96 @@
+/**
+ * $Id: fusionforge-fullscreen.css 7661 2010-08-31 15:08:32Z vargenau $
+ *
+ * Copyright (C) 2008 Alcatel-Lucent
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The Style Sheet ("Contribution") has not been tested and/or
+ * validated for release as or in products, combinations with products or
+ * other commercial use. Any use of the Contribution is entirely made at
+ * the user's own responsibility and the user can not rely on any features,
+ * functionalities or performances Alcatel-Lucent has attributed to the
+ * Contribution.
+ *
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
+ * ALONE BASIS."
+ */
+
+/* Do not display the top bar, the horizontal navigation bar and the left bar */
+#topbar { display: none; }
+#horiznavbar { display: none; }
+#leftnav { display: none; }
+
+/* Do not display the wiki navigation and edition bars */
+.toolpalettes { display: none; }
+
+/**
+ * Table of content
+ */
+div.toc {
+    border: 1px solid black;
+    padding: 5px;
+}
+div.toc ul { list-style: none; }
+
+/*
+ * "E-mail" style blockquote
+ */
+blockquote.mail-style-quote {
+    margin: 0em;
+    margin-bottom: 1em;
+    border: 1px solid #284;
+    padding: 0.5em;
+}
+
+.mail-style-quote blockquote.mail-style-quote {
+    margin-left: 0.3em;
+    margin-bottom : 0em;
+    border-style: none;
+    border-left: medium solid #284;
+    padding: 0em;
+    padding-left: 0.5em;
+}
+
+div.wikitext pre {
+    font-family: monospace;
+    border-width: 1px;
+    border-style: dashed;
+    padding: 0.5em;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    padding-top: .5em;
+    padding-bottom: .17em;
+    border-bottom: 1px solid black;
+}
+
+#content {
+    background: white;
+}

Copied: trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-min.css (from rev 10383, trunk/src/plugins/wiki/www/themes/gforge/gforge-min.css)
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-min.css	                        (rev 0)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-min.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -0,0 +1 @@
+li p{margin:0;}div.br{display:none;}.toolbar,div.toolbar{margin:.5ex 0;}div.wikitext{width:auto;}div.wikitext table p{margin-top:.3em;margin-bottom:.3em;}img{vertical-align:baseline;}input{margin:.1em;}input.numeric{text-align:right;}fieldset{background-color:#e0f3f7;}legend{border:1px solid #d8d8e7;background-color:white;}div.wikiaction,form.wikiadmin div{border-bottom:1px solid #d8d8e7;border-right:1px solid #d8d8e7;border-top:1px solid #96a2ae;border-left:1px solid #96a2ae;margin-top:.5ex;margin-bottom:.5ex;padding:.5ex .5em;display:table;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}div#navbuttons,div#signin,div#actionbuttons{line-height:3.0ex;}.wikiunknown a,.named-wikiunknown a{border-top:1px solid #c6d2de;border-left:1px solid #c6d2de;border-bottom:1px solid #a2a2a2;border-right:1px solid #a2a2a2;padding-left:1px;padding-right:1px;padding-top:1px;margin-right:.15em;}img.linkicon{vertical-align:middle;}img.inlineimage{vertical-align:middle;}.diff .prefix{position:relative;left:-1em;}.diff del,.diff ins{padding-left:1px;padding-right:1px;}img{border:0;}form{margin:0;}table{empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;}div.wikitext pre{font-family:monospace;border-width:1px;border-color:navy;border-style:dashed;padding:.5em;}div.wikitext{margin-top:1ex;margin-bottom:.5ex;background:white;padding-bottom:1em;clear:both;}body.sidebar{margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}.wiki,.named-wiki{font-weight:bold;}a.wikiaction,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;white-space:nowrap;}input.wikiaction,input.button,input.wikiadmin{margin-right:1em;margin-left:1em;}.wikiunsafe{background-color:#fcc;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;}h1 .backlinks{text-decoration:none;color:inherit;}.wikipage{font-weight:normal;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}div.toc{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;}div.toc ul{list-style:none;}div.toc p.toctitle{font-weight:bold;font-size:1.6em;margin-bottom:1ex;}div.toc p{margin:0;}.toclist a{text-decoration:none;}div.toc p.toctitle,h2,h3,h4,h5,h6{font-family:Verdana,Arial,Helvetica,sans-serif;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1,h1 .backlinks,h2,.wikitext h2 a,h3,.wikitext h3 a,h4,.wikitext h4 a,h5,h6{text-decoration:none;}.pagelist thead th{background:#d8d8d8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tr{vertical-align:top;}.pagelist tr.evenrow{background:#eee;}.pagelist tr.oddrow{background:white;}th.gridbutton{background-color:#d8d8d8;color:#565c5e;font-weight:bold;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:black;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;color:#565c5e;}.toolbar,input.button,#signin{font-family:Verdana,Arial,Helvetica,sans-serif;}.toolbar{padding:0;margin:0;}.toolbar li{margin-left:-20px;list-style-type:none;font-weight:bold;}.toolbar a{text-decoration:none;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}.tooltitle{font-weight:bold;}#navbuttons,#actionbuttons{white-space:nowrap;}#navbuttons .named-wiki,#actionbuttons .named-wiki,#navbuttons .wikiaction,#actionbuttons .wikiaction,#navbuttons .wikiadmin,#actionbuttons .wikiadmin{font-weight:normal;color:#565c5e;}#navbuttons .named-wiki:hover,#actionbuttons .named-wiki:hover,#navbuttons .wikiaction:hover,#actionbuttons .wikiaction:hover,#navbuttons .wikiadmin:hover,#actionbuttons .wikiadmin:hover{text-decoration:underline;}#actionbuttons td{border:1px solid #aaa;border-bottom:none;border-collapse:collapse;padding-left:.8em;padding-right:.8em;}#actionbuttons td.spacer{width:10px;border:none;padding-left:0;padding-right:0;}#actionbuttons td.bold a{font-weight:bold;}.editdate{font-family:Verdana,Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.5ex;border-top:1px #aaa solid;}#logo img{float:right;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}#search-replace{margin-top:1ex;text-align:left;font-size:smaller;}#toolbar{padding:0;}.search-context{background:white;}.search-term{background:yellow;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.pagetrail{background-color:#FF9;padding:.2em;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Verdana,Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;border:1px #ccc solid;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}div.errors{font-weight:bold;border-width:2px;border-style:solid;background-color:#ffc0cb;border-color:red;padding:.5em;}div.warning{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:thin solid blue;clear:both;}.debug{color:black;background:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc;}.hint{color:black;background:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa;}span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}blockquote.mail-style-quote{margin:0;margin-bottom:1em;border:1px solid #284;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;background:transparent;border-style:none;border-left:medium solid #284;padding:0;padding-left:.5em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.clear-floats{clear:both;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid #888;}.box-title{font-weight:normal;background-color:#ccc;color:black;text-align:center;}.box-data{width:160px;font-size:9pt;font-weight:normal;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.rss{margin:1em;padding:1em;}div.feed{margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;font-size:1.2em;}.chandesc{font-weight:bold;}div.rssitem{padding-top:1em;padding-bottom:1em;border-top:2px solid #565c5e;}div.itemname{padding-bottom:1em;font-weight:bold;}div.itemdesc{padding-left:1em;}div.authordate{font-style:italic;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{border:0;vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}#content{margin:0;padding:1em 1em 1.5em 1em;background:white;border:1px solid #aaa;line-height:1.2em;position:relative;z-index:2;}#footer{text-align:right;vertical-align:bottom;font-style:italic;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid;padding:.5em;}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px;}td.tdselected{color:white;background-color:#554295;}td.tdunselected{color:black;background-color:#e9e8de;}.browsebanner table{width:100%;background-color:#e9fbff;border-style:solid;border-color:blue;border-width:2px;}.browsebanner table td{text-align:center;font-weight:bold;font-style:oblique;}.rateit{font-size:60%;font-weight:bold;vertical-align:middle;}
\ No newline at end of file

Copied: trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print-min.css (from rev 10383, trunk/src/plugins/wiki/www/themes/gforge/gforge-print-min.css)
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print-min.css	                        (rev 0)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print-min.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -0,0 +1 @@
+.toolpalettes{display:none;}.pagetrail{display:none;}.browsebanner{display:none;}.editdate{display:none;}a{color:black;}a.interwiki img{display:none;}a.named-interwiki img{display:none;}a.namedurl img{display:none;}img[src="/wiki/themes/fusionforge/buttons/no_order.png"]{display:none;}div.toc{border:1px solid black;}#toctoggle{display:none;}div.toc p.toctitle,h1,h2,h3,h4,h5,h6{border-bottom:1px solid black;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-color:black;}#content{background:white;border:none;}table.nobreak{page-break-inside:avoid!important;}
\ No newline at end of file

Copied: trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print.css (from rev 10383, trunk/src/plugins/wiki/www/themes/gforge/gforge-print.css)
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print.css	                        (rev 0)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -0,0 +1,101 @@
+/**
+ * $Id: fusionforge-print.css 7662 2010-08-31 15:12:14Z vargenau $
+ *
+ * Copyright (C) 2008 Alcatel-Lucent
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The Style Sheet ("Contribution") has not been tested and/or
+ * validated for release as or in products, combinations with products or
+ * other commercial use. Any use of the Contribution is entirely made at
+ * the user's own responsibility and the user can not rely on any features,
+ * functionalities or performances Alcatel-Lucent has attributed to the
+ * Contribution.
+ *
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
+ * ALONE BASIS."
+ */
+
+/* Do not print the wiki navigation and edition bars */
+.toolpalettes { display: none; }
+
+/* Do not print Page Trail line */
+.pagetrail { display: none; }
+
+/* Do not print main wiki browse banner */
+.browsebanner { display: none; }
+
+/* Do not print date of last edition */
+.editdate { display: none; }
+
+/* Print links in black */
+a { color: black; }
+
+/* Do not print icons in front of hyperlinks */
+a.interwiki img { display: none; }
+a.named-interwiki img { display: none; }
+a.namedurl img { display: none; }
+
+/* Do not print "none" sorting icon */
+img[src="/wiki/themes/fusionforge/buttons/no_order.png"] { display: none; }
+
+/**
+ * Table of content
+ */
+div.toc {
+    border: 1px solid black;
+}
+
+/* Do not print TOC toggle image */
+#toctoggle { display: none; }
+
+div.toc p.toctitle, h1, h2, h3, h4, h5, h6 {
+    border-bottom: 1px solid black;
+}
+
+/*
+div.toclist a::after {
+    content: leader('.') target-counter(attr(href), page);
+}
+*/
+
+table.boxed, table.bordered, table.bordered th, table.bordered td {
+    border-color: black;
+}
+
+#content {
+    background: white;
+    border: none;
+}
+
+/* Do not cut tables with class "nobreak" */
+
+table.nobreak {
+    page-break-inside: avoid !important;
+}

Copied: trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-rereading-min.css (from rev 10383, trunk/src/plugins/wiki/www/themes/gforge/gforge-rereading-min.css)
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-rereading-min.css	                        (rev 0)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-rereading-min.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -0,0 +1 @@
+ at import url(fusionforge-autonumbering.css);#content{counter-reset:paragraph;}div.wikitext p:before{content:"{" counter(paragraph) ";}";counter-increment:paragraph;color:red;}
\ No newline at end of file

Copied: trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-rereading.css (from rev 10383, trunk/src/plugins/wiki/www/themes/gforge/gforge-rereading.css)
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-rereading.css	                        (rev 0)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-rereading.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -0,0 +1,55 @@
+/**
+ * $Id: fusionforge-rereading.css 7662 2010-08-31 15:12:14Z vargenau $
+ *
+ * Copyright (C) 2008 Alcatel-Lucent
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The Style Sheet ("Contribution") has not been tested and/or
+ * validated for release as or in products, combinations with products or
+ * other commercial use. Any use of the Contribution is entirely made at
+ * the user's own responsibility and the user can not rely on any features,
+ * functionalities or performances Alcatel-Lucent has attributed to the
+ * Contribution.
+ *
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
+ * ALONE BASIS."
+ */
+
+ at import url(fusionforge-autonumbering.css);
+
+#content {
+    counter-reset: paragraph;    /* Create a paragraph counter scope */
+}
+div.wikitext p:before {
+    content: "{" counter(paragraph) "} ";
+    counter-increment: paragraph;
+    color: red;
+}
+

Copied: trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge.css (from rev 10383, trunk/src/plugins/wiki/www/themes/gforge/gforge.css)
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge.css	                        (rev 0)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -0,0 +1,1048 @@
+/**
+ * $Id: gforge.css 7376 2010-05-04 13:37:54Z vargenau $
+ *
+ * Copyright (C) 2002-2007 $ThePhpWikiProgrammingTeam
+ * Copyright (C) 2008-2009 Alcatel-Lucent
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The Style Sheet ("Contribution") has not been tested and/or
+ * validated for release as or in products, combinations with products or
+ * other commercial use. Any use of the Contribution is entirely made at
+ * the user's own responsibility and the user can not rely on any features,
+ * functionalities or performances Alcatel-Lucent has attributed to the
+ * Contribution.
+ *
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
+ * ALONE BASIS."
+ */
+
+/* Because in some cases there is a <p> in nested lists */
+li p { margin:0; }
+
+/* Hide the elements we put in just to get around NS4 bugs. */
+div.br { display: none; }
+
+/* This makes spacings in NS4 too big. */
+.toolbar, div.toolbar { margin: 0.5ex 0ex; }
+
+/* This breaks NS4, but is necessary for IE4. */
+div.wikitext { width: auto; }
+
+div.wikitext table p { margin-top: 0.3em;  margin-bottom: 0.3em;}
+
+/**
+ * General
+ */
+/* for NS4 */
+img { vertical-align: baseline; }
+input { margin: 0.1em; }
+input.numeric { text-align: right; }
+
+fieldset {
+    background-color: #e0f3f7;
+}
+
+legend {
+    border: 1px solid #d8d8e7;
+    background-color: white;
+}
+
+/**
+ * Wiki Forms
+ * 
+ * The div inside the wikiadmin upload form does not
+ * have a class yet, so it must be referenced indirectly
+ */
+/* div.wikiaction, div.wikiadmin { */
+div.wikiaction, form.wikiadmin div {
+  border-bottom: 1px solid #d8d8e7;
+  border-right:  1px solid #d8d8e7;
+  border-top:  1px solid #96a2ae;
+  border-left: 1px solid #96a2ae;
+
+  margin-top: 0.5ex;
+  margin-bottom: 0.5ex;
+  padding: 0.5ex 0.5em;
+  /* Emulate the display behaviour of a table, to shrink it's width.
+   * ie5.1Mac ignores this */
+  display: table;
+}
+
+/* Add space between the input field and following buttons, but not after the last button. */
+div.wikiaction input[type=text], div.wikiadmin input[type=text], form.wikiadmin input[type=file] { margin-right: 0.5em; }
+
+div#navbuttons, div#signin, div#actionbuttons { line-height: 3.0ex; }
+
+/* QuestionMark */
+.wikiunknown a, .named-wikiunknown a {
+  border-top:  1px solid #c6d2de;
+  border-left: 1px solid #c6d2de;
+  border-bottom: 1px solid #a2a2a2;
+  border-right:  1px solid #a2a2a2;
+  padding-left:  1px;
+  padding-right: 1px;
+  padding-top: 1px;
+  margin-right: .15em;
+}
+
+/* Link icons */
+img.linkicon { vertical-align: middle; }
+
+img.inlineimage { vertical-align: middle; }
+
+/**
+ * Edit Page & View Source
+ */
+/* color: inherit; and background: inherit; display as lime in NS4 */
+
+/**
+ * Diff Output
+ */
+.diff .prefix {
+  position: relative;
+  left: -1em;
+}
+/* deleted & added words */
+.diff del, .diff ins {
+  padding-left: 1px;
+  padding-right: 1px;
+}
+
+/**
+ * General
+ */ 
+img { border: 0ex; }
+
+form { margin: 0ex; }
+
+table {
+  /* For Mozilla */
+  empty-cells: show;
+}
+
+caption {
+  caption-side: top;
+  text-align: left;
+  margin-bottom: .5ex;
+}
+
+/**
+ * Wiki
+ */
+
+div.wikitext pre { 
+  font-family: monospace; 
+  border-width: 1px;
+  border-color: navy;
+  border-style: dashed;
+  padding: 0.5em;
+}
+
+/**
+ * PageTypes
+ */
+/* Main wiki text box */
+div.wikitext {
+  margin-top:    1ex;
+  margin-bottom: 0.5ex;
+  background: white;
+  padding-bottom: 1em;
+  clear: both;
+}
+
+/* Mozilla RecentChanges Sidebar */
+body.sidebar {
+  margin: 0.5em;
+}
+body.sidebar div.wikitext {
+  padding: 0.5em;
+}
+body.sidebar div.wikitext ul { padding-left: 1em; }
+body.sidebar h2 { margin-top: 0; }
+
+/**
+ * Link styles
+ */
+.wiki, .named-wiki {
+  /* text-decoration: none; */
+  font-weight: bold;
+}
+
+/* Action buttons */
+a.wikiaction, a.wiki-rc-action, a.wikiunsafe,
+input.wikiaction, input.button, input.wikiadmin {
+  text-decoration: none;
+  /* don't wrap text buttons */
+  white-space: nowrap;
+}
+
+input.wikiaction, input.button, input.wikiadmin {
+  margin-right: 1em;
+  margin-left: 1em;
+}
+
+.wikiunsafe { background-color: #fcc; }
+
+/* Unknown links */
+.wikiunknown, .named-wikiunknown {
+  font-weight: normal;
+  font-size: 100%;
+}
+ /* QuestionMark #600 */
+.wikiunknown a, .named-wikiunknown a {
+  color: #447;
+  background-color: #eee;
+  text-decoration: none;
+  font-weight: normal;
+  font-size: smaller;
+}
+
+/* Backlinks */
+.backlinks {
+  text-decoration: underline;
+}
+h1 .backlinks { text-decoration: none; color: inherit; }
+
+/* Interwiki links */
+.wikipage  { font-weight: normal; }
+.interwiki, i.interwiki .wikipage, em .interwiki .wikipage { font-style: oblique; }
+.interwiki .wikipage, i .interwiki, em .interwiki { font-style: normal; }
+
+/**
+ * Table of content
+ */
+div.toc {
+    border: 1px solid #aaaaaa;
+    background-color: #f9f9f9;
+    padding: 5px;
+}
+
+div.toc ul { list-style: none }
+
+div.toc p.toctitle { font-weight: bold; font-size: 1.6em; margin-bottom: 1ex; }
+div.toc p { margin: 0; }
+
+.toclist a { text-decoration: none; }
+
+/**
+ * headings
+ */
+div.toc p.toctitle, h2, h3, h4, h5, h6 { 
+	font-family: Verdana, Arial, Helvetica, sans-serif; 
+        padding-top: .5em;
+        padding-bottom: .17em;
+        border-bottom: 1px solid #aaaaaa;
+}
+
+h1, h1 .backlinks, h2, .wikitext h2 a, h3, .wikitext h3 a, h4, .wikitext h4 a, h5, h6 {
+    text-decoration: none;
+}
+
+/**
+ * Tables
+ */
+.pagelist thead th {
+  background: #d8d8d8;
+  text-decoration: none;
+  font-weight: bold;
+}
+.pagelist thead td u { text-decoration: none; }
+.pagelist tr { vertical-align: top; }
+.pagelist tr.evenrow { background: #eee; }
+.pagelist tr.oddrow  { background: white; }
+th.gridbutton {
+  background-color: #d8d8d8;
+  color: #565c5e;
+  font-weight: bold;
+  white-space: nowrap;
+  margin: 5px 0px;
+  max-height: 24px;
+  padding: 5px 0px 5px 0px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: black;
+}
+input.gridbutton, a.gridbutton, a:hover.gridbutton, a:visited.gridbutton {
+  text-decoration: none;
+  color: #565c5e;
+}
+
+/**
+ * Toolbar
+ */
+.toolbar, input.button, #signin { 
+	font-family: Verdana, Arial, Helvetica, sans-serif; 
+}
+
+.toolbar {
+  padding: 0;
+  margin:  0;
+}
+.toolbar li {
+  margin-left: -20px; /* Because there is no list symbol */
+  list-style-type: none;
+  font-weight: bold;
+}
+.toolbar a {
+  text-decoration: none;
+}
+
+.edit-toolbar {
+  padding: 0;
+  margin:  0;
+}
+.edit-toolbar img, .edit-toolbar input {
+  background-color: #fff;
+  border: 1px solid ButtonFace;
+}
+
+.tooltitle {
+	font-weight: bold ;
+}
+
+#navbuttons, #actionbuttons {
+  white-space: nowrap;
+}
+
+#navbuttons .named-wiki,
+#actionbuttons .named-wiki,
+#navbuttons .wikiaction,
+#actionbuttons .wikiaction,
+#navbuttons .wikiadmin,
+#actionbuttons .wikiadmin {
+  font-weight: normal;
+  color: #565c5e; /* Alcatel-Lucent grey */
+}
+
+#navbuttons .named-wiki:hover,
+#actionbuttons .named-wiki:hover,
+#navbuttons .wikiaction:hover,
+#actionbuttons .wikiaction:hover,
+#navbuttons .wikiadmin:hover,
+#actionbuttons .wikiadmin:hover {
+  text-decoration: underline;
+}
+
+#actionbuttons td {
+    border: 1px solid #aaaaaa;
+    border-bottom: none;
+    border-collapse: collapse;
+    padding-left:0.8em;
+    padding-right:0.8em;
+}
+
+#actionbuttons td.spacer {
+    width:10px;
+    border:none;
+    padding-left:0;
+    padding-right:0;
+}
+
+#actionbuttons td.bold a {
+    font-weight: bold;
+}
+
+.editdate {
+  font-family: Verdana, Arial, Helvetica, sans-serif;
+  margin: 0;
+  padding: 0;
+  padding-top: 0.5ex;
+  border-top: 1px #aaaaaa solid;
+}
+
+#logo img {
+  float: right;
+  border: 1px black solid;
+  /* "paper" borders */
+  border-top:  1px #e8e6df solid;
+  border-left: 1px #e8e6df solid;
+  border-bottom: 1px #d2d2d2 solid;
+  border-right:  1px #b2b2b2 solid;
+}
+
+/**
+ * Edit Page & View Source
+ */
+
+/* Make the textarea the full page width */
+textarea.wikiedit {
+  width: 100%;
+  margin-bottom: 0.5ex;
+  margin-top:    0.5ex;
+  padding: 2px;
+}
+
+#editarea-size {
+  margin-top: 1ex;
+  text-align: right;
+  font-size: smaller;
+}
+#search-replace {
+  margin-top: 1ex;
+  text-align: left;
+  font-size: smaller;
+}
+#toolbar { padding:0px; }
+
+/**
+ * Search Results
+ */
+.search-context { background: white; }
+.search-term {
+  background: yellow;
+  font-weight: normal;
+}
+#LSResult {
+  position: absolute;
+  text-align: left;
+  display: none;
+  z-index: 100;
+  background-color: white;
+  border: 1px solid #d0d0d0; 
+  font-size: 9px;
+  overflow: hidden;
+}
+#LSHighlight {
+  background-color: #f08000;
+}
+#LSResult .evenrow {
+  background-color: #f0f0f0;
+} 
+#LSREsult .oddrow {
+} 
+.LSEnd {
+  text-align: right;
+}
+.LSRow:hover {
+  background-color: white;
+}
+.LSRow {
+  padding: 1px;
+} 
+ul.LSRes {
+  margin: 0px;
+  padding: 0px;
+}
+li.LSRow {
+  margin: 0px;
+  list-style-image: none;
+}
+
+/* PageTrail plugin */
+.pagetrail {
+     background-color: #FFFF99;
+     padding: 0.2em;
+}
+
+/* IncludePage plugin */
+.transclusion-title {
+  text-align: right;
+  font-style: oblique;
+  font-size:  smaller;
+  text-decoration: underline;
+  margin-bottom: 0.25ex;
+  margin-right:  0.25em;
+} 
+.transclusion, .wiki-edithelp {
+  font-size: smaller;
+}
+.transclusion {
+  border: 1px solid gray;
+  padding-left:  0.8em; 
+  padding-right: 0.8em; 
+  padding-top:     0px;
+  padding-bottom:  0px;
+  margin-left:   0.25em;
+  margin-right:  0.25em;
+  margin-bottom: 0.1ex;
+}
+.wiki-edithelp {
+  background: white;
+  border: medium solid #fff8dc; /* darker ivory */
+  padding-left:  0.5em;
+  padding-right: 0.5em;
+  padding-top:    0.75ex;
+  padding-bottom: 0.75ex;
+  margin-left:  0;
+  margin-right: 0;
+  margin-top: 1ex;
+  margin-bottom: 1ex;
+}
+.wiki-edithelp p {
+  font-family: Verdana, Arial, Helvetica, sans-serif;
+  padding-left:  0.5em;
+  padding-right: 0.5em;
+  padding-top:    0.5ex;
+  padding-bottom: 0.5ex;
+  margin: 0;
+}
+
+/**
+ * Calendar plugin
+ */
+table.cal {
+  border: 1px outset gray;
+  background: white;
+  margin: 0.5ex 0.5em;
+  padding: 1px;
+  /* For Mozilla */
+  empty-cells: hide;
+} 
+
+/* cells */
+table.cal td {
+  background: white;
+  text-align: right;
+} 
+
+/* Month-name header */
+table.cal-header { font-size: larger; }
+table.cal-header tr, table.cal-header td { text-align: center; }
+.cal-arrow {
+  font-weight: bold;
+  text-decoration: none;
+}
+
+/* Day-names header */
+table.cal tbody tr .cal-dayname {  }
+.cal-dayname td {
+  text-align: center;
+  font-size: smaller;
+  text-decoration: underline;
+}
+
+/* Individual days */
+a.cal-hide { text-decoration: none; }
+
+/* Today */
+ /* cell */
+table.cal td.cal-today {
+  margin: 1px;
+  border: 1px solid gray;
+}
+ /* text */
+table.cal td.cal-today a.cal-hide {  }
+
+/**
+ * Diff Output
+ */
+/* main box */
+.diff {
+  margin-top:    1ex;
+  margin-bottom: 0.5ex;
+  background: white;
+  border: 1px #ccc solid;
+  color: black;
+  border-top: 1px solid #494f5d;
+  border-left:  1px solid #494f5d;
+  border-bottom:  1px solid #c6d2de;
+  border-right: 1px solid #c6d2de;
+  padding-top:    1px;
+  padding-bottom: 1px;
+  padding-left:  .125em;
+  padding-right: .125em;
+  padding: 0;
+  clear: both;
+}
+.diff .block {
+  background: #ddd;
+  padding-left: 1em;
+}
+
+/* individual blocks */
+.diff .context {
+  background: white;
+  /* for NS4 */
+  border: none;
+}
+/* entire difftextblock */
+.difftext {
+  margin-top:    0;
+  margin-bottom: 0;
+  background: white;
+  border: 1px black solid;
+  border-top:  1px #e8e6df solid;
+  border-left: 1px #e8e6df solid;
+  border-bottom: 1px #d2d2d2 solid;
+  border-right:  1px #b2b2b2 solid;
+  padding-left:  0em; 
+  padding-right: 0em;
+  padding-top:    0ex;
+  padding-bottom: 0ex;
+  clear: both;
+}
+/* + - line prefix */
+.diff .block tt {
+  font-weight: normal;
+  font-family: monospace;
+  color: black;
+  margin-left: 0;
+  border: none;
+}
+/* changed words */
+.diff del, .diff ins {
+  font-weight: bold;
+  text-decoration: none;
+}
+
+/* blocks containing deleted or added words */
+.diff .original, .diff .deleted,
+.diff .final, .diff .added {
+  background: white;
+}
+/* blocks containing deleted words */
+.diff .original, .diff .deleted {
+  background: #fcc;
+  border: none;
+}
+/* blocks containing added words */
+.diff .final, .diff .added {
+  background: #cfc;
+  border: none;
+}
+
+/* deleted words */
+.diff del { background: #f99; }
+/* added words */
+.diff ins { background: #9f9; }
+
+/**
+ * PageHistory, Info
+ */
+td.pageinfo { font-weight: bold; }
+.pageinfo-minoredit, .pageinfo-authorid {
+  font-size: smaller;
+  font-style: oblique;
+}
+
+div.errors {
+    font-weight: bold;
+    border-width: 2px;
+    border-style: solid;
+    background-color: #ffc0cb; /* pink */
+    border-color: red;
+    padding: 0.5em;
+}
+
+div.warning {
+  color: black;
+  background: #eee;
+  margin-top:    1em;
+  margin-bottom: 1em;
+  padding-left:  0.8em; 
+  padding-right: 0.8em; 
+  padding-top:    0.8ex;
+  padding-bottom: 0;
+  border: thin solid blue;
+  clear: both;
+}
+
+/* Debug */
+.debug {
+  color: black;
+  background: white;
+  font-family: monospace;
+  font-size: smaller;
+  margin: 1ex 0;
+  padding: 0.5ex 0.5em;
+  border: medium solid #fff8dc; /* darker ivory */
+}
+
+/* Hints */
+.hint {
+  color: black;
+  background: #eeeeee;
+  font-style: italic;
+  margin-left: 3em;
+  padding: 0.5ex 0.5em;
+  border: thin solid #aaaaaa;
+}
+span.hint {
+  padding: 0;
+}
+
+/* Disabled Plugins */
+.disabled-plugin
+{
+  clear: both;
+  margin: 1ex 0;
+  padding: 0;
+}
+.disabled-plugin .title {
+  color: #400;
+  background-color: inherit;
+  font-size: x-small;
+  text-align: right;
+  padding: 0 0.5em;
+}
+.disabled-plugin pre {
+  color: black;
+  background: #ddd;
+  margin: 0;
+  padding: 0.3ex 0.5em;
+}
+
+/* "(Redirected from ...)" message. */
+span.redirectfrom {
+  font-size: small;
+  font-style: oblique;
+  font-weight: normal;
+  padding-left: 1em;
+}
+
+/*
+ * "DL tables"
+ */
+.wiki-dl-table {
+  border-collapse: collapse;
+  border: 2px #444 solid;
+}
+.wiki-dl-table tr {
+  border-top: 2px #444 solid;
+  border-bottom: 2px #444 solid;
+  border-left: none; 
+  border-right: none; 
+}
+.wiki-dl-table th,
+.wiki-dl-table td {
+  padding: 0.25em 0.5em;
+}
+.wiki-dl-table th {
+  vertical-align: top;
+  text-align: right;
+  border-right: 1px #444 solid;
+  border-left: none;
+  border-top: none;
+  border-bottom: none;
+}
+.wiki-dl-table td {
+  border: none;
+}
+
+/*
+ * "E-mail" style blockquote
+ */
+blockquote.mail-style-quote {
+	margin: 0em;
+	margin-bottom: 1em;
+	border: 1px solid #284;
+	padding: 0.5em;
+} 
+.mail-style-quote blockquote.mail-style-quote {
+        margin-left: 0.3em;
+	margin-bottom : 0em;
+	background: transparent;
+	border-style: none;
+	border-left: medium solid #284;
+	padding: 0em;
+	padding-left: 0.5em;
+}
+
+/*
+ * wikiblog
+ */
+.floatleft { float: left; }
+.floatright { float: right; }
+
+div.wikiblog {
+  /* border: thin black solid; */
+  margin: 1ex 2em;
+  padding: 0 0;
+}
+div.wikiblog > div {
+  margin: 0 0;
+  padding: 0.5ex 0.5em;
+}
+div.wikiblog-header {
+  /* background-color: #ccf; */
+}
+div.wikiblog > div.wikiblog-footer {
+  /* background-color: #eee; */
+  padding: 0.2ex 0.5em;
+}
+h3.wikiblog-summary {
+  font-size: medium;
+  font-weight: bold;
+  margin: 0 0 1ex 0;
+}
+
+table.wikiblog-form {
+  width: auto;
+  border-collapse: collapse;
+  margin: 0.25em 0;
+}
+.wikiblog-form caption {
+  caption-side: top;
+  font-weight: bold;
+  text-align: left;
+  padding: 0.5ex 0.5em;
+}
+.wikiblog-form th {
+  vertical-align: top;
+  text-align: right;
+  padding: 0 0 0.3em 0.5em;
+}
+.wikiblog-form td {
+  padding: 0.25em 0.5em;
+}
+.wikiblog-form td.submit-button {
+  padding: 0;
+}
+.wikiblog-form input[type=text],
+.wikiblog-form textarea {
+  margin: 0 0;
+  width: 100%;
+}
+div.wikicomment div.wikicomment-footer {
+  padding: 0.2ex 0.5em;
+}
+div.wikicomment div.wikicomment-footer named-wiki {
+  font-size: small;
+}
+table.interwiki-map {
+  margin: 1em 2em;
+}
+.interwiki-map th {
+  text-decoration: underline;
+  text-align: left;
+  padding-left: 1em;
+}
+.interwiki-map td.interwiki-url {
+  padding-left: 2em;
+}
+.interwiki-map th.interwiki-url {
+  padding-left: 3em;
+}
+
+.dialog {
+  background-color: #cdf;
+  color: black;
+  margin: 2em auto 2em auto;
+  border: thin black solid;
+  width: 50%;
+}
+.dialog h1, .dialog p, .dialog div {
+  text-align: center;
+}
+.dialog h1 {
+  font-size: large;
+  margin: 0.5em 0 1em 0;
+}
+.dialog div.message {
+  background-color: white;
+  color: black;
+  color: black;
+  margin: 0 1em;
+  padding: 0.5em 0.5em;
+}
+.dialog p.buttons {
+  margin: 1em 0 0.5em 0;
+}
+
+.clear-floats {
+  clear: both;
+}
+
+
+/* postnuke css:*/
+.gensmall{font-size:10px}
+.genmed{font-size:11px}
+td.cat{font-weight:bold;letter-spacing:1px;color:#000000;background: url(./images/cellpic1.png);height:27px}
+/* Main table cell colours and backgrounds */
+td.row1{background:#eaedf4;color:#000000}
+td.row2{background:#d9e2ec;color:#000000}
+td.row3{background:#cad9ea;color:#000000}
+td.spacerow{background:#cad9ea;color:#000000}
+
+/* This is the outline round the main forum tables */
+.forumline{background:#ffffff;color:#000000;border:1px solid #006699}
+
+/* Sidebar */
+.box { background:#ffffff; border: 1px solid #888888 }
+.box-title { font-weight: normal; background-color: #ccc; color: black; text-align: center; }
+.box-data { width: 160px; font-size: 9pt; font-weight: normal; }
+.box-data .wiki { font-weight: normal; }
+td.sidebar { border-spacing: 0px; margin: 0ex;}
+
+/* RssFeed */
+div.rss { margin: 1em; padding: 1em; }
+div.feed { margin: -0.5em; margin-bottom: 0em; padding: 0.3em;
+           font-weight: bold; font-size: 1.2em; }
+.chandesc { font-weight: bold; }
+div.rssitem { padding-top:1em; padding-bottom: 1em;
+              border-top: 2px solid #565c5e; /* Alcatel-Lucent grey */ }
+div.itemname { padding-bottom: 1em; font-weight: bold; }
+div.itemdesc { padding-left: 1em; }
+div.authordate { font-style: italic; }
+a.rssicon { font-weight:normal; font-size:small; vertical-align:middle; }
+
+/* SqlResult */
+table.sqlresult {
+  border: 1px outset gray;
+  background: white;
+  margin: 0.5ex 0.5em;
+  padding: 1px;
+}
+.sqlresult tr.evenrow { background: #eee; }
+.sqlresult tr.oddrow  { background: white; }
+table.sqlresult td {
+  margin: 1px;
+  border: 1px solid gray;
+}
+
+/**
+ * TeX2png plugin
+ */
+img.tex { 
+  border: 0ex;
+  vertical-align: middle; 
+}
+
+/**
+ * PhotoAlbum plugin
+ */
+.boldsmall {
+  font-weight: bold;
+  font-size: 11px;
+}
+
+#content {
+    margin: 0;
+    padding: 1em 1em 1.5em 1em;
+    background: white;
+    border: 1px solid #aaaaaa;
+    line-height: 1.2em;
+    position: relative;
+    z-index: 2;
+}
+
+/* the left column width is specified in class .portlet */
+
+#footer {
+        text-align: right;
+        vertical-align: bottom;
+        font-style: italic;
+}
+
+/*
+ * table class="boxed"
+ * will put a border around the table (but not around the cells)
+ *
+ * table class="bordered"
+ * will put a border around the table and the cells
+ *
+ * In both cases, the caption will be bold and centered under the table
+ *
+ * In both cases, the headers (th) will have a "#d8d8d8" background
+ */
+
+table.boxed, table.bordered, table.bordered th, table.bordered td {
+    border-width: 1px;
+    border-style: solid;
+    border-collapse: collapse;
+    vertical-align: top;
+}
+
+table.boxed td, table.bordered td,
+table.boxed th, table.bordered th {
+    padding-left: 5px;
+    padding-right: 5px;
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+
+table.boxed caption, table.bordered caption {
+    text-align: center;
+    font-weight: bold;
+    caption-side: bottom;
+    padding-top: 0.8em;
+}
+
+table.boxed th, table.bordered th {
+    font-weight: bold;
+    background-color: #d8d8d8;
+}
+
+/* plugin BoxRight */
+div.boxright {
+  background-color: #e9fbff;
+  width: 200px; 
+  right: 10px;
+  padding: 0.5em; 
+  float: right; 
+  border: thin solid; 
+  padding: 0.5em;
+}
+
+td.tdselected, td.tdunselected {
+   text-align: center;
+   font-weight: bold;
+   padding-left: 5px;
+   padding-right: 5px;
+}
+
+td.tdselected {
+   color: white;
+   background-color: #554295;
+}
+
+td.tdunselected {
+   color: black;
+   background-color: #e9e8de;
+}
+
+/* Main wiki browse banner */
+.browsebanner table {
+   width: 100%;
+   background-color: #e9fbff;
+   border-style: solid;
+   border-color: blue;
+   border-width: 2px;
+}
+
+.browsebanner table td {
+   text-align: center;
+   font-weight: bold;
+   font-style: oblique;
+}
+
+.rateit {
+   font-size: 60%;
+   font-weight: bold;
+   vertical-align: middle;
+}
+
+/* For emacs users
+ *
+ * Local Variables:
+ * mode: c
+ * c-file-style: cc-mode
+ * End:
+ */

Deleted: trunk/src/plugins/wiki/www/themes/fusionforge/gforge-autonumbering-min.css
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/gforge-autonumbering-min.css	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/gforge-autonumbering-min.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1 +0,0 @@
- at import url(gforge.css);body{counter-reset:chapter;}h2:before{content:counter(chapter) ". ";counter-increment:chapter;}h2{counter-reset:section;}h3:before{content:counter(chapter) "." counter(section) " ";counter-increment:section;}h3{counter-reset:subsection;}h4:before{content:counter(chapter) "." counter(section) "." counter(subsection) " ";counter-increment:subsection;}h4{counter-reset:subsection2;}h5:before{content:counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) " ";counter-increment:subsection2;}h5{counter-reset:subsection3;}h6:before{content:counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) "." counter(subsection3) " ";counter-increment:subsection3;}
\ No newline at end of file

Deleted: trunk/src/plugins/wiki/www/themes/fusionforge/gforge-autonumbering.css
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/gforge-autonumbering.css	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/gforge-autonumbering.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,81 +0,0 @@
-/**
- * $Id: gforge-autonumbering.css 6937 2009-06-15 13:25:25Z vargenau $
- *
- * Copyright (C) 2008 Alcatel-Lucent
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/*
- * Standard Alcatel-Lucent disclaimer for contributing to open source
- *
- * "The Style Sheet ("Contribution") has not been tested and/or
- * validated for release as or in products, combinations with products or
- * other commercial use. Any use of the Contribution is entirely made at
- * the user's own responsibility and the user can not rely on any features,
- * functionalities or performances Alcatel-Lucent has attributed to the
- * Contribution.
- *
- * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
- * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
- * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
- * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
- * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
- * ALONE BASIS."
- */
-
- at import url(gforge.css);
-
-body {
-    counter-reset: chapter;      /* Create a chapter counter scope */
-}
-h2:before {
-    content: counter(chapter) ". ";
-    counter-increment: chapter;  /* Add 1 to chapter */
-}
-h2 {
-    counter-reset: section;      /* Set section to 0 */
-}
-h3:before {
-    content: counter(chapter) "." counter(section) " ";
-    counter-increment: section;
-}
-h3 {
-    counter-reset: subsection;   /* Set subsection to 0 */
-}
-h4:before {
-    content: counter(chapter) "." counter(section) "." counter(subsection) " ";
-    counter-increment: subsection;
-}
-h4 {
-    counter-reset: subsection2;      /* Set section to 0 */
-}
-h5:before {
-    content: counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) " ";
-    counter-increment: subsection2;
-}
-h5 {
-    counter-reset: subsection3;      /* Set subsection to 0 */
-}
-h6:before {
-    content: counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) "." counter(subsection3) " ";
-    counter-increment: subsection3;
-}

Deleted: trunk/src/plugins/wiki/www/themes/fusionforge/gforge-fullscreen-min.css
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/gforge-fullscreen-min.css	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/gforge-fullscreen-min.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1 +0,0 @@
-#topbar{display:none;}#horiznavbar{display:none;}#leftnav{display:none;}.toolpalettes{display:none;}div.toc{border:1px solid black;padding:5px;}div.toc ul{list-style:none;}blockquote.mail-style-quote{margin:0;margin-bottom:1em;border:1px solid #284;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;border-style:none;border-left:medium solid #284;padding:0;padding-left:.5em;}div.wikitext pre{font-family:monospace;border-width:1px;border-style:dashed;padding:.5em;}h1,h2,h3,h4,h5,h6{padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid black;}#content{background:white;}
\ No newline at end of file

Deleted: trunk/src/plugins/wiki/www/themes/fusionforge/gforge-fullscreen.css
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/gforge-fullscreen.css	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/gforge-fullscreen.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,96 +0,0 @@
-/**
- * $Id: gforge-fullscreen.css 6937 2009-06-15 13:25:25Z vargenau $
- *
- * Copyright (C) 2008 Alcatel-Lucent
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/*
- * Standard Alcatel-Lucent disclaimer for contributing to open source
- *
- * "The Style Sheet ("Contribution") has not been tested and/or
- * validated for release as or in products, combinations with products or
- * other commercial use. Any use of the Contribution is entirely made at
- * the user's own responsibility and the user can not rely on any features,
- * functionalities or performances Alcatel-Lucent has attributed to the
- * Contribution.
- *
- * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
- * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
- * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
- * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
- * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
- * ALONE BASIS."
- */
-
-/* Do not display the top bar, the horizontal navigation bar and the left bar */
-#topbar { display: none; }
-#horiznavbar { display: none; }
-#leftnav { display: none; }
-
-/* Do not display the wiki navigation and edition bars */
-.toolpalettes { display: none; }
-
-/**
- * Table of content
- */
-div.toc {
-    border: 1px solid black;
-    padding: 5px;
-}
-div.toc ul { list-style: none; }
-
-/*
- * "E-mail" style blockquote
- */
-blockquote.mail-style-quote {
-    margin: 0em;
-    margin-bottom: 1em;
-    border: 1px solid #284;
-    padding: 0.5em;
-}
-
-.mail-style-quote blockquote.mail-style-quote {
-    margin-left: 0.3em;
-    margin-bottom : 0em;
-    border-style: none;
-    border-left: medium solid #284;
-    padding: 0em;
-    padding-left: 0.5em;
-}
-
-div.wikitext pre {
-    font-family: monospace;
-    border-width: 1px;
-    border-style: dashed;
-    padding: 0.5em;
-}
-
-h1, h2, h3, h4, h5, h6 {
-    padding-top: .5em;
-    padding-bottom: .17em;
-    border-bottom: 1px solid black;
-}
-
-#content {
-    background: white;
-}

Deleted: trunk/src/plugins/wiki/www/themes/fusionforge/gforge-min.css
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/gforge-min.css	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/gforge-min.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1 +0,0 @@
-li p{margin:0;}div.br{display:none;}.toolbar,div.toolbar{margin:.5ex 0;}div.wikitext{width:auto;}div.wikitext table p{margin-top:.3em;margin-bottom:.3em;}img{vertical-align:baseline;}input{margin:.1em;}input.numeric{text-align:right;}fieldset{background-color:#e0f3f7;}legend{border:1px solid #d8d8e7;background-color:white;}div.wikiaction,form.wikiadmin div{border-bottom:1px solid #d8d8e7;border-right:1px solid #d8d8e7;border-top:1px solid #96a2ae;border-left:1px solid #96a2ae;margin-top:.5ex;margin-bottom:.5ex;padding:.5ex .5em;display:table;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}div#navbuttons,div#signin,div#actionbuttons{line-height:3.0ex;}.wikiunknown a,.named-wikiunknown a{border-top:1px solid #c6d2de;border-left:1px solid #c6d2de;border-bottom:1px solid #a2a2a2;border-right:1px solid #a2a2a2;padding-left:1px;padding-right:1px;padding-top:1px;margin-right:.15em;}img.linkicon{vertical-align:middle;}img.inlineimage{vertical-align:middle;}.diff .prefix{position:relative;left:-1em;}.diff del,.diff ins{padding-left:1px;padding-right:1px;}img{border:0;}form{margin:0;}table{empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;}div.wikitext pre{font-family:monospace;border-width:1px;border-color:navy;border-style:dashed;padding:.5em;}div.wikitext{margin-top:1ex;margin-bottom:.5ex;background:white;padding-bottom:1em;clear:both;}body.sidebar{margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}.wiki,.named-wiki{font-weight:bold;}a.wikiaction,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;white-space:nowrap;}input.wikiaction,input.button,input.wikiadmin{margin-right:1em;margin-left:1em;}.wikiunsafe{background-color:#fcc;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;}h1 .backlinks{text-decoration:none;color:inherit;}.wikipage{font-weight:normal;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}div.toc{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;}div.toc ul{list-style:none;}div.toc p.toctitle{font-weight:bold;font-size:1.6em;margin-bottom:1ex;}div.toc p{margin:0;}.toclist a{text-decoration:none;}div.toc p.toctitle,h2,h3,h4,h5,h6{font-family:Verdana,Arial,Helvetica,sans-serif;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1,h1 .backlinks,h2,.wikitext h2 a,h3,.wikitext h3 a,h4,.wikitext h4 a,h5,h6{text-decoration:none;}.pagelist thead th{background:#d8d8d8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tr{vertical-align:top;}.pagelist tr.evenrow{background:#eee;}.pagelist tr.oddrow{background:white;}th.gridbutton{background-color:#d8d8d8;color:#565c5e;font-weight:bold;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:black;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;color:#565c5e;}.toolbar,input.button,#signin{font-family:Verdana,Arial,Helvetica,sans-serif;}.toolbar{padding:0;margin:0;}.toolbar li{margin-left:-20px;list-style-type:none;font-weight:bold;}.toolbar a{text-decoration:none;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}.tooltitle{font-weight:bold;}#navbuttons,#actionbuttons{white-space:nowrap;}#navbuttons .named-wiki,#actionbuttons .named-wiki,#navbuttons .wikiaction,#actionbuttons .wikiaction,#navbuttons .wikiadmin,#actionbuttons .wikiadmin{font-weight:normal;color:#565c5e;}#navbuttons .named-wiki:hover,#actionbuttons .named-wiki:hover,#navbuttons .wikiaction:hover,#actionbuttons .wikiaction:hover,#navbuttons .wikiadmin:hover,#actionbuttons .wikiadmin:hover{text-decoration:underline;}#actionbuttons td{border:1px solid #aaa;border-bottom:none;border-collapse:collapse;padding-left:.8em;padding-right:.8em;}#actionbuttons td.spacer{width:10px;border:none;padding-left:0;padding-right:0;}#actionbuttons td.bold a{font-weight:bold;}.editdate{font-family:Verdana,Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.5ex;border-top:1px #aaa solid;}#logo img{float:right;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}#search-replace{margin-top:1ex;text-align:left;font-size:smaller;}#toolbar{padding:0;}.search-context{background:white;}.search-term{background:yellow;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.pagetrail{background-color:#FF9;padding:.2em;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Verdana,Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;border:1px #ccc solid;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}div.errors{font-weight:bold;border-width:2px;border-style:solid;background-color:#ffc0cb;border-color:red;padding:.5em;}div.warning{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:thin solid blue;clear:both;}.debug{color:black;background:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc;}.hint{color:black;background:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa;}span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}blockquote.mail-style-quote{margin:0;margin-bottom:1em;border:1px solid #284;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;background:transparent;border-style:none;border-left:medium solid #284;padding:0;padding-left:.5em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.clear-floats{clear:both;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid #888;}.box-title{font-weight:normal;background-color:#ccc;color:black;text-align:center;}.box-data{width:160px;font-size:9pt;font-weight:normal;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.rss{margin:1em;padding:1em;}div.feed{margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;font-size:1.2em;}.chandesc{font-weight:bold;}div.rssitem{padding-top:1em;padding-bottom:1em;border-top:2px solid #565c5e;}div.itemname{padding-bottom:1em;font-weight:bold;}div.itemdesc{padding-left:1em;}div.authordate{font-style:italic;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{border:0;vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}#content{margin:0;padding:1em 1em 1.5em 1em;background:white;border:1px solid #aaa;line-height:1.2em;position:relative;z-index:2;}#footer{text-align:right;vertical-align:bottom;font-style:italic;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid;padding:.5em;}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px;}td.tdselected{color:white;background-color:#554295;}td.tdunselected{color:black;background-color:#e9e8de;}.browsebanner table{width:100%;background-color:#e9fbff;border-style:solid;border-color:blue;border-width:2px;}.browsebanner table td{text-align:center;font-weight:bold;font-style:oblique;}.rateit{font-size:60%;font-weight:bold;vertical-align:middle;}
\ No newline at end of file

Deleted: trunk/src/plugins/wiki/www/themes/fusionforge/gforge-print-min.css
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/gforge-print-min.css	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/gforge-print-min.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1 +0,0 @@
-.toolpalettes{display:none;}.pagetrail{display:none;}.browsebanner{display:none;}.editdate{display:none;}a{color:black;}a.interwiki img{display:none;}a.named-interwiki img{display:none;}a.namedurl img{display:none;}img[src="/wiki/themes/gforge/buttons/no_order.png"]{display:none;}div.toc{border:1px solid black;}#toctoggle{display:none;}div.toc p.toctitle,h1,h2,h3,h4,h5,h6{border-bottom:1px solid black;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-color:black;}#content{background:white;border:none;}table.nobreak{page-break-inside:avoid!important;}
\ No newline at end of file

Deleted: trunk/src/plugins/wiki/www/themes/fusionforge/gforge-print.css
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/gforge-print.css	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/gforge-print.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,101 +0,0 @@
-/**
- * $Id: gforge-print.css 7312 2010-03-31 09:49:47Z vargenau $
- *
- * Copyright (C) 2008 Alcatel-Lucent
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/*
- * Standard Alcatel-Lucent disclaimer for contributing to open source
- *
- * "The Style Sheet ("Contribution") has not been tested and/or
- * validated for release as or in products, combinations with products or
- * other commercial use. Any use of the Contribution is entirely made at
- * the user's own responsibility and the user can not rely on any features,
- * functionalities or performances Alcatel-Lucent has attributed to the
- * Contribution.
- *
- * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
- * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
- * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
- * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
- * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
- * ALONE BASIS."
- */
-
-/* Do not print the wiki navigation and edition bars */
-.toolpalettes { display: none; }
-
-/* Do not print Page Trail line */
-.pagetrail { display: none; }
-
-/* Do not print main wiki browse banner */
-.browsebanner { display: none; }
-
-/* Do not print date of last edition */
-.editdate { display: none; }
-
-/* Print links in black */
-a { color: black; }
-
-/* Do not print icons in front of hyperlinks */
-a.interwiki img { display: none; }
-a.named-interwiki img { display: none; }
-a.namedurl img { display: none; }
-
-/* Do not print "none" sorting icon */
-img[src="/wiki/themes/gforge/buttons/no_order.png"] { display: none; }
-
-/**
- * Table of content
- */
-div.toc {
-    border: 1px solid black;
-}
-
-/* Do not print TOC toggle image */
-#toctoggle { display: none; }
-
-div.toc p.toctitle, h1, h2, h3, h4, h5, h6 {
-    border-bottom: 1px solid black;
-}
-
-/*
-div.toclist a::after {
-    content: leader('.') target-counter(attr(href), page);
-}
-*/
-
-table.boxed, table.bordered, table.bordered th, table.bordered td {
-    border-color: black;
-}
-
-#content {
-    background: white;
-    border: none;
-}
-
-/* Do not cut tables with class "nobreak" */
-
-table.nobreak {
-    page-break-inside: avoid !important;
-}

Deleted: trunk/src/plugins/wiki/www/themes/fusionforge/gforge-rereading-min.css
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/gforge-rereading-min.css	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/gforge-rereading-min.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1 +0,0 @@
- at import url(gforge-autonumbering.css);#content{counter-reset:paragraph;}div.wikitext p:before{content:"{" counter(paragraph) ";}";counter-increment:paragraph;color:red;}
\ No newline at end of file

Deleted: trunk/src/plugins/wiki/www/themes/fusionforge/gforge-rereading.css
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/gforge-rereading.css	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/gforge-rereading.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,55 +0,0 @@
-/**
- * $Id: gforge-rereading.css 6937 2009-06-15 13:25:25Z vargenau $
- *
- * Copyright (C) 2008 Alcatel-Lucent
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/*
- * Standard Alcatel-Lucent disclaimer for contributing to open source
- *
- * "The Style Sheet ("Contribution") has not been tested and/or
- * validated for release as or in products, combinations with products or
- * other commercial use. Any use of the Contribution is entirely made at
- * the user's own responsibility and the user can not rely on any features,
- * functionalities or performances Alcatel-Lucent has attributed to the
- * Contribution.
- *
- * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
- * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
- * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
- * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
- * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
- * ALONE BASIS."
- */
-
- at import url(gforge-autonumbering.css);
-
-#content {
-    counter-reset: paragraph;    /* Create a paragraph counter scope */
-}
-div.wikitext p:before {
-    content: "{" counter(paragraph) "} ";
-    counter-increment: paragraph;
-    color: red;
-}
-

Deleted: trunk/src/plugins/wiki/www/themes/fusionforge/gforge.css
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/gforge.css	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/gforge.css	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,1048 +0,0 @@
-/**
- * $Id: gforge.css 7376 2010-05-04 13:37:54Z vargenau $
- *
- * Copyright (C) 2002-2007 $ThePhpWikiProgrammingTeam
- * Copyright (C) 2008-2009 Alcatel-Lucent
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/*
- * Standard Alcatel-Lucent disclaimer for contributing to open source
- *
- * "The Style Sheet ("Contribution") has not been tested and/or
- * validated for release as or in products, combinations with products or
- * other commercial use. Any use of the Contribution is entirely made at
- * the user's own responsibility and the user can not rely on any features,
- * functionalities or performances Alcatel-Lucent has attributed to the
- * Contribution.
- *
- * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
- * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
- * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
- * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
- * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
- * ALONE BASIS."
- */
-
-/* Because in some cases there is a <p> in nested lists */
-li p { margin:0; }
-
-/* Hide the elements we put in just to get around NS4 bugs. */
-div.br { display: none; }
-
-/* This makes spacings in NS4 too big. */
-.toolbar, div.toolbar { margin: 0.5ex 0ex; }
-
-/* This breaks NS4, but is necessary for IE4. */
-div.wikitext { width: auto; }
-
-div.wikitext table p { margin-top: 0.3em;  margin-bottom: 0.3em;}
-
-/**
- * General
- */
-/* for NS4 */
-img { vertical-align: baseline; }
-input { margin: 0.1em; }
-input.numeric { text-align: right; }
-
-fieldset {
-    background-color: #e0f3f7;
-}
-
-legend {
-    border: 1px solid #d8d8e7;
-    background-color: white;
-}
-
-/**
- * Wiki Forms
- * 
- * The div inside the wikiadmin upload form does not
- * have a class yet, so it must be referenced indirectly
- */
-/* div.wikiaction, div.wikiadmin { */
-div.wikiaction, form.wikiadmin div {
-  border-bottom: 1px solid #d8d8e7;
-  border-right:  1px solid #d8d8e7;
-  border-top:  1px solid #96a2ae;
-  border-left: 1px solid #96a2ae;
-
-  margin-top: 0.5ex;
-  margin-bottom: 0.5ex;
-  padding: 0.5ex 0.5em;
-  /* Emulate the display behaviour of a table, to shrink it's width.
-   * ie5.1Mac ignores this */
-  display: table;
-}
-
-/* Add space between the input field and following buttons, but not after the last button. */
-div.wikiaction input[type=text], div.wikiadmin input[type=text], form.wikiadmin input[type=file] { margin-right: 0.5em; }
-
-div#navbuttons, div#signin, div#actionbuttons { line-height: 3.0ex; }
-
-/* QuestionMark */
-.wikiunknown a, .named-wikiunknown a {
-  border-top:  1px solid #c6d2de;
-  border-left: 1px solid #c6d2de;
-  border-bottom: 1px solid #a2a2a2;
-  border-right:  1px solid #a2a2a2;
-  padding-left:  1px;
-  padding-right: 1px;
-  padding-top: 1px;
-  margin-right: .15em;
-}
-
-/* Link icons */
-img.linkicon { vertical-align: middle; }
-
-img.inlineimage { vertical-align: middle; }
-
-/**
- * Edit Page & View Source
- */
-/* color: inherit; and background: inherit; display as lime in NS4 */
-
-/**
- * Diff Output
- */
-.diff .prefix {
-  position: relative;
-  left: -1em;
-}
-/* deleted & added words */
-.diff del, .diff ins {
-  padding-left: 1px;
-  padding-right: 1px;
-}
-
-/**
- * General
- */ 
-img { border: 0ex; }
-
-form { margin: 0ex; }
-
-table {
-  /* For Mozilla */
-  empty-cells: show;
-}
-
-caption {
-  caption-side: top;
-  text-align: left;
-  margin-bottom: .5ex;
-}
-
-/**
- * Wiki
- */
-
-div.wikitext pre { 
-  font-family: monospace; 
-  border-width: 1px;
-  border-color: navy;
-  border-style: dashed;
-  padding: 0.5em;
-}
-
-/**
- * PageTypes
- */
-/* Main wiki text box */
-div.wikitext {
-  margin-top:    1ex;
-  margin-bottom: 0.5ex;
-  background: white;
-  padding-bottom: 1em;
-  clear: both;
-}
-
-/* Mozilla RecentChanges Sidebar */
-body.sidebar {
-  margin: 0.5em;
-}
-body.sidebar div.wikitext {
-  padding: 0.5em;
-}
-body.sidebar div.wikitext ul { padding-left: 1em; }
-body.sidebar h2 { margin-top: 0; }
-
-/**
- * Link styles
- */
-.wiki, .named-wiki {
-  /* text-decoration: none; */
-  font-weight: bold;
-}
-
-/* Action buttons */
-a.wikiaction, a.wiki-rc-action, a.wikiunsafe,
-input.wikiaction, input.button, input.wikiadmin {
-  text-decoration: none;
-  /* don't wrap text buttons */
-  white-space: nowrap;
-}
-
-input.wikiaction, input.button, input.wikiadmin {
-  margin-right: 1em;
-  margin-left: 1em;
-}
-
-.wikiunsafe { background-color: #fcc; }
-
-/* Unknown links */
-.wikiunknown, .named-wikiunknown {
-  font-weight: normal;
-  font-size: 100%;
-}
- /* QuestionMark #600 */
-.wikiunknown a, .named-wikiunknown a {
-  color: #447;
-  background-color: #eee;
-  text-decoration: none;
-  font-weight: normal;
-  font-size: smaller;
-}
-
-/* Backlinks */
-.backlinks {
-  text-decoration: underline;
-}
-h1 .backlinks { text-decoration: none; color: inherit; }
-
-/* Interwiki links */
-.wikipage  { font-weight: normal; }
-.interwiki, i.interwiki .wikipage, em .interwiki .wikipage { font-style: oblique; }
-.interwiki .wikipage, i .interwiki, em .interwiki { font-style: normal; }
-
-/**
- * Table of content
- */
-div.toc {
-    border: 1px solid #aaaaaa;
-    background-color: #f9f9f9;
-    padding: 5px;
-}
-
-div.toc ul { list-style: none }
-
-div.toc p.toctitle { font-weight: bold; font-size: 1.6em; margin-bottom: 1ex; }
-div.toc p { margin: 0; }
-
-.toclist a { text-decoration: none; }
-
-/**
- * headings
- */
-div.toc p.toctitle, h2, h3, h4, h5, h6 { 
-	font-family: Verdana, Arial, Helvetica, sans-serif; 
-        padding-top: .5em;
-        padding-bottom: .17em;
-        border-bottom: 1px solid #aaaaaa;
-}
-
-h1, h1 .backlinks, h2, .wikitext h2 a, h3, .wikitext h3 a, h4, .wikitext h4 a, h5, h6 {
-    text-decoration: none;
-}
-
-/**
- * Tables
- */
-.pagelist thead th {
-  background: #d8d8d8;
-  text-decoration: none;
-  font-weight: bold;
-}
-.pagelist thead td u { text-decoration: none; }
-.pagelist tr { vertical-align: top; }
-.pagelist tr.evenrow { background: #eee; }
-.pagelist tr.oddrow  { background: white; }
-th.gridbutton {
-  background-color: #d8d8d8;
-  color: #565c5e;
-  font-weight: bold;
-  white-space: nowrap;
-  margin: 5px 0px;
-  max-height: 24px;
-  padding: 5px 0px 5px 0px;
-  border-width: 1px;
-  border-style: solid;
-  border-color: black;
-}
-input.gridbutton, a.gridbutton, a:hover.gridbutton, a:visited.gridbutton {
-  text-decoration: none;
-  color: #565c5e;
-}
-
-/**
- * Toolbar
- */
-.toolbar, input.button, #signin { 
-	font-family: Verdana, Arial, Helvetica, sans-serif; 
-}
-
-.toolbar {
-  padding: 0;
-  margin:  0;
-}
-.toolbar li {
-  margin-left: -20px; /* Because there is no list symbol */
-  list-style-type: none;
-  font-weight: bold;
-}
-.toolbar a {
-  text-decoration: none;
-}
-
-.edit-toolbar {
-  padding: 0;
-  margin:  0;
-}
-.edit-toolbar img, .edit-toolbar input {
-  background-color: #fff;
-  border: 1px solid ButtonFace;
-}
-
-.tooltitle {
-	font-weight: bold ;
-}
-
-#navbuttons, #actionbuttons {
-  white-space: nowrap;
-}
-
-#navbuttons .named-wiki,
-#actionbuttons .named-wiki,
-#navbuttons .wikiaction,
-#actionbuttons .wikiaction,
-#navbuttons .wikiadmin,
-#actionbuttons .wikiadmin {
-  font-weight: normal;
-  color: #565c5e; /* Alcatel-Lucent grey */
-}
-
-#navbuttons .named-wiki:hover,
-#actionbuttons .named-wiki:hover,
-#navbuttons .wikiaction:hover,
-#actionbuttons .wikiaction:hover,
-#navbuttons .wikiadmin:hover,
-#actionbuttons .wikiadmin:hover {
-  text-decoration: underline;
-}
-
-#actionbuttons td {
-    border: 1px solid #aaaaaa;
-    border-bottom: none;
-    border-collapse: collapse;
-    padding-left:0.8em;
-    padding-right:0.8em;
-}
-
-#actionbuttons td.spacer {
-    width:10px;
-    border:none;
-    padding-left:0;
-    padding-right:0;
-}
-
-#actionbuttons td.bold a {
-    font-weight: bold;
-}
-
-.editdate {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  margin: 0;
-  padding: 0;
-  padding-top: 0.5ex;
-  border-top: 1px #aaaaaa solid;
-}
-
-#logo img {
-  float: right;
-  border: 1px black solid;
-  /* "paper" borders */
-  border-top:  1px #e8e6df solid;
-  border-left: 1px #e8e6df solid;
-  border-bottom: 1px #d2d2d2 solid;
-  border-right:  1px #b2b2b2 solid;
-}
-
-/**
- * Edit Page & View Source
- */
-
-/* Make the textarea the full page width */
-textarea.wikiedit {
-  width: 100%;
-  margin-bottom: 0.5ex;
-  margin-top:    0.5ex;
-  padding: 2px;
-}
-
-#editarea-size {
-  margin-top: 1ex;
-  text-align: right;
-  font-size: smaller;
-}
-#search-replace {
-  margin-top: 1ex;
-  text-align: left;
-  font-size: smaller;
-}
-#toolbar { padding:0px; }
-
-/**
- * Search Results
- */
-.search-context { background: white; }
-.search-term {
-  background: yellow;
-  font-weight: normal;
-}
-#LSResult {
-  position: absolute;
-  text-align: left;
-  display: none;
-  z-index: 100;
-  background-color: white;
-  border: 1px solid #d0d0d0; 
-  font-size: 9px;
-  overflow: hidden;
-}
-#LSHighlight {
-  background-color: #f08000;
-}
-#LSResult .evenrow {
-  background-color: #f0f0f0;
-} 
-#LSREsult .oddrow {
-} 
-.LSEnd {
-  text-align: right;
-}
-.LSRow:hover {
-  background-color: white;
-}
-.LSRow {
-  padding: 1px;
-} 
-ul.LSRes {
-  margin: 0px;
-  padding: 0px;
-}
-li.LSRow {
-  margin: 0px;
-  list-style-image: none;
-}
-
-/* PageTrail plugin */
-.pagetrail {
-     background-color: #FFFF99;
-     padding: 0.2em;
-}
-
-/* IncludePage plugin */
-.transclusion-title {
-  text-align: right;
-  font-style: oblique;
-  font-size:  smaller;
-  text-decoration: underline;
-  margin-bottom: 0.25ex;
-  margin-right:  0.25em;
-} 
-.transclusion, .wiki-edithelp {
-  font-size: smaller;
-}
-.transclusion {
-  border: 1px solid gray;
-  padding-left:  0.8em; 
-  padding-right: 0.8em; 
-  padding-top:     0px;
-  padding-bottom:  0px;
-  margin-left:   0.25em;
-  margin-right:  0.25em;
-  margin-bottom: 0.1ex;
-}
-.wiki-edithelp {
-  background: white;
-  border: medium solid #fff8dc; /* darker ivory */
-  padding-left:  0.5em;
-  padding-right: 0.5em;
-  padding-top:    0.75ex;
-  padding-bottom: 0.75ex;
-  margin-left:  0;
-  margin-right: 0;
-  margin-top: 1ex;
-  margin-bottom: 1ex;
-}
-.wiki-edithelp p {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  padding-left:  0.5em;
-  padding-right: 0.5em;
-  padding-top:    0.5ex;
-  padding-bottom: 0.5ex;
-  margin: 0;
-}
-
-/**
- * Calendar plugin
- */
-table.cal {
-  border: 1px outset gray;
-  background: white;
-  margin: 0.5ex 0.5em;
-  padding: 1px;
-  /* For Mozilla */
-  empty-cells: hide;
-} 
-
-/* cells */
-table.cal td {
-  background: white;
-  text-align: right;
-} 
-
-/* Month-name header */
-table.cal-header { font-size: larger; }
-table.cal-header tr, table.cal-header td { text-align: center; }
-.cal-arrow {
-  font-weight: bold;
-  text-decoration: none;
-}
-
-/* Day-names header */
-table.cal tbody tr .cal-dayname {  }
-.cal-dayname td {
-  text-align: center;
-  font-size: smaller;
-  text-decoration: underline;
-}
-
-/* Individual days */
-a.cal-hide { text-decoration: none; }
-
-/* Today */
- /* cell */
-table.cal td.cal-today {
-  margin: 1px;
-  border: 1px solid gray;
-}
- /* text */
-table.cal td.cal-today a.cal-hide {  }
-
-/**
- * Diff Output
- */
-/* main box */
-.diff {
-  margin-top:    1ex;
-  margin-bottom: 0.5ex;
-  background: white;
-  border: 1px #ccc solid;
-  color: black;
-  border-top: 1px solid #494f5d;
-  border-left:  1px solid #494f5d;
-  border-bottom:  1px solid #c6d2de;
-  border-right: 1px solid #c6d2de;
-  padding-top:    1px;
-  padding-bottom: 1px;
-  padding-left:  .125em;
-  padding-right: .125em;
-  padding: 0;
-  clear: both;
-}
-.diff .block {
-  background: #ddd;
-  padding-left: 1em;
-}
-
-/* individual blocks */
-.diff .context {
-  background: white;
-  /* for NS4 */
-  border: none;
-}
-/* entire difftextblock */
-.difftext {
-  margin-top:    0;
-  margin-bottom: 0;
-  background: white;
-  border: 1px black solid;
-  border-top:  1px #e8e6df solid;
-  border-left: 1px #e8e6df solid;
-  border-bottom: 1px #d2d2d2 solid;
-  border-right:  1px #b2b2b2 solid;
-  padding-left:  0em; 
-  padding-right: 0em;
-  padding-top:    0ex;
-  padding-bottom: 0ex;
-  clear: both;
-}
-/* + - line prefix */
-.diff .block tt {
-  font-weight: normal;
-  font-family: monospace;
-  color: black;
-  margin-left: 0;
-  border: none;
-}
-/* changed words */
-.diff del, .diff ins {
-  font-weight: bold;
-  text-decoration: none;
-}
-
-/* blocks containing deleted or added words */
-.diff .original, .diff .deleted,
-.diff .final, .diff .added {
-  background: white;
-}
-/* blocks containing deleted words */
-.diff .original, .diff .deleted {
-  background: #fcc;
-  border: none;
-}
-/* blocks containing added words */
-.diff .final, .diff .added {
-  background: #cfc;
-  border: none;
-}
-
-/* deleted words */
-.diff del { background: #f99; }
-/* added words */
-.diff ins { background: #9f9; }
-
-/**
- * PageHistory, Info
- */
-td.pageinfo { font-weight: bold; }
-.pageinfo-minoredit, .pageinfo-authorid {
-  font-size: smaller;
-  font-style: oblique;
-}
-
-div.errors {
-    font-weight: bold;
-    border-width: 2px;
-    border-style: solid;
-    background-color: #ffc0cb; /* pink */
-    border-color: red;
-    padding: 0.5em;
-}
-
-div.warning {
-  color: black;
-  background: #eee;
-  margin-top:    1em;
-  margin-bottom: 1em;
-  padding-left:  0.8em; 
-  padding-right: 0.8em; 
-  padding-top:    0.8ex;
-  padding-bottom: 0;
-  border: thin solid blue;
-  clear: both;
-}
-
-/* Debug */
-.debug {
-  color: black;
-  background: white;
-  font-family: monospace;
-  font-size: smaller;
-  margin: 1ex 0;
-  padding: 0.5ex 0.5em;
-  border: medium solid #fff8dc; /* darker ivory */
-}
-
-/* Hints */
-.hint {
-  color: black;
-  background: #eeeeee;
-  font-style: italic;
-  margin-left: 3em;
-  padding: 0.5ex 0.5em;
-  border: thin solid #aaaaaa;
-}
-span.hint {
-  padding: 0;
-}
-
-/* Disabled Plugins */
-.disabled-plugin
-{
-  clear: both;
-  margin: 1ex 0;
-  padding: 0;
-}
-.disabled-plugin .title {
-  color: #400;
-  background-color: inherit;
-  font-size: x-small;
-  text-align: right;
-  padding: 0 0.5em;
-}
-.disabled-plugin pre {
-  color: black;
-  background: #ddd;
-  margin: 0;
-  padding: 0.3ex 0.5em;
-}
-
-/* "(Redirected from ...)" message. */
-span.redirectfrom {
-  font-size: small;
-  font-style: oblique;
-  font-weight: normal;
-  padding-left: 1em;
-}
-
-/*
- * "DL tables"
- */
-.wiki-dl-table {
-  border-collapse: collapse;
-  border: 2px #444 solid;
-}
-.wiki-dl-table tr {
-  border-top: 2px #444 solid;
-  border-bottom: 2px #444 solid;
-  border-left: none; 
-  border-right: none; 
-}
-.wiki-dl-table th,
-.wiki-dl-table td {
-  padding: 0.25em 0.5em;
-}
-.wiki-dl-table th {
-  vertical-align: top;
-  text-align: right;
-  border-right: 1px #444 solid;
-  border-left: none;
-  border-top: none;
-  border-bottom: none;
-}
-.wiki-dl-table td {
-  border: none;
-}
-
-/*
- * "E-mail" style blockquote
- */
-blockquote.mail-style-quote {
-	margin: 0em;
-	margin-bottom: 1em;
-	border: 1px solid #284;
-	padding: 0.5em;
-} 
-.mail-style-quote blockquote.mail-style-quote {
-        margin-left: 0.3em;
-	margin-bottom : 0em;
-	background: transparent;
-	border-style: none;
-	border-left: medium solid #284;
-	padding: 0em;
-	padding-left: 0.5em;
-}
-
-/*
- * wikiblog
- */
-.floatleft { float: left; }
-.floatright { float: right; }
-
-div.wikiblog {
-  /* border: thin black solid; */
-  margin: 1ex 2em;
-  padding: 0 0;
-}
-div.wikiblog > div {
-  margin: 0 0;
-  padding: 0.5ex 0.5em;
-}
-div.wikiblog-header {
-  /* background-color: #ccf; */
-}
-div.wikiblog > div.wikiblog-footer {
-  /* background-color: #eee; */
-  padding: 0.2ex 0.5em;
-}
-h3.wikiblog-summary {
-  font-size: medium;
-  font-weight: bold;
-  margin: 0 0 1ex 0;
-}
-
-table.wikiblog-form {
-  width: auto;
-  border-collapse: collapse;
-  margin: 0.25em 0;
-}
-.wikiblog-form caption {
-  caption-side: top;
-  font-weight: bold;
-  text-align: left;
-  padding: 0.5ex 0.5em;
-}
-.wikiblog-form th {
-  vertical-align: top;
-  text-align: right;
-  padding: 0 0 0.3em 0.5em;
-}
-.wikiblog-form td {
-  padding: 0.25em 0.5em;
-}
-.wikiblog-form td.submit-button {
-  padding: 0;
-}
-.wikiblog-form input[type=text],
-.wikiblog-form textarea {
-  margin: 0 0;
-  width: 100%;
-}
-div.wikicomment div.wikicomment-footer {
-  padding: 0.2ex 0.5em;
-}
-div.wikicomment div.wikicomment-footer named-wiki {
-  font-size: small;
-}
-table.interwiki-map {
-  margin: 1em 2em;
-}
-.interwiki-map th {
-  text-decoration: underline;
-  text-align: left;
-  padding-left: 1em;
-}
-.interwiki-map td.interwiki-url {
-  padding-left: 2em;
-}
-.interwiki-map th.interwiki-url {
-  padding-left: 3em;
-}
-
-.dialog {
-  background-color: #cdf;
-  color: black;
-  margin: 2em auto 2em auto;
-  border: thin black solid;
-  width: 50%;
-}
-.dialog h1, .dialog p, .dialog div {
-  text-align: center;
-}
-.dialog h1 {
-  font-size: large;
-  margin: 0.5em 0 1em 0;
-}
-.dialog div.message {
-  background-color: white;
-  color: black;
-  color: black;
-  margin: 0 1em;
-  padding: 0.5em 0.5em;
-}
-.dialog p.buttons {
-  margin: 1em 0 0.5em 0;
-}
-
-.clear-floats {
-  clear: both;
-}
-
-
-/* postnuke css:*/
-.gensmall{font-size:10px}
-.genmed{font-size:11px}
-td.cat{font-weight:bold;letter-spacing:1px;color:#000000;background: url(./images/cellpic1.png);height:27px}
-/* Main table cell colours and backgrounds */
-td.row1{background:#eaedf4;color:#000000}
-td.row2{background:#d9e2ec;color:#000000}
-td.row3{background:#cad9ea;color:#000000}
-td.spacerow{background:#cad9ea;color:#000000}
-
-/* This is the outline round the main forum tables */
-.forumline{background:#ffffff;color:#000000;border:1px solid #006699}
-
-/* Sidebar */
-.box { background:#ffffff; border: 1px solid #888888 }
-.box-title { font-weight: normal; background-color: #ccc; color: black; text-align: center; }
-.box-data { width: 160px; font-size: 9pt; font-weight: normal; }
-.box-data .wiki { font-weight: normal; }
-td.sidebar { border-spacing: 0px; margin: 0ex;}
-
-/* RssFeed */
-div.rss { margin: 1em; padding: 1em; }
-div.feed { margin: -0.5em; margin-bottom: 0em; padding: 0.3em;
-           font-weight: bold; font-size: 1.2em; }
-.chandesc { font-weight: bold; }
-div.rssitem { padding-top:1em; padding-bottom: 1em;
-              border-top: 2px solid #565c5e; /* Alcatel-Lucent grey */ }
-div.itemname { padding-bottom: 1em; font-weight: bold; }
-div.itemdesc { padding-left: 1em; }
-div.authordate { font-style: italic; }
-a.rssicon { font-weight:normal; font-size:small; vertical-align:middle; }
-
-/* SqlResult */
-table.sqlresult {
-  border: 1px outset gray;
-  background: white;
-  margin: 0.5ex 0.5em;
-  padding: 1px;
-}
-.sqlresult tr.evenrow { background: #eee; }
-.sqlresult tr.oddrow  { background: white; }
-table.sqlresult td {
-  margin: 1px;
-  border: 1px solid gray;
-}
-
-/**
- * TeX2png plugin
- */
-img.tex { 
-  border: 0ex;
-  vertical-align: middle; 
-}
-
-/**
- * PhotoAlbum plugin
- */
-.boldsmall {
-  font-weight: bold;
-  font-size: 11px;
-}
-
-#content {
-    margin: 0;
-    padding: 1em 1em 1.5em 1em;
-    background: white;
-    border: 1px solid #aaaaaa;
-    line-height: 1.2em;
-    position: relative;
-    z-index: 2;
-}
-
-/* the left column width is specified in class .portlet */
-
-#footer {
-        text-align: right;
-        vertical-align: bottom;
-        font-style: italic;
-}
-
-/*
- * table class="boxed"
- * will put a border around the table (but not around the cells)
- *
- * table class="bordered"
- * will put a border around the table and the cells
- *
- * In both cases, the caption will be bold and centered under the table
- *
- * In both cases, the headers (th) will have a "#d8d8d8" background
- */
-
-table.boxed, table.bordered, table.bordered th, table.bordered td {
-    border-width: 1px;
-    border-style: solid;
-    border-collapse: collapse;
-    vertical-align: top;
-}
-
-table.boxed td, table.bordered td,
-table.boxed th, table.bordered th {
-    padding-left: 5px;
-    padding-right: 5px;
-    padding-top: 0px;
-    padding-bottom: 0px;
-}
-
-table.boxed caption, table.bordered caption {
-    text-align: center;
-    font-weight: bold;
-    caption-side: bottom;
-    padding-top: 0.8em;
-}
-
-table.boxed th, table.bordered th {
-    font-weight: bold;
-    background-color: #d8d8d8;
-}
-
-/* plugin BoxRight */
-div.boxright {
-  background-color: #e9fbff;
-  width: 200px; 
-  right: 10px;
-  padding: 0.5em; 
-  float: right; 
-  border: thin solid; 
-  padding: 0.5em;
-}
-
-td.tdselected, td.tdunselected {
-   text-align: center;
-   font-weight: bold;
-   padding-left: 5px;
-   padding-right: 5px;
-}
-
-td.tdselected {
-   color: white;
-   background-color: #554295;
-}
-
-td.tdunselected {
-   color: black;
-   background-color: #e9e8de;
-}
-
-/* Main wiki browse banner */
-.browsebanner table {
-   width: 100%;
-   background-color: #e9fbff;
-   border-style: solid;
-   border-color: blue;
-   border-width: 2px;
-}
-
-.browsebanner table td {
-   text-align: center;
-   font-weight: bold;
-   font-style: oblique;
-}
-
-.rateit {
-   font-size: 60%;
-   font-weight: bold;
-   vertical-align: middle;
-}
-
-/* For emacs users
- *
- * Local Variables:
- * mode: c
- * c-file-style: cc-mode
- * End:
- */

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/pgsrc/PhpWikiAdministration	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,6 +1,6 @@
-Date: Fri, 13 Aug 2010 15:31:51 +0000
+Date: Tue, 31 Aug 2010 11:36:17 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: PhpWikiAdministration 7644 2010-08-13 13:34:26Z vargenau $
+X-Rcs-Id: $Id: PhpWikiAdministration 7654 2010-08-31 09:41:22Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
   flags=PAGE_LOCKED;
@@ -24,6 +24,8 @@
 
 == Global Access Rights ==
 
+These action pages will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
 * [[SetGlobalAccessRightsSimple]]
 * [[SetGlobalAccessRights]]
 

Added: trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration%FSetAclSimple
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple	                        (rev 0)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple	2010-09-01 18:19:59 UTC (rev 10384)
@@ -0,0 +1,29 @@
+Date: Tue, 31 Aug 2010 11:36:17 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id: PhpWikiAdministration%2FSetAclSimple 7656 2010-08-31 11:42:09Z vargenau $
+Content-Type: application/x-phpwiki;
+  pagename=PhpWikiAdministration%2FSetAclSimple;
+  flags=PAGE_LOCKED;
+  markup=2;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+For more complex Access Rights modifications, see **[[phpwiki:?action=setacl|SetAcl]]**.
+
+----
+
+//Liberal Access Rights// means //Everyone can edit//, even if not member of the project.
+
+view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
+
+
+//Restrictive Access Rights// means //Only project members can see the page//.
+
+view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
+
+----
+
+<<WikiAdminSetAclSimple>>
+
+----
+[[CategoryActionPage]]

Added: trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple	                        (rev 0)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple	2010-09-01 18:19:59 UTC (rev 10384)
@@ -0,0 +1,28 @@
+Date: Tue, 31 Aug 2010 11:36:04 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id: SetGlobalAccessRightsSimple 7657 2010-08-31 12:07:02Z vargenau $
+Content-Type: application/x-phpwiki;
+  pagename=SetGlobalAccessRightsSimple;
+  flags=PAGE_LOCKED;
+  markup=2;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+This action page will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
+
+----
+
+//Liberal Access Rights// means //Everyone can edit//, even if not member of the project.
+
+view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
+
+
+//Restrictive Access Rights// means //Only project members can see the page//.
+
+view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
+
+<<WikiAdminSetAclSimple s=. info=pagename>>
+
+----
+[[CategoryActionPage]]

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/SpecialPages
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/pgsrc/SpecialPages	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/SpecialPages	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,6 +1,6 @@
-Date: Thu, 15 Jul 2010 16:58:46 +0000
+Date: Tue, 24 Aug 2010 11:59:55 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: SpecialPages 7610 2010-07-15 14:59:08Z vargenau $
+X-Rcs-Id: $Id: SpecialPages 7649 2010-08-24 10:03:52Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=SpecialPages;
   flags=EXTERNAL_PAGE;
@@ -21,6 +21,7 @@
 * [[AllPagesCreatedByMe]]
 * [[AllPagesOwnedByMe]]
 * [[AllPagesLastEditedByMe]]
+* [[AllPagesByAcl]]
 * [[NewPagesPerUser]]
 * [[LockedPages]]
 * [[OrphanedPages]]

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/html.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/templates/html.tmpl	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/html.tmpl	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1,9 +1,9 @@
 <?php // -*-php-*-
-// rcs_id('$Id: html.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: html.tmpl 7666 2010-08-31 16:02:45Z vargenau $');
 ?>
 <?php
 /*
- * No header for Gforge (already provided)
+ * No header for FusionForge (already provided)
  */
 ?>
 <?php $WikiTheme->header() ?>

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/themeinfo.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/themeinfo.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -6,12 +6,12 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// rcs_id('$Id: themeinfo.php 7665 2010-08-31 15:54:37Z vargenau $');
 
 require_once('lib/WikiTheme.php');
 require_once('themes/wikilens/themeinfo.php');
 
-class WikiTheme_gforge extends WikiTheme_Wikilens {
+class WikiTheme_fusionforge extends WikiTheme_Wikilens {
 
     function header() {
         global $HTML, $group_id, $group_public_name, $request, $project;
@@ -23,13 +23,13 @@
         //group is private
         if (!$project->isPublic()) {
             //if it's a private group, you must be a member of that group
-            session_require_perm ('project_read', $group_id);
+            session_require(array('group'=>$group_id));
         }
 
         //for dead projects must be member of admin project
         if (!$project->isActive()) {
             //only SF group can view non-active, non-holding groups
-            session_require_global_perm ('forge_admin');
+            session_require(array('group'=>'1'));
         }
 
         $HTML->header(array('title'=> $group_public_name.': '.htmlspecialchars($pagename),
@@ -148,7 +148,7 @@
     }
 }
 
-$WikiTheme = new WikiTheme_gforge('gforge');
+$WikiTheme = new WikiTheme_fusionforge('fusionforge');
 
 // Local Variables:
 // mode: php

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/wikilens-min.js
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/wikilens-min.js	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/wikilens-min.js	2010-09-01 18:19:59 UTC (rev 10384)
@@ -1 +1 @@
-var rating=new Array;var prediction=new Array;var avg=new Array;var numusers=new Array;var canRate=new Array;var msg_rating_votes="Rating: %.1f (%d votes)";var msg_curr_rating="Your current rating: ";var msg_curr_prediction="Your current prediction: ";var msg_to=" to ";var msg_add_rating="Add your rating: ";var msg_thanks="Thanks!";var msg_rating_deleted="Rating deleted!";var rateit_imgsrc="/plugins/wiki/themes/gforge/images/RateIt";var rateit_action="RateIt";var idTop="";function displayRating(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(canRate[a]){if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(g<=(k*2)){e="O"}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function displayRating2(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(k<=n){if(g<=(k*2)){e="Rp"}else{if(g<=(n*2)){e="R"}}}else{if(g<=(n*2)){e="Rp"}else{if(g<=(k*2)){e="Rm"}}}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function sprintfRating(b,a,c){var d=Math.round(a*10)/10;if(c<2){b=b.replace(/votes/,"vote")}return b.replace(/\%.1f/,d).replace(/\%d/,c)}function clickRating(c,f,i,a,e,g){var h=a+"Action";var j=document.getElementById("rateit-widget-top");var k=numusers[a];var b=rating[a];if(g=="X"){deleteRating(h,f,e);if(j&&k){var d=avg[a]*k;var l;if(b&&b>0){if(k>1){l=(d-b)/(k-1);numusers[a]--}else{l=0;numusers[a]=0}}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,k-1)}}rating[a]=0;displayRating2(a,c,0,0,1)}else{submitRating(h,f,i,e,g);if(j&&k){var d=avg[a]*k;var l;if(b&&(b>0)){l=(d+g-b)/k}else{l=(d+g)/(k+1);numusers[a]++}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;if(g!=rating[a]){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,numusers[a])}}}else{if(j&&idTop==a){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,g,1);avg[a]=g;numusers[a]=1}}rating[a]=g;displayRating2(a,c,g,0,1)}}function submitRating(d,e,a,f,g){var c=Math.round(Math.random()*(1000000));var b=WikiURL(e)+"version="+a+"&action="+rateit_action+"&mode=add&rating="+g+"&dimension="+f+"&nocache=1&nopurge=1&rand="+c;document[d].title=msg_thanks;document[d].src=b}function deleteRating(c,d,e){var b=Math.round(Math.random()*(1000000));var a=WikiURL(d)+"action="+rateit_action+"&mode=delete&dimension="+e+"&nocache=1&nopurge=1&rand="+b;document[c].title=msg_rating_deleted;document[c].src=a};
\ No newline at end of file
+var rating=new Array;var prediction=new Array;var avg=new Array;var numusers=new Array;var canRate=new Array;var msg_rating_votes="Rating: %.1f (%d votes)";var msg_curr_rating="Your current rating: ";var msg_curr_prediction="Your current prediction: ";var msg_to=" to ";var msg_add_rating="Add your rating: ";var msg_thanks="Thanks!";var msg_rating_deleted="Rating deleted!";var rateit_imgsrc="/plugins/wiki/themes/fusionforge/images/RateIt";var rateit_action="RateIt";var idTop="";function displayRating(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(canRate[a]){if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(g<=(k*2)){e="O"}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function displayRating2(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(k<=n){if(g<=(k*2)){e="Rp"}else{if(g<=(n*2)){e="R"}}}else{if(g<=(n*2)){e="Rp"}else{if(g<=(k*2)){e="Rm"}}}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function sprintfRating(b,a,c){var d=Math.round(a*10)/10;if(c<2){b=b.replace(/votes/,"vote")}return b.replace(/\%.1f/,d).replace(/\%d/,c)}function clickRating(c,f,i,a,e,g){var h=a+"Action";var j=document.getElementById("rateit-widget-top");var k=numusers[a];var b=rating[a];if(g=="X"){deleteRating(h,f,e);if(j&&k){var d=avg[a]*k;var l;if(b&&b>0){if(k>1){l=(d-b)/(k-1);numusers[a]--}else{l=0;numusers[a]=0}}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,k-1)}}rating[a]=0;displayRating2(a,c,0,0,1)}else{submitRating(h,f,i,e,g);if(j&&k){var d=avg[a]*k;var l;if(b&&(b>0)){l=(d+g-b)/k}else{l=(d+g)/(k+1);numusers[a]++}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;if(g!=rating[a]){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,numusers[a])}}}else{if(j&&idTop==a){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,g,1);avg[a]=g;numusers[a]=1}}rating[a]=g;displayRating2(a,c,g,0,1)}}function submitRating(d,e,a,f,g){var c=Math.round(Math.random()*(1000000));var b=WikiURL(e)+"version="+a+"&action="+rateit_action+"&mode=add&rating="+g+"&dimension="+f+"&nocache=1&nopurge=1&rand="+c;document[d].title=msg_thanks;document[d].src=b}function deleteRating(c,d,e){var b=Math.round(Math.random()*(1000000));var a=WikiURL(d)+"action="+rateit_action+"&mode=delete&dimension="+e+"&nocache=1&nopurge=1&rand="+b;document[c].title=msg_rating_deleted;document[c].src=a};
\ No newline at end of file

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/wikilens.js
===================================================================
--- trunk/src/plugins/wiki/www/themes/gforge/wikilens.js	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/wikilens.js	2010-09-01 18:19:59 UTC (rev 10384)
@@ -23,7 +23,7 @@
 var msg_rating_deleted = "Rating deleted!";
 
 //var rateit_imgsrc = '/phpwiki-cvs/themes/MonoBook/images/RateIt';
-var rateit_imgsrc = '/plugins/wiki/themes/gforge/images/RateIt';
+var rateit_imgsrc = '/plugins/wiki/themes/fusionforge/images/RateIt';
 var rateit_action = 'RateIt';
 var idTop = '';
 //

Modified: trunk/src/plugins/wiki/www/wikiadmin.php
===================================================================
--- trunk/src/plugins/wiki/www/wikiadmin.php	2010-09-01 16:38:20 UTC (rev 10383)
+++ trunk/src/plugins/wiki/www/wikiadmin.php	2010-09-01 18:19:59 UTC (rev 10384)
@@ -43,9 +43,9 @@
  */
 
 require_once dirname(__FILE__)."/../../env.inc.php";
-require_once $gfcommon.'include/pre.php';
-require_once forge_get_config('plugins_path').'wiki/common/WikiPlugin.class.php';
-require_once forge_get_config('plugins_path').'wiki/common/wikiconfig.class.php';
+require_once $gfwww.'include/pre.php';
+require_once $sys_plugins_path.'wiki/common/WikiPlugin.class.php';
+require_once $sys_plugins_path.'wiki/common/wikiconfig.class.php';
 
 // the header that displays for the user portion of the plugin
 function wiki_Project_Header($params) {




More information about the Fusionforge-commits mailing list