Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts:
	app/views/layouts/menu.html.erb
	config/routes.rb

app/assets/javascripts/calendars.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/calentries.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/application.css.scss

@@ -10,7 +10,7 @@
  *
  *= require_self
  *= require_tree .
- *  require 'bootstrap'
+ * require 'bootstrap'
  */
 $linkColor: #03006E;
 @import 'bootstrap';
@@ -30,7 +30,8 @@ border-bottom:1px solid black;
 height:60px; 
 padding-left:160px;
 padding-top:0px;
-overflow:hidden
+overflow:hidden;
+margin-bottom: 20px
 }
 
 #menudiv

app/assets/stylesheets/bootstrap-responsive.scss

@@ -0,0 +1,5 @@
+@import "bootstrap/responsive";
+@media (max-width: 979px){
+.earlymax {
+min-width: 100%;
+}}

app/assets/stylesheets/calendars.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the calendars controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/calentries.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the calentries controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/formtastic-changes.css.scss

@@ -0,0 +1,15 @@
+form.formtastic .stringish input {
+width:90%;
+}
+form.formtastic select {
+width:90%
+}
+form.formtastic textarea {
+width:90%;
+height:20em;
+}
+form.formtastic .input label.control-label {
+font-weight:bold;
+font-size:125%;
+}
+

app/assets/stylesheets/lvas.css.scss

@@ -1,3 +1,27 @@
 // Place all the styles related to the lvas controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+div.lva-semester {
+border: solid;
+border-width: 1px;
+margin: 1px;
+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/assets/stylesheets/studien.css.scss

@@ -1,3 +1,18 @@
 // Place all the styles related to the studia controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+div.verwalten-block {
+border-width: 1px;
+border-style: solid;
+padding: 5px;
+border-radius:10px;
+margin: 2px;
+}
+div.studien-semester {
+border-width: 1px;
+border-style: solid;
+padding: 5px;
+border-radius:10px;
+border-color: blue;
+margin: 2px;
+}

app/controllers/beispiele_controller.rb

@@ -26,7 +26,8 @@ class BeispieleController < ApplicationController
   # GET /beispiele/new.json
   def new
     @beispiel = Beispiel.new
-    @beispiel.lva_id = params[:lva_id]
+    @beispiel.lva = Lva.find(params[:lva_id])
+
     respond_to do |format|
       format.html # new.html.erb
       format.json { render json: @beispiel }
@@ -41,8 +42,9 @@ class BeispieleController < ApplicationController
   # POST /beispiele
   # POST /beispiele.json
   def create
+    lvaid=params[:lva_id]
+    params.delete(:lva_id)
     @beispiel = Beispiel.new(params[:beispiel])
-
     respond_to do |format|
       if @beispiel.save
         format.html { redirect_to @beispiel, notice: 'Beispiel was successfully created.' }

app/controllers/calendars_controller.rb

