From a5bc96fb7e3cf8c5f1cb1da51f81c95e0d7d3b61 Mon Sep 17 00:00:00 2001 From: lars Date: Wed, 20 Dec 2006 01:37:42 +0000 Subject: [PATCH] content update templatewriter improved --- content/demo/{left => 05_left} | 0 content/demo/{center2 => 10_center} | 0 content/download/{left => 05_left} | 0 content/download/10_center | 35 ++++++++++++++++++++ content/download/center | 36 -------------------- content/index/{left => 05_left} | 4 +-- content/index/{center => 10_center} | 16 ++++----- content/screenshots/{center => 10_center} | 0 demo.html | 5 +-- download.html | 40 +++++++++++------------ index.html | 25 +++++++------- placeholder/footer | 3 +- placeholder/header | 2 +- project.html | 5 +-- screenshots.html | 5 +-- templatewriter.py | 24 +++++++++++--- 16 files changed, 110 insertions(+), 90 deletions(-) rename content/demo/{left => 05_left} (100%) rename content/demo/{center2 => 10_center} (100%) rename content/download/{left => 05_left} (100%) create mode 100644 content/download/10_center delete mode 100644 content/download/center rename content/index/{left => 05_left} (81%) rename content/index/{center => 10_center} (57%) rename content/screenshots/{center => 10_center} (100%) diff --git a/content/demo/left b/content/demo/05_left similarity index 100% rename from content/demo/left rename to content/demo/05_left diff --git a/content/demo/center2 b/content/demo/10_center similarity index 100% rename from content/demo/center2 rename to content/demo/10_center diff --git a/content/download/left b/content/download/05_left similarity index 100% rename from content/download/left rename to content/download/05_left diff --git a/content/download/10_center b/content/download/10_center new file mode 100644 index 0000000..65e75a9 --- /dev/null +++ b/content/download/10_center @@ -0,0 +1,35 @@ +
+

Debian, Ubuntu (cryptobox-server)

+

Install the cryptobox-server package to integrate the + features of the CryptoBox into your running server/desktop + without downloading the whole CD.

+

First add the following line to your /etc/apt/sources.list:
+   deb http://systemausfall.org/toolforge/debian unstable main"

+

Then run:
+   apt-get install cryptobox-server

+
+

Mabye the package can also be installed in other Debian based + distributions: your mileage may vary.

+
+ +
+

Go with the sources

+

Download the source package of the latest release from CodeCoop. +

You can also use the read-only webinterface of trac + for browsing through the Subversion repository. +

Full Subversion access access is possible via commandline tools or your + favourite GUI.

+

Create your local working copy with the following command:
+   svn checkout https://svn.systemausfall.org/svn/cryptobox

+
+ +
+

Get the live-CD

+

Get the newest live-CD by following this link. +

We'd like to thank codecoop.org for + providing bandwidth.

+

You could buy a Live-CD at OpenSoft.nl for 5.95 european bugs. Note: this is an unpaid advertisement link. So if you ask us kindly, we might send you a CD for a better price. ;) +

+
+ diff --git a/content/download/center b/content/download/center deleted file mode 100644 index 8c8766f..0000000 --- a/content/download/center +++ /dev/null @@ -1,36 +0,0 @@ -
-

Debian, Ubuntu (cryptobox-server)

-

With the cryptobox-server package you recieve the newest - version without downloading the hole CD.

-

First add the following to your "/etc/apt/sources.list"
- "deb http://systemausfall.org/toolforge/debian unstable main"

-

Then run: apt-get install cryptobox-server

-
-

This package may also be installable in other Debian based - distributions, maybe not without some dependency trouble.

-
- -
-

Go with the sources

-

Use svn for access the latest source code of the CryptoBox. Trac provides a read-only webinterface for the svn repository.

-

Full svn access is possible via commandline or your favorite - tool. For commandline the following command creates a dir - "cryptobox" and downloads the latest code. To stay bleeding edge, - just repeat the second command everytime before you start browsing - the code (once a day should be enough).

-
    -
  1. svn checkout https://svn.systemausfall.org/svn/ cryptobox
  2. -
  3. svn up
  4. -
-
- -
-

Get the live-CD

-

Get the newest live-CD by following this link. -

We'd like to thank codecoop.org for - providing bandwidth.

-

You could buy a Live-CD at OpenSoft.nl for 5.95 european bugs. Note: this is an unpaid advertisement link. So if you ask us kindly, we might send you a CD for a better price. ;) -

