Merge branch 'master' into calendar

Conflicts:
	app/views/lvas/show.html.erb
	db/schema.rb

app/assets/stylesheets/lvas.css.scss

@@ -10,3 +10,18 @@ padding: 5px;
 border-color: green;
 border-radius: 5px;
 }
+div.lva-sidebar {
+border:solid;
+border-width: 1px;
+margin: 2px;
+padding:5px;
+border-radius:5px;
+}
+div.lva-beispiele {
+border:solid;
+border-width: 1px;
+margin: 2px;
+padding:5px;
+border-radius:5px;
+border-color: green;
+}

app/controllers/lvas_controller.rb

@@ -16,14 +16,6 @@ class LvasController < ApplicationController
    
     @toolbar_elements<<{:hicon=>'icon-plus-sign', :icon=>:plus, :text => "Neues Beispiel", :path=> new_beispiel_path(:lva_id =>@lva.id)}
      @toolbar_elements<<{:hicon=>'icon-pencil', :icon=>:pencil,:text =>I18n.t('common.edit'),:path => edit_lva_path(@lva)}
-    @topbar_elements =[{:hicon=>'icon-list', :text=>I18n.t("lva.list"), :path=>lvas_path}]
-    for m in @lva.modul
-      @topbar_elements << {:newline=>true}
-      @topbar_elements << {:text=> '<b>' + m.name + '</b>', :path=>modul_path(m)}
-      for mg in m.modulgruppen
-        @topbar_elements << {:text => mg.studium.name + ' (' + mg.name + ')', :path=>studium_path(mg.studium)}
-        end
-      end
   end
 
   # GET /lvas/new

app/views/beispiele/_beispiel.html.erb

@@ -1,4 +1,4 @@
-<div class="span4">
+<div class="lva-beispiele">
 <h4><%=link_to beispiel.name, beispiel.beispieldatei.url%></h4>
 <%= beispiel.desc %>
 </div>

app/views/lvas/show.html.erb

@@ -1,27 +1,32 @@
 <div class="container-fluid">
-<%= render 'studien/tabs'%>
+  <%= render 'studien/tabs'%>
-<p id="notice"><%= notice %></p>
+  <p id="notice"><%= notice %></p>
-<p>
-
-  <h2><%= @lva.lvanr %><%= @lva.name %> <%= @lva.ects %> ECTS/ <%= @lva.stunden %> Std</h2>
-  
-</p>
-
-  <p><h4>Beschreibung</h4>
-  <%= @lva.desc %>
-
-<%= link_to "Beispiel neu" , new_beispiel_path(:lva_id=>@lva.id) %>
-</p>
   <div class="row-fluid">
-<h4>Beispiele</h4>
+    <div class="span8">
+      <h1><%= @lva.name %></h1>
+      
+      <h2>Beschreibung</h2>
+      <div class="lva-beschreibung">
+	<%= @lva.desc %>
+      </div>
+      <div class="row-fluid">
+	<h2>Beispiele</h2>
+
 	<% @lva.beispiele.each do |b|%>
 
 	  <%= render b%>
-
 	<% end %>
-</div>
+      </div>
-<h4>Module</h4>
+    </div>
-<ul>
+    <div class="span4">
+      <div class="lva-sidebar">
+	<ul>
+	  <li><b>LVA-Nummer:</b> <%=@lva.lvanr %></li>
+	  <li><b>ECTS:</b> <%=@lva.ects %></li>
+	  <li><b>Stunden:</b> <%=@lva.ects %></li>
+	</ul>
+	<h2>Module</h2>
+	<ul>
 	  <% @lva.modul.each do |modul| %>
 	  <li><b><%= link_to modul.name , modul_path(modul)%></b>
 	    <ul>
@@ -33,6 +38,10 @@
 	  </li>
 	  
 	  <% end %>
-</ul>
+	</ul>
-<%= render 'layouts/pretty_toolbar' %>
+      </div>
+    </div>
+  </div>
+
+  <%= render 'layouts/pretty_toolbar' %>
 </div>

app/views/studien/semesteransicht.html.erb

@@ -13,9 +13,12 @@
       <div class="span12">
 	<div class="studien-semester">
 	  <div class="container-fluid">
-	    
+	    <div class="row-fluid">
-	    <h2><%= sem.name %> <%= link_to 'Lvas hinzufügen/entfernen', edit_semester_path(sem)%></h2>
+	      <div class="span8">
-
+	    <h2><%= sem.name %></h2>
+	    </div>
+	    <div class="span4"><div class="pull-right"><%= link_to 'Lvas hinzufügen/entfernen', edit_semester_path(sem), :class=>"btn"%></div>
+	    </div></div>
 	    <% sem.lvas.each_slice(4) do |row| %>
 	      <div class="row-fluid">
 		<% row.each do |l| %>

db/schema.rb

@@ -17,6 +17,7 @@ ActiveRecord::Schema.define(:version => 20130810214456) do
     t.string   "name"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
+<<<<<<< HEAD
   end
 
   create_table "beispiel_translations", :force => true do |t|
@@ -28,6 +29,10 @@ ActiveRecord::Schema.define(:version => 20130810214456) do
   end
 
   add_index "beispiel_translations", ["locale"], :name => "index_beispiel_translations_on_locale"
+=======
+    t.integer  "thema_id"
+  end
+>>>>>>> master
 
   create_table "beispiele", :force => true do |t|
     t.string   "name"
@@ -63,11 +68,29 @@ ActiveRecord::Schema.define(:version => 20130810214456) do
     t.datetime "updated_at", :null => false
   end
 
+<<<<<<< HEAD
+=======
+  create_table "frage_translations", :force => true do |t|
+    t.string   "locale"
+    t.string   "title"
+    t.text     "text"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.integer  "fragen_id"
+  end
+
+  add_index "frage_translations", ["locale"], :name => "index_frage_translations_on_locale"
+
+>>>>>>> master
   create_table "fragen", :force => true do |t|
     t.string   "title"
     t.text     "text"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
+<<<<<<< HEAD
+=======
+    t.integer  "thema_id"
+>>>>>>> master
   end
 
   create_table "lva_translations", :force => true do |t|
@@ -212,13 +235,45 @@ ActiveRecord::Schema.define(:version => 20130810214456) do
 
   add_index "studium_translations", ["locale"], :name => "index_studium_translations_on_locale"
 
+<<<<<<< HEAD
+  create_table "themen", :force => true do |t|
+=======
+  create_table "thema_translations", :force => true do |t|
+    t.string   "locale"
+>>>>>>> master
+    t.string   "title"
+    t.text     "text"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+<<<<<<< HEAD
+  end
+
+=======
+    t.integer  "themen_id"
+  end
+
+  add_index "thema_translations", ["locale"], :name => "index_thema_translations_on_locale"
+
   create_table "themen", :force => true do |t|
     t.string   "title"
     t.text     "text"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
+    t.integer  "themengruppe_id"
   end
 
+  create_table "themengruppe_translations", :force => true do |t|
+    t.string   "locale"
+    t.string   "title"
+    t.text     "text"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+    t.integer  "themengruppen_id"
+  end
+
+  add_index "themengruppe_translations", ["locale"], :name => "index_themengruppe_translations_on_locale"
+
+>>>>>>> master
   create_table "themengruppen", :force => true do |t|
     t.string   "title"
     t.text     "text"