@@ -0,0 +1,83 @@
+class CalendarsController < ApplicationController
+  # GET /calendars
+  # GET /calendars.json
+  def index
+    @calendars = Calendar.all
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @calendars }
+    end
+  end
+
+  # GET /calendars/1
+  # GET /calendars/1.json
+  def show
+    @calendar = Calendar.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @calendar }
+      format.ics  { render 'show.ics.erb'}
+    end
+  end
+
+  # GET /calendars/new
+  # GET /calendars/new.json
+  def new
+    @calendar = Calendar.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @calendar }
+    end
+  end
+
+  # GET /calendars/1/edit
+  def edit
+    @calendar = Calendar.find(params[:id])
+  end
+
+  # POST /calendars
+  # POST /calendars.json
+  def create
+    @calendar = Calendar.new(params[:calendar])
+
+    respond_to do |format|
+      if @calendar.save
+        format.html { redirect_to @calendar, notice: 'Calendar was successfully created.' }
+        format.json { render json: @calendar, status: :created, location: @calendar }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @calendar.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /calendars/1
+  # PUT /calendars/1.json
+  def update
+    @calendar = Calendar.find(params[:id])
+
+    respond_to do |format|
+      if @calendar.update_attributes(params[:calendar])
+        format.html { redirect_to @calendar, notice: 'Calendar was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @calendar.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /calendars/1
+  # DELETE /calendars/1.json
+  def destroy
+    @calendar = Calendar.find(params[:id])
+    @calendar.destroy
+
+    respond_to do |format|
+      format.html { redirect_to calendars_url }
+      format.json { head :no_content }
+    end
+  end
+end

app/controllers/calentries_controller.rb

@@ -0,0 +1,84 @@
+class CalentriesController < ApplicationController
+  # GET /calentries
+  # GET /calentries.json
+  def index
+    @calentries = Calentry.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @calentries }
+    end
+  end
+
+  # GET /calentries/1
+  # GET /calentries/1.json
+  def show
+    @calentry = Calentry.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @calentry }
+      format.ics  { render 'show.ics.erb'}
+    end
+  end
+
+  # GET /calentries/new
+  # GET /calentries/new.json
+  def new
+    @calentry = Calentry.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @calentry }
+    end
+  end
+
+  # GET /calentries/1/edit
+  def edit
+    @calentry = Calentry.find(params[:id])
+  end
+
+  # POST /calentries
+  # POST /calentries.json
+  def create
+    @calentry = Calentry.new(params[:calentry])
+
+    respond_to do |format|
+      if @calentry.save
+        format.html { redirect_to @calentry, notice: 'Calentry was successfully created.' }
+        format.json { render json: @calentry, status: :created, location: @calentry }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @calentry.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /calentries/1
+  # PUT /calentries/1.json
+  def update
+    @calentry = Calentry.find(params[:id])
+
+    respond_to do |format|
+      if @calentry.update_attributes(params[:calentry])
+        format.html { redirect_to @calentry, notice: 'Calentry was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @calentry.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /calentries/1
+  # DELETE /calentries/1.json
+  def destroy
+    @calentry = Calentry.find(params[:id])
+    @calentry.destroy
+
+    respond_to do |format|
+      format.html { redirect_to calentries_url }
+      format.json { head :no_content }
+    end
+  end
+end

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/controllers/modulgruppen_controller.rb

@@ -51,15 +51,10 @@ class ModulgruppenController < ApplicationController
   def create
     @modulgruppe = Modulgruppe.new(params[:modulgruppe])
     
-    if !params[:studium_id].nil?
-      @studium=Studium.find_by_id(params[:studium_id]) 
-    else
-      @studium=Studium.find_by_id(params[:modulgruppe][:studium_id]) 
-    end
     respond_to do |format|
          
       if @modulgruppe.save
-        format.html { redirect_to @studium, notice: 'Modulgruppe was successfully created.' }
+        format.html { redirect_to @modulgruppe.studium, notice: 'Modulgruppe was successfully created.' }
 
       else
         format.html { render action: "new" }

app/controllers/semesters_controller.rb

@@ -16,6 +16,7 @@ class SemestersController < ApplicationController
 
   def edit
     @semester = Semester.find(params[:id])
+    @studium = @semester.studium
   end
 
   def create
@@ -33,7 +34,7 @@ class SemestersController < ApplicationController
 
   def update
     @semester = Semester.find(params[:id])
-
+    @studium= @semester.studium
     respond_to do |format|
       if @semester.update_attributes(params[:semester])
         format.html { redirect_to @semester, notice: 'Semester was successfully updated.' } 

app/controllers/studien_controller.rb

@@ -1,6 +1,6 @@
 class StudienController < ApplicationController
   before_filter {@toolbar_elements =[]} 
-
+  #  before_filter :authorize, :only => :verwalten
 
   def index
     @studien = Studium.all
@@ -39,10 +39,10 @@ class StudienController < ApplicationController
     @toolbar_modulgruppen =[ {:hicon=>'icon-plus-sign', :text=> I18n.t('modulgruppe.new'), :path=>new_studium_modulgruppe_path(@studium)},
                              {:hicon=>'icon-list', :text => I18n.t('modulgruppe.list'), :path=>modulgruppen_path}]
     
-    if params[:ansicht] == 'semesteransicht'
+    if params[:ansicht] != 'modulgruppenansicht'
       @text = 'Zu Modulansicht wechseln'
       @flip = 'modulgruppenansicht'
-        render 'semesteransicht'
+      render 'semesteransicht'
     else
       @text = 'Zu Semesteransicht wechseln'
       @flip = 'semesteransicht'
@@ -90,7 +90,147 @@ class StudienController < ApplicationController
     @studium.destroy
     redirect_to studien_url
   end
+
+  def verwalten
+    @new_params={:std_verw=>params[:std_verw], :mg_verw=>params[:mg_verw], :m_verw=>params[:m_verw], :lva_verw=>params[:lva_verw], :b_verw=>params[:b_verw]}
+    if @new_params.values.compact.empty?
+      @studien=Studium.all
+      @modulgruppen=Modulgruppe.all
+      @module=Modul.all
+      @lvas=Lva.all
+      @beispiele=Beispiel.all
+    else
+      if !@new_params[:std_verw].nil?
+        @studien = [Studium.find(@new_params[:std_verw])]
+      else
+        @studien = Studium.all
+      end
+      if !@new_params[:mg_verw].nil?
+        @modulgruppen = [Modulgruppe.find(@new_params[:mg_verw])]
+        temp = @modulgruppen.map{|x| x.studium}.flatten.uniq # Force Studien
+        @studien=@studien.select{|k| temp.include?(k)}
+
+      else
+        @modulgruppen = Modulgruppe.all
+        temp = @studien.map{|x| x.modulgruppen}.flatten.uniq # Studien forcen Modulgruppen
+        @modulgruppen = @modulgruppen.select{|k| temp.include?(k)}
+      end
+      if !@new_params[:m_verw].nil?
+        @module = [Modul.find(@new_params[:m_verw])]
+        temp = @module.map{|x| x.modulgruppen}.flatten.uniq # Force Modulgruppen
+        @modulgruppen = @modulgruppen.select{|k| temp.include?(k)}
+        temp = @modulgruppen.map{|x| x.studium}.flatten.uniq # Force Studien
+        @studien=@studien.select{|k| temp.include?(k)}
+        
+      else
+        @module = Modul.all
+        temp = @modulgruppen.map{|x| x.moduls}.flatten.uniq
+        @module=@module.select{|k| temp.include?(k)}
+      end
+      if !@new_params[:lva_verw].nil?
+        @lvas = [Lva.find(@new_params[:lva_verw])]
+        temp = @lvas.map{|x| x.modul}.flatten.uniq
+        @module=@module.select{|k| temp.include?(k)}
+        temp = @module.map{|x| x.modulgruppen}.flatten.uniq # Force Modulgruppen
+        @modulgruppen = @modulgruppen.select{|k| temp.include?(k)}
+        temp = @modulgruppen.map{|x| x.studium}.flatten.uniq # Force Studien
+        @studien=@studien.select{|k| temp.include?(k)}
+      else
+        @lvas = Lva.all
+        temp = @module.map{|x| x.lvas}.flatten.uniq #Force Module
+        @lvas=@lvas.select{|k| temp.include?(k)}
+      end
+      if !@new_params[:b_verw].nil?
+        @beispiele = [Beispiel.find(@new_params[:b_verw])]
+        temp = @lvas.map{|x| x.beispiele}.flatten.uniq #Force Force Lvas
+        @lvas=@lvas.select{|k| temp.include?(k)}
+        temp = @module.map{|x| x.lvas}.flatten.uniq #Force Module
+        @module=@module.select{|k| temp.include?(k)}
+        temp = @module.map{|x| x.modulgruppen}.flatten.uniq # Force Modulgruppen
+        @modulgruppen = @modulgruppen.select{|k| temp.include?(k)}
+        temp = @modulgruppen.map{|x| x.studium}.flatten.uniq # Force Studien
+        @studien=@studien.select{|k| temp.include?(k)}
+        
+        
+      else
+        @beispiele = Beispiel.all
+        temp = @lvas.map{|x| x.beispiele}.flatten.uniq # Force beispiel
+        @beispiele=@beispiele.select{|k| temp.include?(k)}
+      end
+    end
+
+    @messages = []
+    for s in @studien
+
+      if s.valid?
+        @messages << s.name + ' hat keine Modulgruppe' if s.modulgruppen.count == 0
+        
+      else
+        @messages << '<font color="red"><b>'+s.name + ': '
+        @messages << s.errors.full_messages
+        @messages << '</font></b>'
+      end
+    end
+    for mg in @modulgruppen
+      
+      if mg.valid?
+        @messages << mg.name +  ' hat kein Modul' if mg.moduls.count == 0
+      else
+        @messages << '<font color="red"><b>'+mg.name + ': '
+        @messages << mg.errors.full_messages
+        @messages << '</font></b>'
+      end
+    end
+    for m in @module
+      
+      if m.valid?
+        @messages << m.name.to_s + ' hat keine Modulgruppe' if m.modulgruppen.count == 0
+        @messages << m.name.to_s + ' hat keine Lvas' if m.lvas.count == 0
+      else
+        @messages << '<font color="red"><b>'+m.name.to_s + ': '
+        @messages << m.errors.full_messages
+        @messages << '</font></b>'
+      end
+    end
+    for lva in @lvas
+      
+      if lva.valid?
+        @messages << lva.name + ' hat keine Module' if lva.modul.count == 0
+        for s in @studien
+          stu_sem = s.semester.map{|l| l.lvas}.flatten.uniq.index(lva)
+          stu_mod = s.modulgruppen.map{|m| m.moduls}.flatten.map{|l| l.lvas}.flatten.uniq.index(lva)
+          if (stu_sem.nil? && !stu_mod.nil?) 
+            @messages << lva.name + ' erscheint nicht in der Semesteransicht von ' +s.name + ' aber in der Modulgruppenansicht'
+          end
+          if (!stu_sem.nil? && stu_mod.nil?)
+            @messages << lva.name + ' erscheint in der Semesteransicht von ' +s.name + ' aber nicht in der Modulgruppenansicht'
+          end
+        end
+      else
+        @messages << '<font color="red"><b>'+lva.name + ': '
+        @messages << lva.errors.full_messages
+        @messages << '</font></b>'
+      end
+    end
+    for b in @beispiele
+      if b.valid?
+        @messages << b.name + ' hat keine Lva' if b.lva.nil?
+      else
+        @messages << '<font color="red"><b>'+b.name + ': '
+        @messages << b.errors.full_messages
+        @messages << '</font></b>'
+      end
+    end
+    render 'studien/verwalten'
+  end
+
   def default_url_options
-    {ansicht: params[:ansicht]}.merge(super)
+    {:ansicht=> params[:ansicht],
+      :std_verw=> params[:std_verw],
+      :mg_verw=> params[:mg_verw],
+      :m_verw=>params[:m_verw],
+      :lva_verw=>params[:lva_verw],
+      :b_verw=>params[:b_verw]}.merge(super)
+
   end
 end

app/helpers/calendars_helper.rb

@@ -0,0 +1,2 @@
+module CalendarsHelper
+end

app/helpers/calentries_helper.rb

@@ -0,0 +1,2 @@
+module CalentriesHelper
+end

app/inputs/date_string_input.rb

@@ -0,0 +1,7 @@
+class DateStringInput < FormtasticBootstrap::Inputs::StringInput
+	def input_html_options
+		value = (@object.send(method.to_sym))
+		super.merge(:class => "datetext", :onclick =>"beep", :value=>I18n.l((value.is_a?(Time)||value.is_a?(Date)||value.is_a?(DateTime)) ? value : Time.now))
+	end
+	
+end

app/models/calendar.rb

@@ -0,0 +1,5 @@
+class Calendar < ActiveRecord::Base
+  attr_accessible :name, :public, :picture
+  has_and_belongs_to_many :calentries
+  mount_uploader :picture, PictureUploader
+end

app/models/calentry.rb

@@ -0,0 +1,20 @@
+class Calentry < ActiveRecord::Base
+  attr_accessible :ende, :start, :summary, :typ,:calendar_ids
+  has_and_belongs_to_many :calendars
+  validates :start, :presence => true
+  validates :typ, :presence => true
+  validate do |entry|
+	if entry.ende.nil? 
+		errors.add(:ende, "Es muss ein Endzeitpunkt vorhanden sein")
+	end
+  end
+  def start_time
+    start
+  end
+  def start1
+    start.to_date
+  end
+  def name
+	summary
+  end
+end

app/models/lva.rb

@@ -16,8 +16,9 @@
 #
 
 class Lva < ActiveRecord::Base
+  ERLAUBTE_TYPEN = ['VO', 'UE', 'VU', 'LU', 'SE', 'andere'];
   has_paper_trail # Versionsverfolgung
-  attr_accessible :desc, :ects, :lvanr, :name, :stunden, :modul_ids, :semester_ids
+  attr_accessible :desc, :ects, :lvanr, :name, :stunden, :modul_ids, :semester_ids, :pruefungsinformation, :lernaufwand, :typ
   has_and_belongs_to_many :modul # Gehört zu einem Modul
   has_and_belongs_to_many :semester
   #Gehört zu einem Semester( derzeit nicht implementiert)
@@ -27,8 +28,8 @@ class Lva < ActiveRecord::Base
   
   validates :lvanr,:format=>{ :with => /^[0-9][0-9][0-9]\.[0-9][0-9][0-9]$/}, :presence=>true, :uniqueness=>true # , :uniqueness=>true # LVA-Nummer muss das Format 000.000 besitzen (uniqueness?) oder 000 für nicht 
   validates_presence_of :ects  # ECTS vorhanden?
-  validates :name, :presence=>true
-  validates :name,  :uniqueness=>true# Name Eingetragen?
+  validates :name, :presence=>true, :uniqueness=>true# Name Eingetragen?
+  validates :typ, :presence=>true, :inclusion=> ERLAUBTE_TYPEN
   validates_presence_of :stunden # Stunden Eingetragen?
   validates_presence_of :modul # Zugehöriges Modul eingetragen? (zumindest eines)
   def add_semesters

app/models/modulgruppe.rb

@@ -13,7 +13,7 @@
 #
 
 class Modulgruppe < ActiveRecord::Base
-  attr_accessible :name, :phase, :typ,:desc, :studium_id
+  attr_accessible :name, :phase, :typ,:desc, :studium_id, :modul_ids
   belongs_to :studium, :foreign_key => "studium_id"
   has_and_belongs_to_many :moduls
 

app/models/studium.rb

@@ -12,14 +12,17 @@
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 class Studium < ActiveRecord::Base
-  attr_accessible :desc, :name, :typ, :zahl
+  attr_accessible :desc, :name,:abkuerzung, :typ, :zahl, :semester
   has_many :modulgruppen, inverse_of: :studium, :class_name => "Modulgruppe", :dependent => :destroy
   has_many :semester, :dependent => :destroy
-  
+  validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$/}
   validates :typ, :inclusion => {:in => ["Bachelor","Master"] }
   validates :name, :uniqueness => true, :presence=>true
   validates :zahl, :presence=>true, :format=>{:with=>/^0(33|66)[0-9]{3}$/}, :uniqueness => true 
   translates :desc,:shortdesc, :versioning =>true,:fallbacks_for_empty_translations => true