-
- diff --git a/content/index/left b/content/index/05_left similarity index 81% rename from content/index/left rename to content/index/05_left index 6be2210..b5eaa40 100644 --- a/content/index/left +++ b/content/index/05_left @@ -1,6 +1,6 @@
- -

See more screenshots

+

img: screenshot
+ See more screenshots


About

diff --git a/content/index/center b/content/index/10_center similarity index 57% rename from content/index/center rename to content/index/10_center index 32d0528..bd6ee56 100644 --- a/content/index/center +++ b/content/index/10_center @@ -3,24 +3,24 @@

NEWS: Cryptobox-server 0.3.0 release

15/12/02006

Here it comes, the earliest x-mas present 02006, the - CryptoBox-server 0.3.0 package ready for Debian/sid and - Ubuntu/edgy_eft. It is not a live-cd, but a software package that you can just install on your linux system. - Take a look at the screenshots. It was a long ride and this is the + CryptoBox-server 0.3.0 package ready for Debian/sid and + Ubuntu/edgy_eft. It is not a live-cd, but a software package that you can just install on your linux system. + Take a look at the screenshots. It was a long ride and this is the first milestone reached. Be prepared fo another 1000 miles of code. - The live-CD with the new version will appear in February 02007.

+ The live-CD with the new version will be released in February 02007.

NEWS: Python rewrite progress

19/08/02006

Finally the cryptobox-python-rewrite-process is in progress. From now on you can follow discussions and participate at the - development mailinglist via gmane.

+ development mailinglist via gmane.

NEWS: Download interception

14/04/02006

-

Sorry folks, codecoop.org is temporarly down. Update: it's up - and running again. Fetch the latest version here

+

Sorry folks, codecoop.org is temporarly down. Update: it's up + and running again. Fetch the latest version here

NEWS: CryptoBox code splitting

@@ -34,6 +34,6 @@

NEWS: CryptoBox code splitting

30/10/02005

The new CryptoBox version 0.2.1 is available at - codecoop.org!

+ codecoop.org!

diff --git a/content/screenshots/center b/content/screenshots/10_center similarity index 100% rename from content/screenshots/center rename to content/screenshots/10_center diff --git a/demo.html b/demo.html index 31647ae..4fb69aa 100644 --- a/demo.html +++ b/demo.html @@ -5,7 +5,7 @@ CryptoBox - + @@ -40,7 +40,8 @@
diff --git a/download.html b/download.html index 9e14a0f..38fb1bc 100644 --- a/download.html +++ b/download.html @@ -5,7 +5,7 @@ CryptoBox - + @@ -42,28 +42,27 @@

Debian, Ubuntu (cryptobox-server)

-

With the cryptobox-server package you recieve the newest - version without downloading the hole CD.

-

First add the following to your "/etc/apt/sources.list"
- "deb http://systemausfall.org/toolforge/debian unstable main"

-

Then run: apt-get install cryptobox-server

-
-

This package may also be installable in other Debian based - distributions, maybe not without some dependency trouble.

+

Install the cryptobox-server package to integrate the + features of the CryptoBox into your running server/desktop + without downloading the whole CD.

+

First add the following line to your /etc/apt/sources.list:
+   deb http://systemausfall.org/toolforge/debian unstable main"

+

Then run:
+   apt-get install cryptobox-server

+
+

Mabye the package can also be installed in other Debian based + distributions: your mileage may vary.

Go with the sources

-

Use svn for access the latest source code of the CryptoBox. Trac provides a read-only webinterface for the svn repository.

-

Full svn access is possible via commandline or your favorite - tool. For commandline the following command creates a dir - "cryptobox" and downloads the latest code. To stay bleeding edge, - just repeat the second command everytime before you start browsing - the code (once a day should be enough).

-
    -
  1. svn checkout https://svn.systemausfall.org/svn/ cryptobox
  2. -
  3. svn up
  4. -
+

Download the source package of the latest release from CodeCoop. +

You can also use the read-only webinterface of trac + for browsing through the Subversion repository. +

Full Subversion access access is possible via commandline tools or your + favourite GUI.

+

Create your local working copy with the following command:
+   svn checkout https://svn.systemausfall.org/svn/cryptobox

@@ -79,7 +78,8 @@
diff --git a/index.html b/index.html index 34b42cb..cec7e8e 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ CryptoBox - + @@ -24,8 +24,8 @@
- -

