diff --git a/content/project/05_left b/content/development/05_left similarity index 68% rename from content/project/05_left rename to content/development/05_left index d0bcf8f..05d178d 100644 --- a/content/project/05_left +++ b/content/development/05_left @@ -11,21 +11,16 @@ href="http://post.gmane.org/post.php?group=gmane.comp.encryption.cryptobox.devel">gmane.

-
-

Future release plans

-

CryptoBox-Server:

- -

CryptoBox-CD:

- -

Read the development roadmap - for more details.

-
-

Contribute

You are not just a consumer. At least not in the Open Source world.

You can always help others with your knowledge or go and spend your money for lousy software. ;)

+ +
+

Recent changes

+ %(rss_content)s +
diff --git a/content/project/10_center b/content/development/10_center similarity index 100% rename from content/project/10_center rename to content/development/10_center diff --git a/content/index/02_top b/content/index/02_top index 8b9121e..c8e84ce 100644 --- a/content/index/02_top +++ b/content/index/02_top @@ -1,4 +1,4 @@ -
+

What is it about?

The CryptoBox project wants to bring data encryption to the masses.

Therefore we develop two free (GPL) software packages:

@@ -9,7 +9,7 @@ encrypting fileserver without bothering about complicated administration issues. -

The privacy of your data is our mission.

-

Any Questions? Mail to info(at)cryptobox.org!

+

Get some more details.

+

Any questions left? Send a mail to %(mailaddress)s!

diff --git a/content/index/05_left b/content/index/05_left index 4e637b6..97287c9 100644 --- a/content/index/05_left +++ b/content/index/05_left @@ -1,19 +1,12 @@
-

Screenshots

-

img: screenshot
- More screenshots

-
- -
-

Download

-

Fetch the latest release of the CryptoBox-server - package v0.3.1.

-
- -
-

Recent changes

- %(rss_content)s +

Future release plans

+

CryptoBox-Server:

+
  • v0.4 04/15/02007
+

CryptoBox-CD:

+
  • v0.3.1 02/15/02007
+

Read the development roadmap + for more details.

diff --git a/content/support/02_top b/content/support/02_top new file mode 100644 index 0000000..2592680 --- /dev/null +++ b/content/support/02_top @@ -0,0 +1,13 @@ +
+

Any problems?

+
    +
  1. Check if the FAQ below helps you to solve your problem.
    2. +
  2. Check if it is a known issues. Maybe you + could add some information.
    3. +
  3. Submit a bug report.
    4. +
  4. Any questions left? Send a mail to %(mailaddress)s!
    5. +
+
+ diff --git a/content/faq/05_left b/content/support/05_left similarity index 100% rename from content/faq/05_left rename to content/support/05_left diff --git a/content/faq/10_center b/content/support/10_center similarity index 96% rename from content/faq/10_center rename to content/support/10_center index f1b73a2..6ee322e 100644 --- a/content/faq/10_center +++ b/content/support/10_center @@ -1,7 +1,7 @@

Frequently asked questions

If you have more questions or if you want better answers, just send a mail - to info(at)cryptobox.org. Thanks!

+ to %(mailaddress)s. Thanks!

diff --git a/demo.html b/demo.html index d37eabd..68b5934 100644 --- a/demo.html +++ b/demo.html @@ -12,22 +12,17 @@
- - - +

Home | Download | Screenshots | Demo | - Details | - Project | - FAQ + Support | + Development

-
- - +

Pardon in advance

@@ -49,7 +44,6 @@ -

-- a Sense.Lab project -- Impressum --

@@ -82,7 +76,5 @@ --> - - - + diff --git a/details.html b/details.html index 947a1dd..85d7d21 100644 --- a/details.html +++ b/details.html @@ -12,22 +12,17 @@
- - - +

Home | Download | Screenshots | Demo | - Details | - Project | - FAQ + Support | + Development

-
- - +

Thank you!

@@ -103,7 +98,6 @@
-

-- a Sense.Lab project -- Impressum --

@@ -136,7 +130,5 @@ --> - - - + diff --git a/project.html b/development.html similarity index 78% rename from project.html rename to development.html index 4266a74..ee27e88 100644 --- a/project.html +++ b/development.html @@ -12,22 +12,17 @@
- - - +

Home | Download | Screenshots | Demo | - Details | - Project | - FAQ + Support | + Development

-
- - +

Issues and bugs

@@ -41,22 +36,35 @@ href="http://post.gmane.org/post.php?group=gmane.comp.encryption.cryptobox.devel">gmane.

-
-

Future release plans

-

CryptoBox-Server:

-
  • v0.4 04/15/02007
-

CryptoBox-CD:

-
  • v0.3.1 02/15/02007
-

Read the development roadmap - for more details.

-
-

Contribute

You are not just a consumer. At least not in the Open Source world.

You can always help others with your knowledge or go and spend your money for lousy software. ;)

+ +
+

Recent changes

+ + +
@@ -106,7 +114,6 @@
-

-- a Sense.Lab project -- Impressum --

@@ -139,7 +146,5 @@ --> - - - + diff --git a/download.html b/download.html index bb552d9..c8e0abe 100644 --- a/download.html +++ b/download.html @@ -12,22 +12,17 @@
- - - +