+  def title_context
+    return self.abkuerzung.to_s.strip.empty? ? self.name : self.abkuerzung
+  end
   
   def batch_add_semester
     # Semester automatisch zu Studien hinzufügen

app/uploaders/picture_uploader.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+
+class PictureUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or MiniMagick support:
+   include CarrierWave::RMagick
+  # include CarrierWave::MiniMagick
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+   version :thumb do
+     process :resize_to_fill => [64, 64]
+   end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+   def extension_white_list
+     %w(jpg jpeg gif png)
+   end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+
+end

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/beispiele/_form.html.erb

@@ -1,13 +1,25 @@
-<%= semantic_form_for @beispiel, :html => { :multipart => true } do |f| %>
-  <%= f.inputs do %>
-    <%= f.input :name %>
-    <%= f.input :desc %>
-    <%= f.file_field :beispieldatei %>
-    <%= f.hidden_field :beispieldatei_cache %>
-    <%= f.input :lva, :as=>:select, :collection => Lva.all%>
-  <% end %>
 
-  <%= f.actions do %>
+    <%= semantic_form_for @beispiel, :html => { :multipart => true } do |f| %>
+
+    <%= f.inputs do %>
+    <%= f.hidden_field :beispieldatei_cache %>
+
+    <%= f.file_field :beispieldatei, :wrapper_html=>{:class=>"span4"}%>
+    <div class="row-fluid">
+      <%= f.input :name, :wrapper_html=>{:class=>'span6'} %>
+      <%= f.input :lva, :as=>:select, :collection => Lva.all, :wrapper_html=>{:class=>'span6'}%>
+
+ 
+    </div>
+    
+    <div class="row-fluid">
+      <%= f.input :desc %>
+    </div>
+    <% end %>    
+
+    <%= f.actions do %>
     <%= f.action :submit, :as => :input %>