See more screenshots

+

img: screenshot
+ See more screenshots


About

@@ -50,24 +50,24 @@

NEWS: Cryptobox-server 0.3.0 release

15/12/02006

Here it comes, the earliest x-mas present 02006, the - CryptoBox-server 0.3.0 package ready for Debian/sid and - Ubuntu/edgy_eft. It is not a live-cd, but a software package that you can just install on your linux system. - Take a look at the screenshots. It was a long ride and this is the + CryptoBox-server 0.3.0 package ready for Debian/sid and + Ubuntu/edgy_eft. It is not a live-cd, but a software package that you can just install on your linux system. + Take a look at the screenshots. It was a long ride and this is the first milestone reached. Be prepared fo another 1000 miles of code. - The live-CD with the new version will appear in February 02007.

+ The live-CD with the new version will be released in February 02007.

NEWS: Python rewrite progress

19/08/02006

Finally the cryptobox-python-rewrite-process is in progress. From now on you can follow discussions and participate at the - development mailinglist via gmane.

+ development mailinglist via gmane.

NEWS: Download interception

14/04/02006

-

Sorry folks, codecoop.org is temporarly down. Update: it's up - and running again. Fetch the latest version here

+

Sorry folks, codecoop.org is temporarly down. Update: it's up + and running again. Fetch the latest version here

NEWS: CryptoBox code splitting

@@ -81,13 +81,14 @@

NEWS: CryptoBox code splitting

30/10/02005

The new CryptoBox version 0.2.1 is available at - codecoop.org!

+ codecoop.org!

diff --git a/placeholder/footer b/placeholder/footer index ce2f2a8..160a22e 100644 --- a/placeholder/footer +++ b/placeholder/footer @@ -1,6 +1,7 @@ diff --git a/placeholder/header b/placeholder/header index 93fba3e..77b36cc 100644 --- a/placeholder/header +++ b/placeholder/header @@ -5,7 +5,7 @@ CryptoBox - + diff --git a/project.html b/project.html index c31c8ee..66b2c0c 100644 --- a/project.html +++ b/project.html @@ -5,7 +5,7 @@ CryptoBox - + @@ -26,7 +26,8 @@ diff --git a/screenshots.html b/screenshots.html index 3a818b4..b4ad75b 100644 --- a/screenshots.html +++ b/screenshots.html @@ -5,7 +5,7 @@ CryptoBox - + @@ -47,7 +47,8 @@ diff --git a/templatewriter.py b/templatewriter.py index 1f19325..be31b98 100755 --- a/templatewriter.py +++ b/templatewriter.py @@ -8,15 +8,25 @@ class TemplateWriter: contentdir = "./content" tmplfileext = ".tmpl" outfileext = ".html" + ignore_items = [ ".svn" ] def __init__(self): pass + + + def get_sorted(self, list): + result = list[:] + result.sort() + return result + def string_replace(self, infile, outfile): template = open(infile).read() open(outfile,"w").write(template) text = {} - for tmpl in os.listdir(self.tmpldir): + for tmpl in self.get_sorted(os.listdir(self.tmpldir)): + if tmpl in self.ignore_items: + continue tmplfile = str(self.tmpldir+"/"+tmpl) if not os.path.isfile(tmplfile): print " str.repl: cancelling "+tmplfile+" - not a file" @@ -30,7 +40,9 @@ class TemplateWriter: def build_sites(self): '''use all files ending with .tmpl''' - for tmplfile in os.listdir("./"): + for tmplfile in self.get_sorted(os.listdir("./")): + if tmplfile in self.ignore_items: + continue if tmplfile.rfind(self.tmplfileext) >= 1: infile = tmplfile (tmplfilename, tmplfileext)=os.path.splitext(tmplfile) @@ -41,10 +53,14 @@ class TemplateWriter: def build_sites_from_gerippe(self): print "Let's build some html files from: "+self.templatefile - for html in os.listdir(self.contentdir): + for html in self.get_sorted(os.listdir(self.contentdir)): + if html in self.ignore_items: + continue print " building: "+html+self.outfileext entries = "" - for entry in os.listdir(self.contentdir+"/"+html): + for entry in self.get_sorted(os.listdir(self.contentdir+"/"+html)): + if entry in self.ignore_items: + continue print " adding entry: "+entry entries += open(self.contentdir+"/"+html+"/"+entry).read()