Browse Source

-logfile checks

-Ms logo
-warning message under logo
master
age 15 years ago
parent
commit
a2d35b6119
  1. 6
      bin/CryptoBoxWebserver
  2. BIN
      design/logo/cbx-text-logo1.png
  3. BIN
      design/logo/cbx-text-logo2.png
  4. 113
      design/logo/cryptoboxlogogebastel.svg
  5. 152
      design/logo/cryptoboxlogogebastelhintergrundbild.svg
  6. 2
      src/cryptobox/core/settings.py
  7. 13
      templates/header.cs

6
bin/CryptoBoxWebserver

@ -63,8 +63,8 @@ except:
sys.exit(1)
# TODO: change this for the release version
SERVER_ENVIRONMENT = "development"
# TODO: change this for the release version [development|production]
SERVER_ENVIRONMENT = "production"
class CryptoBoxWebserver:
'''this class starts the cherryp webserver and serves the single sites'''
@ -204,6 +204,8 @@ def parseOptions():
## we do not expect any remaining arguments
if len(args) != 0:
parser.error("unknown argument: %s" % str(args[0]))
if not os.access(options.logfile, os.W_OK):
parser.error("could not write to logfile (%s)" % options.logfile)
if not os.path.isdir(options.datadir) or not os.access(options.datadir,os.X_OK):
parser.error("could not access the data directory (%s)" % options.datadir)
try:

BIN
design/logo/cbx-text-logo1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
design/logo/cbx-text-logo2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

113
design/logo/cryptoboxlogogebastel.svg

@ -0,0 +1,113 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="210mm"
height="297mm"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.44.1"
sodipodi:docbase="/home/mtsrc"
sodipodi:docname="cryptoboxlogogebastel.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="485.84714"
inkscape:cy="400.70966"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:window-width="1022"
inkscape:window-height="741"
inkscape:window-x="0"
inkscape:window-y="0" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1">
<text
xml:space="preserve"
style="font-size:72px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ff8a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
x="130.43625"
y="646.03717"
id="text2232"
sodipodi:linespacing="100%"><tspan
sodipodi:role="line"
id="tspan2234"
x="130.43625"
y="646.03717">Crypto</tspan></text>
<text
xml:space="preserve"
style="font-size:72px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#7c7c7c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
x="419.97946"
y="646.76141"
id="text2236"
sodipodi:linespacing="100%"><tspan
sodipodi:role="line"
id="tspan2238"
x="419.97946"
y="646.76141">Box</tspan></text>
<rect
id="rect2240"
width="176.46666"
height="87.940598"
x="409.89847"
y="577.0567"
ry="20"
rx="20"
style="fill:none;fill-opacity:1;stroke:#ff8a00;stroke-width:9.60879135;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<text
xml:space="preserve"
style="font-size:72px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ff8a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
x="130.43625"
y="818.77332"
id="text2301"
sodipodi:linespacing="100%"><tspan
sodipodi:role="line"
id="tspan2303"
x="130.43625"
y="818.77332">Crypto</tspan></text>
<text
xml:space="preserve"
style="font-size:72px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#7c7c7c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
x="419.97946"
y="819.49756"
id="text2305"
sodipodi:linespacing="100%"><tspan
sodipodi:role="line"
id="tspan2307"
x="419.97946"
y="819.49756">Box</tspan></text>
<path
id="path2331"
d="M 409.89847,770.68098 L 409.89847,761.71164 C 409.89847,750.63166 418.81847,741.71166 429.89847,741.71166 L 429.89847,741.71164 L 566.36515,741.71164 C 577.44512,741.71166 586.36512,750.63166 586.36512,761.71166 L 586.36513,770.68101"
style="fill:none;fill-opacity:1;stroke:#ff8a00;stroke-width:9.60879135;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path2334"
d="M 586.36515,819.83449 L 586.36515,827.83499 C 586.36512,838.91497 577.44512,847.83497 566.36512,847.83497 L 429.89847,847.83497 C 418.81847,847.83497 409.89847,838.91497 409.89847,827.835 L 409.89847,819.83448"
style="fill:none;fill-opacity:1;stroke:#ff8a00;stroke-width:9.60879135;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.9 KiB

152
design/logo/cryptoboxlogogebastelhintergrundbild.svg

