Author: Lars Michelsen <[email protected]>
Date: Sat Sep 24 01:34:44 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Sat Sep 24 01:34:44 2011 +0200
w attribute of textboxes is defaults to "auto" now, Fixed order of textbox
attributes
---
docs/en_US/map_config_format_description.html | 13 ++++++-------
share/server/core/mapcfg/default.php | 13 +++++++------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/docs/en_US/map_config_format_description.html
b/docs/en_US/map_config_format_description.html
index a5472ab..23a98e6 100644
--- a/docs/en_US/map_config_format_description.html
+++ b/docs/en_US/map_config_format_description.html
@@ -995,7 +995,6 @@
text="This is an informational text which can be placed anywhere on the map,
HTML can also be used for formatting purposes"
x=200
y=100
- w=200
}</pre>
<table style="width:100%">
<tr>
@@ -1014,9 +1013,6 @@
<b>[worker_last_run]:</b> Shows the time of the last worker run</td>
</tr>
<tr>
- <td> <b>w</b> </td><td> </td><td> Width of the textbox in px (pixels).
Set to "auto" for auto scaling. </td>
- </tr>
- <tr>
<td> <b>x</b> </td><td> </td>
<td>X axis coordinate(s).
Take a look at the <a href="#coordinate">coordinate
definition</a> for details.</td>
@@ -1027,13 +1023,16 @@
Take a look at the <a href="#coordinate">coordinate
definition</a> for details.</td>
</tr>
<tr>
- <td> background_color </td><td> #C0C0C0 </td><td> Background color of
the textbox. The color should be given in hexcode. Can also be
"transparent". </td>
+ <td>w</td><td>auto</td><td>Width of the textbox in px (pixels). Set to
"auto" for auto scaling. </td>
</tr>
<tr>
- <td> border_color </td><td> #000000 </td><td> Background color of the
textbox. The color should be given in hexcode. Can also be
"transparent". </td>
+ <td>h</td><td>auto</td><td>Height of the textbox in px (pixels). Set
to "auto" for auto scaling.</td>
</tr>
<tr>
- <td>h</td><td>auto</td><td>Height of the textbox in px (pixels). Set
to "auto" for auto scaling.</td>
+ <td> background_color </td><td> #C0C0C0 </td><td> Background color of
the textbox. The color should be given in hexcode. Can also be
"transparent". </td>
+ </tr>
+ <tr>
+ <td> border_color </td><td> #000000 </td><td> Background color of the
textbox. The color should be given in hexcode. Can also be
"transparent". </td>
</tr>
<tr>
<td>style</td><td></td><td>Custom styling for the text. To be given
like HTML style attribute contents. E.g.
<code>font-family:sans;font-weight:bold;</code></td>
diff --git a/share/server/core/mapcfg/default.php
b/share/server/core/mapcfg/default.php
index 802d8f8..d904328 100644
--- a/share/server/core/mapcfg/default.php
+++ b/share/server/core/mapcfg/default.php
@@ -708,13 +708,14 @@ $mapConfigVars = Array(
'match' => MATCH_STRING_STYLE,
),
'h' => Array(
- 'must' => 0,
+ 'must' => 0,
'default' => 'auto',
- 'match' => MATCH_TEXTBOX_HEIGHT,
+ 'match' => MATCH_TEXTBOX_HEIGHT,
),
'w' => Array(
- 'must' => 1,
- 'match' => MATCH_TEXTBOX_WIDTH,
+ 'must' => 0,
+ 'default' => 'auto',
+ 'match' => MATCH_TEXTBOX_WIDTH,
),
// SHAPE SPECIFIC OPTIONS
@@ -1052,12 +1053,12 @@ $mapConfigVarMap['textbox'] = Array(
'x' => null,
'y' => null,
'z' => null,
+ 'w' => null,
+ 'h' => null,
'background_color' => null,
'border_color' => null,
'style' => null,
'use' => null,
- 'h' => null,
- 'w' => null,
);
$mapConfigVarMap['shape'] = Array(
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2dcopy2
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
