From 8666896422e3c664065b9dc63c84599d3dc98da1 Mon Sep 17 00:00:00 2001
From: Nico von Geyso <Nico.Geyso@FU-Berlin.de>
Date: Wed, 15 Aug 2012 18:08:34 +0200
Subject: fixed css

---
 static/style_v2.css        | 185 ---------------------------------------------
 static/style_v3.css        | 182 ++++++++++++++++++++++++++++++++++++++++++++
 templates/layout.html      |   4 +-
 templates/module_show.html |   4 -
 4 files changed, 184 insertions(+), 191 deletions(-)
 delete mode 100644 static/style_v2.css
 create mode 100644 static/style_v3.css

diff --git a/static/style_v2.css b/static/style_v2.css
deleted file mode 100644
index 89fa08b..0000000
--- a/static/style_v2.css
+++ /dev/null
@@ -1,185 +0,0 @@
-html, body {
-  padding: 0;
-  margin: 0;
-  height: 100%;
-  font: 13px/1.5 'Helvetica Neue', Arial, 'Liberation Sans', FreeSans, sans-serif;
-}
-
-body {
-  background-color: #333;
-}
-
-#content {
-  background-color: #fff;
-  clear: both;
-  margin: 0px auto;
-  width: 1000px;
-  padding: 20px;
-}
-
-
-#header {
-  background-color: #fff;
-  margin: 0px auto 10px auto;
-  float: left;
-  width: 100%;
-}
-
-footer {
-  clear: both;
-  margin: 0px auto;
-  width: 920px;
-  padding: 20px;
-  text-align: center;
-  color: #fff;
-}
-
-footer a, footer a:visited {
-  color: #fff;
-}
-
-#sub-header {
-  width:100%;
-}
-
-#container {
-  float: left;
-}
-
-#header h1, #header p, #header form {
-  padding: 20px 0px 20px 20px;
-}
-
-#header h1 {
-  display: inline-block;
-  float: left;
-  width: 50%;
-  margin: 0px;
-}
-#header p {
-  display: inline-block;
-  font-family: monospace;
-  text-align: right;
-  line-height: 180%;
-  padding: 5px;
-  margin: 0;
-  float: right;
-  width: 30%;
-}
-
-#header h1 small {
-  color: #777;
-  font-size: 50%;
-}
-
-
-#filelist  {
-  list-style: none;
-}
-
-#container p {
-  margin-bottom: 0px;
-}
-
-label {
-  float: left;
-  width: 200px;
-}
-
-ul.flashes {
-  margin: 0px auto;
-  width: 40%;
-}
-
-ul.flashes li {
-  list-style-type: none;
-  border: 2px solid green;
-  background-color: #0D5;
-  padding: 5px;
-  padding: 0px;
-  text-align: center;
-}
-
-a, a:visited {
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  color: #0069D6;
-  text-decoration: none;
-}
-
-a:hover {
-  text-decoration: underline;
-}
-
-#sub-header p {
-  float: right;
-  text-align: right;
-}
-
-span.error {
-  font-weight: bold;
-  color: #F00;
-  display: block;
-  margin-left: 200px;
-}
-
-select {
-  font-family: monospace;
-  width: 350px;
-  border: 1px solid #ccc;
-  padding: 5px 5px;
-  background-color: #fff;
-}
-
-#module_new {
-  width: 200px;
-  margin-left: 10px;
-  padding: 5px 5px;
-  border: 1px solid #ccc;
-}
-
-#studies {
-  margin: auto;
-  text-align: center;
-  padding: 40px 0px 60px 0px;
-}
-
-#studies ul {
-  display: inline-block;
-}
-
-#studies li {
-  float: left;
-  list-style-type: none;
-  text-align: center;
-  width: 200px;
-}
-
-#studies li a {
-  margin: 0px 20px;
-  padding: 10px;
-  border: 1px solid #ccc;
-  display: block;
-}
-
-#studies li a:hover {
-  background-color: #ccc;
-  border: 1px solid #000;
-}
-
-#studies li img{
-  display: block;
-  margin: 0px auto;
-}
-
-#upload form, #upload div {
-  display: inline-block;
-}
-
-#upload div {
-  vertical-align: top;
-  padding-left: 30px;
-}
-
-.right {
-  float: right;
-}
diff --git a/static/style_v3.css b/static/style_v3.css
new file mode 100644
index 0000000..3b9bee3
--- /dev/null
+++ b/static/style_v3.css
@@ -0,0 +1,182 @@
+html, body {
+  padding: 0;
+  margin: 0;
+  height: 100%;
+  font: 13px/1.5 'Helvetica Neue', Arial, 'Liberation Sans', FreeSans, sans-serif;
+}
+
+body {
+  background-color: #333;
+}
+
+#content {
+  background-color: #fff;
+  clear: both;
+  margin: 0px auto;
+  width: 1000px;
+  padding: 20px;
+}
+
+
+#header {
+  background-color: #fff;
+  margin: 0px auto 10px auto;
+  float: left;
+  width: 100%;
+}
+
+footer {
+  clear: both;
+  margin: 0px auto;
+  width: 920px;
+  padding: 20px;
+  text-align: center;
+  color: #fff;
+}
+
+footer a, footer a:visited {
+  color: #fff;
+}
+
+#sub-header {
+  clear: both;
+  width:100%;
+}
+
+#container {
+  float: left;
+}
+
+#header h1, #header p, #header form {
+  padding: 20px 0px 20px 20px;
+}
+
+#header h1 {
+  display: inline-block;
+  float: left;
+  width: 50%;
+  margin: 0px;
+}
+#header p {
+  display: inline-block;
+  font-family: monospace;
+  text-align: right;
+  line-height: 180%;
+  padding: 5px;
+  margin: 0;
+  float: right;
+  width: 30%;
+}
+
+#header h1 small {
+  color: #777;
+  font-size: 50%;
+}
+
+
+#filelist  {
+  list-style: none;
+}
+
+#container p {
+  margin-bottom: 0px;
+}
+
+label {
+  float: left;
+  width: 200px;
+}
+
+ul.flashes {
+  margin: 0px auto;
+  width: 40%;
+}
+
+ul.flashes li {
+  list-style-type: none;
+  border: 2px solid green;
+  background-color: #0D5;
+  padding: 5px;
+  padding: 0px;
+  text-align: center;
+}
+
+a, a:visited {
+  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  color: #0069D6;
+  text-decoration: none;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+#sub-header p {
+  float: right;
+  text-align: right;
+}
+
+span.error {
+  font-weight: bold;
+  color: #F00;
+  display: block;
+  margin-left: 200px;
+}
+
+select {
+  font-family: monospace;
+  width: 350px;
+  border: 1px solid #ccc;
+  padding: 5px 5px;
+  background-color: #fff;
+}
+
+#module_new {
+  width: 200px;
+  margin-left: 10px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+}
+
+#studies {
+  margin: auto;
+  text-align: center;
+  padding: 40px 0px 60px 0px;
+}
+
+#studies ul {
+  display: inline-block;
+}
+
+#studies li {
+  float: left;
+  list-style-type: none;
+  text-align: center;
+  width: 200px;
+}
+
+#studies li a {
+  margin: 0px 20px;
+  padding: 10px;
+  border: 1px solid #ccc;
+  display: block;
+}
+
+#studies li a:hover {
+  background-color: #ccc;
+  border: 1px solid #000;
+}
+
+#studies li img{
+  display: block;
+  margin: 0px auto;
+}
+
+#upload form, #upload div {
+  display: inline-block;
+}
+
+#upload div {
+  vertical-align: top;
+  padding-left: 30px;
+}
diff --git a/templates/layout.html b/templates/layout.html
index 0089f04..bb14781 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <link rel="stylesheet" type="text/css" media="all" href="{{url_for('static',
-    filename='style_v2.css')}}" />
+    filename='style_v3.css')}}" />
     <script type="text/javascript" src="{{url_for('static',filename='jquery-1.8.0.min.js')}}"></script>
     <title>Fit</title>
   </head>
@@ -34,7 +34,7 @@
               <a href="{{url_for('study_index', study=study, module=module)}}">zurück</a>
             {% endif %}
         </p>
-        <h2>{{study.capitalize()}}</h2>
+        <h2><a href="{{url_for('study_index', study=study)}}">{{study.capitalize()}}</a></h2>
         {% endif %}
 
         <ul class="flashes">
diff --git a/templates/module_show.html b/templates/module_show.html
index 56fcf15..989d946 100644
--- a/templates/module_show.html
+++ b/templates/module_show.html
@@ -20,10 +20,6 @@
 
 {% extends "layout.html" %}
 {% block body %}
-    <p class="right"> 
-      <a href="{{url_for('study_index', study=study)}}">zurück zur Übersicht</a>
-    </p>
-
   <div id="module-index">
     <h3>{{module}}</h3>
 
-- 
cgit v1.2.3-1-g7c22