From c3432dd1bc773714fd0da0964a80bd2cba3eac57 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Mon, 5 Aug 2013 08:36:16 +0200
Subject: [PATCH] Layouts

---
 app/views/layouts/_pretty_toolbar.html.erb   |  6 ++++
 app/views/layouts/_topbar.html.erb           |  8 +++++
 app/views/modulgruppen/_modulgruppe.html.erb |  5 ---
 app/views/studien/_studium.html.erb          | 10 +++---
 app/views/studien/index.html.erb             | 12 ++++---
 app/views/studien/semesteransicht.html.erb   | 36 ++++++++++++--------
 app/views/studien/show.html.erb              | 29 ++++++++--------
 7 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/app/views/layouts/_pretty_toolbar.html.erb b/app/views/layouts/_pretty_toolbar.html.erb
index cb8514a..09c0a6c 100644
--- a/app/views/layouts/_pretty_toolbar.html.erb
+++ b/app/views/layouts/_pretty_toolbar.html.erb
@@ -1,3 +1,9 @@
+<!--
+Verwendung: Aufruf mit 
+< % = render 'layouts/pretty_toolbar % > verwendet die Elemente die im Controller per @toolbar_elements vorgegeben werden. Sonst kann man über
+< % = render :partial=>'layouts/pretty_toolbar', :object=>@foo % > einen beliebigen array @foo übergeben
+
+-->
 <% toolbar_elements = !pretty_toolbar.nil? ? pretty_toolbar : @toolbar_elements %>
 <span class="label"><%= I18n.t("common.actions")%></span>
  <div class="btn-group">
diff --git a/app/views/layouts/_topbar.html.erb b/app/views/layouts/_topbar.html.erb
index 2a4c0de..13307ae 100755
--- a/app/views/layouts/_topbar.html.erb
+++ b/app/views/layouts/_topbar.html.erb
@@ -1,3 +1,11 @@
+<!--
+Verwendung: Aufruf mit 
+< % = render 'layouts/topbar % > verwendet die Elemente die im Controller per @topbar_elements vorgegeben werden. Sonst kann man über
+< % = render :partial=>'layouts/topbar', :object=>@foo % > einen beliebigen array @foo übergeben
+
+-->
+
+
 <% topbar = !topbar.nil? ? topbar : @topbar_elements %>
 <ul class="breadcrumb">
   <% topbar.each do |tb| %>
diff --git a/app/views/modulgruppen/_modulgruppe.html.erb b/app/views/modulgruppen/_modulgruppe.html.erb
index e897957..0e3f9d4 100755
--- a/app/views/modulgruppen/_modulgruppe.html.erb
+++ b/app/views/modulgruppen/_modulgruppe.html.erb
@@ -8,10 +8,5 @@
 
   <% link_to '<i class="icon-pencil"></i>'.html_safe+I18n.t("common.edit"), edit_modulgruppe_path(modulgruppe) %>
   <!-- dropdown menu links -->
-
-</ul>
-
-
-</span>
 </div>
 
diff --git a/app/views/studien/_studium.html.erb b/app/views/studien/_studium.html.erb
index 04a654a..791402a 100644
--- a/app/views/studien/_studium.html.erb
+++ b/app/views/studien/_studium.html.erb
@@ -1,9 +1,7 @@
 <div class="studium">
-  <h2><%= link_to studium.name + " " + studium.zahl.to_s, studium_semesteransicht_path(studium)%></h2>
-  <ul>
-    <li><b><%= studium.typ%> </b></li>
-    <li><b>Beschreibung:</b><br>
-      <%= !(studium.desc.to_s == "") ? studium.desc.html_safe :  I18n.t("keine.beschreibung")%></li>
-    <li><%=link_to "Link zur Modulgruppenansicht",studium_path(studium) %> </li>
+  <h2><%= link_to studium.name + " " + studium.zahl.to_s, studium_semesteransicht_path(studium)%></h2>  <p><b><%= studium.typ%> </b></p>
+  <p><b>Beschreibung:</b><br>
+      <%= !(studium.desc.to_s == "") ? studium.desc.html_safe :  I18n.t("keine.beschreibung")%></p>
+    <div><%=link_to "Link zur Modulgruppenansicht",studium_path(studium) %> </div>
   </ul>
 </div>