@ -0,0 +1,152 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="841.88977pt"
height="595.27557pt"
id="svg2249"
sodipodi:version="0.32"
inkscape:version="0.44.1"
version="1.0"
sodipodi:docbase="/home/mtsrc"
sodipodi:docname="cryptoboxlogogebastelhintergrundbild.svg">
<defs
id="defs2251">
<linearGradient
id="linearGradient2404">
<stop
id="stop2406"
offset="0"
style="stop-color:#fff000;stop-opacity:0;" />
<stop
id="stop2408"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient2291">
<stop
style="stop-color:#7c7c7c;stop-opacity:1;"
offset="0"
id="stop2293" />
<stop
style="stop-color:#7c7c7c;stop-opacity:0;"
offset="1"
id="stop2295" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2291"
id="linearGradient2297"
x1="656.79797"
y1="-505.65021"
x2="656.79797"
y2="-524.08954"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.615808,0,0,1.615808,-339.2673,277.1819)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2404"
id="linearGradient2402"
x1="4.2857141"
y1="372.66592"
x2="1044.2856"
y2="372.66592"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#1a0000"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="0.69999999"
inkscape:cx="647.17167"
inkscape:cy="335.22277"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:window-width="1024"
inkscape:window-height="768"
inkscape:window-x="0"
inkscape:window-y="0" />
<metadata
id="metadata2254">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1">
<text
xml:space="preserve"
style="font-size:122.15254211px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ff8a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
x="120.76317"
y="388.1806"
id="text1307"
sodipodi:linespacing="100%"><tspan
sodipodi:role="line"
id="tspan1309"
x="120.76317"
y="388.1806">Crypto</tspan></text>
<text
xml:space="preserve"
style="font-size:122.15254211px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#7c7c7c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
x="611.99152"
y="389.40933"
id="text1311"
sodipodi:linespacing="100%"><tspan
sodipodi:role="line"
id="tspan1313"
x="611.99152"
y="389.40933">Box</tspan></text>
<rect
id="rect1315"
width="299.38681"
height="161.59277"
x="594.88849"
y="264.95297"
ry="20"
rx="20"
style="fill:none;fill-opacity:1;stroke:#ff8a00;stroke-width:16.96563148;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<text
xml:space="preserve"
style="font-size:36.83153534px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#7c7c7c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
x="489.82135"
y="515.61743"
id="text2276"
sodipodi:linespacing="100%"><tspan
sodipodi:role="line"
id="tspan2278"
x="489.82135"
y="515.61743">Privacy for the rest of us.</tspan></text>
<text
xml:space="preserve"
style="font-size:36.83153534px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient2297);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
x="489.82135"
y="-547.867"
id="text2287"
sodipodi:linespacing="100%"
transform="scale(1,-1)"><tspan
sodipodi:role="line"
id="tspan2289"
x="489.82135"
y="-547.867"
style="fill:url(#linearGradient2297);fill-opacity:1">Privacy for the rest of us.</tspan></text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.5 KiB

2
src/cryptobox/core/settings.py

@ -411,7 +411,7 @@ class CryptoBoxSettings:
except KeyError:
raise CBConfigUndefinedError("Log", "Details")
except IOError:
raise CBEnvironmentError("could not create the log file (%s)" % \
raise CBEnvironmentError("could not write to log file (%s)" % \
self.prefs["Log"]["Details"])
log_handler.setFormatter(
logging.Formatter('%(asctime)s CryptoBox %(levelname)s: %(message)s'))

13
templates/header.cs

@ -57,11 +57,6 @@
<table id="pane">
<?cs if:?Data.EnvironmentWarning
?><tr><td colspan="3"><div id="EnvironmentWarning"><?cs
call:environment_warning(Data.EnvironmentWarning) ?></div></td></tr>
<?cs /if ?>
<tr><td colspan="3"><div id="head">
<table>
<tr><td>
@ -70,14 +65,18 @@
</td>
<td>
<?cs if:Data.activeDisksCount > 0 ?><?cs
set:logoFile = "antlogo100px_red.png" ?><?cs
set:logoFile = "cbx-text-logo2.png" ?><?cs
else ?><?cs
set:logoFile = "antlogo100px_green.png" ?><?cs
set:logoFile = "cbx-text-logo1.png" ?><?cs
/if ?>
<img src="/cryptobox-misc/<?cs var:logoFile ?>" alt="icon: logo" />
</td></tr></table>
</div></td></tr>
<?cs if:?Data.EnvironmentWarning ?>
<tr><td colspan="3"><div id="EnvironmentWarning"><?cs
call:environment_warning(Data.EnvironmentWarning) ?></div></td></tr>
<?cs /if ?>
<tr><td id="pane_left_top" /><td id="pane_top" /><td id="pane_right_top" /></tr>
<tr><td id="pane_left" />

Loading…
Cancel
Save