Home | Download | Screenshots | Demo | - Details | - Project | - FAQ + Support | + Development

-
- - +

Latest releases

@@ -93,7 +88,6 @@
-

-- a Sense.Lab project -- Impressum --

@@ -126,7 +120,5 @@ --> - - - + diff --git a/gfx/main.css b/gfx/main.css index 0a52d00..6d0ba1b 100644 --- a/gfx/main.css +++ b/gfx/main.css @@ -72,13 +72,13 @@ div#header { height: 78px; } -div#mission { +div.centercontent { padding: 0.3em 1ex 0.3em 1ex; margin: 5px 5px 9px 5px; border: 1px solid #e0e0e0; } -div#mission h2 { +div.centercontent h2 { padding: 0.1em 0 0.1em 0.5em; } @@ -119,7 +119,7 @@ div.left h2 { } div.leftcontent { - margin: 0.2em 0.4em 0.3em 0; + margin: 0.2em 0.4em 0.5em 0; padding: 0.3em; text-align: left; border: 1px solid #e0e0e0; @@ -130,7 +130,7 @@ div.leftcontent p { } div.content { - margin: 5px 5px 9px 31%; + margin: 5px 5px 15px 31%; } div.onecolumn { @@ -179,6 +179,7 @@ div.footer { /* FAQ headers */ div.faq h3 { margin: 0.5em; + font-size: 0.9em; color: #8bbf75; } diff --git a/index.html b/index.html index 870c979..30286e0 100644 --- a/index.html +++ b/index.html @@ -12,23 +12,18 @@
- - - +

Home | Download | Screenshots | Demo | - Details | - Project | - FAQ + Support | + Development

-
- - -
+
+

What is it about?

The CryptoBox project wants to bring data encryption to the masses.

Therefore we develop two free (GPL) software packages:

@@ -39,43 +34,19 @@ encrypting fileserver without bothering about complicated administration issues. -

The privacy of your data is our mission.

-

Any Questions? Mail to info(at)cryptobox.org!

+

Get some more details.

+

Any questions left? Send a mail to info@cryptobox.org!

-

Screenshots

-

img: screenshot
- More screenshots

-
- -
-

Download

-

Fetch the latest release of the CryptoBox-server - package v0.3.1.

-
- -
-

Recent changes

- - +

Future release plans

+

CryptoBox-Server:

+
  • v0.4 04/15/02007
+

CryptoBox-CD:

+
  • v0.3.1 02/15/02007
+

Read the development roadmap + for more details.

@@ -130,7 +101,6 @@ installation of samba package works now
-

-- a Sense.Lab project -- Impressum --

@@ -163,7 +133,5 @@ installation of samba package works now --> - - - + diff --git a/placeholder/mailaddress b/placeholder/mailaddress new file mode 100644 index 0000000..fec8f13 --- /dev/null +++ b/placeholder/mailaddress @@ -0,0 +1 @@ +info@cryptobox.org diff --git a/placeholder/nav b/placeholder/nav index 2534b02..f2a9f4e 100644 --- a/placeholder/nav +++ b/placeholder/nav @@ -4,9 +4,8 @@ Download | Screenshots | Demo | - Details | - Project | - FAQ + Support | + Development

diff --git a/screenshots.html b/screenshots.html index c171351..221c1a6 100644 --- a/screenshots.html +++ b/screenshots.html @@ -12,22 +12,17 @@
- - - +

Home | Download | Screenshots | Demo | - Details | - Project | - FAQ + Support | + Development

-
- - +

Versions 0.3.x

@@ -53,7 +48,6 @@

-

-- a Sense.Lab project -- Impressum --

@@ -86,7 +80,5 @@ --> - - - + diff --git a/faq.html b/support.html similarity index 86% rename from faq.html rename to support.html index b83a1dd..467a2e3 100644 --- a/faq.html +++ b/support.html @@ -12,23 +12,31 @@
- - - +

Home | Download | Screenshots | Demo | - Details | - Project | - FAQ + Support | + Development

+
+
+

Any problems?

+
    +
  1. Check if the FAQ below helps you to solve your problem.
    2. +
  2. Check if it is a known issues. Maybe you + could add some information.
    3. +
  3. Submit a bug report.
    4. +
  4. Any questions left? Send a mail to info@cryptobox.org!
    5. +
- -
+

Table of content

@@ -53,7 +61,7 @@

Frequently asked questions

If you have more questions or if you want better answers, just send a mail - to info(at)cryptobox.org. Thanks!

+ to info@cryptobox.org. Thanks!

@@ -101,7 +109,6 @@
-

-- a Sense.Lab project -- Impressum --

@@ -134,7 +141,5 @@ --> - - - + diff --git a/templatewriter.py b/templatewriter.py index cd4c86b..7625f59 100755 --- a/templatewriter.py +++ b/templatewriter.py @@ -54,7 +54,7 @@ class TemplateWriter: if not os.path.isfile(tmplfile): print " str.repl: cancelling %s - not a file" % tmplfile else: - placeholder[tmpl] = file(tmplfile).read() + placeholder[tmpl] = file(tmplfile).read().strip() placeholder["rss_content"] = self.get_rss_info() return placeholder