phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] SF.net SVN: phpwiki:[8439] trunk/lib/WikiDB.php

[<var...@us...>]

Revision: 8439
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8439&view=rev
Author:   vargenau
Date:     2012-11-14 15:47:08 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove empty lines

Modified Paths:
--------------
    trunk/lib/WikiDB.php

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2012-11-14 15:45:07 UTC (rev 8438)
+++ trunk/lib/WikiDB.php	2012-11-14 15:47:08 UTC (rev 8439)
@@ -755,9 +755,6 @@
     }
 }
 
-
-
-
 /**
  * A base class which representing a wiki-page within a
  * WikiDB.
@@ -1539,8 +1536,6 @@
 
 }
 
-
-
 /**
  * This class represents a specific revision of a WikiDB_Page within
  * a WikiDB.
@@ -1888,9 +1883,6 @@
     }
 }
 
-
-
-
 /**
  * Class representing a sequence of WikiDB_Pages.
  * TODO: Enhance to php5 iterators
@@ -2046,8 +2038,6 @@
 
 }
 
-
-
 /**
  * A class which represents a sequence of WikiDB_PageRevisions.
  * TODO: Enhance to php5 iterators
@@ -2134,8 +2124,6 @@
     }
 }
 
-
-
 /** pseudo iterator
  */
 class WikiDB_Array_PageIterator
@@ -2431,8 +2419,6 @@
     }
 }
 
-
-
 function _sql_debuglog($msg, $newline = true, $shutdown = false)
 {
     static $fp = false;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8438] trunk/lib

[<var...@us...>]

Revision: 8438
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8438&view=rev
Author:   vargenau
Date:     2012-11-14 15:45:07 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove useless semicolon

Modified Paths:
--------------
    trunk/lib/WikiDB/ADODB.php
    trunk/lib/WikiDB/PDO.php
    trunk/lib/WikiDB/SQL.php
    trunk/lib/WikiDB/backend/ADODB.php
    trunk/lib/WikiDB/backend/ADODB_mssql.php
    trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
    trunk/lib/WikiDB/backend/ADODB_mysql.php
    trunk/lib/WikiDB/backend/ADODB_oci8po.php
    trunk/lib/WikiDB/backend/ADODB_postgres7.php
    trunk/lib/WikiDB/backend/ADODB_sqlite.php
    trunk/lib/WikiDB/backend/PDO.php
    trunk/lib/WikiDB/backend/PearDB.php
    trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
    trunk/lib/WikiDB/backend/PearDB_mysql.php
    trunk/lib/WikiDB/backend/PearDB_oci8.php
    trunk/lib/WikiDB/backend/PearDB_pgsql.php
    trunk/lib/WikiDB/backend/PearDB_sqlite.php
    trunk/lib/WikiDB/backend/dba.php
    trunk/lib/WikiDB/backend/dbaBase.php
    trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
    trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
    trunk/lib/WikiDB/backend/file.php
    trunk/lib/WikiDB/backend/flatfile.php
    trunk/lib/WikiDB/backend.php
    trunk/lib/WikiDB/dba.php
    trunk/lib/WikiPlugin.php
    trunk/lib/XmlElement.php
    trunk/lib/wikilens/CustomPrefs.php
    trunk/lib/wikilens/PageListColumns.php

Modified: trunk/lib/WikiDB/ADODB.php
===================================================================
--- trunk/lib/WikiDB/ADODB.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/ADODB.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -106,8 +106,6 @@
 
 }
 
-;
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/PDO.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -113,8 +113,6 @@
 
 }
 
-;
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/SQL.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -103,8 +103,6 @@
 
 }
 
-;
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/ADODB.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -1330,8 +1330,6 @@
 
 }
 
-;
-
 class WikiDB_backend_ADODB_generic_iter
     extends WikiDB_backend_iterator
 {

Modified: trunk/lib/WikiDB/backend/ADODB_mssql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssql.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/ADODB_mssql.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -113,8 +113,6 @@
 
 }
 
-;
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -245,8 +245,6 @@
 
 }
 
-;
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mysql.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/ADODB_mysql.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -239,8 +239,6 @@
 
 }
 
-;
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_oci8po.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/ADODB_oci8po.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -154,8 +154,6 @@
 
 }
 
-;
-
 class WikiDB_backend_ADODB_oci8_search
     extends WikiDB_backend_ADODB_search
 {

Modified: trunk/lib/WikiDB/backend/ADODB_postgres7.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_postgres7.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/ADODB_postgres7.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -144,8 +144,6 @@
 
 }
 
-;
-
 class WikiDB_backend_ADODB_postgres7_search
     extends WikiDB_backend_ADODB_search
 {

Modified: trunk/lib/WikiDB/backend/ADODB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_sqlite.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/ADODB_sqlite.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -57,8 +57,6 @@
     }
 }
 
-;
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/PDO.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -1327,8 +1327,6 @@
     }
 }
 
-;
-
 class WikiDB_backend_PDO_generic_iter
     extends WikiDB_backend_iterator
 {

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/PearDB.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -1210,8 +1210,6 @@
     }
 }
 
-;
-
 /**
  * This class is a generic iterator.
  *

Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -666,8 +666,6 @@
     }
 }
 
-;
-
 class WikiDB_backend_PearDB_ffpgsql_search
     extends WikiDB_backend_PearDB_pgsql_search
 {

Modified: trunk/lib/WikiDB/backend/PearDB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysql.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/PearDB_mysql.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -218,8 +218,6 @@
 
 }
 
-;
-
 class WikiDB_backend_PearDB_mysql_search
     extends WikiDB_backend_PearDB_search
 {

Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_oci8.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/PearDB_oci8.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -106,8 +106,6 @@
 
 }
 
-;
-
 class WikiDB_backend_PearDB_oci8_search
     extends WikiDB_backend_PearDB_search
 {

Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_pgsql.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/PearDB_pgsql.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -273,8 +273,6 @@
 
 }
 
-;
-
 class WikiDB_backend_PearDB_pgsql_search
     extends WikiDB_backend_PearDB_search
 {

Modified: trunk/lib/WikiDB/backend/PearDB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_sqlite.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/PearDB_sqlite.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -97,8 +97,6 @@
 
 }
 
-;
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/WikiDB/backend/dba.php
===================================================================
--- trunk/lib/WikiDB/backend/dba.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/dba.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -36,8 +36,6 @@
     }
 }
 
-;
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/dbaBase.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -609,8 +609,6 @@
     }
 }
 
-;
-
 function WikiDB_backend_dbaBase_sortby_pagename_ASC($a, $b)
 {
     return strcasecmp($a, $b);
@@ -717,8 +715,6 @@
     }
 }
 
-;
-
 class WikiDB_backend_dbaBase_linktable
 {
     function WikiDB_backend_dbaBase_linktable(&$dba)

Modified: trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -68,8 +68,6 @@
     }
 }
 
-;
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/TextSearchIter.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/dumb/TextSearchIter.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -86,8 +86,6 @@
     }
 }
 
-;
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/file.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -730,8 +730,6 @@
 
 }
 
-;
-
 class WikiDB_backend_file_iter extends WikiDB_backend_iterator
 {
     function WikiDB_backend_file_iter(&$backend, &$query_result, $options = array())

Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/flatfile.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -196,8 +196,6 @@
     }
 }
 
-;
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -699,8 +699,6 @@
     }
 }
 
-;
-
 /**
  * Iterator returned by backend methods which (possibly) return
  * multiple records.
@@ -773,8 +771,6 @@
     }
 }
 
-;
-
 /**
  * search baseclass, pcre-specific
  */

Modified: trunk/lib/WikiDB/dba.php
===================================================================
--- trunk/lib/WikiDB/dba.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/dba.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -20,8 +20,6 @@
     }
 }
 
-;
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiPlugin.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -554,8 +554,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/XmlElement.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -199,8 +199,6 @@
     }
 }
 