diff --git a/app/views/studien/index.html.erb b/app/views/studien/index.html.erb
index c67e6c9..e707018 100755
--- a/app/views/studien/index.html.erb
+++ b/app/views/studien/index.html.erb
@@ -1,14 +1,18 @@
+<div class="container-fluid">
 <%= render 'layouts/topbar' %>
+<div class="row-fluid">
 <h1><%= I18n.t("studien.list") %></h1>
 
 
 <% @studien.sort_by{|z| z[:zahl]}.each do |studium| %>
-  <ul>
-    <li><%= render studium%></li>
-  </ul>
+  <div class="span5">
+    <%= render studium%>
+  </div>
 <% end %>
 
 
 <br>
+
+</div>
 <%= render :partial=>'layouts/pretty_toolbar'%>
-<% #toolbar_html(@toolbar_elements) %>
+</div>
diff --git a/app/views/studien/semesteransicht.html.erb b/app/views/studien/semesteransicht.html.erb
index 22c82c2..e2047ab 100644
--- a/app/views/studien/semesteransicht.html.erb
+++ b/app/views/studien/semesteransicht.html.erb
@@ -1,17 +1,23 @@
-<%= render :partial=>'layouts/topbar'%>
-
-<h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
-<%= raw(@studium.desc) %>
-<% @studium.semester.each do |sem| %>
+<div class="container-fluid">
+  <%= render :partial=>'layouts/topbar'%>
   <div class="row-fluid">
-    <h2><%= sem.name %></h2>
-    <div class="span<%= sem[:width]%> min-width:13em;">
-      <ul>      
-	<% sem.lvas.sort_by{|n| n[:name]}.each do |l| %>
-	  <li><%= render :partial=>'lvas/lva_semester', :locals =>{:lva => l}%>
-	<% end %>
-      </ul>
-    </div>
-<% end %>
+    <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
+    <%= raw(@studium.desc) %>
+    <% @studium.semester.each do |sem| %>
 
-<%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
+      <div class="span5 min-width:13em;">
+	<div class="modulgruppe_phase_1">
+	  <h2><%= sem.name %></h2>
+	  
+	  <% sem.lvas.sort_by{|n| n[:name]}.each do |l| %>
+	    
+	    
+	    <%= render :partial=>'lvas/lva_semester', :locals =>{:lva => l}%>
+	    
+	  <% end %>
+	</div>
+      </div>
+    <% end %>
+  </div>
+  <%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
+</div>
diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb
index e813c9c..98a40f8 100644
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -1,23 +1,24 @@
-<%= render 'layouts/topbar'%>
+
 <div class="container-fluid">
+  <%= render 'layouts/topbar'%>
   <div class="row-fluid">
     <p id="notice"><%= notice %></p>
     <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
   </div>
   <div>
-  <%= raw(@studium.desc) %>
-  <% @studienphasen.each do |sp| %>
-    <% sp[:modulgruppen].each do |row| %>
-      <div class="row-fluid">
-	<% row.each do |modulgruppe| %>
-	  <div class="span<%= sp[:width]%> min-width:13em;">
-	    <%= render modulgruppe %>
-	  </div>
-	<% end %>
-      </div>
+    <%= raw(@studium.desc) %>
+    <% @studienphasen.each do |sp| %>
+      <% sp[:modulgruppen].each do |row| %>
+	<div class="row-fluid">
+	  <% row.each do |modulgruppe| %>
+	    <div class="span<%= sp[:width]%> min-width:13em;">
+	      <%= render modulgruppe %>
+	    </div>
+	  <% end %>
+	</div>
+      <% end %>
     <% end %>
-  <% end %>
-   <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
-   </div>
+    <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
+  </div>
   <%= render 'layouts/pretty_toolbar' %>
 </div>