-  <% end %>
-<% end %>
+
+    <% end %>
+
+    <% end %>

app/views/beispiele/show.html.erb

@@ -10,7 +10,9 @@
   <%= @beispiel.desc %>
   <%= @beispiel.beispieldatei.url %>
 </p>
-
+<p>
+  <%= @beispiel.lva.name %>
+  </p>
 
 <%= link_to 'Edit', edit_beispiel_path(@beispiel) %> |
 <%= link_to 'Back', beispiele_path %>

app/views/calendars/_form.html.erb

@@ -0,0 +1,11 @@
+<%= semantic_form_for @calendar do |f| %>
+  <%= f.inputs do %>
+    <%= f.input :name %>
+    <%= f.input :public %>
+    <%= f.input :picture, :as => :file %>
+  <% end %>
+
+  <%= f.actions do %>
+    <%= f.action :submit, :as => :input %>
+  <% end %>
+<% end %>

app/views/calendars/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing calendar</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @calendar %> |
+<%= link_to 'Back', calendars_path %>

app/views/calendars/index.html.erb

@@ -0,0 +1,14 @@
+<h1>Listing calendars</h1>
+
+<% @calendars.each do |calendar| %>
+    <div class="media">
+	<a class="pull-left" href="#">
+	    <img class="media-object img-circle" src="<%= calendar.picture.thumb.url %>"/>
+	</a>
+	<div class="media-body">
+	    <h4><%= link_to calendar.name, calendar %></h4>
+	</div>
+    </div>
+<% end %>
+
+<%= link_to 'New Calendar', new_calendar_path %>

app/views/calendars/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New calendar</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', calendars_path %>

app/views/calendars/show.html.erb

@@ -0,0 +1,30 @@
+<div class="container-fluid">
+ <div class="row-fluid">
+<p id="notice"><%= notice %></p>
+
+<h1>
+  <%= '<i class="icon-globe"></i>'.html_safe unless !@calendar.public%>
+  <%=  @calendar.name %>
+</h1>
+ <div class="row-fluid">
+<ul class="list-group">
+<% @calendar.calentries.each do |entry| %>
+<li class="list-group-item">
+<%= link_to entry.summary+ " - " + I18n.l(entry.start1), entry %>
+</li>
+<% end %>
+</ul>
+</div>
+ <div class="row-fluid">
+<%= calendar @calendar.calentries do |entry| %>
+  <div><%= link_to entry.name, entry %></div>
+<% end %>
+</div>
+ <div class="row-fluid">
+<div class="btn-group">
+<%= link_to 'New Entry', new_calentry_path, {:class=>"btn"} %>
+<%= link_to 'Edit', edit_calendar_path(@calendar), {:class=>"btn"} %>
+<%= link_to 'Back', calendars_path, {:class=>"btn"} %>
+</div>
+</div>
+</div>

app/views/calendars/show.ics.erb

@@ -0,0 +1,3 @@
+<% @calendar.calentries.each do |entry| %>
+<%= render entry %>
+<% end %>

app/views/calentries/_calentry.ics.erb

@@ -0,0 +1,5 @@
+  <%= calentry.start %>
+  <%= calentry.ende %>
+  <%= calentry.summary %>
+  <%= calentry.typ %>
+

app/views/calentries/_form.html.erb

@@ -0,0 +1,34 @@
+<div class="container-fluid">
+<%= semantic_form_for @calentry do |f| %>
+  <%= f.inputs do %>
+ <div class="row-fluid">
+ <div class="span6">
+    <%= f.input :start , :as => :date_string %>
+ </div>
+ <div class="span6">
+    <%= f.input :ende , :as => :date_string %>
+ </div>   
+ </div>
+ <div class="row-fluid">  
+ <div class="span12">
+    <%= f.input :summary %>
+ </div>
+ </div>
+ <div class="row-fluid">
+ <div class="span6">
+    <%= f.input :calendars, :as=> :radio %>
+ </div>
+ <div class="span6">
+    <%= f.input :typ %>
+ </div>
+ </div>
+  <% end %>
+  <div class="row-fluid">
+  <div class="span12">
+  <%= f.actions do %>
+    <%= f.action :submit, :as => :input %>
+  <% end %>
+  </div>
+  </div>
+<% end %>
+</div>

app/views/calentries/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing calentry</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @calentry %> |
+<%= link_to 'Back', calentries_path %>

app/views/calentries/index.html.erb

@@ -0,0 +1,29 @@
+<h1>Listing calentries</h1>
+
+<table>
+  <tr>
+    <th>Start</th>
+    <th>Ende</th>
+    <th>Summary</th>
+    <th>Typ</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @calentries.each do |calentry| %>
+  <tr>
+    <td><%= calentry.start %></td>
+    <td><%= calentry.ende %></td>
+    <td><%= calentry.summary %></td>
+    <td><%= calentry.typ %></td>
+    <td><%= link_to 'Show', calentry %></td>
+    <td><%= link_to 'Edit', edit_calentry_path(calentry) %></td>
+    <td><%= link_to 'Destroy', calentry, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Calentry', new_calentry_path %>

app/views/calentries/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New calentry</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', calentries_path %>

app/views/calentries/show.html.erb

@@ -0,0 +1,25 @@
+<p id="notice"><%= notice %></p>
+<div class="container-fluid">
+<div class="row-fluid">
+<div class="span12">
+  <b>
+  <%= @calentry.summary %>
+  </b>
+
+</div>
+</div>
+<div class="row-fluid">
+<div class="span9">
+  <%= I18n.l @calentry.start %>
+  <%= " bis " unless @calentry.ende.nil? %>
+  <%= I18n.l @calentry.ende %>
+  </div>
+  <div class="span3">
+  <%= @calentry.typ %>
+</div></div>
+
+ <div class="row-fluid">
+ <div class="span12">
+<%= link_to 'Edit', edit_calentry_path(@calentry) %> |
+<%= link_to 'Back', calentries_path %>
+</div></div></div>

app/views/calentries/show.ics.erb

@@ -0,0 +1,25 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <b>Start:</b>
+  <%= @calentry.start %>
+</p>
+
+<p>
+  <b>Ende:</b>
+  <%= @calentry.ende %>
+</p>
+
+<p>
+  <b>Summary:</b>
+  <%= @calentry.summary %>
+</p>
+
+<p>
+  <b>Typ:</b>
+  <%= @calentry.typ %>
+</p>
+
+
+<%= link_to 'Edit', edit_calentry_path(@calentry) %> |
+<%= link_to 'Back', calentries_path %>

app/views/home/index.html.erb