-
-
 /**
  * An XML element.
  *
@@ -459,8 +457,6 @@
 
 }
 
-
-
 class RawXml
 {
     function RawXml($xml_text)

Modified: trunk/lib/wikilens/CustomPrefs.php
===================================================================
--- trunk/lib/wikilens/CustomPrefs.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/wikilens/CustomPrefs.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -23,8 +23,6 @@
     }
 }
 
-;
-
 class _UserPreference_recalgo // recommendation engine algorithm
     extends _UserPreference
 {
@@ -44,15 +42,11 @@
     }
 }
 
-;
-
 class _UserPreference_recnnbr // recommendation engine key clustering, neighborhood size
     extends _UserPreference_numeric
 {
 }
 
-;
-
 $WikiTheme->customUserPreferences
 (array
 (

Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
--- trunk/lib/wikilens/PageListColumns.php	2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/wikilens/PageListColumns.php	2012-11-14 15:45:07 UTC (rev 8438)
@@ -1,6 +1,5 @@
-<?php // -*-php-*-
+<?php
 
-
 /*
  * Copyright 2004 Mike Cassano
  *
@@ -56,8 +55,6 @@
     }
 }
 
-;
-
 class _PageList_Column_coagreement extends _PageList_Column_custom
 {
     function _PageList_Column_coagreement($params)
@@ -143,8 +140,6 @@
     }
 }
 
-;
-
 /**
  * Show the value of a rating as a digit (or "-" if no value), given the
  * user who is the rater.
@@ -216,8 +211,6 @@
     }
 }
 
-;
-
 /**
  * Ratings widget for the logged-in user and the given page
  * This uses the column name "rating".
@@ -260,8 +253,6 @@
     }
 }
 
-;
-
 class _PageList_Column_prediction extends _PageList_Column
 {
     var $_active_ratings_user;
@@ -313,8 +304,6 @@
     }
 }
 
-;
-
 class _PageList_Column_top3recs extends _PageList_Column_custom
 {
 
@@ -385,8 +374,6 @@
     }
 }
 
-;
-
 // register custom PageList type
 global $WikiTheme;
 $WikiTheme->addPageListColumn

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8437] trunk/themes

[<var...@us...>]

Revision: 8437
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8437&view=rev
Author:   vargenau
Date:     2012-11-14 14:28:09 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
No table summary in HTML 5

Modified Paths:
--------------
    trunk/themes/Crao/templates/top.tmpl
    trunk/themes/MonoBook/templates/info.tmpl
    trunk/themes/Portland/templates/editpage.tmpl
    trunk/themes/Portland/templates/navbar.tmpl
    trunk/themes/Wordpress/templates/editpage.tmpl
    trunk/themes/blog/templates/actionbar.tmpl
    trunk/themes/default/templates/actionbar.tmpl
    trunk/themes/default/templates/editpage.tmpl
    trunk/themes/default/templates/info.tmpl
    trunk/themes/fusionforge/templates/editpage.tmpl
    trunk/themes/smaller/templates/actionbar.tmpl

Modified: trunk/themes/Crao/templates/top.tmpl
===================================================================
--- trunk/themes/Crao/templates/top.tmpl	2012-11-14 14:14:24 UTC (rev 8436)
+++ trunk/themes/Crao/templates/top.tmpl	2012-11-14 14:28:09 UTC (rev 8437)
@@ -3,8 +3,7 @@
 if (!$HIDE_TOOLBARS) {
 ?>
 <!-- The logo -->
-<table summary="logo"
-       width="100%" cellpadding="0" cellspacing="0" border="0">
+<table width="100%" cellpadding="0" cellspacing="0" border="0">
  <tr valign="middle">
   <td><div id="logo"><a href="<?php echo WikiURL(HOME_PAGE)?>"><?php echo WIKI_NAME?></a></div></td>
   <td><div id="signin"><?php echo Template('signin')  ?></div></td>

Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl	2012-11-14 14:14:24 UTC (rev 8436)
+++ trunk/themes/MonoBook/templates/info.tmpl	2012-11-14 14:28:09 UTC (rev 8437)
@@ -88,7 +88,7 @@
 }
 ?>
 
-<table summary="<?php echo $tableSummary ?>" class="pageinfo">
+<table class="pageinfo">
 
 <?php if (!$is_current) { ?>
   <tr>

Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2012-11-14 14:14:24 UTC (rev 8436)
+++ trunk/themes/Portland/templates/editpage.tmpl	2012-11-14 14:28:09 UTC (rev 8437)
@@ -10,7 +10,7 @@
 <form method="post" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
       accept-charset="<?php echo CHARSET?>">
-<table summary="Toolbar: Save, Preview, and edit warnings." class="toolbar" width="100%"
+<table class="toolbar" width="100%"
        cellpadding="0" cellspacing="0" border="0">
 <tr align="bottom">
   <td>

Modified: trunk/themes/Portland/templates/navbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/navbar.tmpl	2012-11-14 14:14:24 UTC (rev 8436)
+++ trunk/themes/Portland/templates/navbar.tmpl	2012-11-14 14:28:09 UTC (rev 8437)
@@ -14,8 +14,7 @@
      CSSs float:left; and float:right;.  However float:right; seems
      to cause MSIE4.01/NT to hang.
      So, we use tables...  -->
-<table summary="Toolbar 1: Navigation and user login."
-       class="toolbar" width="100%"
+<table class="toolbar" width="100%"
        cellpadding="0" cellspacing="0" border="0"
        id="actionbar">
 <tr valign="baseline">

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2012-11-14 14:14:24 UTC (rev 8436)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2012-11-14 14:28:09 UTC (rev 8437)
@@ -13,7 +13,7 @@
       action="<?php echo $request->getPostURL() ?>"
       accept-charset="<?php echo CHARSET?>">
   <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
-<table summary="Toolbar: Save, Preview, and edit warnings." class="toolbar" width="100%"
+<table class="toolbar" width="100%"
        cellpadding="0" cellspacing="0" border="0">
 <tr align="bottom">
   <td>

Modified: trunk/themes/blog/templates/actionbar.tmpl
===================================================================
--- trunk/themes/blog/templates/actionbar.tmpl	2012-11-14 14:14:24 UTC (rev 8436)
+++ trunk/themes/blog/templates/actionbar.tmpl	2012-11-14 14:28:09 UTC (rev 8437)
@@ -1,5 +1,4 @@
-<table summary="Toolbar: Mani Navigation"
-       width="100%" cellpadding="0" cellspacing="0" border="0">
+<table width="100%" cellpadding="0" cellspacing="0" border="0">
 <tr valign="baseline">
   <td>
   <div class="actionbuttons">

Modified: trunk/themes/default/templates/actionbar.tmpl
===================================================================
--- trunk/themes/default/templates/actionbar.tmpl	2012-11-14 14:14:24 UTC (rev 8436)
+++ trunk/themes/default/templates/actionbar.tmpl	2012-11-14 14:28:09 UTC (rev 8437)
@@ -4,8 +4,7 @@
        * CSSs float:left; and float:right;.  However float:right; seems
        * to cause MSIE4.01/NT to hang. 
        * So, we use tables...  */ ?>
-<table summary="Toolbar 1: Page actions and user login."
-       width="100%" cellpadding="0" cellspacing="0" border="0">
+<table width="100%" cellpadding="0" cellspacing="0" border="0">
 <tr valign="baseline">
   <td>
   <div id="actionbuttons">

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2012-11-14 14:14:24 UTC (rev 8436)
+++ trunk/themes/default/templates/editpage.tmpl	2012-11-14 14:28:09 UTC (rev 8437)
@@ -53,7 +53,7 @@
   <?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?>
 </div> 
 <?php } ?>
-<table summary="Toolbar: Page editing options." class="toolbar" width="100%"
+<table class="toolbar" width="100%"
        cellpadding="0" cellspacing="0" border="0">
 <tr valign="middle">
   <td> 

Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl	2012-11-14 14:14:24 UTC (rev 8436)
+++ trunk/themes/default/templates/info.tmpl	2012-11-14 14:28:09 UTC (rev 8437)
@@ -61,7 +61,6 @@
     $label['summary'] = _("Summary") . _(":");
 }
 
-$tableSummary = fmt("Statistics about %s.", $page->getName());
 $Sep = $WikiTheme->getButtonSeparator();
 
 $perm_tree = pagePermissions($page->getName());
@@ -75,7 +74,7 @@
 }
 ?>
 
