added placeholder for obfuscated mailaddress

cleaned up the main navigation bar
moved some text around
This commit is contained in:
lars 2007-01-04 19:21:10 +00:00
parent bbe38e4649
commit e6eec6a97c
18 changed files with 119 additions and 171 deletions

View File

@ -11,21 +11,16 @@
href="http://post.gmane.org/post.php?group=gmane.comp.encryption.cryptobox.devel">gmane</a>.</p>
</div>
<div class="leftcontent">
<h2>Future release plans</h2>
<p>CryptoBox-Server:</p>
<ul><li>v0.4 <span class="date">04/15/02007</span></li></ul>
<p>CryptoBox-CD:</p>
<ul><li>v0.3.1 <span class="date">02/15/02007</span></li></ul>
<p>Read the <a href="http://devel.cryptobox.org/roadmap">development roadmap</a>
for more details.</p>
</div>
<div class="leftcontent">
<h2>Contribute</h2>
<p>You are not just a consumer. At least not in the Open Source world.</p>
<p>You can always help others with your knowledge or go and spend your
money for lousy software. ;)</p>
</div>
<div class="leftcontent">
<h2>Recent changes</h2>
%(rss_content)s
</div>
</div>

View File

@ -1,4 +1,4 @@
<div id="mission">
<div class="centercontent">
<h2>What is it about?</h2>
<p>The CryptoBox project wants to bring data encryption to the masses.</p>
<p>Therefore we develop two free (GPL) software packages:</p>
@ -9,7 +9,7 @@
encrypting fileserver without bothering about complicated administration
issues.</li>
</ul>
<p>The privacy of <i>your</i> data is our mission. </p>
<p>Any Questions? Mail to <i>info(at)cryptobox.org</i>!</p>
<p>Get some more <a href="details.html">details</a>.</p>
<p>Any questions left? Send a mail to <a href="mailt&#x006F;:%(mailaddress)s">%(mailaddress)s</a>!</p>
</div>

View File

@ -1,19 +1,12 @@
<div class="left">
<div class="leftcontent">
<h2>Screenshots</h2>
<p style="text-align:center"><a href="screenshots.html"><img border="0" alt="img: screenshot" src="gfx/screen_mini.png"/><br/>
More screenshots</a></p>
</div>
<div class="leftcontent">
<h2>Download</h2>
<p>Fetch the latest release of the <a href="download.html">CryptoBox-server
package v0.3.1</a>.</p>
</div>
<div class="leftcontent">
<h2>Recent changes</h2>
%(rss_content)s
<h2>Future release plans</h2>
<p>CryptoBox-Server:</p>
<ul><li>v0.4 <span class="date">04/15/02007</span></li></ul>
<p>CryptoBox-CD:</p>
<ul><li>v0.3.1 <span class="date">02/15/02007</span></li></ul>
<p>Read the <a href="http://devel.cryptobox.org/roadmap">development roadmap</a>
for more details.</p>
</div>
</div>

13
content/support/02_top Normal file
View File

@ -0,0 +1,13 @@
<div class="centercontent">
<h2>Any problems?</h2>
<ol>
<li>Check if the FAQ below helps you to solve your problem.</li>
<li>Check if it is a <a
href="http://devel.cryptobox.org/reports/2">known issues<a>. Maybe you
could add some information.</li>
<li>Submit a <a href="http://devel.cryptobox.org/newticket">bug report</a>.</li>
<li>Any questions left? Send a mail to <a
href="mailt&#x006F;:%(mailaddress)s">%(mailaddress)s</a>!</li>
</ol>
</div>

View File

@ -1,7 +1,7 @@
<div class="content">
<h2>Frequently asked questions</h2>
<p>If you have more questions or if you want better answers, just send a mail
to <i>info(at)cryptobox.org</i>. Thanks!</p>
to <a href="mailt&#x006F;:%(mailaddress)s">%(mailaddress)s</a>. Thanks!</p>
</div>
<div class="content faq">

View File