@@ -1,3 +1,21 @@
 <h1><%= t 'home.willkommen' %></h1>
+<div class="alert alert-info">
+<h2>Alpha Test</h2>
+<p>Die Webseite befindet sich derzeit in einem Entsicklungsstadium,
+volle Funktionsfähigkeit ist noch nicht erreicht. Bitte Featurerequests und
+Fehlermeldungen auf GitHub melden.
+</p>
+<p>
+<%= link_to "Issues", "http://www.github.com/fetsite/fetsite/issues" %>
+</p>
+<p>
+Folgene Features sind schon soweit, dass Bugreports sinnvoll sind:
+<ul>
+<li>Studien/Beispielsammlung</li>
+</ul>
+alle anderen sind nur zur Voransicht. Bezüglich Design und Steuerung sind Vorschläge erwünscht.
+</p>
+<p><%= link_to "Steuerelemente und Komponenten", "http://getbootstrap.com/2.3.2/index.html" %></p>
+</div>
 <p><%= t 'home.hallobeiderfet' %></p>
 <%= link_to "Entwicklungsstatus" , home_dev_path %>

app/views/layouts/application.html.erb

@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html>
-<head>
+
+ <head>
+   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Fetsite</title>
   <%= stylesheet_link_tag "application", :media => "all" %>
   
@@ -15,9 +17,9 @@
 	</div>
 	<div class="container-fluid">
 		<div class="row-fluid">
-	<div class="span2">
+	<div class="span2 earlymax">
 	<div id="menudiv"><%= render :template => 'layouts/menu' %></div>
-	</div>	<div class="span10">
+	</div>	<div class="span10 earlymax">
 	
 			<%= yield %>
 	</div>

app/views/layouts/menu.html.erb

@@ -1,27 +1,41 @@
-<%= t 'home.mtitle'%>
-<ul class="nav nav-pills nav-stacked">
-	<li><%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %>
-</li>
-<li><%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %></li>
-<li><%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %></li>
-<li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %>
-</li>
-<li><%= link_to "wiki intern", page_path(1) %>
-</li>
-</ul>
-<% if user_signed_in? %>
-  <li>Logged in as : <%= current_user.email %>
-  <%= link_to('Logout', destroy_user_session_path, :method => :delete) %>        
-  </li>
-<% else %>
-  <li>
-  <%= link_to('Login', new_user_session_path)  %>  
-  </li>
-<% end %>
-<%if I18n.locale == :en %>
-<%= link_to "Deutsch" ,switch_locale_url(:de)%>
-<% elsif I18n.locale == :de %>
-  <%= link_to "English" ,switch_locale_url(:en)%>
-  <%end %>
-<%= link_to 'Admin' , config_url
-%>
+<div class="navbar">
+  <div class="navbar-inner">
+    <div class="container-fluid">
+            <a class="brand" href="#"><%= t 'home.mtitle'%></a>
+      <a class ="btn btn-navbar" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse">
+	<span class="icon-bar"></span>
+	<span class="icon-bar"></span>
+	<span class="icon-bar"></span>
+      </a>
+      <div class="nav-collapse collapse">
+	<ul class="nav nav-pills nav-stacked">
+	  <li><%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %>
+	  </li>
+	  <li><%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %></li>
+	  <li><%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %></li>
+	  <li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %></li>
+	  <li><%= link_to "Kalender", calendars_path %></li>
+	  <% if user_signed_in? %>
+	  <li>Logged in as : <%= current_user.email %>
+	    <%= link_to('Logout', destroy_user_session_path, :method => :delete) %>        
+	  </li>
+	  <% else %>
+	  <li>
+	    <%= link_to('Login', new_user_session_path)  %>  
+	  </li>
+	  <% end %>
+	  <li><%if I18n.locale == :en %>
+	    <%= link_to "Deutsch" ,switch_locale_url(:de)%>
+	    <% elsif I18n.locale == :de %>
+	    <%= link_to "English" ,switch_locale_url(:en)%>
+	    <%end %>
+	  </li>
+	  <li>
+	    <%= link_to 'Admin' , config_path%>
+	  </li>
+	</ul>
+      </div>
+
+</div>
+</div>
+</div>

app/views/lvas/_form.html.erb

@@ -1,15 +1,49 @@
-<%= semantic_form_for @lva do |f| %>
-  <%= f.inputs do %>
-    <%= f.input :semester, :collection=>Semester.all.sort_by{|n| [:name]}%>
-    <%= f.input :modul %> 
-    <%= f.input :name %>
-    <%= f.input :ects %>
-    <%= f.input :stunden %>
-    <%= f.input :desc %>
-    <%= f.input :lvanr %>
-  <% end %>
 
-  <%= f.actions do %>
-    <%= f.action :submit, :as => :input %>
-  <% end %>
+<%= semantic_form_for @lva do |f| %>
+  <div class="row-fluid">
+    <%= f.inputs do %>
+
+      <div class="span9">
+	<div class="row-fluid">
+	  <div class="span9">
+	    <div class="form-group">
+	      <div class="row-fluid">
+		  <%= f.input :typ, :as=>:select,  :include_blank=>false, :collection=>Lva::ERLAUBTE_TYPEN, :wrapper_html=>{:class=>'span2'}%>
+		  
+		<%= f.input :name, :wrapper_html=>{:class=>'span10'}%>
+		</div>
+		<div class="row-fluid">
+		<div class="span7"%>
+	      	  <div class="row-fluid">
+		    <%= f.input :lvanr, :wrapper_html=>{:class=>'span4'}%>
+
+		    <%= f.input :ects, :wrapper_html=>{:class=>'span4'} %>
+		    <%= f.input :stunden, :wrapper_html=>{:class=>'span4'} %>
+		  </div>
+		</div>
+	      </div>
+	    </div>
+	    <div class="form-group">
+	      <div class="row-fluid">
+	    <%= f.input :desc %>
+	    <%= f.input :pruefungsinformation %>
+	    	    <%= f.input :lernaufwand %>
+	    </div></div>
+	  </div>
+	  
+	  <div class="span3">
+	    <h1> BILD </h1>
+	    <%= f.input :modul, :as=>:check_boxes%>	  
+	  </div>
+	</div>
+      </div>
+      <div class="span3">
+	
+	<%= f.input :semester, :as=>:check_boxes%>
+	
+      </div>
+    <% end %>
+    <%= f.actions do %>
+      <%= f.action :submit, :as => :input %>
+    <% end %>
 <% end %>

app/views/lvas/_lva_semester.html.erb

@@ -1,10 +1,9 @@
 
-<p class="lva_semester">
+<div class="lva-semester">
   <b><%= link_to lva.name, lva_path(lva)%></b><br>
   Module: /<% lva.modul.each do |m| %> <%= link_to m.name + ' / ', modul_path(m) unless m.modulgruppen.map{|x| x.studium}.index(@studium).nil? && !@studium.nil? %><% end %>
   <br>
   <%="LVa-Nr " + lva.lvanr.to_s %>
   <%= lva.ects %> ECTS / <%= lva.stunden %> Std <% " / " + lva.beispiele.count.to_s + " Beispiele"%> <br>
   <%= link_to "Edit", edit_lva_path(lva) %> | <%= link_to "Beispiel hinzufügen", new_beispiel_path(:lva_id=>lva.id) %>