-<table summary="<?php echo $tableSummary ?>" class="pageinfo">
+<table class="pageinfo">
 
 <?php if (!$is_current) { ?>
   <tr>
@@ -152,7 +151,7 @@
 if ($page->get('pagetype') == 'wikiblog') {
     $pagetype []= _("Blog page");
 }
-if ($page->getName() == _("InterWikiMap")) {
+if ($page->getName() == __("InterWikiMap")) {
     $pagetype []= _("InterWikiMap");
 }
 if (isSubPage($page->getName())) {

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 14:14:24 UTC (rev 8436)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 14:28:09 UTC (rev 8437)
@@ -76,7 +76,7 @@
 <div style="text-align: center;">
   <label for="edit-summary"><?php echo _("Summary").':'?></label> <?php echo $SUMMARY_INPUT?>
 </div>
-<table summary="Toolbar: Page editing options." class="fullwidth">
+<table class="fullwidth">
 <tr valign="middle">
   <td>
     <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />

Modified: trunk/themes/smaller/templates/actionbar.tmpl
===================================================================
--- trunk/themes/smaller/templates/actionbar.tmpl	2012-11-14 14:14:24 UTC (rev 8436)
+++ trunk/themes/smaller/templates/actionbar.tmpl	2012-11-14 14:28:09 UTC (rev 8437)
@@ -8,8 +8,7 @@
        * CSSs float:left; and float:right;.  However float:right; seems
        * to cause MSIE4.01/NT to hang. 
        * So, we use tables...  */ ?>
-<table summary="Toolbar 1: Page actions and user login."
-       width="100%" cellpadding="0" cellspacing="0" border="0">
+<table width="100%" cellpadding="0" cellspacing="0" border="0">
 <tr valign="baseline">
   <td>
   <div id="actionbuttons">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8436] trunk/themes/fusionforge/templates/editpage.tmpl

[<var...@us...>]

Revision: 8436
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8436&view=rev
Author:   vargenau
Date:     2012-11-14 14:14:24 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Whitespace only

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/editpage.tmpl

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 14:02:50 UTC (rev 8435)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 14:14:24 UTC (rev 8436)
@@ -93,13 +93,14 @@
 <tr>
   <td>
     <?php if ($user->isAdmin()) { ?>
-    <?php echo $LOCKED_CB ?> <label for="edit-locked" title="<?php echo _("Make the page read-only?")?>"><?php echo _("Locked")?></label>
-    <?php if (ENABLE_PAGE_PUBLIC) { ?>
-    <?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Make the page public?")?>"><?php echo _("Public")?></label>
+      <?php echo $LOCKED_CB ?> <label for="edit-locked" title="<?php echo _("Make the page read-only?")?>"><?php echo _("Locked")?></label>
+      <?php if (ENABLE_PAGE_PUBLIC) { ?>
+        <?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Make the page public?")?>"><?php echo _("Public")?></label>
+      <?php } ?>
+      <?php if (ENABLE_EXTERNAL_PAGES) { ?>
+        <?php echo $EXTERNAL_CB ?> <label for="edit-external" title="<?php echo _("Make the page external?")?>"><?php echo _("External")?></label>
+      <?php } ?>
     <?php } ?>
-    <?php if (ENABLE_EXTERNAL_PAGES) { ?>
-    <?php echo $EXTERNAL_CB ?> <label for="edit-external" title="<?php echo _("Make the page external?")?>"><?php echo _("External")?></label>
-    <?php }} ?>
   </td>
 </tr>
 </table>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8435] trunk/themes/fusionforge/templates/editpage.tmpl

[<var...@us...>]

Revision: 8435
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8435&view=rev
Author:   vargenau
Date:     2012-11-14 14:02:50 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Add use_jquery_form_navigate

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/editpage.tmpl

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 14:00:48 UTC (rev 8434)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 14:02:50 UTC (rev 8435)
@@ -13,6 +13,51 @@
       <?php echo _("Warning: You are editing an old revision. Saving this page will overwrite the current version.")?>
   </p>
 <?php } ?>
+<?php if (forge_get_config('use_jquery_form_navigate')) { ?>
+<script type="text/javascript">
+<!--//
+    function supports_local_storage() {
+        try {
+          return 'localStorage' in window && window['localStorage'] !== null;
+        }
+        catch(e) {
+            return false;
+        }
+    }
+    $(document).ready(function() {
+        $("#editpage").FormNavigate('<?php echo _('Warning: leaving the page will lose all your modifications!') ?>');
+        $(this+ ":submit").unbind('click');
+        $(this+ ":submit[name='edit[save]']").click(function(){
+            global_formNavigate = true;
+        });
+        $(this+ ":input[type='image'], :submit[name='edit[preview]'], :submit[name='edit[diff]']").click(function(){
+            if (supports_local_storage()) {
+                if (global_formNavigate == false) {
+                    window.sessionStorage.setItem('wiki_modified', 1);
+                }
+                else {
+                    window.sessionStorage.setItem('wiki_modified', 0);
+                }
+            }
+            global_formNavigate = true;
+        });
+        $("#toolbar a").click(function() {
+            global_formNavigate = false;
+        });
+<?php if (isset($PREVIEW_CONTENT)) { ?>
+        if (supports_local_storage()) {
+            if (window.sessionStorage.getItem('wiki_modified') == 1) {
+                global_formNavigate = false;
+            }
+            else {
+                global_formNavigate = true;
+            }
+        }
+<?php } ?>
+    });
+// --></script> 
+<?php } ?>
+
 <form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
       accept-charset="<?php echo CHARSET?>">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8434] trunk/themes/fusionforge/templates/editpage.tmpl

[<var...@us...>]

Revision: 8434
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8434&view=rev
Author:   vargenau
Date:     2012-11-14 14:00:48 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Use CSS

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/editpage.tmpl

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 13:53:28 UTC (rev 8433)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 14:00:48 UTC (rev 8434)
@@ -1,7 +1,6 @@
 <?php if (isset($PREVIEW_CONTENT)) { ?>
-  <p><strong><?php echo _("Preview only!  Changes not saved.")?></strong>
-     <?php echo fmt("Please continue editing.  (You'll find your %s at the bottom of the page.)",
-          /* HTML::a(array("href" => "#editarea"), */ _("edit area") /*)  */) ?>
+  <p class="information">
+      <?php echo _("Preview only! Changes not saved. Please continue editing. (You'll find your edit area at the bottom of the page.)") ?>
   </p>
   <?php echo $PREVIEW_CONTENT ?>
 <?php } ?>
@@ -10,8 +9,9 @@
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
 
 <?php if (! $IS_CURRENT) { ?>
-  <p class="warning_msg"><strong><?php echo _("Warning: You are editing an old revision.")?>
-        <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
+  <p class="warning_msg">
+      <?php echo _("Warning: You are editing an old revision. Saving this page will overwrite the current version.")?>
+  </p>
 <?php } ?>
 <form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8433] trunk/themes/fusionforge/templates/editpage.tmpl

[<var...@us...>]

Revision: 8433
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8433&view=rev
Author:   vargenau
Date:     2012-11-14 13:53:28 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove comment

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/editpage.tmpl

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 13:51:10 UTC (rev 8432)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 13:53:28 UTC (rev 8433)
@@ -13,13 +13,6 @@
   <p class="warning_msg"><strong><?php echo _("Warning: You are editing an old revision.")?>
         <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
 <?php } ?>
-<?php /*
- * FIXME: Hack!
- * The funky URL used for the form action parameter is bogus.
- * This is needed, otherwise the redirect to the real browser
- * page won't work with some browsers. (NS4 and Mozilla 0.97 won't accept
- * a redirect from a page to itself.)
- */ ?>
 <form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
       accept-charset="<?php echo CHARSET?>">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8432] trunk/themes/fusionforge/templates/editpage.tmpl

[<var...@us...>]

Revision: 8432
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8432&view=rev
Author:   vargenau
Date:     2012-11-14 13:51:10 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove  

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/editpage.tmpl

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 13:48:31 UTC (rev 8431)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 13:51:10 UTC (rev 8432)
@@ -50,17 +50,17 @@
     <?php } ?>
     <?php echo $SEP?><?php echo $CHANGES_B ?>
   </td>