@ -13,21 +13,16 @@
<div class="container">
<div id="header"><!-- just the logo --></div>
<div class="navbar">
<p>
<a href="index.html">Home</a> |
<a href="download.html">Download</a> |
<a href="screenshots.html">Screenshots</a> |
<a href="demo.html">Demo</a> |
<a href="details.html">Details</a> |
<a href="project.html">Project</a> |
<a href="faq.html">FAQ</a>
<a href="support.html">Support</a> |
<a href="development.html">Development</a>
</p>
</div>
<div class="left">
<div class="leftcontent">
<h2>Pardon in advance</h2>
@ -49,7 +44,6 @@
<div class="footer">
<!-- TODO: add real link! -->
<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="index.html">Impressum</a> --</p>
@ -84,5 +78,3 @@
</body>
</html>

View File

@ -13,21 +13,16 @@
<div class="container">
<div id="header"><!-- just the logo --></div>
<div class="navbar">
<p>
<a href="index.html">Home</a> |
<a href="download.html">Download</a> |
<a href="screenshots.html">Screenshots</a> |
<a href="demo.html">Demo</a> |
<a href="details.html">Details</a> |
<a href="project.html">Project</a> |
<a href="faq.html">FAQ</a>
<a href="support.html">Support</a> |
<a href="development.html">Development</a>
</p>
</div>
<div class="left">
<div class="leftcontent">
<h2>Thank you!</h2>
@ -103,7 +98,6 @@
</div>
<div class="footer">
<!-- TODO: add real link! -->
<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="index.html">Impressum</a> --</p>
@ -138,5 +132,3 @@
</body>
</html>

View File

@ -13,21 +13,16 @@
<div class="container">
<div id="header"><!-- just the logo --></div>
<div class="navbar">
<p>
<a href="index.html">Home</a> |
<a href="download.html">Download</a> |
<a href="screenshots.html">Screenshots</a> |
<a href="demo.html">Demo</a> |
<a href="details.html">Details</a> |
<a href="project.html">Project</a> |
<a href="faq.html">FAQ</a>
<a href="support.html">Support</a> |
<a href="development.html">Development</a>
</p>
</div>
<div class="left">
<div class="leftcontent">
<h2>Issues and bugs</h2>
@ -41,22 +36,35 @@
href="http://post.gmane.org/post.php?group=gmane.comp.encryption.cryptobox.devel">gmane</a>.</p>
</div>
<div class="leftcontent">
<h2>Future release plans</h2>
<p>CryptoBox-Server:</p>
<ul><li>v0.4 <span class="date">04/15/02007</span></li></ul>
<p>CryptoBox-CD:</p>
<ul><li>v0.3.1 <span class="date">02/15/02007</span></li></ul>
<p>Read the <a href="http://devel.cryptobox.org/roadmap">development roadmap</a>
for more details.</p>
</div>
<div class="leftcontent">
<h2>Contribute</h2>
<p>You are not just a consumer. At least not in the Open Source world.</p>
<p>You can always help others with your knowledge or go and spend your
money for lousy software. ;)</p>
</div>
<div class="leftcontent">
<h2>Recent changes</h2>
<ul class="recent_changes">
<li><p class="date">Thu, 04 Jan 2007 18:24:26 GMT</p><h3><a href="http://devel.cryptobox.org/changeset/656">Changeset [656] by lars</a></h3><p>
added cc license information (rdf) to footer
templatewriter rewritten
rss feed of trac integrated
</p></li>
<li><p class="date">Thu, 04 Jan 2007 14:28:24 GMT</p><h3><a href="http://devel.cryptobox.org/changeset/655">Changeset [655] by phil</a></h3><p>
Minor stylish changes to the website
</p></li>
<li><p class="date">Thu, 04 Jan 2007 03:05:24 GMT</p><h3><a href="http://devel.cryptobox.org/changeset/654">Changeset [654] by lars</a></h3><p>
remove obsolete live-cd files
</p></li>
<li><p class="date">Thu, 04 Jan 2007 01:19:55 GMT</p><h3><a href="http://devel.cryptobox.org/ticket/109">Ticket #109 resolved: server configuration changed yesterday</a></h3><p>
server configuration changed yesterday
</p></li>
<li><p class="date">Thu, 04 Jan 2007 01:19:10 GMT</p><h3><a href="http://devel.cryptobox.org/ticket/107">Ticket #107 resolved: done in [506]</a></h3><p>
done in [<a title="cleaned up all languages ..." href="http://devel.cryptobox.org/changeset/506">506</a>]
</p></li></ul>
</div>
</div>
<div class="content">
@ -106,7 +114,6 @@
</div>
<div class="footer">
<!-- TODO: add real link! -->
<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="index.html">Impressum</a> --</p>
@ -141,5 +148,3 @@
</body>
</html>

