From f2e2b1203f56a9ea5cef8412178c552ff30219b0 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <st-andreas@gmx.at>
Date: Wed, 13 Feb 2013 00:47:24 +0100
Subject: [PATCH] studien,modul views: internationalisierung und Navigation

---
 app/views/lvas/show.html.erb                 | 20 ++++-----
 app/views/modulgruppen/_modulgruppe.html.erb | 15 +++++--
 app/views/modulgruppen/show.html.erb         | 11 +++--
 app/views/moduls/_kurz.html.erb              |  3 +-
 app/views/moduls/_modul.html.erb             |  4 +-
 app/views/moduls/show.html.erb               | 15 ++++---
 app/views/studien/show.html.erb              | 44 +++++++++++---------
 config/locales/de.yml                        |  2 +
 8 files changed, 71 insertions(+), 43 deletions(-)

diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb
index 58e3be9..b96ce51 100644
--- a/app/views/lvas/show.html.erb
+++ b/app/views/lvas/show.html.erb
@@ -1,5 +1,14 @@
+<% @lva.modul.each do |modul| %>
+<% modul.modulgruppen.each do |g| %>
+<ul class="breadcrumb">
+<li><%= link_to g.studium.name , studium_path(g)%>
+<span class="divider">/</span></li>
+<li><%= link_to g.name , modulgruppe_path(g)%><span class="divider">/</span></li>
+<li><%= link_to modul.name , modul_path(modul)%></li>
+<%end%>
+</ul>
+<%end%>
 <p id="notice"><%= notice %></p>
-
 <p>  <%= @lva.lvanr %>
   <b>
   <%= @lva.name %> (<%= @lva.ects %> ECTS/ <%= @lva.stunden %> Std)</b><%= link_to image_tag('edit.png'), edit_lva_path(@lva) %> |
@@ -8,13 +17,4 @@
   <%= @lva.desc %>
 </p>
 
-<% @lva.modul.each do |modul| %>
-<%= link_to modul.name , modul_path(modul)%> <br>
-	<% modul.modulgruppen.each do |g| %>
-		<% link =g.studium.name + " - " +g.name %>
-		<%= link_to link , modulgruppe_path(g)%><br>
-	<%end%>
-<%end%>
 
-
-<%= link_to 'Back', lvas_path %>
diff --git a/app/views/modulgruppen/_modulgruppe.html.erb b/app/views/modulgruppen/_modulgruppe.html.erb
index 3c710ae..7bb6b54 100644
--- a/app/views/modulgruppen/_modulgruppe.html.erb
+++ b/app/views/modulgruppen/_modulgruppe.html.erb
@@ -1,8 +1,17 @@
-<div class="modulgruppe_phase_<%= modulgruppe.phase %>">
-<h2><%=  link_to modulgruppe.name, modulgruppe_path(modulgruppe) %><%= link_to image_tag('edit.png').html_safe+"Edit", edit_modulgruppe_path(modulgruppe),:class=>"btn" %></h2> 
-<%= modulgruppe.desc%>
+<div class="modulgruppe_phase_<%= modulgruppe.phase %>" >
+<h2><%=  link_to modulgruppe.name, modulgruppe_path(modulgruppe) %> 
+	</h2> 
 
+<%= modulgruppe.desc%>
 <%= render :partial=>'moduls/kurz', :collection=>modulgruppe.moduls, :as=>:modul%>
 <br>
+
+   <%= 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/modulgruppen/show.html.erb b/app/views/modulgruppen/show.html.erb
index f50a29f..f0a05e4 100644
--- a/app/views/modulgruppen/show.html.erb
+++ b/app/views/modulgruppen/show.html.erb
@@ -1,4 +1,10 @@
-<p id="notice"><%= notice %></p>
+
+<ul class="breadcrumb">
+<li>
+<%= link_to @modulgruppe.studium.name, studium_path(@modulgruppe.studium) %> <span class="divider">/</span></li>
+
+
+</ul><p id="notice"><%= notice %></p>
 <div class ="modulgruppe_phase_<%= @modulgruppe.phase %>">
 <h1>
   <%= @modulgruppe.name %>
@@ -20,8 +26,7 @@
 	 
 <span class="label"><%= I18n.t("common.actions")%></span>
    <div class="btn-group">
-<%= link_to I18n.t("modulgruppe.addmodul"), new_modul_path(:modulgruppen_id =>@modulgruppe.id),:class =>"btn"   %> 
+<%= link_to '<i class="icon-plus-sign"></i>'.html_safe+I18n.t("modulgruppe.addmodul"), new_modul_path(:modulgruppen_id =>@modulgruppe.id),:class =>"btn"   %> 
 <%= link_to I18n.t("modulgruppe.studium"), studium_path(@modulgruppe.studium),:class =>"btn" %> 
 <%= link_to I18n.t("common.edit"), edit_modulgruppe_path(@modulgruppe),:class =>"btn" %> 