-  <td>&nbsp; <?php echo $AUTHOR_MESSAGE?></td>
+  <td><?php echo $AUTHOR_MESSAGE?></td>
 </tr>
 <tr>
   <td>
     <?php if ($user->isAdmin()) { ?>
     <?php echo $LOCKED_CB ?> <label for="edit-locked" title="<?php echo _("Make the page read-only?")?>"><?php echo _("Locked")?></label>
     <?php if (ENABLE_PAGE_PUBLIC) { ?>
-    &nbsp;&nbsp;<?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Make the page public?")?>"><?php echo _("Public")?></label>
+    <?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Make the page public?")?>"><?php echo _("Public")?></label>
     <?php } ?>
     <?php if (ENABLE_EXTERNAL_PAGES) { ?>
-    &nbsp;&nbsp;<?php echo $EXTERNAL_CB ?> <label for="edit-external" title="<?php echo _("Make the page external?")?>"><?php echo _("External")?></label>
+    <?php echo $EXTERNAL_CB ?> <label for="edit-external" title="<?php echo _("Make the page external?")?>"><?php echo _("External")?></label>
     <?php }} ?>
   </td>
 </tr>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8431] trunk/themes/fusionforge/templates/editpage.tmpl

[<var...@us...>]

Revision: 8431
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8431&view=rev
Author:   vargenau
Date:     2012-11-14 13:48:31 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Use CSS

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/editpage.tmpl

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 13:45:45 UTC (rev 8430)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 13:48:31 UTC (rev 8431)
@@ -26,7 +26,7 @@
   <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
   <?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?>
   <br class="clear-floats" />
-  <table width="100%">
+  <table class="fullwidth">
     <tr><td><?php echo $EDIT_TOOLBAR ?></td>
         <td align="right"><div id="editarea-size">
     <?php echo _("Size").':'?>
@@ -35,11 +35,10 @@
     <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
   </div></td></tr></table>
   <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
-<div class="toolbar" style="text-align: center;">
+<div style="text-align: center;">
   <label for="edit-summary"><?php echo _("Summary").':'?></label> <?php echo $SUMMARY_INPUT?>
 </div>
-<table summary="Toolbar: Page editing options." class="toolbar" width="100%"
-       cellpadding="0" cellspacing="0" border="0">
+<table summary="Toolbar: Page editing options." class="fullwidth">
 <tr valign="middle">
   <td>
     <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8430] trunk/themes/fusionforge/templates/editpage.tmpl

[<var...@us...>]

Revision: 8430
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8430&view=rev
Author:   vargenau
Date:     2012-11-14 13:45:45 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove $Id$

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/editpage.tmpl

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 13:42:29 UTC (rev 8429)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2012-11-14 13:45:45 UTC (rev 8430)
@@ -1,6 +1,3 @@
-<?php // -*-php-*-
-// $Id$
-?>
 <?php if (isset($PREVIEW_CONTENT)) { ?>
   <p><strong><?php echo _("Preview only!  Changes not saved.")?></strong>
      <?php echo fmt("Please continue editing.  (You'll find your %s at the bottom of the page.)",

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8429] trunk/themes/Hawaiian/lib/random.php

[<var...@us...>]

Revision: 8429
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8429&view=rev
Author:   vargenau
Date:     2012-11-14 13:42:29 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove useless semicolon

Modified Paths:
--------------
    trunk/themes/Hawaiian/lib/random.php

Modified: trunk/themes/Hawaiian/lib/random.php
===================================================================
--- trunk/themes/Hawaiian/lib/random.php	2012-11-14 13:25:55 UTC (rev 8428)
+++ trunk/themes/Hawaiian/lib/random.php	2012-11-14 13:42:29 UTC (rev 8429)
@@ -35,8 +35,6 @@
     }
 }
 
-;
-
 class imageSet extends fileSet
 {
     /**
@@ -49,8 +47,6 @@
     }
 }
 
-;
-
 // Local Variables:
 // mode: php
 // tab-width: 8

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8428] trunk/lib

[<var...@us...>]

Revision: 8428
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8428&view=rev
Author:   vargenau
Date:     2012-11-14 13:25:55 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove empty lines

Modified Paths:
--------------
    trunk/lib/RssWriter.php
    trunk/lib/Template.php

Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php	2012-11-14 13:25:20 UTC (rev 8427)
+++ trunk/lib/RssWriter.php	2012-11-14 13:25:55 UTC (rev 8428)
@@ -198,8 +198,6 @@
     }
 }
 
-
-
 /* Taken from mediawiki.
  * See http://www.atomenabled.org/developers/syndication/
  */

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2012-11-14 13:25:20 UTC (rev 8427)
+++ trunk/lib/Template.php	2012-11-14 13:25:55 UTC (rev 8428)
@@ -224,8 +224,6 @@
     }
 }
 
-
-
 /**
  * Get a templates
  *

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8427] trunk/lib/Request.php

[<var...@us...>]

Revision: 8427
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8427&view=rev
Author:   vargenau
Date:     2012-11-14 13:25:20 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
elseif

Modified Paths:
--------------
    trunk/lib/Request.php

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2012-11-14 11:26:33 UTC (rev 8426)
+++ trunk/lib/Request.php	2012-11-14 13:25:20 UTC (rev 8427)
@@ -831,7 +831,7 @@
                 while (($header = fgets($fd, 4096))) {
                     if (trim($header) == '') {
                         break;
-                    } else if (!preg_match('/^content-(length|type):/i', $header)) {
+                    } elseif (!preg_match('/^content-(length|type):/i', $header)) {
                         rewind($fd);
                         break;
                     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8426] trunk/themes/fusionforge

[<var...@us...>]

Revision: 8426
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8426&view=rev
Author:   vargenau
Date:     2012-11-14 11:26:33 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Use HTML 5

Modified Paths:
--------------
    trunk/themes/fusionforge/fusionforge-fullscreen.css
    trunk/themes/fusionforge/fusionforge-print.css
    trunk/themes/fusionforge/fusionforge.css

Modified: trunk/themes/fusionforge/fusionforge-fullscreen.css
===================================================================
--- trunk/themes/fusionforge/fusionforge-fullscreen.css	2012-11-14 11:14:49 UTC (rev 8425)
+++ trunk/themes/fusionforge/fusionforge-fullscreen.css	2012-11-14 11:26:33 UTC (rev 8426)
@@ -40,24 +40,19 @@
  * ALONE BASIS."
  */
 
-/* Do not display the top bar, the horizontal navigation bar and the left bar */
-#topbar {
+/* Do not display the header and the navigation */
+header {
     display: none;
 }
 
-#horiznavbar {
+nav {
     display: none;
 }
 
-#leftnav {
+menu {
     display: none;
 }
 
-/* Do not display the wiki navigation and edition bars */
-.toolpalettes {
-    display: none;
-}
-
 /**
  * Table of content
  */
@@ -75,7 +70,6 @@
  */
 blockquote.mail-style-quote {
     margin: 0;
-    margin-bottom: 1em;
     border: 1px solid #284;
     padding: 0.5em;
 }
@@ -86,13 +80,11 @@
     border-style: none;
     border-left: medium solid #284;
     padding: 0;
-    padding-left: 0.5em;
 }
 
 div.wikitext pre {
     font-family: monospace;
-    border-width: 1px;
-    border-style: dashed;
+    border: 1px dashed;
     padding: 0.5em;
 }
 

Modified: trunk/themes/fusionforge/fusionforge-print.css
===================================================================
--- trunk/themes/fusionforge/fusionforge-print.css	2012-11-14 11:14:49 UTC (rev 8425)
+++ trunk/themes/fusionforge/fusionforge-print.css	2012-11-14 11:26:33 UTC (rev 8426)
@@ -40,11 +40,24 @@
  * ALONE BASIS."
  */
 
