Skip to content

Commit

Permalink
Item12864: don't use DEBUG constant for debug
Browse files Browse the repository at this point in the history
- remove SVN ids
- remove bogus html fluff
  • Loading branch information
MichaelDaum committed Aug 28, 2014
1 parent 14cf0a4 commit 59a6b03
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 31 deletions.
10 changes: 10 additions & 0 deletions .gitignore
@@ -0,0 +1,10 @@
*.gz
*.swp
pub/System/MediaWikiTablePlugin/styles.css
MediaWikiTablePlugin.md5
MediaWikiTablePlugin.sha1
MediaWikiTablePlugin.tgz
MediaWikiTablePlugin.txt
MediaWikiTablePlugin.zip
MediaWikiTablePlugin_installer
MediaWikiTablePlugin_installer.pl
29 changes: 6 additions & 23 deletions data/System/MediaWikiTablePlugin.txt
@@ -1,23 +1,7 @@
%META:TOPICINFO{author="ProjectContributor" date="1236428691" format="1.1" reprev="1.3" version="1.3"}%
<!--

PLEASE DO NOT EDIT THIS TOPIC

It is automatically generated from the subversion repository, and any changes
you make will simply be overwritten the next time a release is generated.
%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1356278776" format="1.1" version="1"}%

Instead, you could check your fix in, raise a bug in the Bugs web, or mail the author(s).
-->
---+!! <nop>%TOPIC%
%TOC%
<table style="float:right">
<tr>
<td><img src="%ATTACHURLPATH%/wikiringlogo40x40.png" alt="wiki ring logo" /></td>
<td><a href="http://wikiring.com" title="Make your Wiki ring!" style="text-decoration:none">
Powered by <br /> <nop>WikiRing Consultants </a>
</td>
</tr>
</table>

This plugin allows to create tables using the
[[http://meta.wikimedia.org/wiki/Help:Table][MediaWiki table syntax]]
Expand Down Expand Up @@ -737,8 +721,8 @@ right side
{| border="0"
|+''A table in a table''
|-
| align="center" width="150px" | <img src="%PUBURLPATH%/%SYSTEMWEB%/ProjectLogos/foswiki-logo-slogan.png" alt="Foswiki" />
| align="center" width="150px" | <img src="%PUBURLPATH%/%SYSTEMWEB%/ProjectLogos/foswiki-logo-slogan.png" alt="Foswiki" />
| align="center" width="150px" | <img src="%PUBURLPATH%/%SYSTEMWEB%/ProjectLogos/foswiki-logo.png" alt="Foswiki" />
| align="center" width="150px" | <img src="%PUBURLPATH%/%SYSTEMWEB%/ProjectLogos/foswiki-logo.png" alt="Foswiki" />
|-
| align="center" colspan="2" style="border-top:1px solid red; border-right:1px; solid red; border-bottom:2px solid red; border-left:1px solid red;" |
Two logos
Expand Down Expand Up @@ -766,8 +750,8 @@ right side
{| border="0"
|+''A table in a table''
|-
| align="center" width="150px" | <img src="%PUBURLPATH%/%SYSTEMWEB%/ProjectLogos/foswiki-logo-slogan.png" alt="Foswiki" />
| align="center" width="150px" | <img src="%PUBURLPATH%/%SYSTEMWEB%/ProjectLogos/foswiki-logo-slogan.png" alt="Foswiki" />
| align="center" width="150px" | <img src="%PUBURLPATH%/%SYSTEMWEB%/ProjectLogos/foswiki-logo.png" alt="Foswiki" />
| align="center" width="150px" | <img src="%PUBURLPATH%/%SYSTEMWEB%/ProjectLogos/foswiki-logo.png" alt="Foswiki" />
|-
| align="center" colspan="2" style="border-top:1px solid red; border-right:1px solid red; border-bottom:2px solid red; border-left:1px solid red;" | Two logos
|}
Expand Down Expand Up @@ -1232,7 +1216,7 @@ Wiki markup like <code>_text_</code> instead of "font-style:italic".
* Set SHORTDESCRIPTION = Format tables the <nop>MediaWiki way
-->
| Plugin Author: | Michael Daum |
| Copyright &copy;: | 2006-2010, Michael Daum http://michaeldaumconsulting.com |
| Copyright &copy;: | 2006-2014, Michael Daum http://michaeldaumconsulting.com |
| License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
| Release: | %$RELEASE% |
| Version: | %$VERSION% |
Expand All @@ -1254,4 +1238,3 @@ Wiki markup like <code>_text_</code> instead of "font-style:italic".
| Plugin Home: | Foswiki:Extensions/%TOPIC% |
| Support: | Foswiki:Development/%TOPIC% |

%META:FILEATTACHMENT{name="wikiringlogo40x40.png" attachment="wikiringlogo40x40.png" attr="h" comment="" date="1189787359" path="wikiringlogo40x40.png" size="2571" stream="wikiringlogo40x40.png" tmpFilename="" user="ProjectContributor" version="1"}%
8 changes: 5 additions & 3 deletions lib/Foswiki/Plugins/MediaWikiTablePlugin.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2006-2010 Michael Daum http://michaeldaumconsulting.com
# Copyright (C) 2006-2014 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand All @@ -15,9 +15,11 @@
package Foswiki::Plugins::MediaWikiTablePlugin;

use strict;
use warnings;

use Foswiki::Func ();
our $VERSION = '$Rev$';
our $RELEASE = '1.31';
our $VERSION = '1.32';
our $RELEASE = '1.32';
our $NO_PREFS_IN_TOPIC = 1;
our $SHORTDESCRIPTION = 'Format tables the <nop>MediaWiki way';
our $doneInit = 0;
Expand Down
11 changes: 7 additions & 4 deletions lib/Foswiki/Plugins/MediaWikiTablePlugin/Core.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2006-2010 Michael Daum http://michaeldaumconsulting.com
# Copyright (C) 2006-2014 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand All @@ -15,13 +15,16 @@
package Foswiki::Plugins::MediaWikiTablePlugin::Core;

use strict;
use warnings;

use Foswiki::Func ();
use constant DEBUG => 0; # toggle me

use constant TRACE => 0; # toggle me

###############################################################################
sub writeDebug {
#&Foswiki::Func::writeDebug('- MediaWikiTablePlugin::Core - '.$_[0]) if DEBUG;
print STDERR '- MediaWikiTablePlugin::Core - '.$_[0]."\n" if DEBUG;
#&Foswiki::Func::writeDebug('- MediaWikiTablePlugin::Core - '.$_[0]) if TRACE;
print STDERR '- MediaWikiTablePlugin::Core - '.$_[0]."\n" if TRACE;
}

###############################################################################
Expand Down
1 change: 0 additions & 1 deletion lib/Foswiki/Plugins/MediaWikiTablePlugin/MANIFEST
Expand Up @@ -5,4 +5,3 @@ pub/System/MediaWikiTablePlugin/Makefile 0644
pub/System/MediaWikiTablePlugin/styles.css 0644
pub/System/MediaWikiTablePlugin/styles.css.gz 0644
pub/System/MediaWikiTablePlugin/styles.uncompressed.css 0644
pub/System/MediaWikiTablePlugin/wikiringlogo40x40.png 0644

0 comments on commit 59a6b03

Please sign in to comment.