-
     </div>
\ No newline at end of file
diff --git a/app/views/moduls/_kurz.html.erb b/app/views/moduls/_kurz.html.erb
index 96e9726..05e8a37 100644
--- a/app/views/moduls/_kurz.html.erb
+++ b/app/views/moduls/_kurz.html.erb
@@ -1,9 +1,10 @@
 <div style="border: solid 1px; padding:2px;margin-top:5px;"><p>
-  <b><%= link_to "Modul "+ modul.name , modul_path(modul) %> <%= link_to image_tag("edit.png"), edit_modul_path(modul) %></b>
+  <b><%= link_to "Modul "+ modul.name , modul_path(modul) %> </b>
 </p>
 <p >
   <%= raw(modul.desc) %>
 </p>
 
+<%= link_to '<i class="icon-pencil"></i>'.html_safe+I18n.t("common.edit"), edit_modul_path(modul) %>
 </div>
 
diff --git a/app/views/moduls/_modul.html.erb b/app/views/moduls/_modul.html.erb
index c3fc650..1626c01 100644
--- a/app/views/moduls/_modul.html.erb
+++ b/app/views/moduls/_modul.html.erb
@@ -1,5 +1,5 @@
 <div style="border: solid 1px; padding:2px"><p>
-  <b><%= link_to "Modul "+ modul.name , modul_path(modul) %> <%= link_to image_tag("edit.png"), edit_modul_path(modul) %></b>
+  <b><%= link_to "Modul "+ modul.name , modul_path(modul) %> </b>
 </p>
 <p>
   <%= raw(modul.desc) %>
@@ -10,4 +10,6 @@ LVAs:
 <li><%= link_to lva.lvanr+" "+ lva.name, lva %></li>
 <% end %>
 </ul>
+
+<%= link_to '<i class="icon-pencil"></i>'.html_safe+I18n.t("common.edit"), edit_modul_path(modul) %>
 </div>
diff --git a/app/views/moduls/show.html.erb b/app/views/moduls/show.html.erb
index e9160de..c715ed7 100644
--- a/app/views/moduls/show.html.erb
+++ b/app/views/moduls/show.html.erb
@@ -1,11 +1,14 @@
-<p id="notice"><%= notice %></p>
-
-<%= render @modul %>
 
 <% @modul.modulgruppen.each do |g| %>
-<% link = g.studium.name + " - " +g.name %>
-<%= link_to g.studium.name  , studium_path(g.studium)%> <br />
-<%= link_to link , modulgruppe_path(g)%><br />
+<ul class="breadcrumb">
+<li>
+<%= link_to g.studium.name  , studium_path(g.studium)%> <span class="divider">/</span></li>
+<li><%= link_to g.name , modulgruppe_path(g)%></li>
 <%end%>
+</ul>
+
+<p id="notice"><%= notice %></p>
+<%= render @modul %>
+
 
 <%= link_to 'Add LVA', new_lva_path(:modul_id =>@modul.id) %>
diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb
index f11ce90..5c2dbfa 100644
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -1,24 +1,30 @@
 <div class="container-fluid">
-<p id="notice"><%= notice %></p>
-<h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
-  <%= 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 %>
+	<p id="notice"><%= notice %></p>
+
+	<%= link_to '<i class="icon-list"></i>'.html_safe+ I18n.t("studien.allestudien"), studien_path,:raw=>true %>
+
+	<h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
 </div>
-<% end %>
-</div>
-<% end %>
-<% end %>
-</div>
- <div class="row-fluid">
+	<%= 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 %>
+
+
+<div class="row-fluid">
 <span class="span12">
-<%= link_to 'New Modulgruppe', new_studium_modulgruppe_path(@studium),:class=>"btn" %> |
-<%= link_to I18n.t("common.edit"), edit_studium_path(@studium) ,:class=>"btn"%> |
-<%= link_to '<i class="icon-list"></i> Alle Studien'.html_safe, studien_path,:class=>"btn",:raw=>true %>
+<%= link_to '<i class="icon-plus-sign"></i>'.html_safe+I18n.t("studien.newmodulgroup"), new_studium_modulgruppe_path(@studium),:class=>"btn" %> |
+<%= link_to '<i class="icon-pencil"></i>'.html_safe+I18n.t("common.edit"), edit_studium_path(@studium) ,:class=>"btn"%>
 </span>
-</div></div>
\ No newline at end of file
+</div>
+
+</div>
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 5b280f9..6cc9116 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -9,6 +9,8 @@ de:
   studien:
     list: "Studien der Fakultät Elektrotechnik"
     new: "Neues Studium"
+    newmodulgroup: "Neue Modulgruppe"
+    allestudien: "Alle Studien"
   modul:
     edit: 
       title: "Bearbeite Modul"