-</p class="lva_semester"> 
-<% #toolbar_html(@toolbar_elements) %>
+</div class="lva-semester"> 

app/views/lvas/show.html.erb

@@ -1,36 +1,60 @@
 <div class="container-fluid">
-<%= render 'layouts/topbar'%>
-<p id="notice"><%= notice %></p>
-<p>
-
-  <h2><%= @lva.lvanr %><%= @lva.name %> <%= @lva.ects %> ECTS/ <%= @lva.stunden %> Std</h2>
-  
-</p>
-
+  <%= render 'studien/tabs'%>
+  <p id="notice"><%= notice %></p>
+  <div class="row-fluid">
+    <div class="span8">
+      <h1><%=@lva.typ.to_s + ' ' +  @lva.name %></h1>
+      <h2>Prüfungsinformation</h2>
+      <div class="lva-beschreibung">
+	<%= @lva.pruefungsinformation %>
+      </div>
+      <h2>Lernaufwand</h2>
+      <div class="lva-beschreibung">
+	<%= @lva.lernaufwand %>
+      </div>
+      <h2>Beschreibung</h2>
+      <div class="lva-beschreibung">
+	<%= @lva.desc %>
+      </div>
+      <div class="row-fluid">
+	<h2>Beispiele</h2>
   <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>
+<ul>
   <% @lva.beispiele.each do |b|%>
 
-    <%= render b%>
-
-  <% end %>
-</div>
-<h4>Module</h4>
-<ul>
-  <% @lva.modul.each do |modul| %>
-    <li><b><%= link_to modul.name , modul_path(modul)%></b>
+	  <%= render b%>
+	<% end %>
+      </div>
+    </div>
+    <div class="span4">
+      <div class="lva-sidebar">
 	<ul>
-      <% modul.modulgruppen.each do |g| %>
+	  <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>
+	      <% modul.modulgruppen.each do |g| %>
 
-	<li><%= link_to g.studium.name , studium_semesteransicht_path(g.studium)%> (<%=link_to g.name, modulgruppe_path(g)%>)</li>
-      <% end %>
-      </ul>
-    </li>
-    
-  <% end %>
-</ul>
-<%= render 'layouts/pretty_toolbar' %>
+	      <li><%= link_to g.studium.title_context , studium_path(g.studium)%> (<%=link_to g.name, modulgruppe_path(g)%>)</li>
+	      <% end %>
+	    </ul>
+	  </li>
+	  
+	  <% end %>
+	</ul>
+      </div>
+    </div>
+  </div>
+
+  <%= render 'layouts/pretty_toolbar' %>
 </div>

app/views/modulgruppen/_form.html.erb

@@ -1,13 +1,29 @@
 <%= semantic_form_for @modulgruppe do |f| %>
-  <%= f.inputs do %>
-    <%= f.input :studium_id, :as =>:select, :collection => Studium.all %>
-    <%= f.input :typ ,:as => :radio, :collection=>["Pflicht","Vertiefungspflicht","Wahl"]%>
-    <%= f.input :phase,:as => :radio,:collection=>1..3 %>
-    <%= f.input :name %>
-   <%= f.input :desc,:input_html=>{:rows=> 3 }%>
-  <% end %>
+<%= f.inputs do %>
+<div class="span8">
 
-  <%= f.actions do %>
-    <%= f.action :submit, :as => :input %>
+  <div class="row-fluid">
+    <%= f.input :name, :wrapper_html=>{:class=>"span12"}%>
+    </div>
+    <div class="row-fluid">
+      <%= f.input :studium_id, :as =>:select, :collection => Studium.all, :wrapper_html=>{:class=>"span4"} %>
+      <%= f.input :typ, :collection=>["Pflicht","Vertiefungspflicht","Wahl"], :wrapper_html=>{:class=>"span4"}%>
+      <%= f.input :phase, :as=>:select, :collection=>1..3, :wrapper_html=>{:class=>"span4"} %>
+    </div>
+
+
+  <div class="row-fluid">
+    <%= f.input :desc %>
+   
+  </div>
+
+</div>
+<div class="span4">
+  <%= f.input :moduls, :as=>:check_boxes %>
+</div>
   <% end %>
+<%= f.actions do %>
+<%= f.action :submit, :as => :input %>
+
+<% end %>
 <% end %>

app/views/modulgruppen/_kurz.html.erb

@@ -0,0 +1 @@
+<b><%=link_to modulgruppe.name, modulgruppe %></b> <%= ' ( ' + modulgruppe.studium.title_context + ')' unless modulgruppe.studium.nil? %>

app/views/modulgruppen/show.html.erb

@@ -1,11 +1,4 @@
-
-<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 %>
 </h1>
@@ -19,9 +12,8 @@
 
 
 <% @modulgruppe.moduls.each do |modul| %>
-<%= render modul%>
+<%= render 'moduls/kurz', :modul=>modul%>
 <% end %>
-</div>
 
 	 
 <span class="label"><%= I18n.t("common.actions")%></span>
@@ -30,4 +22,4 @@
 <%= link_to I18n.t("modulgruppe.studium"), studium_path(@modulgruppe.studium),:class =>"btn" %> 
 <%= link_to I18n.t("common.edit"), edit_modulgruppe_path(@modulgruppe),:class =>"btn" %> 
 <%= link_to I18n.t("common.delete"),[@modulgruppe], :method=>:delete , :data=>{:confirm=>I18n.t("common.sure")} ,:class=>"btn" %>
-    </div>
+</div>

app/views/moduls/_form.html.erb

@@ -1,15 +1,30 @@
+<div class="container-fluid">
+  <%= semantic_form_for @modul do |f| %>
 
-<%= semantic_form_for @modul do |f| %>
   <%= f.inputs do %>
-   <% # f.input :modulgruppen,:as => :select,      :collection => Hash[Modulgruppe.all.map{|m| [m.studium.name + " " + m.name,m.id]}] %>
-   <%= f.input :modulgruppen %>
-    <%= f.input :name ,:hint=>true%>
-    <%= f.input :desc, :as=>:tinymce_text %>
-    <%= f.input :depend %>
+  <div class="row-fluid">
+    <div class="span9">
+      <%= f.input :name ,:hint=>true%>
+       <div class="row-fluid">
+    <div class="span8">
+      <%= f.input :desc, :as=>:tinymce_text %>
+    </div>
+    <div class="span4">
+      <%= f.input :depend %>
+    </div>
+  </div>
+    </div>
+    <div class="span3">
+      <%= f.input :modulgruppen,:as => :check_boxes, :collection => Hash[Modulgruppe.all.map{|m| [m.studium.name + " " + m.name,m.id]}.sort] %>
+    </div>
+  </div>
+ 
   <% end %>
 
   <%= f.actions do %>
