From: oetiker Date: Sun, 22 Oct 2006 15:57:01 +0000 (+0000) Subject: minor fixed to the web code X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4aee713a34ee4d3a82c2ce1cb8a8f28043799fb6;p=rrdtool-all.git minor fixed to the web code git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@904 a5681a0c-68f1-0310-ab6d-d61299d08faa --- diff --git a/website/bin/fix-hrefs.pl b/website/bin/fix-hrefs.pl index 17160b37..4b6701b7 100755 --- a/website/bin/fix-hrefs.pl +++ b/website/bin/fix-hrefs.pl @@ -14,8 +14,9 @@ sub startsub { my $text = shift; if ($tag eq "a") { - $text =~ s,/home/oetiker/data/svn-checkout/rrdtool/branches/1.2/website/doc/,,; + $text =~ s,".*?/doc/,",; $text =~ /^http:/ || $text =~ s,\.html,.en.html,; + $text =~ s/name=".+?"//; } print $text; } diff --git a/website/bin/htmlfix.sh b/website/bin/htmlfix.sh index 9437245e..bca2bec3 100755 --- a/website/bin/htmlfix.sh +++ b/website/bin/htmlfix.sh @@ -2,10 +2,11 @@ case $1 in *.html) tidy -latin1 -wrap 0 -q -asxhtml $1 >$1.fixed 2>$1.report + TIDY_RET=$? perl -i -0777 -p -e 's/^\s*//;s{="mailto:(oetiker|tobi|tobias)@(oetiker.ch|ee.ethz.ch)"}{="http://tobi.oetiker.ch/"}g;s{="mailto:(\S*?)\@(\S*?)"}{="mailto:$1@..delete..this..$2"}g' $1.fixed # yes, beleive it or not IE chockes on propper xhtml pages ... sigh perl -i -0777 -p -e 's/^\s*<\?xml.+?\?>\s*//;' $1.fixed - if [ $? != 0 ]; then + if [ $TIDY_RET != 0 ]; then echo Parsing: $1 egrep -v "^(HTML Tidy|$1:|To learn|Please send|HTML and CSS|Lobby your)" $1.report rm $1.report diff --git a/website/download.wml b/website/download.wml index 6ab627a3..d0d788b6 100644 --- a/website/download.wml +++ b/website/download.wml @@ -8,8 +8,8 @@ You can download RRD tool from several places:

Primary Distribution Point

You might want to read the build instructions for inspiration on where to go after downloading the source.

@@ -17,50 +17,29 @@ You can download RRD tool from several places:

Mirror Sites

Binary Distributions

Anonymous SVN for RRDtool

-

RRDtool source is stored in a subversion repository with anonymous access.

Browse the RRDtool SVN via RRDtrac. diff --git a/website/inc/html.inc b/website/inc/html.inc index afffb002..5a82ecce 100644 --- a/website/inc/html.inc +++ b/website/inc/html.inc @@ -17,8 +17,8 @@ google_ad_height = 600; google_ad_format = "160x600_as"; google_ad_type = "text_image"; google_ad_channel ="5627785043"; -google_color_border = "ffffff"; -google_color_bg = "ffffff"; +google_color_border = "e6e6e6"; +google_color_bg = "f8f8f8"; google_color_link = "0017C1"; google_color_url = "270B83"; google_color_text = "000000"; @@ -42,3 +42,33 @@ google_color_text = "000000"; kjhasdflkjhasdf s/\\n/ /g; print :>:#Title#} + +my $addcount=0; + + +$addcount++; +if ($addcount == 6){ +print <<'GOOGLEAD'; +

+ + +

+GOOGLEAD +} + +%body + diff --git a/website/inc/template.inc b/website/inc/template.inc index f78ff581..bf074671 100644 --- a/website/inc/template.inc +++ b/website/inc/template.inc @@ -82,7 +82,9 @@ RRDtool
+ {#Body#} +
@@ -92,6 +94,30 @@ RRDtool + +if ( -s "$(WML_SRC_BASENAME).wml" > 4000 ){ +print <<'GOOGLEAD'; +
+ + +
+GOOGLEAD +} +
@@ -114,30 +140,6 @@ LINE
- -if ( -s "$(WML_SRC_BASENAME).en.html" > 15000 ) { -print <<'GOOGLEAD'; -

- - -

-GOOGLEAD -} -
diff --git a/website/navbar.inc b/website/navbar.inc index 1ff88fc9..2b0092b0 100644 --- a/website/navbar.inc +++ b/website/navbar.inc @@ -9,7 +9,7 @@ - + diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml index 8d2322a4..68822b8d 100644 --- a/website/rrdworld/index.wml +++ b/website/rrdworld/index.wml @@ -14,6 +14,7 @@ while we wait for new material to arrive.

RRDtool Companions

#include "drraw.xml" +#include "dsreport.xml" #include "rrd_merger.xml" #include "weathermap4rrd.xml" #include "rrdutils.xml" @@ -28,6 +29,7 @@ while we wait for new material to arrive.

#include "bigsis_rrdworld.xml" #include "cacti.xml" #include "collectd.xml" +#include "eluna_graph_system.xml" #include "mailgraph.xml" #include "monitorix.xml" #include "munin.xml" diff --git a/website/site-sync b/website/site-sync index a963a727..274b0be9 100755 --- a/website/site-sync +++ b/website/site-sync @@ -43,7 +43,7 @@ mirror by <a target="_top" href="http://YOUR.SITE">Company</a> HEAD for xt in html png gif ico css htaccess js; do - gfind . -name "*.$xt" -not -name stat"*" -not -name "hoster*" -exec printf '.' \; >> mirror.html + find . -name "*.$xt" -not -name stat"*" -not -name "hoster*" -exec printf '.' \; >> mirror.html done echo "" >> mirror.html