[TWiki-Dev] [SVN] DanielRohde r11982 - in twiki/branches/TWikiRelease04x00/twikiplugins/RackPlannerPlugin: data/TWiki lib/TWiki/Plugins lib/TWiki/Plugins/RackPlannerPlugin

[<de...@de...>]

Author: DanielRohde
Date: 2006-11-14 11:57:04 -0600 (Tue, 14 Nov 2006)
New Revision: 11982

Modified:
   twiki/branches/TWikiRelease04x00/twikiplugins/RackPlannerPlugin/data/TWiki/RackPlannerPlugin.txt
   twiki/branches/TWikiRelease04x00/twikiplugins/RackPlannerPlugin/lib/TWiki/Plugins/RackPlannerPlugin.pm
   twiki/branches/TWikiRelease04x00/twikiplugins/RackPlannerPlugin/lib/TWiki/Plugins/RackPlannerPlugin/RackPlanner.pm
Log:
Item3151: fixed displayowner/displaynotes bug reported by 
TWiki:Main.PatrickTuite


Modified: twiki/branches/TWikiRelease04x00/twikiplugins/RackPlannerPlugin/data/TWiki/RackPlannerPlugin.txt
===================================================================
--- twiki/branches/TWikiRelease04x00/twikiplugins/RackPlannerPlugin/data/TWiki/RackPlannerPlugin.txt	2006-11-14 16:01:44 UTC (rev 11981)
+++ twiki/branches/TWikiRelease04x00/twikiplugins/RackPlannerPlugin/data/TWiki/RackPlannerPlugin.txt	2006-11-14 17:57:04 UTC (rev 11982)
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="TWikiContributor" date="1161865490" format="1.0" version="$Rev$"}%
+%META:TOPICINFO{author="TWikiContributor" date="1163604499" format="1.0" version="$Rev$"}%
 ---+ <nop>RackPlannerPlugin
 The <nop>RackPlannerPlugin handles the tag =%<nop>RACKPLANNER%= and renders a rack overview (HTML table) with devices (computer, router, switches, ...). 
 ---++ Syntax Rules
@@ -20,7 +20,7 @@
 
 *Notes:*
 	* The device order in the table is not relevant (except there's a conflict) but the column order is relevant (because the table header will be ignored).
-	* If more than one device uses the same unit the conflict will be displayed with a icon (see =conflicticon= attribute, e.g. %S%). The tooltip of the icon contains the server names.
+	* If more than one device uses the same unit the conflict will be displayed with a icon (see =conflicticon= attribute, e.g. %S%). The tooltip of the icon contains the device names.
 	* If you have more than one device in the same unit you have to put them into a single table row and separate server names, 'connected to', owner, colors, notes with a =' / '= or a ' # ' (a whitespace before and after the separator is required).
 	
   
@@ -136,9 +136,10 @@
 |  Plugin Author: | TWiki:Main.DanielRohde |
 |  Copyright: | &copy; 2006, TWiki:Main.DanielRohde |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
-|  Plugin Version: | V1.002 (26 Oct 2006) |
+|  Plugin Version: | V1.003 (BETA) |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
-|  V1.002 (26 Oct 2006): | TWiki:Main.DanielRohde: allowed multiple entries in a single unit; fixed rendering bug reported by Main:TWiki.SteveWray; fixed link color bug reported by Main:TWiki.SteveWray |
+|  V1.003 (BETA) | TWiki:Main.DanielRohde: fixed displayowner/displaynotes bug reported by TWiki:Main.PatrickTuite |
+|  V1.002 (26 Oct 2006): | TWiki:Main.DanielRohde: allowed multiple entries in a single unit; fixed rendering bug reported by TWiki:Main.SteveWray; fixed link color bug reported by TWiki:Main.SteveWray |
 |  V1.001 (7 Aug 2006): | TWiki:Main.DanielRohde: improved some features (added statistics); added attributes (rackstatformat, displayunitcolumn, unitcolumn*); renamed attribute statformat; fixed documentation; fixed tooltip bug; fixed conflict bug;|
 |  V1.000 (4 Aug 2006): | TWiki:Main.DanielRohde: Initial version |
 |  TWiki Dependency: | $TWiki::Plugins::VERSION 1.021 |

Modified: twiki/branches/TWikiRelease04x00/twikiplugins/RackPlannerPlugin/lib/TWiki/Plugins/RackPlannerPlugin/RackPlanner.pm
===================================================================
--- twiki/branches/TWikiRelease04x00/twikiplugins/RackPlannerPlugin/lib/TWiki/Plugins/RackPlannerPlugin/RackPlanner.pm	2006-11-14 16:01:44 UTC (rev 11981)
+++ twiki/branches/TWikiRelease04x00/twikiplugins/RackPlannerPlugin/lib/TWiki/Plugins/RackPlannerPlugin/RackPlanner.pm	2006-11-14 17:57:04 UTC (rev 11982)
@@ -389,8 +389,8 @@
 		my $text=$s;
 		$text.=":" if ( $options{'displayconnectedto'}||$options{'displayowner'}||$options{'displaynotes'});
 		$text.=" ".$connectedto if defined $connectedto && $options{'displayconnectedto'};
-		$text.=" ".$owner if defined $owner &&  $options{'owner'};
-		$text.=" ".$note if defined $note && $options{'notes'};
+		$text.=" ".$owner if defined $owner &&  $options{'displayowner'};
+		$text.=" ".$note if defined $note && $options{'displaynotes'};
 
 		$text .= &_renderIconContent($connectedto,$note);
 		my ($fgcolor, $bgcolor, $style) = &_getColorsAndStyle($colors);

Modified: twiki/branches/TWikiRelease04x00/twikiplugins/RackPlannerPlugin/lib/TWiki/Plugins/RackPlannerPlugin.pm
===================================================================
--- twiki/branches/TWikiRelease04x00/twikiplugins/RackPlannerPlugin/lib/TWiki/Plugins/RackPlannerPlugin.pm	2006-11-14 16:01:44 UTC (rev 11981)
+++ twiki/branches/TWikiRelease04x00/twikiplugins/RackPlannerPlugin/lib/TWiki/Plugins/RackPlannerPlugin.pm	2006-11-14 17:57:04 UTC (rev 11982)
@@ -38,7 +38,8 @@
 # of the version number in PLUGINDESCRIPTIONS.
 $RELEASE = 'Dakar';
  
-$REVISION = '1.002'; #dro# allowed multiple entries in a single unit; fixed rendering bug reported by Main:TWiki.SteveWray; fixed link color bug reported by Main:TWiki.SteveWray
+$REVISION = '1.003'; #dro# fixed displayowner/displaynotes bug reported by TWiki:Main.PatrickTuite 
+#$REVISION = '1.002'; #dro# allowed multiple entries in a single unit; fixed rendering bug reported by TWiki:Main.SteveWray; fixed link color bug reported by TWiki:Main.SteveWray
 #$REVISION = '1.001'; #dro# improved some features (added statistics); added attributes (rackstatformat, displayunitcolumn, unitcolumn*); renamed attribute statformat; fixed documentation; fixed tooltip bug; fixed conflict bug;
 #$REVISION = '1.000'; #dro# initial version