-/* Do not print the wiki navigation and edition bars */
-.toolpalettes {
+/* Do not display the header and the navigation */
+header {
     display: none;
 }
 
+nav {
+    display: none;
+}
+
+menu {
+    display: none;
+}
+
+/* Do not print debug */
+.debug {
+    display: none;
+}
+
 /* Do not print Page Trail line */
 .pagetrail {
     display: none;
@@ -106,6 +119,8 @@
 
 h1 {
     font-weight: bold;
+    background: white;
+    color: black;
 }
 
 /*

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2012-11-14 11:14:49 UTC (rev 8425)
+++ trunk/themes/fusionforge/fusionforge.css	2012-11-14 11:26:33 UTC (rev 8426)
@@ -89,15 +89,8 @@
 
 /* Titles in the page. */
 h1, .titlebar, .widget_titlebar {
-    background: url(/themes/base-alcatel-lucent/images/bgrd_hpage_header.gif) white;
-    background-position: bottom;
-    background-repeat: repeat-x;
-    padding-left: 10px;
-    padding-right: 10px;
     padding-top: 4px;
     padding-bottom: 6px;
-    border-top: 1px solid #dddddd;
-    border-bottom: 1px solid #dddddd;
     vertical-align: middle;
     font-family: 'trebuchet MS', Arial, Helvetica, sans-serif;
     color: #554295; /* Alcatel-Lucent violet */
@@ -167,10 +160,9 @@
  */
 /* 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;
+    border: 1px solid #96a2ae;
+    border-right-color: #d8d8e7;
+    border-bottom-color: #d8d8e7;
 
     margin-top: 0.5ex;
     margin-bottom: 0.5ex;
@@ -184,16 +176,11 @@
     margin-right: 0.5em;
 }
 
-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;
+    border: 1px solid #c6d2de;
+    border-right-color: #a2a2a2;
+    border-bottom-color: #a2a2a2;
     padding-left: 1px;
     padding-right: 1px;
     padding-top: 1px;
@@ -215,9 +202,7 @@
 
 div.wikitext pre {
     font-family: monospace;
-    border-width: 1px;
-    border-color: navy;
-    border-style: dashed;
+    border: 1px dashed navy;
     padding: 0.5em;
 }
 
@@ -313,9 +298,7 @@
 }
 
 table.wikipaging {
-    border-width: 1px;
-    border-style: solid;
-    border-color: black;
+    border: 1px solid black;
     font-weight: bold;
     margin-top: 10px;
     margin-bottom: 10px;
@@ -394,9 +377,7 @@
     margin: 5px 0;
     max-height: 24px;
     padding: 5px 0 5px 0;
-    border-width: 1px;
-    border-style: solid;
-    border-color: black;
+    border: 1px solid black;
 }
 
 input.gridbutton, a.gridbutton, a:hover.gridbutton, a:visited.gridbutton {
@@ -407,25 +388,10 @@
 /**
  * Toolbar
  */
-.toolbar, input.button {
+input.button {
     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;
@@ -440,8 +406,19 @@
     font-weight: bold;
 }
 
+menu, menu ul {
+    padding: 0;
+}
+
+menu ul {
+    display: inline;
+    margin-right: 10px;
+}
+
 #actionbuttons {
     white-space: nowrap;
+    margin-left: 0;
+    margin-bottom: 0;
 }
 
 #actionbuttons .named-wiki,
@@ -457,22 +434,24 @@
     text-decoration: underline;
 }
 
-#actionbuttons td {
+#actionbuttons li {
+    display: inline;
     border: 1px solid #aaaaaa;
     border-bottom: none;
     border-collapse: collapse;
     padding-left: 0.8em;
     padding-right: 0.8em;
+    margin-right: 10px;
 }
 
-#actionbuttons td.spacer {
-    width: 10px;
-    border: none;
-    padding-left: 0;
-    padding-right: 0;
+/* Smaller for IE6 and IE7: else moves the area down */
+.ie67 #actionbuttons li {
+    padding-left: 0.2em;
+    padding-right: 0.2em;
+    margin-right: 5px;
 }
 
-#actionbuttons td.bold a {
+#actionbuttons li.bold a {
     font-weight: bold;
 }
 
@@ -480,17 +459,15 @@
     font-family: Verdana, Arial, Helvetica, sans-serif;
     margin: 0;
     padding: 0;
-    padding-top: 0.5ex;
     border-top: 1px #aaaaaa solid;
 }
 
 #logo img {
     float: right;
     /* "paper" borders */
-    border-top: 1px #e8e6df solid;
-    border-left: 1px #e8e6df solid;
-    border-bottom: 1px #d2d2d2 solid;
-    border-right: 1px #b2b2b2 solid;
+    border: 1px solid #e8e6df;
+    border-right-color: #b2b2b2;
+    border-bottom-color: #d2d2d2;
 }
 
 /**
@@ -505,6 +482,11 @@
     padding: 2px;
 }
 
+/* Not for IE6 and IE7: moves the area down */
+.ie67 textarea.wikiedit {
+    width: auto;
+}
+
 #editarea-size {
     margin-top: 1ex;
     text-align: right;
@@ -517,10 +499,6 @@
     font-size: smaller;
 }
 
-#toolbar {
-    padding: 0;
-}
-
 /**
  * Search Results
  */
@@ -572,10 +550,7 @@
 
 .transclusion {
     border: 1px solid gray;
-    padding-left: 0.8em;
-    padding-right: 0.8em;
-    padding-top: 0;
-    padding-bottom: 0;
+    padding: 0 0.8em;
     margin-left: 0.25em;
     margin-right: 0.25em;
     margin-bottom: 0.1ex;
@@ -584,22 +559,13 @@
 .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;
+    padding: 0.75ex 0.5em;
+    margin: 1ex 0;
 }
 
 .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;
+    padding: 0.5ex 0.5em;
     margin: 0;
 }
 
@@ -679,14 +645,10 @@
     margin-bottom: 0.5ex;
     background: white;
     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;
+    border: 1px solid #494f5d;
+    border-right-color: #c6d2de;
+    border-bottom-color: #c6d2de;
+
     padding: 0;
     clear: both;
 }
@@ -707,14 +669,10 @@
     margin-top: 0;
     margin-bottom: 0;
     background: white;
-    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;
+    border: 1px solid #e8e6df;
+    border-right-color: #b2b2b2;
+    border-bottom-color: #d2d2d2;
+    padding: 0;
     clear: both;
 }
 
@@ -864,8 +822,7 @@
     font-weight: bold;
     font-size: 11px;
     text-align: left;
-    border-width: 1px;
-    border-style: solid;
+    border: 1px solid;
     padding: 0.5em;
 }
 
