diff options
| author | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-04-08 19:32:13 +0200 |
|---|---|---|
| committer | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-04-08 19:33:28 +0200 |
| commit | 7c45c9604fa0f754b771e676efc89e5209044aa9 (patch) | |
| tree | 36887147cfcb4a9d74a4e1d5457552635e8a1fb8 | |
| parent | 229976c9833a86996de25c5fcf3ac626ded57fc1 (diff) | |
extracted banner content from status and adjust layout
| -rw-r--r-- | source/_banner.html.erb | 13 | ||||
| -rw-r--r-- | source/_status.html.erb | 25 | ||||
| -rw-r--r-- | source/layouts/layout.erb | 23 |
3 files changed, 28 insertions, 33 deletions
diff --git a/source/_banner.html.erb b/source/_banner.html.erb new file mode 100644 index 0000000..a260119 --- /dev/null +++ b/source/_banner.html.erb @@ -0,0 +1,13 @@ +<div id="banner"> + <p> + 22. bis 25. Mai: <a href="/cryptocon14">CryptoCon</a> + </p> + + <p> + <a href="/inc/sublab_ev_mitgliedsantrag.pdf">Mitglied werden</a> + </p> + + <p> + <a href="http://void.subsignal.org:9000/status.xsl"><b>Livestream</b></a> + </p> +</div> diff --git a/source/_status.html.erb b/source/_status.html.erb index 07f4e74..5229f9c 100644 --- a/source/_status.html.erb +++ b/source/_status.html.erb @@ -1,11 +1,4 @@ <div id="status"> - - <h4> - Statusdisplay - </h4> - - <hr> - <table> <tbody> <tr> @@ -26,18 +19,6 @@ <hr> <p> - <a href="http://void.subsignal.org:9000/status.xsl"><b>Livestream</b></a> - </p> - - <hr> - - <p> - 22. bis 25. Mai: <a href="/cryptocon14">CryptoCon</a> - </p> - - <hr> - - <p> <a href="/webcam" class="img"><img src="/img/thumb.street.webcam.jpg" alt="Webcam im Fenster" class="webcamthumb"></a> </p> @@ -51,10 +32,4 @@ <!-- <object data="http://reeknersprook.de/sublog/graph-small?width=180" type="image/png" title="sublog/graph"></object> --> </p> - <hr> - - <p> - <a href="/inc/sublab_ev_mitgliedsantrag.pdf">Mitglied werden</a> - </p> - </div> diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb index a88ab54..0686d89 100644 --- a/source/layouts/layout.erb +++ b/source/layouts/layout.erb @@ -20,24 +20,31 @@ <div class="container"> - <div class="header"> - <h1>sublab</h1> + <div class="header container"> + <div class="row"> + <div class="col-md-3"> + <h1>sublab</h1> + </div> + <div id="moods" class="col-md-9"> + <%= yield_content :moods %> + </div> + </div> </div> <div class="row"> - <div class="col-md-2"> + <div class="col-md-3"> <%= partial "navigation" %> + <hr /> + <%= partial "banner" %> + <hr /> + <%= partial "status" %> </div> - <div class="col-md-7"> + <div class="col-md-9"> <%= yield %> </div> - <div class="col-md-3"> - <%= partial "status" %> - </div> - </div> <!-- end main row --> </div> <!-- end container --> |