View File

@ -13,21 +13,16 @@
<div class="container">
<div id="header"><!-- just the logo --></div>
<div class="navbar">
<p>
<a href="index.html">Home</a> |
<a href="download.html">Download</a> |
<a href="screenshots.html">Screenshots</a> |
<a href="demo.html">Demo</a> |
<a href="details.html">Details</a> |
<a href="project.html">Project</a> |
<a href="faq.html">FAQ</a>
<a href="support.html">Support</a> |
<a href="development.html">Development</a>
</p>
</div>
<div class="left">
<div class="leftcontent">
<h2>Latest releases</h2>
@ -93,7 +88,6 @@
</div>
<div class="footer">
<!-- TODO: add real link! -->
<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="index.html">Impressum</a> --</p>
@ -128,5 +122,3 @@
</body>
</html>

View File

@ -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;
}

View File

@ -13,22 +13,17 @@
<div class="container">
<div id="header"><!-- just the logo --></div>
<div class="navbar">
<p>
<a href="index.html">Home</a> |
<a href="download.html">Download</a> |
<a href="screenshots.html">Screenshots</a> |
<a href="demo.html">Demo</a> |
<a href="details.html">Details</a> |
<a href="project.html">Project</a> |
<a href="faq.html">FAQ</a>
<a href="support.html">Support</a> |
<a href="development.html">Development</a>
</p>
</div>
<div id="mission">
<div class="centercontent">
<h2>What is it about?</h2>
<p>The CryptoBox project wants to bring data encryption to the masses.</p>
<p>Therefore we develop two free (GPL) software packages:</p>
@ -39,43 +34,19 @@
encrypting fileserver without bothering about complicated administration
issues.</li>
</ul>
<p>The privacy of <i>your</i> data is our mission. </p>
<p>Any Questions? Mail to <i>info(at)cryptobox.org</i>!</p>
<p>Get some more <a href="details.html">details</a>.</p>
<p>Any questions left? Send a mail to <a href="mailt&#x006F;:info&#x0040;&#x0063;ryptobox.org">info&#x0040;&#x0063;ryptobox.org</a>!</p>
</div>
<div class="left">
<div class="leftcontent">
<h2>Screenshots</h2>
<p style="text-align:center"><a href="screenshots.html"><img border="0" alt="img: screenshot" src="gfx/screen_mini.png"/><br/>
More screenshots</a></p>
</div>
<div class="leftcontent">
<h2>Download</h2>
<p>Fetch the latest release of the <a href="download.html">CryptoBox-server
package v0.3.1</a>.</p>
</div>
<div class="leftcontent">
<h2>Recent changes</h2>
<ul class="recent_changes">
<li><p class="date">Thu, 04 Jan 2007 14:28:24 GMT</p><h3><a href="http://devel.cryptobox.org/changeset/655">Changeset [655] by phil</a></h3><p>
Minor stylish changes to the website
</p></li>
<li><p class="date">Thu, 04 Jan 2007 03:05:24 GMT</p><h3><a href="http://devel.cryptobox.org/changeset/654">Changeset [654] by lars</a></h3><p>
remove obsolete live-cd files
</p></li>
<li><p class="date">Thu, 04 Jan 2007 01:19:55 GMT</p><h3><a href="http://devel.cryptobox.org/ticket/109">Ticket #109 resolved: server configuration changed yesterday</a></h3><p>
server configuration changed yesterday
</p></li>
<li><p class="date">Thu, 04 Jan 2007 01:19:10 GMT</p><h3><a href="http://devel.cryptobox.org/ticket/107">Ticket #107 resolved: done in [506]</a></h3><p>
done in [<a title="cleaned up all languages ..." href="http://devel.cryptobox.org/changeset/506">506</a>]
</p></li>
<li><p class="date">Wed, 03 Jan 2007 15:10:41 GMT</p><h3><a href="http://devel.cryptobox.org/changeset/653">Changeset [653] by lars</a></h3><p>
added patch for custom preparation/cleanup scripts for dfsbuild
installation of samba package works now
</p></li></ul>
<h2>Future release plans</h2>
<p>CryptoBox-Server:</p>
<ul><li>v0.4 <span class="date">04/15/02007</span></li></ul>
<p>CryptoBox-CD:</p>
<ul><li>v0.3.1 <span class="date">02/15/02007</span></li></ul>
<p>Read the <a href="http://devel.cryptobox.org/roadmap">development roadmap</a>
for more details.</p>
</div>
</div>
@ -130,7 +101,6 @@ installation of samba package works now
</div>
<div class="footer">
<!-- TODO: add real link! -->
<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="index.html">Impressum</a> --</p>
@ -165,5 +135,3 @@ installation of samba package works now
</body>
</html>

