[tokkee]

tokkee.org

Code

projects / rrdtool-all.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 659115b)
added hoster and mirror support
authoroetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Sun, 23 Apr 2006 21:09:08 +0000 (21:09 +0000)
committeroetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Sun, 23 Apr 2006 21:09:08 +0000 (21:09 +0000)
git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@799 a5681a0c-68f1-0310-ab6d-d61299d08faa

website/.htaccess patch | blob | history
website/hoster.html [new file with mode: 0644] patch | blob
website/inc/design.css patch | blob | history
website/inc/template.inc patch | blob | history
website/site-sync patch | blob | history

diff --git a/website/.htaccess b/website/.htaccess
index a736563fe801facbd55f6b3ff5aa01e2e2c1197d..669b99edc0be42d969c29fa20d242f2ffc5e885f 100644 (file)
--- a/website/.htaccess
+++ b/website/.htaccess
@@ -2,3 +2,5 @@ ErrorDocument 404 http://oss.oetiker.ch/rrdtool/404.var
 RewriteEngine On
 RewriteRule pub/(.*) http://people.ee.ethz.ch/oetiker/webtools/rrdtool/pub/$1 [R=301,L]
 RewriteRule pub$ http://people.ee.ethz.ch/oetiker/webtools/rrdtool/pub/ [R=301,L]
+RewriteRule index.html http://oss.oetiker.ch/rrdtool/ [R=302,L]
+RewriteRule download.html http://oss.oetiker.ch/rrdtool/download.en.html [R=302,L]
diff --git a/website/hoster.html b/website/hoster.html
new file mode 100644 (file)
index 0000000..b8d5f68
--- /dev/null
+++ b/website/hoster.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<style type="text/css">
+body {
+    margin: 0px;
+    padding: 0px;
+    background-color: rgb(96, 96, 96);
+}
+
+#hoster a {
+    color: black;
+    text-decoration: none;
+</style>
+</head>
+<body>
+<div id="hoster">
+<a target="_top" href="http://www.init7.com/bandwidth.php">bandwidth</a> by <a href="http://www.init7.net/" target="_top">Init7</a>
+</div>
+</body>
+</html>
diff --git a/website/inc/design.css b/website/inc/design.css
index 0e0bb33818855247543450094d5e2d84b012c5e6..4a913ef664616649546ba4f73e8e746694e5dccf 100644 (file)
--- a/website/inc/design.css
+++ b/website/inc/design.css
@@ -6,6 +6,7 @@ body {
   font-family: sans-serif;
   line-height: 1.5em;
 }
+
 /* hide old stuff */
 .legacy {
   display: none
@@ -107,9 +108,14 @@ div#body pre a{
 div#googlead_right {
   background-color: #1a1a1a;
   float: right;
-  padding-top: 31px;
-  padding-left: 15px;
+  margin-top: 31px;
+  padding-left: 20px;
+  margin-left: 20px;
+  border-left-width: 1px;
+  border-left-style: solid;
+  border-left-color: #404040;
   padding-right: 0px;
+  padding-bottom: 10px;
 }
 
 /**************************
diff --git a/website/inc/template.inc b/website/inc/template.inc
index 06dd2b753feb0ec49a004de861de8403dc6c0a51..8fa4b72e55818f234657c25e705c8c1a14af5dae 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -47,16 +47,13 @@
 <br/>
 <br/>
 <a href="http://people.ee.ethz.ch/oetiker/wish"><img border="0" src="$(ROOT)/inc/button.png"/></a><br/>
-#<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-#<input type="hidden" name="cmd" value="_xclick"/>
-#<input type="hidden" name="business" value="tobias@oetiker.ch"/>
-#<input type="hidden" name="item_name" value="Tobi's OpenSource Projects MRTG / RRDtool / SmokePing"/>
-#<input type="hidden" name="item_number" value="appreciators"/>
-#<input type="hidden" name="no_note" value="1"/>
-#<input type="hidden" name="currency_code" value="USD"/>
-#<input type="hidden" name="tax" value="0"/>
-#<input type="image" src="https://www.paypal.com/images/x-click-but04.gif" name="submit" alt="Sponsor RRDtool with PayPal"/>
-#</form>
+<br/>
+<br/>
+<div>
+<iframe width="120" height="50" name="bandwidth" frameborder="0" src="$(ROOT)/hoster.html"></iframe>
+</div>
+<br/>
+<br/>
 </div>
 </td>
 <!-- ############################# -->
@@ -93,11 +90,11 @@ google_ad_height = 600;
 google_ad_format = "160x600_as";
 google_ad_type = "text";
 google_ad_channel ="5627785043";
-google_color_border = "616FC5";
-google_color_bg = "202020";     
-google_color_link = "66A5FF";      
-google_color_url = "FFBBE8";      
-google_color_text = "FFFFFF";
+google_color_border = "1A1A1A";
+google_color_bg = "303030";     
+google_color_link = "66A5E0";      
+google_color_url = "E0BBE8";      
+google_color_text = "D0D0D0";
 //--></script>
 <script type="text/javascript"
   src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
diff --git a/website/site-sync b/website/site-sync
index 88cf10841f1f00c8a3ff47788559c6bcae700f30..e9984efc20e94c613c66fc29498e6aadcc3d6484 100755 (executable)
--- a/website/site-sync
+++ b/website/site-sync
@@ -1,3 +1,49 @@
+cat <<HEAD > mirror.html
+<html>
+<head>
+<title>website mirror instructions</title>
+</head>
+<h1>RRDtool Mirror Source</h1>
+<p>Run the following commands once a day.</p>
+<pre>
+#!/bin/sh
+cd /YOUR/MIRROR/TREE
+wget --no-host-directories --timestamping --recursive --level=1 http://oss.oetiker.ch/rrdtool/mirror.html
+</pre>
+
+<p>Create a file called <b>hoster.html</b> like that:</p>
+<pre>
+&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;
+&lt;html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"&gt;
+&lt;head&gt;
+&lt;style type="text/css"&gt;
+body {
+    margin: 0px;
+    padding: 0px;
+    background-color: #909090;
+}
+
+#hoster a {
+    color: black;
+    text-decoration: none;
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div id="hoster"&gt;
+mirror by &lt;a target="_top" href="http://YOUR.SITE"&gt;Company&lt;/a&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</pre>
+
+HEAD
+
+for xt in html png gif ico css htaccess js; do
+  gfind . -name "*.$xt" -not -name stat"*" -not -name "hoster*" -exec printf '<a href="{}">.</a>' \; >> mirror.html
+done
+echo "</body></html>"                                     >> mirror.html
+
 rsync --copy-unsafe-links --verbose --times --delete --exclude pub --exclude='*~' --exclude=".svn" --exclude=".condor" -r . oposs@oss.oetiker.ch:public_html/rrdtool/
 #rsync --copy-unsafe-links --verbose --times --delete --exclude pub --exclude='*~' --exclude=".svn" --exclude=".condor" -r . /home/oetiker/public_html/webtools/rrdtool
 #rsync --links --verbose --times --delete --exclude pub --exclude='*~' --rsh=ssh -r . tobi@ipn.caida.org:/ipn/web/Tools/RRDtool
round robin database tool (complete SVN clone)