diff options
| -rw-r--r-- | COPYING | 32 | ||||
| l--------- | INSTALL | 2 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | doc/httpd-sample.conf | 8 | ||||
| -rw-r--r-- | tools/Makefile.am | 1 | ||||
| -rw-r--r-- | www/ajax/rrdui.js | 1 | ||||
| -rw-r--r-- | www/ajax/style.css | 4 |
7 files changed, 43 insertions, 7 deletions
@@ -0,0 +1,32 @@ + +Copyright (c) 2005-2006, Stefan Walter +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + * Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + * Redistributions in binary form must reproduce the + above copyright notice, this list of conditions and + the following disclaimer in the documentation and/or + other materials provided with the distribution. + * The names of contributors to this software may not be + used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. + @@ -1 +1 @@ -/usr/share/automake-1.9/INSTALL
\ No newline at end of file +/usr/share/automake-1.10/INSTALL
\ No newline at end of file diff --git a/Makefile.am b/Makefile.am index 321579f..115359a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = tools www -EXTRA_DIST = graphics tools +EXTRA_DIST = graphics dist-hook: rm -rf `find $(distdir)/ -name .svn` diff --git a/doc/httpd-sample.conf b/doc/httpd-sample.conf index 4e1df94..555278a 100644 --- a/doc/httpd-sample.conf +++ b/doc/httpd-sample.conf @@ -1,14 +1,16 @@ +# --------------------------------------------------- +# ADD THE FOLLOWING LINES TO YOUR APACHE httpd.conf + # The front end to use -Alias /rrdui/ /usr/local/share/rrdui/ajax/ +Alias /rrdui /usr/local/share/rrdui/ajax/ # The CGI backend which manages the graphs -ScriptAlias /rrdui-back /usr/local/bin/rrdui-cgi +ScriptAlias /rrdui-back /usr/local/libexec/rrdui-cgi <Location "/rrdui-back"> # The location of the configuration files SetEnv CONFDIR "/usr/local/etc/rrdbot" - # The location of the RRD files SetEnv WORKDIR "/var/db/rrdbot" diff --git a/tools/Makefile.am b/tools/Makefile.am index ed8519b..ac184d0 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,6 +1,7 @@ libexec_PROGRAMS = rrdui-cgi +rrdui_cgi_CFLAGS = -I$(top_srcdir) rrdui_cgi_SOURCES = rrdui-cgi.c \ ../common/config-parser.c ../common/config-parser.h \ diff --git a/www/ajax/rrdui.js b/www/ajax/rrdui.js index 4a776cb..55c68fd 100644 --- a/www/ajax/rrdui.js +++ b/www/ajax/rrdui.js @@ -630,6 +630,7 @@ function displayCategories() { changeCategory(evt || window.event); } categoryArea.insertBefore(el, template); + categoryArea.insertBefore(document.createTextNode(" "), template) } } diff --git a/www/ajax/style.css b/www/ajax/style.css index ac7f89d..7b6cfe2 100644 --- a/www/ajax/style.css +++ b/www/ajax/style.css @@ -54,12 +54,12 @@ body .header { background-color: #3D2C2C; - padding: 4pt 6pt; + line-height: 19pt; + padding: 3pt 5pt; font-size: 8pt; font-weight: bold; -moz-border-radius: 3pt; cursor: pointer; - margin-right: 5pt; text-decoration: none; } |