summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sublab_project/settings.py1
-rw-r--r--sublab_project/static/css/sublab.css330
-rw-r--r--sublab_project/static/img/background.jpgbin0 -> 115859 bytes
-rw-r--r--sublab_project/static/img/favicon.pngbin0 -> 316 bytes
-rw-r--r--sublab_project/static/img/logo.pngbin0 -> 7193 bytes
-rw-r--r--sublab_project/static/img/topimage.jpgbin0 -> 71066 bytes
-rw-r--r--sublab_project/templates/500.html10
-rw-r--r--sublab_project/templates/base.html14
8 files changed, 343 insertions, 12 deletions
diff --git a/sublab_project/settings.py b/sublab_project/settings.py
index 5dad6a3..d5f7cad 100644
--- a/sublab_project/settings.py
+++ b/sublab_project/settings.py
@@ -74,6 +74,7 @@ STATICFILES_DIRS = (
# Put strings here, like "/home/html/static" or "C:/www/django/static".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
+ os.path.join(SITE_ROOT, 'static'),
)
# List of finder classes that know how to find static files in
diff --git a/sublab_project/static/css/sublab.css b/sublab_project/static/css/sublab.css
new file mode 100644
index 0000000..20e9c5b
--- /dev/null
+++ b/sublab_project/static/css/sublab.css
@@ -0,0 +1,330 @@
+* {
+ padding: 0px;
+ margin: 0px;
+ font-family: Verdana, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #ddd;
+ }
+
+iframe.youtube {
+ margin: 5px 15px 0px 15px;
+ width: 300px;
+ height: 235px;
+ border: 1px solid #444;
+ }
+
+iframe.osm {
+ margin: 5px 15px 0px 15px;
+ width: 500px;
+ height: 325px;
+ border: 1px solid #444;
+ scroll: no;
+ }
+
+body {
+ background: #000 url(../img/background.jpg) no-repeat fixed center center;
+ }
+
+div.frame {
+ border: 1px solid #aaa;
+ background-color: rgba(0, 0, 0, 0.75);
+ margin-left: auto;
+ margin-right: auto;
+ min-width: 700px;
+ max-width: 1500px;
+ position: relative;
+ }
+
+div.hiddenframe {
+ margin: 50px;
+ }
+
+div.logo {
+ float: left;
+ height: 150px;
+ width: 110px;
+ margin: 5px 5px 5px 5px;
+ border: 0px solid #222;
+ background: #000 url(../img/logo.png) no-repeat center center;
+ }
+
+div.image {
+ margin-top: 0px;
+ margin: 5px;
+ margin-left: 125px;
+ border: 1px solid #444;
+ height: 150px;
+ background: #000 url(../img/topimage.jpg) no-repeat left bottom;
+ }
+
+div.menu {
+ clear: both;
+ color: #fff;
+ border: 1px solid #444;
+ padding: 5px;
+ background-color: rgba(16, 16, 16, 0.5);
+ margin-left: 5px;
+ position: absolute;
+ top: 160px;
+ width: 100px;
+ min-height: 150px;
+ }
+
+div.content {
+ color: #fff;
+ border: 1px solid #444;
+ padding: 5px;
+ background-color: rgba(16, 16, 16, 0.5);
+ position: static;
+ margin: 0px 225px 5px 125px;
+ top: 160px;
+ min-height: 120px;
+ height: 100%;
+ }
+
+div.info {
+ color: #fff;
+ background-color: rgba(16, 16, 16, 0.5);
+ border: 1px solid #444;
+ padding: 5px;
+ margin-right: 5px;
+ margin-bottom: 5px;
+ width: 200px;
+ position: absolute;
+ right: 0px;
+ min-height: 200px;
+ }
+
+div.status {
+ width: 180px;
+ margin-left: 10px;
+ margin-right: 10px;
+ }
+
+div.footer {
+ clear: both;
+ background-color: rgba(16, 16, 16, 0.5);
+ color: #fff;
+ border: 1px solid #444;
+ padding: 5px;
+ margin: 5px;
+ text-align: center;
+ }
+
+.imagecontent {
+ clear: both;
+ float: right;
+ margin: 5px 10px 5px 10px;
+ width: 35%;
+ min-width: 150px;
+ }
+
+img {
+ border: 1px solid #444;
+ }
+
+img.webcam {
+ border: 1px solid #444;
+ width: 400px;
+ margin: 5px 5px 0px 15px;
+ }
+
+img.logo {
+ height: 140px;
+ width: auto;
+ border: 0px;
+ }
+
+img.webcamthumb {
+ margin: 10px;
+ border: 1px solid #444;
+ width: 180px;
+ height: auto;
+ }
+
+.contentimage {
+ width: 95%;
+ height: auto;
+ margin: 0px 5px 0px 5px;
+ border: 2px solid #444;
+ }
+
+img.bigimage {
+ width: 100%;
+ max-width: 640px;
+ margin-left: auto;
+ margin-right: auto;
+ display: block;
+ }
+
+.floatright {
+ float: right;
+ }
+
+.floatleft {
+ float: left;
+ }
+
+table {
+ width: 200px;
+ margin: auto;
+ }
+
+hr {
+ margin: 10px;
+ color: #ddd;
+ clear: both;
+ }
+
+ul {
+ margin-left: 40px;
+ }
+
+#menu {
+ list-style: none;
+ margin: 5px;
+ }
+
+#menu a {
+ text-decoration: none;
+ font-weight: bold;
+ line-height: 15px;
+ border: 0px;
+ color: #ddd;
+ }
+
+#menu a:hover {
+ text-decoration: none;
+ font-weight: bold;
+ color: #fff;
+ }
+
+#menu a:active {
+ text-decoration: none;
+ font-weight: bold;
+ color: #bbb;
+ }
+
+h1 {
+ text-align: center;
+ visibility: hidden;
+ }
+
+h3 {
+ /*clear: both;*/
+ font-size: 14px;
+ text-align: left;
+ color: #ddd;
+ line-height: 20px;
+ margin: 15px 10px 5px 10px;
+ }
+
+h4 {
+ line-height: 25px;
+ text-align: center;
+ color: #ddd;
+ margin-top: 5px;
+ }
+
+h2 {
+ font-size: 18px;
+ line-height: 40px;
+ margin-left: 10px;
+ color: #ddd;
+ }
+
+p {
+ margin: 5px 15px 5px 15px;
+ color: #ddd;
+ line-height: 20px;
+ }
+
+p.subtext {
+ color: #ddd;
+ line-height: 12px;
+ margin: 2px 5px 5px 15px;
+ }
+
+p.header {
+ text-align: right;
+ margin: 10px;
+ }
+
+span.header {
+ background-color: rgba(16, 16, 16, 0.75);
+ padding: 5px 10px 5px 10px;
+ }
+
+.statusinfo {
+ line-height: 20px;
+ }
+
+.status {
+ line-height: 20px;
+ margin-left: 10px;
+ margin-right: 10px;
+ }
+
+.member {
+ line-height: 20px;
+ font-weight: bold;
+ margin-left: 10px;
+ margin-right: 10px;
+ text-align: center;
+ }
+
+a {
+ text-decoration: none;
+ border-bottom: 1px dotted;
+ color: #ddd;
+ }
+
+a:hover {
+ text-decoration: none;
+ color: #fff;
+ }
+
+a:active {
+ text-decoration: none;
+ color: #bbb;
+ }
+
+a.img {
+ text-decoration: none;
+ border: 0px;
+ color: #ddd;
+ }
+
+a.img:hover {
+ text-decoration: none;
+ color: #bbb;
+ }
+
+a.img:active {
+ text-decoration: none;
+ color: #999;
+ }
+
+span {
+ border: 1px solid #222;
+ padding: 2px;
+ }
+
+.olFramedCloudPopupContent h2 {
+ color: #000000;
+ font-size: 14px;
+ }
+
+.olFramedCloudPopupContent p {
+ color: #000000;
+ font-size: 12px;
+ }
+
+.olFramedCloudPopupContent a {
+ color: #3333FF;
+ font-size: 14px;
+ }
+
+#mapdiv img {
+ border: 0px;
+ }
diff --git a/sublab_project/static/img/background.jpg b/sublab_project/static/img/background.jpg
new file mode 100644
index 0000000..1cdbe5e
--- /dev/null
+++ b/sublab_project/static/img/background.jpg
Binary files differ
diff --git a/sublab_project/static/img/favicon.png b/sublab_project/static/img/favicon.png
new file mode 100644
index 0000000..ae20cc3
--- /dev/null
+++ b/sublab_project/static/img/favicon.png
Binary files differ
diff --git a/sublab_project/static/img/logo.png b/sublab_project/static/img/logo.png
new file mode 100644
index 0000000..e785360
--- /dev/null
+++ b/sublab_project/static/img/logo.png
Binary files differ
diff --git a/sublab_project/static/img/topimage.jpg b/sublab_project/static/img/topimage.jpg
new file mode 100644
index 0000000..447b26d
--- /dev/null
+++ b/sublab_project/static/img/topimage.jpg
Binary files differ
diff --git a/sublab_project/templates/500.html b/sublab_project/templates/500.html
index dd87d27..76ab090 100644
--- a/sublab_project/templates/500.html
+++ b/sublab_project/templates/500.html
@@ -11,11 +11,11 @@
{# <meta name="description" lang="de" content="$template_desc_de"> #}
{# <meta name="description" lang="en" content="$template_desc_en"> #}
- <link rel="stylesheet" href="css/sublab-2011-11-02.css" type="text/css">
- <link rel="stylesheet" href="css/taifun.status.css" type="text/css">
- <link rel="stylesheet" href="css/trieste.status.css" type="text/css">
- <link rel="stylesheet" href="css/nautilus.status.css" type="text/css">
- <link rel="shortcut icon" href="img/favicon.png">
+ <link rel="stylesheet" href="{{ STATIC_URL }}css/sublab-2011-11-02.css" type="text/css">
+ <link rel="stylesheet" href="{{ STATIC_URL }}css/taifun.status.css" type="text/css">
+ <link rel="stylesheet" href="{{ STATIC_URL }}css/trieste.status.css" type="text/css">
+ <link rel="stylesheet" href="{{ STATIC_URL }}css/nautilus.status.css" type="text/css">
+ <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.png">
</head>
<body>
diff --git a/sublab_project/templates/base.html b/sublab_project/templates/base.html
index 2c71ff7..63b0f72 100644
--- a/sublab_project/templates/base.html
+++ b/sublab_project/templates/base.html
@@ -12,11 +12,11 @@
{# <meta name="description" lang="de" content="$template_desc_de"> #}
{# <meta name="description" lang="en" content="$template_desc_en"> #}
- <link rel="stylesheet" href="css/sublab-2011-11-02.css" type="text/css">
- <link rel="stylesheet" href="css/taifun.status.css" type="text/css">
- <link rel="stylesheet" href="css/trieste.status.css" type="text/css">
- <link rel="stylesheet" href="css/nautilus.status.css" type="text/css">
- <link rel="shortcut icon" href="img/favicon.png">
+ <link rel="stylesheet" href="{{ STATIC_URL }}css/sublab.css" type="text/css">
+ <link rel="stylesheet" href="{{ STATIC_URL }}autogen/taifun.status.css" type="text/css">
+ <link rel="stylesheet" href="{{ STATIC_URL }}autogen/trieste.status.css" type="text/css">
+ <link rel="stylesheet" href="{{ STATIC_URL }}autogen/nautilus.status.css" type="text/css">
+ <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.png">
</head>
<body>
@@ -116,9 +116,9 @@
{% endblock %}
</p>
<hr>
- <a href="/webcam" class="img"><img src="img/thumb.rack.webcam.jpg" alt="Webcam im Fenster" class="webcamthumb"></a>
+ <a href="/webcam" class="img"><img src="{{ STATIC_URL }}img/thumb.rack.webcam.jpg" alt="Webcam im Fenster" class="webcamthumb"></a>
<hr>
- <a href="/img/tempgraph.png" class="img"><img src="img/thumb.tempgraph.png" alt="Temperaturen im sublab" class="webcamthumb"></a>
+ <a href="{{ STATIC_URL }}img/tempgraph.png" class="img"><img src="img/thumb.tempgraph.png" alt="Temperaturen im sublab" class="webcamthumb"></a>
<hr>
<p class="member">
<a href="inc/sublab_ev_mitgliedsantrag.pdf">Mitglied werden</a>