@@ -939,10 +896,8 @@
 .wiki-dl-table th {
     vertical-align: top;
     text-align: right;
-    border-right: 1px #444 solid;
-    border-left: none;
-    border-top: none;
-    border-bottom: none;
+    border-style: none;
+    border-right: 1px solid #444;
 }
 
 .wiki-dl-table td {
@@ -954,7 +909,6 @@
  */
 blockquote.mail-style-quote {
     margin: 0;
-    margin-bottom: 1em;
     border: 1px solid #284;
     padding: 0.5em;
 }
@@ -966,7 +920,6 @@
     border-style: none;
     border-left: medium solid #284;
     padding: 0;
-    padding-left: 0.5em;
 }
 
 /*
@@ -1178,7 +1131,6 @@
 
 div.feed {
     margin: -0.5em;
-    margin-bottom: 0;
     padding: 0.3em;
     font-weight: bold;
     font-size: 1.2em;
@@ -1279,18 +1231,14 @@
  */
 
 table.boxed, table.bordered, table.bordered th, table.bordered td {
-    border-width: 1px;
-    border-style: solid;
+    border: 1px 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;
+    padding: 0 5px;
 }
 
 table.boxed caption, table.bordered caption {
@@ -1311,7 +1259,6 @@
     background-color: #e9fbff;
     width: 200px;
     right: 10px;
-    padding: 0.5em;
     float: right;
     border: thin solid;
     padding: 0.5em;
@@ -1343,9 +1290,7 @@
 .browsebanner table {
     width: 100%;
     background-color: #e9fbff;
-    border-style: solid;
-    border-color: blue;
-    border-width: 2px;
+    border: 2px solid blue;
 }
 
 .browsebanner table td {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8425] trunk/themes/fusionforge/templates/actionbar. tmpl

[<var...@us...>]

Revision: 8425
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8425&view=rev
Author:   vargenau
Date:     2012-11-14 11:14:49 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Use list instead of tables for menu

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/actionbar.tmpl

Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl	2012-11-14 10:11:31 UTC (rev 8424)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl	2012-11-14 11:14:49 UTC (rev 8425)
@@ -7,47 +7,43 @@
 $isBrowse = $request->getArg('action') == 'browse';
 ?>
 
-  <div id="actionbuttons">
-    <table cellpadding="0" cellspacing="0">
-    <tr>
-
+  <menu id="actionbuttons">
+  <div>
+  <ul>
     <?php if (!string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion"))) { ?>
     <?php $talk = new WikiPageName('Talk:'.$pagename); ?>
-      <td class="bold">
+      <li class="bold">
       <?php echo Button(array(),
                        $isActionPage ? _("Action Page") : _("Page"),
                        $talk->getParent(), array('title' => "Page")) ?>
-      </td>
-      <td class="spacer">&nbsp;</td>
+      </li>
       <?php if (!$isActionPage) { ?>
         <?php if ($dbh->isWikiPage($talk->getName())) { ?>
-          <td>
+          <li>
           <?php echo Button(array('action'=>'browse'), _("Discussion"), $talk->getName()) ?>
-          </td>
+          </li>
         <?php } else { ?>
-          <td>
+          <li>
           <?php echo Button(array('action'=>'create',
                                  'template'=>_("Template/Talk")),
                            _("Discussion"), $talk->getName()) ?>
-          </td>
+          </li>
         <?php } ?>
       <?php } ?>
     <?php } else {
       $talk = new WikiPageName($pagename); ?>
-      <td>
+      <li>
       <?php echo Button(array(),$isActionPage ? _("Action Page") : _("Page"), $talk->getParent(), array('title' => "View the page")) ?>
-      </td>
-      <td class="spacer">&nbsp;</td>
-      <td class="bold">
+      </li>
+      <li class="bold">
       <?php echo Button(array(),_("Discussion"), $talk->getName()) ?>
-      </td>
+      </li>
     <?php } ?>
+  </ul>
 
-    <td class="spacer">&nbsp;</td>
-    <td class="spacer">&nbsp;</td>
-
+  <ul>
     <?php if ($user->isAdmin() or (!($page->get('locked')) and (mayAccessPage('edit', $page->getName())))) { ?>
-      <td class="bold">
+      <li class="bold">
       <?php if (! $dbh->isWikiPage($page->getName())) { ?>
       <?php echo Button("edit", _("Create Page")) ?>
       <?php } else if ($revision && (($revision->isCurrent()) || ($revision->hasDefaultContents()))) { ?>
@@ -55,80 +51,68 @@
       <?php } else { ?>
       <?php echo Button("edit", _("Edit Old Revision")) ?>
       <?php } ?>
-      </td>
+      </li>
     <?php } else if ($dbh->isWikiPage($page->getName())) { ?>
-      <td><?php echo Button("viewsource", _("View Source")) ?></td>
+      <li><?php echo Button("viewsource", _("View Source")) ?></li>
     <?php } ?>
 
     <?php if ($dbh->isWikiPage($page->getName())) { ?>
 
-    <td class="spacer">&nbsp;</td>
-    <td><?php echo Button("PageHistory", _("History")) ?></td>
+    <li><?php echo Button(_("PageHistory"), _("History")) ?></li>
 
     <?php if ($curuserprefs->get('diffMenuItem')) { ?>
-      <td class="spacer">&nbsp;</td>
-      <td><?php echo Button("diff", _("Last Difference")) ?> </td>
+      <li><?php echo Button("diff", _("Last Difference")) ?> </li>
     <?php } ?>
 
-    <?php if ($curuserprefs->get('revertMenuItem')) { ?>
-      <td class="spacer">&nbsp;</td>
-      <td><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></td>
+    <?php if ($revision && $curuserprefs->get('revertMenuItem')) { ?>
+      <li><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li>
     <?php } ?>
 
-      <td class="spacer">&nbsp;</td>
-      <td><?php echo Button("PageInfo", _("Page Info")) ?></td>
+      <li><?php echo Button(_("PageInfo"), _("Page Info")) ?></li>
 
-      <td class="spacer">&nbsp;</td>
-      <td><?php echo Button(array('action'=>_("BackLinks")), _("Back Links"),$page->getName()) ?></td>
+      <li><?php echo Button(array('action'=>_("BackLinks")), _("Back Links"),$page->getName()) ?></li>
 
     <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
       <?php if ($curuserprefs->get('pdfMenuItem')) { ?>
-        <td class="spacer">&nbsp;</td>
-        <td><?php echo Button("pdf") ?></td>
+        <li><?php echo Button("pdf") ?></li>
       <?php } ?>
     <?php } ?>
+  </ul>
 
-    <td class="spacer">&nbsp;</td>
-    <td class="spacer">&nbsp;</td>
-
+  <ul>
     <?php if ($user->isAdmin() or mayAccessPage('change', $page->getName())) { ?>
       <?php if ($curuserprefs->get('lockMenuItem')) { ?>
         <?php if ($page->get('locked')) { ?>
-          <td><?php echo Button('unlock', _("Unlock")) ?></td>
+          <li><?php echo Button('unlock', _("Unlock")) ?></li>
         <?php } else { ?>
-          <td><?php echo Button('lock', _("Lock")) ?></td>
+          <li><?php echo Button('lock', _("Lock")) ?></li>
         <?php } ?>
-        <td class="spacer">&nbsp;</td>
       <?php } ?>
 
       <?php if (ENABLE_PAGEPERM and mayAccessPage('change', $page->getName())) { ?>
         <?php if ($curuserprefs->get('chownMenuItem')) { ?>
-          <td><?php echo Button('chown', _("Change Owner")) ?></td>
-          <td class="spacer">&nbsp;</td>
+          <li><?php echo Button('chown', _("Change Owner")) ?></li>
         <?php } ?>
 
         <?php if ($curuserprefs->get('setaclMenuItem')) { ?>
-          <td><?php echo Button('setaclsimple', _("Access Rights")) ?></td>
-          <td class="spacer">&nbsp;</td>
+          <li><?php echo Button('setaclsimple', _("Access Rights")) ?></li>
         <?php } ?>
       <?php } ?>
     <?php } ?>
 
     <?php if (($user->isAdmin() or mayAccessPage('rename', $page->getName())) && $revision) { ?>
-        <td><?php echo Button('rename', _("Rename")) ?></td>
-        <td class="spacer">&nbsp;</td>
+        <li><?php echo Button('rename', _("Rename")) ?></li>
     <?php } ?>
 
     <?php if (($user->isAdmin() or mayAccessPage('purge', $page->getName())) && $revision) { ?>
-        <td><?php echo Button('purge', _("Purge")) ?></td>
-        <td class="spacer">&nbsp;</td>
+        <li><?php echo Button('purge', _("Purge")) ?></li>
     <?php } ?>
 
     <?php } ?>
+  </ul>
 
-    <td class="spacer">&nbsp;</td>
-    <td><?php echo Button(_("WatchPage"), _("Watch Page")) ?></td>
-
-  </tr>
-  </table>
+  <ul>
+    <li><?php echo Button(_("WatchPage"), _("Watch Page")) ?></li>
+  </ul>
   </div>
+  </menu>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8424] trunk/themes/fusionforge/templates/body.tmpl

[<var...@us...>]

Revision: 8424
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8424&view=rev
Author:   vargenau
Date:     2012-11-14 10:11:31 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Use list instead of tables for menu

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/body.tmpl

Modified: trunk/themes/fusionforge/templates/body.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/body.tmpl	2012-11-14 10:06:55 UTC (rev 8423)
+++ trunk/themes/fusionforge/templates/body.tmpl	2012-11-14 10:11:31 UTC (rev 8424)
@@ -1,18 +1,11 @@
 <?php if ($WikiTheme->DUMP_MODE) { ?>
 <body>
 <?php } ?>
-<table width="100%" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top">
 <?php
 global $HIDE_TOOLBARS;
 if (!$HIDE_TOOLBARS) {
 ?>
-<div class="toolpalettes">
-<div class="toolbar">
 <?php echo Template('actionbar') ?>
-</div>
-</div>
 <?php } ?>
 <div id="content">
 <?php
@@ -40,9 +33,6 @@
 </h1>
 <?php echo $CONTENT ?>
 </div>
-</td>
-</tr>
-</table>
 <?php echo Template('bottom') ?>
 <?php if ($WikiTheme->DUMP_MODE) { ?>
 </body>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8423] trunk/themes/fusionforge/templates/navbar.tmpl

[<var...@us...>]

Revision: 8423
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8423&view=rev
Author:   vargenau
Date:     2012-11-14 10:06:55 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Use list instead of tables for menu

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/navbar.tmpl

Modified: trunk/themes/fusionforge/templates/navbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/navbar.tmpl	2012-10-26 13:42:26 UTC (rev 8422)
+++ trunk/themes/fusionforge/templates/navbar.tmpl	2012-11-14 10:06:55 UTC (rev 8423)
@@ -4,23 +4,25 @@
 $username = $user->UserName();
 ?>
 
