From 747ba5f91a05f84ed49bb05716ca0df4105b4cb4 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Mon, 29 Jul 2013 17:46:10 +0200
Subject: [PATCH] Kosmetik

---
 app/controllers/moduls_controller.rb | 34 ++++++++++----------
 app/views/semesters/show.html.erb    | 15 +++------
 config/routes.rb                     | 47 +++++++++++++---------------
 3 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/app/controllers/moduls_controller.rb b/app/controllers/moduls_controller.rb
index bace79f..f5315c9 100755
--- a/app/controllers/moduls_controller.rb
+++ b/app/controllers/moduls_controller.rb
@@ -2,11 +2,11 @@ class ModulsController < ApplicationController
   # GET /moduls
   # GET /moduls.json
   def index
-   @moduls = Modul.all
-   if @moduls
-    if !params[:studium_id].nil?
-     @studium=Studium.find_by_id(params[:studium_id])
-     end
+    @moduls = Modul.all
+    if @moduls
+      if !params[:studium_id].nil?
+        @studium=Studium.find_by_id(params[:studium_id])
+      end
       respond_to do |format|
         format.html # index.html.erb
         format.json { render json: @moduls }
@@ -19,7 +19,7 @@ class ModulsController < ApplicationController
   def show
     @modul = Modul.find(params[:id])
 
-      respond_to do |format|
+    respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @modul }
     end
@@ -31,7 +31,7 @@ class ModulsController < ApplicationController
     @modul = Modul.new
     modulgruppe=Modulgruppe.find_by_id(params[:modulgruppen_id])
     if !modulgruppe.nil?
-		@modul.modulgruppen<<modulgruppe 
+      @modul.modulgruppen<<modulgruppe 
     end
     respond_to do |format|
       format.html # new.html.erb
@@ -42,27 +42,27 @@ class ModulsController < ApplicationController
   # GET /moduls/1/edit
   def edit
     @modul = Modul.find(params[:id])
-     if !params[:studium_id].nil?
-  @studium=Studium.find(params[:studium_id])
-  end
+    if !params[:studium_id].nil?
+      @studium=Studium.find(params[:studium_id])
+    end
   end
 
   # POST /moduls
   # POST /moduls.json
   def create
     @modul = Modul.new(params[:modul])
-   
     
-   respond_to do |format|
-     if @modul.save
+    
+    respond_to do |format|
+      if @modul.save
         format.html { redirect_to modulgruppe_path(@modul.modulgruppen.first), notice: 'Modul was successfully created.' }
         format.json { render json: @modul, status: :created, location: @modul }
-     else
+      else
         format.html { render action: "new" }
         format.json { render json: @modul.errors, status: :unprocessable_entity }
-     end
-     end
-   
+      end
+    end
+    
   end
 
   # PUT /moduls/1
diff --git a/app/views/semesters/show.html.erb b/app/views/semesters/show.html.erb
index b6607ef..c06ceee 100755
--- a/app/views/semesters/show.html.erb
+++ b/app/views/semesters/show.html.erb
@@ -1,25 +1,20 @@
 <p id="notice"><%= notice %></p>
 
 <p>
-  <b>Name:</b>
-  <%= @semester.name %>
+  <b>Name:</b>  <%= @semester.name %>
 </p>
 
 <p>
-  <b>Nummer:</b>
-  <%= @semester.nummer %>
+  <b>Nummer:</b>  <%= @semester.nummer %>
 </p>
 
+
 <p>
-  <b>Ws:</b>
-  <%= @semester.ws %>
+  <b>WS/SS?:</b>  <%= @semester.ssws %>
 </p>
-
 <p>
-  <b>Ss:</b>
-  <%= @semester.ss %>
+<%= render :partial =>'lvas/lva_semester', :collection=>@semester.lvas, :as=>:lva%>
 </p>
 
-
 <%= link_to 'Edit', edit_semester_path(@semester) %> |
 <%= link_to 'Back', semesters_path %>
diff --git a/config/routes.rb b/config/routes.rb
index 4e4ed7d..0c2ce9e 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,29 +1,24 @@
 Fetsite::Application.routes.draw do
+  
+  devise_for :users
+  resources :home, :only=>[:index]
+  #get 'home',:controller=>home,:action=>:index,:as=>"home_index"
+  scope '(:locale)/admin' do
+    resources :users
+    get 'config',:controller=>:config,:action=>:index , :as => 'config'
+    get 'config/get_git_update',:controller=>:config,:action=>:get_git_update, :as=>'config_getgitupdate'
+    get 'config/get_git_update',:controller=>:config,:action=>:get_git_update
+  end
 
+  devise_for :users
 
-
- 
-	devise_for :users
-	resources :home, :only=>[:index]
-	#get 'home',:controller=>home,:action=>:index,:as=>"home_index"
-	scope '(:locale)/admin' do
-	resources :users
-	get 'config',:controller=>:config,:action=>:index , :as => 'config'
-	get 'config/get_git_update',:controller=>:config,:action=>:get_git_update, :as=>'config_getgitupdate'
-	get 'config/get_git_update',:controller=>:config,:action=>:get_git_update
-
-
-end
-
-devise_for :users
-
-resources :pages, :except => [:index] do
-	member do
-	post 'preview'
-	end
-end
-get 'pages', :to =>'pages#show'
-scope '(:locale)' do
+  resources :pages, :except => [:index] do
+    member do
+      post 'preview'
+    end
+  end
+  get 'pages', :to =>'pages#show'
+  scope '(:locale)' do
     resources :studien, :only=>[:show,:new,:edit,:update,:destroy]
     resources :modulgruppen,:only =>[:create,:index]
     resources :studien,:except=>[:show,:new,:edit,:update,:destroy], :shallow=>true do 
@@ -36,7 +31,7 @@ scope '(:locale)' do
     get 'rubriken/verwalten', :controller=>:rubriken, :action=>:alle_verwalten, :as=>'alle_verwalten_rubrik'
 
     resources :rubriken do
-    resources :neuigkeiten, :only=>[:new, :show]
+      resources :neuigkeiten, :only=>[:new, :show]
     end
     put 'rubriken/(:id)/addmoderator',:controller=>:rubriken,:action=>:addmoderator
     get 'rubriken/:id/verwalten',:controller=>:rubriken,:action=>:verwalten, :as=>'verwalten_rubrik'
@@ -44,7 +39,7 @@ scope '(:locale)' do
     get 'home/dev', :controller=>:home, :action=>:dev, :as=>'home_dev'
     resources :beispiele
 
- end
+  end
 
   # The priority is based upon order of creation:
   # first created -> highest priority.
@@ -96,7 +91,7 @@ scope '(:locale)' do
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
 
-   root :to => 'home#index'
+  root :to => 'home#index'
 
   # See how all your routes lay out with "rake routes"