-    <%= f.action :submit, :as => :input %>
+  <%= f.action :submit, :as => :input %>
   <% end %>
-<% end %>
+
+  <% end %>
+</div>
 <%= tinymce %>

app/views/moduls/_kurz.html.erb

@@ -1,10 +1,6 @@
 <div style="border: solid 1px; padding:2px;margin-top:5px;"><p>
   <b><% if !modul.name.nil? %><%= link_to "Modul "+ modul.name , modul_path(modul) %> <%end%></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>
 

app/views/moduls/_modul.html.erb

@@ -1,26 +1,28 @@
-<div style="border: solid 1px; padding:2px"><p>
-  <b><%= 
-if modul.name.nil? 
-name=""
-else
-name=modul.name
-end
-link_to "Modul "+name , modul_path(modul) %> </b>
-</p>
+
+<h1><%=@modul.name %></h1>
+
+
+
+<div class="row-fluid">
+  <div class="span8">
+<h2>Beschreibung </h2>    
 <p>
-  <%= raw(modul.desc) %>
+  <%= raw(@modul.desc) %>
 </p>
-LVAs: 
 
-<ul>
-
-<% modul.lvas.each do |lv| %>
-<li>
-<%= link_to  lv.name.to_s, lva_path(lv.id)  %>
-</li>
+</div>
+<div class="span4">
+  <h2>Modulgruppen</h2>
+<% @modul.modulgruppen.each do |mg| %>
+<%= render 'modulgruppen/kurz', :modulgruppe=>mg %><br>
 <% end %>
 
-</ul>
+<h2>Lvas</h2>
+<% @modul.lvas.each_slice(3) do |row| %>
+<% row.each do |lv| %>
+<%= render 'lvas/lva_semester', :lva=>lv%>
+<% end %>
 
-<% # @toolbar_elements << {:icon=>:pencil,:text=>I18n.t("common.edit"),:path=> edit_modul_path(modul)} %>
-</div>
+<% end %>
+
+  </div></div>

app/views/moduls/show.html.erb

@@ -1,8 +1,6 @@
-<%= render 'layouts/topbar'%>
+
+<%= render 'studien/tabs'%>
 <p id="notice"><%= notice %></p>
 <%= render @modul %>
 
 <%= render 'layouts/pretty_toolbar' %>
-<% # link_to 'Add LVA',  %>
-<% # link_to '<i class="icon-pencil"></i>'.html_safe+ I18n.t("common.edit") , edit_modul_path(@modul) %>
-<% # link_to "Loeschen", [@modul],:method=>:delete ,:data => {:confirm =>"Are you sure" } %>

app/views/semesters/_form.html.erb

@@ -1,12 +1,11 @@
 <%= semantic_form_for @semester do |f| %>
   <%= f.inputs do %>
-    <%= f.input :name %>
-    <%= f.input :nummer %>
-    <%= f.input :ssws %>
-    <%= f.input :lvas %>
+    <%= f.input :lvas, :as=>:check_boxes%>
   <% end %>
 
   <%= f.actions do %>
     <%= f.action :submit, :as => :input %>
   <% end %>
 <% end %>
+<%= link_to 'Zurück',@studium, :class=>"btn"%>
+x

app/views/semesters/edit.html.erb

@@ -1,6 +1,3 @@
-<h1>Editing semester</h1>
+    <h1><%=@semester.name%></h1>
+    <%= render 'form' %>
 
-<%= render 'form' %>
-
-<%= link_to 'Show', @semester %> |
-<%= link_to 'Back', semesters_path %>

app/views/studien/_form.html.erb

@@ -1,13 +1,25 @@
+<div class="container-fluid">
   <%= tinymce_assets %>
-<%= semantic_form_for @studium do |f| %>
+  <%= semantic_form_for @studium do |f| %>
+
   <%= f.inputs do %>
-    <%= f.input :zahl %>
-    <%= f.input :name,:append=>"NAME" %>
-    <%= f.input :desc, :as=>:tinymce_text %>
-    <%= f.input :typ, :as=>:radio, :collection=>["Bachelor","Master"]%>
+
+  <div class="row-fluid">
+      <%= f.input :name,:append=>"NAME", :wrapper_html=>{:class=>"span6"}%>
+
+      <%= f.input :abkuerzung, :wrapper_html=>{:class=>"span1"}%>
+      <%= f.input :zahl , :wrapper_html=>{:class=>"span2"}%>
+
+      <%= f.input :typ, :as=>:select, :include_blank=>false, :collection=>["Bachelor","Master"], :wrapper_html=>{:class=>"span2"}%>
+  </div>
+  <div class="row-fluid">
+    <%= f.input :desc, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%>
+  </div>
+
   <% end %>
-<%= tinymce %>
+  <%= tinymce %>
   <%= f.actions do %>
-    <%= f.action :submit, :as => :input %>
+  <%= f.action :submit, :as => :input %>
   <% end %>
-<% end %>
+  <% end %>
+</div>

app/views/studien/_tabs.html.erb

@@ -1,18 +1,25 @@
 <ul class="nav nav-tabs">
-  <% if @studium.nil? %>
+  <% if request.fullpath == studien_path%>
     <li class="active">
-      <% else %>
-  <li>
-    <% end %>
-    <%= link_to "Alle Studien", studien_path %> </li>
-  <% for s in Studium.all %>
-    <% if !@studium.nil? && s == @studium %>
-      <li class="active">
-	<%= link_to s.name, studium_path(s) %>
-      </li>
     <% else %>
-      <li> <%= link_to s.name, studium_path(s) %></li>
-    <% end %>
+    <li>
   <% end %>
+  <%= link_to "Alle Studien", studien_path %> </li>
+<% for s in Studium.all %>
+  <% if !@studium.nil? && s == @studium %>
  
+    <li class="active" title="<%= s.name %>">
+      <%= link_to s.title_context, s %>
+    </li>
+  <% else %>
+    <li title="<%= s.name %>"> <%= link_to s.title_context, s %></li>
+  <% end %>
+<% end %>
+<% if request.fullpath == studien_verwalten_path %>
+  <li class="active pull-right">
+  <% else %>
+  <li class="pull-right">
+<% end %>
+<%= link_to "Verwaltung", studien_verwalten_path %>
+</li>
 </ul>

app/views/studien/semesteransicht.html.erb

@@ -11,16 +11,19 @@
     <% @studium.semester.each do |sem| %>
         <div class="row-fluid">
       <div class="span12">
-	<div class="modulgruppe_phase_1">
+	<div class="studien-semester">
 	  <div class="container-fluid">
-	    
+	    <div class="row-fluid">
+	      <div class="span8">
 	    <h2><%= sem.name %></h2>
-
-	    <% sem.lvas.each_slice(2) do |row| %>
+	    </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| %>
 		  