1
placeholder/mailaddress Normal file
View File

@ -0,0 +1 @@
info&#x0040;&#x0063;ryptobox.org

View File

@ -4,9 +4,8 @@
<a href="download.html">Download</a> |
<a href="screenshots.html">Screenshots</a> |
<a href="demo.html">Demo</a> |
<a href="details.html">Details</a> |
<a href="project.html">Project</a> |
<a href="faq.html">FAQ</a>
<a href="support.html">Support</a> |
<a href="development.html">Development</a>
</p>
</div>

View File

@ -13,21 +13,16 @@
<div class="container">
<div id="header"><!-- just the logo --></div>
<div class="navbar">
<p>
<a href="index.html">Home</a> |
<a href="download.html">Download</a> |
<a href="screenshots.html">Screenshots</a> |
<a href="demo.html">Demo</a> |
<a href="details.html">Details</a> |
<a href="project.html">Project</a> |
<a href="faq.html">FAQ</a>
<a href="support.html">Support</a> |
<a href="development.html">Development</a>
</p>
</div>
<div class="onecolumn">
<h2>Versions 0.3.x</h2>
<p>
@ -53,7 +48,6 @@
</div>
<div class="footer">
<!-- TODO: add real link! -->
<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="index.html">Impressum</a> --</p>
@ -88,5 +82,3 @@
</body>
</html>

View File

@ -13,22 +13,30 @@
<div class="container">
<div id="header"><!-- just the logo --></div>
<div class="navbar">
<p>
<a href="index.html">Home</a> |
<a href="download.html">Download</a> |
<a href="screenshots.html">Screenshots</a> |
<a href="demo.html">Demo</a> |
<a href="details.html">Details</a> |
<a href="project.html">Project</a> |
<a href="faq.html">FAQ</a>
<a href="support.html">Support</a> |
<a href="development.html">Development</a>
</p>
</div>
<div class="centercontent">
<h2>Any problems?</h2>
<ol>
<li>Check if the FAQ below helps you to solve your problem.</li>
<li>Check if it is a <a
href="http://devel.cryptobox.org/reports/2">known issues<a>. Maybe you
could add some information.</li>
<li>Submit a <a href="http://devel.cryptobox.org/newticket">bug report</a>.</li>
<li>Any questions left? Send a mail to <a
href="mailt&#x006F;:info&#x0040;&#x0063;ryptobox.org">info&#x0040;&#x0063;ryptobox.org</a>!</li>
</ol>
</div>
<div class="left">
<div class="left">
<div class="leftcontent">
<h2>Table of content</h2>
@ -53,7 +61,7 @@
<div class="content">
<h2>Frequently asked questions</h2>
<p>If you have more questions or if you want better answers, just send a mail
to <i>info(at)cryptobox.org</i>. Thanks!</p>
to <a href="mailt&#x006F;:info&#x0040;&#x0063;ryptobox.org">info&#x0040;&#x0063;ryptobox.org</a>. Thanks!</p>
</div>
<div class="content faq">
@ -101,7 +109,6 @@
</div>
<div class="footer">
<!-- TODO: add real link! -->
<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="index.html">Impressum</a> --</p>
@ -136,5 +143,3 @@
</body>
</html>

View File

@ -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