-   <tr><td class="submenu"><?php echo WikiLink(_("HomePage"), "", _("Home Page")) ?></td></tr>
-   <tr><td class="submenu"><?php echo WikiLink(_("RecentChanges"), "", _("Recent Changes")) ?></td></tr>
-   <tr><td class="submenu"><?php echo WikiLink(_("SpecialPages"), "", _("Special Pages")) ?></td></tr>
-   <tr><td class="submenu"><?php echo WikiLink(_("FindPage"), "", _("Search")) ?></td></tr>
+   <li class="submenu"><?php echo WikiLink(_("HomePage"), "", _("Home Page")) ?></li>
+   <li class="submenu"><?php echo WikiLink(_("RecentChanges"), "", _("Recent Changes")) ?></li>
+   <li class="submenu"><?php echo WikiLink(_("SpecialPages"), "", _("Special Pages")) ?></li>
+   <li class="submenu"><?php echo WikiLink(_("FindPage"), "", _("Search")) ?></li>
    <?php if ($curuserprefs->get('randomPageMenuItem')) { ?>
-     <tr><td class="submenu"><?php echo WikiLink(_("RandomPage"), "", _("Random Page")) ?></td></tr>
+     <li class="submenu"><?php echo WikiLink(_("RandomPage"), "", _("Random Page")) ?></li>
    <?php } ?>
    <?php if ($curuserprefs->get('likePagesMenuItem')) { ?>
-     <tr><td class="submenu"><?php echo Button(array('action'=>_("LikePages")), _("Like Pages"),$page->getName()) ?></td></tr>
+     <li class="submenu"><?php echo Button(array('action'=>_("LikePages")), _("Like Pages"),$page->getName()) ?></li>
    <?php } ?>
-   <tr><td class="submenu"><?php echo WikiLink(_("UpLoad"), "", _("Upload File")) ?></td></tr>
+   <?php if (!empty($user) && $user->isSignedIn()) { ?>
+     <li class="submenu"><?php echo WikiLink(_("UpLoad"), "", _("Upload File")) ?></li>
+   <?php } ?>
    <?php if (!empty($user) && $user->isAdmin()) { ?>
-     <tr><td class="submenu"><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Wiki Admin")) ?></td></tr>
+     <li class="submenu"><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Wiki Admin")) ?></li>
    <?php } ?>
    <?php if (!empty($user) && $user->isSignedIn()) { ?>
      <?php if ($dbh->isWikiPage($username)) { ?>
-       <tr><td class="submenu"><?php echo WikiLink($username, "", _("My User Page")) ?></td></tr>
+       <li class="submenu"><?php echo WikiLink($username, "", _("My User Page")) ?></li>
      <?php } ?>
-     <tr><td class="submenu"><?php echo WikiLink(_("UserPreferences"), "", _("My Preferences")) ?></td></tr>
+     <li class="submenu"><?php echo WikiLink(_("UserPreferences"), "", _("User Preferences")) ?></li>
    <?php } ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8422] trunk/lib

[<var...@us...>]

Revision: 8422
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8422&view=rev
Author:   vargenau
Date:     2012-10-26 13:42:26 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
Remove useless blank lines

Modified Paths:
--------------
    trunk/lib/RssWriter2.php
    trunk/lib/SemanticWeb.php
    trunk/lib/plugin/AllPages.php
    trunk/lib/plugin/AsciiMath.php

Modified: trunk/lib/RssWriter2.php
===================================================================
--- trunk/lib/RssWriter2.php	2012-10-26 13:41:02 UTC (rev 8421)
+++ trunk/lib/RssWriter2.php	2012-10-26 13:42:26 UTC (rev 8422)
@@ -78,8 +78,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php	2012-10-26 13:41:02 UTC (rev 8421)
+++ trunk/lib/SemanticWeb.php	2012-10-26 13:42:26 UTC (rev 8422)
@@ -105,7 +105,6 @@
 require_once 'lib/TextSearchQuery.php';
 require_once 'lib/Units.php';
 
-
 /**
  * RdfWriter - A class to represent the links of a list of wikipages as RDF.
  * Supports ?format=rdf
@@ -241,8 +240,6 @@
 {
 }
 
-
-
 /**
  * OwlWriter - A class to represent a set of wiki pages (a DL model) as OWL.
  * Requires an actionpage returning a pagelist.
@@ -256,8 +253,6 @@
 {
 }
 
-
-
 /**
  * ModelWriter - Export a KB as set of wiki pages.
  * Requires an actionpage returning a pagelist.
@@ -271,8 +266,6 @@
 {
 }
 
-
-
 /**
  *  NumericSearchQuery can do:
  *         ("population < 20000 and area > 1000000", array("population", "area"))
@@ -414,26 +407,18 @@
     }
 }
 
-
-
 class ReasonerBackend_LISA extends ReasonerBackend
 {
 }
 
-
-
 class ReasonerBackend_Racer extends ReasonerBackend
 {
 }
 
-
-
 class ReasonerBackend_KM extends ReasonerBackend
 {
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php	2012-10-26 13:41:02 UTC (rev 8421)
+++ trunk/lib/plugin/AllPages.php	2012-10-26 13:42:26 UTC (rev 8422)
@@ -147,8 +147,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AsciiMath.php
===================================================================
--- trunk/lib/plugin/AsciiMath.php	2012-10-26 13:41:02 UTC (rev 8421)
+++ trunk/lib/plugin/AsciiMath.php	2012-10-26 13:42:26 UTC (rev 8422)
@@ -82,8 +82,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8421] trunk/lib/plugin

[<var...@us...>]

Revision: 8421
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8421&view=rev
Author:   vargenau
Date:     2012-10-26 13:41:02 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
elseif [PSR-2] The keyword elseif should be used instead of else if so that all control keywords looks like single words.

Modified Paths:
--------------
    trunk/lib/plugin/Calendar.php
    trunk/lib/plugin/RedirectTo.php

Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php	2012-10-26 13:14:46 UTC (rev 8420)
+++ trunk/lib/plugin/Calendar.php	2012-10-26 13:41:02 UTC (rev 8421)
@@ -150,7 +150,7 @@
         if ($mday == $this->_today) {
             $mday = HTML::strong($mday);
             $td->setAttr('class', 'cal-today');
-        } else if ($dbi->isWikiPage($page_for_date)) {
+        } elseif ($dbi->isWikiPage($page_for_date)) {
             $this->_links[] = $page_for_date;
             $td->setAttr('class', 'cal-day');
         }

Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2012-10-26 13:14:46 UTC (rev 8420)
+++ trunk/lib/plugin/RedirectTo.php	2012-10-26 13:41:02 UTC (rev 8421)
@@ -75,7 +75,7 @@
             if (!$thispage->get('locked')) {
                 return $this->disabled(_("Redirect to an external URL is only allowed in locked pages."));
             }
-        } else if ($page) {
+        } elseif ($page) {
             $url = WikiURL($page,
                 array('redirectfrom' => $request->getArg('pagename')),
                 'abs_path');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8420] trunk/lib

[<var...@us...>]

Revision: 8420
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8420&view=rev
Author:   vargenau
Date:     2012-10-26 13:14:46 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
elseif [PSR-2] The keyword elseif should be used instead of else if so that all control keywords looks like single words.

Modified Paths:
--------------
    trunk/lib/WikiTheme.php
    trunk/lib/wikilens/Buddy.php
    trunk/lib/ziplib.php

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2012-10-26 13:07:18 UTC (rev 8419)
+++ trunk/lib/WikiTheme.php	2012-10-26 13:14:46 UTC (rev 8420)
@@ -266,7 +266,7 @@
         }
         if (isset($this->_default_theme)) {
             return $this->_default_theme->_findFile($file, $missing_okay);
-        } else if (!$missing_okay) {
+        } elseif (!$missing_okay) {
             trigger_error("$this->_theme/$file: not found", E_USER_NOTICE);
             if (DEBUG & _DEBUG_TRACE) {
                 echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
@@ -1691,8 +1691,6 @@
 
 }
 
-
-
 /**
  * A class representing a clickable "button".
  *
@@ -1735,9 +1733,6 @@
 
 }
 
-
-
-
 /**
  * A clickable image button.
  */
@@ -1771,8 +1766,6 @@
     }
 }
 
-
-
 /**
  * A class representing a form <samp>submit</samp> button.
  */