-		  <div class="span<%= 12/row.length%>">
+		  <div class="span3">
 		    <%= render :partial=>'lvas/lva_semester', :locals =>{:lva => l}%>
 		  </div>
 	        <% end %>

app/views/studien/verwalten.html.erb

@@ -0,0 +1,172 @@
+<div class="container-fluid">
+  <%= render 'studien/tabs'%>
+  <div class="row-fluid">
+    <div class="span9">
+      
+      <h1><%= I18n.t("studien.verwaltung.title") %></h1> 
+      <%= I18n.t("studien.verwaltung.explanation").html_safe %>
+      <h2>Studien </h2>
+      <div class="verwalten-block">
+	
+	|
+	<% @studien.each do |s| %>
+	<%= (s.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %> <%= link_to s.name, s %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_studium_path(s)%> ||<% end %>
+	<div class="btn-toolbar">
+	  <div class="btn-group">
+	    <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+	      <%= params[:std_verw].nil? ? I18n.t("filter.studium") : Studium.find(params[:std_verw]).name %>
+	      <span class="caret"></span>
+	    </a>  
+	    <ul class="dropdown-menu">
+	      <li> <%= link_to 'Alle Studien', studien_verwalten_path(:std_verw=>nil) %></li>
+	      <% for s in @studien  %>
+	      <li> <%= link_to s.name, studien_verwalten_path(:std_verw=>s)%> </li>
+	      
+	      <% end %>
+	    </ul>
+	    
+	  </div>
+	  <%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%>
+	</div>
+	
+      </div>
+      <div class="row-fluid">
+	
+	<div class="span4">
+	  <h2>Modulgruppen </h2>
+	  <div class="verwalten-block">
+	    <% @modulgruppen.each do |mg| %>
+	    	<%= (mg.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %> <%= link_to mg.name, mg %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_modulgruppe_path(mg)%><br>
+	    <% end %>
+	    <div class="btn-toolbar">
+	      <div class="btn-group">
+		<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+		  <%= params[:mg_verw].nil? ? I18n.t("filter.modulgruppe") : Modulgruppe.find(params[:mg_verw]).name %>
+
+		  <span class="caret"></span>
+		</a>
+		<ul class="dropdown-menu">
+		  <li> <%= link_to 'Alle Modulgruppen', studien_verwalten_path(:mg_verw=>nil) %></li>
+		  <% for mg in @modulgruppen  %>
+		  <li> <%= link_to mg.name, studien_verwalten_path(:mg_verw=>mg)%> </li>
+		  <% end %>
+		</ul>
+		
+	      </div>
+	      <%= link_to "Neue Modulgruppe", new_studium_modulgruppe_path(Studium.first), :class=>"btn" unless Studium.first.nil?%>
+	    </div>
+	    
+	    
+	  </div>
+	</div>
+	<div class="span4">
+	  <h2>Module </h2>
+	  <div class="verwalten-block">
+	    
+	    
+	    <% @module.each do |m| %>
+	    <%= (m.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %> <%= link_to m.name, m %>  
+	    |  <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_modul_path(m)%><br>
+	    <% end %>
+	    <div class="btn-toolbar">
+	      <div class="btn-group">
+		<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+		  <%= params[:m_verw].nil? ? I18n.t("filter.modul") : Modul.find(params[:m_verw]).name %>
+
+		  <span class="caret"></span>
+		</a>
+		<ul class="dropdown-menu">
+		  <li> <%= link_to 'Alle Module', studien_verwalten_path(:m_verw=>nil) %></li>
+		  <% for m in @module  %>
+		  <li> <%= link_to m.name, studien_verwalten_path(:m_verw=>m)%> </li>
+		  <% end %>
+		</ul>
+		
+	      </div>
+	      <%= link_to "Neues Modul", new_modul_path, :class=>"btn"%>
+	    </div>
+	  </div>
+	</div>
+	<div class="span4">
+	  <h2>Lvas </h2>
+	  <div class="verwalten-block">
+	    
+
+	    <% @lvas.each do |lva| %>
+	    <%= (lva.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %><%= link_to lva.name, lva %> |	      
+	     <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_lva_path(lva)%><br>
+	    
+	    <% end %>
+	    <div class="btn-toolbar">
+	      <div class="btn-group">
+		<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+		  <%= params[:lva_verw].nil? ? I18n.t("filter.lva") : Lva.find(params[:lva_verw]).name %>
+
+		  <span class="caret"></span>
+		</a>
+		<ul class="dropdown-menu">
+		  <li> <%= link_to 'Alle Lvas', studien_verwalten_path(:lva_verw=>nil) %></li>
+		  <% for lva in @lvas  %>
+		  <li> <%= link_to lva.name, studien_verwalten_path(:lva_verw=>lva)%> </li>
+		  <% end %>
+		</ul>
+
+	      </div>
+	      <%= link_to "Neue LVa", new_lva_path, :class=>'btn'%>
+	    </div>
+	  </div>
+	</div>
+
+
+
+
+      </div>
+    </div>
+    <div class="span3">
+        <%= link_to I18n.t("filter.reset"), studien_verwalten_path(:std_verw=>nil, :mg_verw=>nil, :m_verw=>nil, :lva_verw=>nil, :b_verw=>nil), :class=>"btn" %>
+      <h2>Error Log</h2>
+      <ul>
+	<li><font color="red"><b>Red</b></font>: Error, Solve immediately</li>
+	<li>Black: Warning, should be solved</li>
+	<li><font color="green"><b>Green</b></font>: Everything is fine</li>
+      </ul>
+      <div class="verwalten-block">
+	<ul>
+	  <% @messages.flatten.each do |m| %>
+	  <% if !m.strip.empty? %>
+	  <li><%= m.html_safe %></li>
+	  <% end %>
+	  <% end %>
+	</ul>
+	<b><font color="green"><%= I18n.t("verwalten.fehler.keine").html_safe if @messages.empty?%></font></b>
+      </div>
+      <h2>Beispiele </h2>
+      <div class="verwalten-block">
+
+
+	<% @beispiele.each do |b| %>
+<%= (b.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %>	<%= link_to b.name, b %> |  <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_beispiel_path(b)%>
+	<% end %>
+	<div class="btn-toolbar">
+	  <div class="btn-group">
+	    <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+	      <%= params[:b_verw].nil? ? I18n.t("filter.beispiel") : Beispiel.find(params[:b_verw]).name %>
+
+	      <span class="caret"></span>
+	    </a>
+	    <ul class="dropdown-menu">
+	      <li> <%= link_to 'Alle Beispiele', studien_verwalten_path(:b_verw=>nil) %></li>
+	      <% for b in @beispiele  %>
+	      <li> <%= link_to b.name, studien_verwalten_path(:b_verw=>b)%> </li>
+	      <% end %>
+	    </ul>
+
+	  </div>
+	  <%= link_to "Neues Beispiel", new_beispiel_path, :class=>"btn"%>
+	</div>
+	
+      </div>
+    </div>
+
+  </div>
+</div>