@@ -1801,8 +1794,6 @@
 
 }
 
-
-
 /**
  * A class representing an image form <samp>submit</samp> button.
  */
@@ -1834,8 +1825,6 @@
 
 }
 
-
-
 /**
  * A sidebar box with title and body, narrow fixed-width.
  * To represent abbrevated content of plugins, links or forms,

Modified: trunk/lib/wikilens/Buddy.php
===================================================================
--- trunk/lib/wikilens/Buddy.php	2012-10-26 13:07:18 UTC (rev 8419)
+++ trunk/lib/wikilens/Buddy.php	2012-10-26 13:14:46 UTC (rev 8420)
@@ -90,9 +90,9 @@
         $buddy_rating = $buddy_rating_array['ratingvalue'];
         if ($buddy_rating == "") {
             $agree = 1;
-        } else if ($agreePos && $buddy_rating >= $MIDDLE_RATING) {
+        } elseif ($agreePos && $buddy_rating >= $MIDDLE_RATING) {
             $agree = 1;
-        } else if (!$agreePos && $buddy_rating < $MIDDLE_RATING) {
+        } elseif (!$agreePos && $buddy_rating < $MIDDLE_RATING) {
             $agree = 1;
         } else {
             $agree = 0;
@@ -101,7 +101,7 @@
     }
     if ($agree && $agreePos) {
         return 1;
-    } else if ($agree && !$agreePos) {
+    } elseif ($agree && !$agreePos) {
         return -1;
     } else {
         return 0;

Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2012-10-26 13:07:18 UTC (rev 8419)
+++ trunk/lib/ziplib.php	2012-10-26 13:14:46 UTC (rev 8420)
@@ -492,7 +492,7 @@
 
         if ($comp_type == ZIP_DEFLATE) {
             $data = zip_inflate($data, $crc32, $uncomp_size);
-        } else if ($comp_type == ZIP_STORE) {
+        } elseif ($comp_type == ZIP_STORE) {
             $crc = zip_crc32($data);
             if ($crc32 != $crc)
                 ExitWiki(sprintf("CRC mismatch %x != %x", $crc, $crc32));
@@ -813,7 +813,7 @@
     }
     if ("$type/$subtype" == 'multipart/mixed') {
         return ParseMimeMultipart($data, $params['boundary']);
-    } else if ("$type/$subtype" != 'application/x-phpwiki') {
+    } elseif ("$type/$subtype" != 'application/x-phpwiki') {
         trigger_error(sprintf("Bad %s", "content-type: $type/$subtype"),
             E_USER_WARNING);
         return false;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8419] trunk/passencrypt.php

[<var...@us...>]

Revision: 8419
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8419&view=rev
Author:   vargenau
Date:     2012-10-26 13:07:18 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
elseif [PSR-2] The keyword elseif should be used instead of else if so that all control keywords looks like single words.

Modified Paths:
--------------
    trunk/passencrypt.php

Modified: trunk/passencrypt.php
===================================================================
--- trunk/passencrypt.php	2012-10-26 13:05:03 UTC (rev 8418)
+++ trunk/passencrypt.php	2012-10-26 13:07:18 UTC (rev 8419)
@@ -143,7 +143,7 @@
     echo "<p>The encrypted password is:<br />\n<br />&nbsp;&nbsp;&nbsp;\n<tt><strong>",
     htmlentities($encrypted_password), "</strong></tt></p>\n";
     echo "<hr />\n";
-} else if ($posted['password'] != "") {
+} elseif ($posted['password'] != "") {
     echo "The passwords did not match. Please try again.<br />\n";
 }
 if (empty($REQUEST_URI))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8418] trunk/themes/MacOSX/buttons/index.php

[<var...@us...>]

Revision: 8418
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8418&view=rev
Author:   vargenau
Date:     2012-10-26 13:05:03 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
include [all] Include and file path should be devided with single space. File path should not be placed under brackets.

Modified Paths:
--------------
    trunk/themes/MacOSX/buttons/index.php

Modified: trunk/themes/MacOSX/buttons/index.php
===================================================================
--- trunk/themes/MacOSX/buttons/index.php	2012-10-16 08:03:36 UTC (rev 8417)
+++ trunk/themes/MacOSX/buttons/index.php	2012-10-26 13:05:03 UTC (rev 8418)
@@ -1,2 +1,2 @@
 <?php
-include("../images/index.php");
+include '../images/index.php';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8417] trunk/lib/config.php

[<var...@us...>]

Revision: 8417
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8417&view=rev
Author:   vargenau
Date:     2012-10-16 08:03:36 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
Always return string

Modified Paths:
--------------
    trunk/lib/config.php

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2012-10-15 22:53:54 UTC (rev 8416)
+++ trunk/lib/config.php	2012-10-16 08:03:36 UTC (rev 8417)
@@ -238,7 +238,9 @@
 // [99ms]
 function update_locale($loc)
 {
-    if ($loc == 'C' or $loc == 'en') return;
+    if ($loc == 'C' or $loc == 'en') {
+        return '';
+    }
     // $LANG or DEFAULT_LANGUAGE is too less information, at least on unix for
     // setlocale(), for bindtextdomain() to succeed.
     $setlocale = guessing_setlocale(LC_ALL, $loc); // [56ms]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8416] trunk/lib/config.php

[<ru...@us...>]

Revision: 8416
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8416&view=rev
Author:   rurban
Date:     2012-10-15 22:53:54 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
lib/config.php:152 strchr warning, use strpos instead.

Modified Paths:
--------------
    trunk/lib/config.php

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2012-10-11 12:56:58 UTC (rev 8415)
+++ trunk/lib/config.php	2012-10-15 22:53:54 UTC (rev 8416)
@@ -154,7 +154,7 @@
                         return $lang_short;
                 }
             }
-            if ($pos = strchr($lang, "-") and in_array(substr($lang, 0, $pos), $languages))
+            if ($pos = strpos($lang, "-") and in_array(substr($lang, 0, $pos), $languages))
                 return substr($lang, 0, $pos);
         }
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8415] trunk/lib/nusoap/nusoap.php

[<var...@us...>]

Revision: 8415
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8415&view=rev
Author:   vargenau
Date:     2012-10-11 12:56:58 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
Remove redundant tags

Modified Paths:
--------------
    trunk/lib/nusoap/nusoap.php

Modified: trunk/lib/nusoap/nusoap.php
===================================================================
--- trunk/lib/nusoap/nusoap.php	2012-10-11 12:35:13 UTC (rev 8414)
+++ trunk/lib/nusoap/nusoap.php	2012-10-11 12:56:58 UTC (rev 8415)
@@ -510,8 +510,6 @@
     }
 }
 
-?><?php
-
 /**
  * soap_fault class, allows for creation of faults
  * mainly used for returning faults from deployed functions
@@ -571,8 +569,6 @@
     }
 }
 
-?><?php
-
 /**
  * parses an XML Schema, allows access to it's data, other utility methods
  * no validation... yet.
@@ -1254,8 +1250,6 @@
     }
 }
 
-?><?php
-
 /**
  * for creating serializable abstractions of native PHP types
  * NOTE: this is only really used when WSDL is not available.
@@ -1311,8 +1305,6 @@
     }
 }
 
-?><?php
-
 /**
  * transport class for sending/receiving data via HTTP and HTTPS
  * NOTE: PHP must be compiled with the CURL extension for HTTPS support
@@ -1549,7 +1541,6 @@
         return $data;
     }
 
-
     /**
      * send the SOAP message via HTTPS 1.0 using CURL
      *
@@ -1775,7 +1766,6 @@
      */
     function decodeChunked($buffer)
     {
-        // length := 0
         $length = 0;
         $new = '';
 
@@ -1824,8 +1814,6 @@
 
 }
 
-?><?php
-
 /**
  *
  * soap_server allows the user to create a SOAP server
@@ -2354,8 +2342,6 @@
     }
 }
 
-?><?php
-
 /**
  * parses a WSDL file, allows access to it's data, other utility methods
  *
@@ -3240,8 +3226,6 @@
     }
 }
 
-?><?php
-
 /**
  *
  * soap_parser class parses SOAP XML messages into native PHP values
@@ -3677,11 +3661,6 @@
     }
 }
 
-
-?><?php
-
-
-
 /**
  *
  * soapclient higher level class for easy usage.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.