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

app/controllers/studien_controller.rb

@@ -1,20 +1,18 @@
 class StudienController < ApplicationController
-before_filter {@toolbar_elements =[]} 
+  before_filter {@toolbar_elements =[]} 
 
 
-def index
+  def index
     @studien = Studium.all
     @topbar_elements=[{:hicon=>'icon-list', :text=>I18n.t("studien.allestudien"),:path=>studien_path}]
     @topbar_elements<<{:hicon=>'icon-list', :text=>I18n.t("modul.list"),:path=>moduls_path}
     @topbar_elements<<{:hicon=>'icon-list', :text=>I18n.t("lva.list"),:path=>lvas_path}
     @toolbar_elements<<{:icon =>:plus, :hicon=>'icon-plus-sign', :text=> I18n.t('studien.new') ,:path=>new_studium_path }
     # @toolbar_elements<<{:text=> I18n.t('modulgruppe.show.link') ,:path=>modulgruppen_path }
-end
+  end
 
-def show
+  def show
     @studium= Studium.find(params[:id])
-  @text = 'Zu Semesteransicht wechseln'
-  @path = studium_semesteransicht_path(@studium)
 
     @studienphasen=[]
     [1, 2 ,3].each do |ph| 
@@ -41,13 +39,14 @@ def show
     @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}]
     
-    @topbar_elements = [ {:hicon=>'icon-list', :text=>I18n.t("studien.allestudien"), :path=>studien_path},
-                         {:text=>'Zur Semesteransicht wechseln', :path=>studium_semesteransicht_path(@studium)},
-                         {:newline=>true}]
-    for i in Studium.all
-      @topbar_elements << {:text=>i.name, :path=>studium_path(i)}
+    if params[:ansicht] == 'semesteransicht'
+      @text = 'Zu Modulansicht wechseln'
+      @flip = 'modulgruppenansicht'
+        render 'semesteransicht'
+    else
+      @text = 'Zu Semesteransicht wechseln'
+      @flip = 'semesteransicht'
     end
-    
   end
 
   def new
@@ -85,31 +84,13 @@ def show
     end
     
   end
-  def semesteransicht
-    @sem = 'true'
-    @studium = Studium.find(params[:id])
-    if @studium.nil?
-      @studium = Studium.first
-    end
-    @text = 'Zu Modulgruppenansicht wechseln'
-    @path = studium_path(@studium)
-    @topbar_elements = [ {:hicon=>'icon-list', :text=>I18n.t("studien.allestudien"), :path=>studien_path},
-                         {:text=>'Zur Modulgruppenansicht wechseln', :path=>studium_path(@studium)},
-                         {:newline=>true}]
-    for i in Studium.all
-      @topbar_elements << {:text=>i.name, :path=>studium_semesteransicht_path(i)}
-    end
-    
-
-    
-    @toolbar_elements = [ {:icon=>:plus, :hicon =>'icon-plus-sign' ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) },
-                          {:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)},
-                          {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>"Sure?" }]
-  end
 
   def destroy
     @studium = Studium.find(params[:id])
     @studium.destroy
     redirect_to studien_url
   end
+  def default_url_options
+    {ansicht: params[:ansicht]}.merge(super)
+  end
 end

app/views/lvas/show.html.erb

@@ -18,7 +18,7 @@
 
   <% end %>
 </div>
-<!-- <h4>Module</h4>
+<h4>Module</h4>
 <ul>
   <% @lva.modul.each do |modul| %>
     <li><b><%= link_to modul.name , modul_path(modul)%></b>
@@ -31,6 +31,6 @@
     </li>
     
   <% end %>
-</ul> -->
+</ul>
 <%= render 'layouts/pretty_toolbar' %>
 </div>

app/views/moduls/show.html.erb

@@ -1,5 +1,4 @@
 <%= render 'layouts/topbar'%>
-<%= render 'layouts/topbar', :topbar=>@tb%>
 <p id="notice"><%= notice %></p>
 <%= render @modul %>
 

app/views/studien/_studium.html.erb

@@ -1,7 +1,6 @@
 <div class="studium">
-  <h2><%= link_to studium.name + " " + studium.zahl.to_s, studium_semesteransicht_path(studium)%></h2>  <p><b><%= studium.typ%> </b></p>
+  <h2><%= link_to studium.name + " " + studium.zahl.to_s, studium_path(studium, :ansicht=>'semesteransicht')%></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>

app/views/studien/_tabs.html.erb

@@ -0,0 +1,18 @@
+<ul class="nav nav-tabs">
+  <% if @studium.nil? %>
+    <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 %>
+  <% end %>
+ 
+</ul>

app/views/studien/index.html.erb

@@ -1,18 +1,18 @@
 <div class="container-fluid">
-<%= render 'layouts/topbar' %>
-<div class="row-fluid">
-<h1><%= I18n.t("studien.list") %></h1>
+  <%= render 'studien/tabs' %>
+  <div class="row-fluid">
+    <h1><%= I18n.t("studien.list") %></h1>
 
 
-<% @studien.sort_by{|z| z[:zahl]}.each do |studium| %>
+    <% @studien.sort_by{|z| z[:zahl]}.each do |studium| %>
       <div class="span5">
 	<%= render studium%>
       </div>
-<% end %>
+    <% end %>
 
 
-<br>
+    <br>
 
-</div>
-<%= render :partial=>'layouts/pretty_toolbar'%>
+  </div>
+  <%= render :partial=>'layouts/pretty_toolbar'%>
 </div>

app/views/studien/semesteransicht.html.erb

@@ -1,10 +1,15 @@
-<div class="container-fluid">
-  <%= render :partial=>'layouts/topbar'%>
-  <div class="row-fluid">
-    <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
-    <%= raw(@studium.desc) %>
-    <% @studium.semester.each do |sem| %>
 
+<div class="container-fluid">
+  <div class="row-fluid">
+    <%= render 'studien/tabs' %>
+    <div class="span6">    <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1></div>
+    <div class="span3 pull-right"><div class="pull-right"> <%= link_to @text, studium_path(@studium, :ansicht=>@flip), :class=>"btn" %></div>
+    </div>
+  </div>
+  <%= raw(@studium.desc) %>
+
+    <% @studium.semester.each do |sem| %>
+        <div class="row-fluid">
       <div class="span12">
 	<div class="modulgruppe_phase_1">
 	  <div class="container-fluid">
@@ -25,7 +30,8 @@
 	  </div>
 	</div>
       </div>
-    <% end %>
         </div>
+    <% end %>
+
   <%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
 </div>

app/views/studien/show.html.erb

@@ -1,11 +1,14 @@
 
 <div class="container-fluid">
-  <%= render 'layouts/topbar'%>
   <div class="row-fluid">
+    <%= render 'studien/tabs' %>
+
     <p id="notice"><%= notice %></p>
-    <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
+    <div class="span6">    <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1></div>
+    <div class="span3 pull-right"><div class="pull-right"><%= link_to @text, studium_path(@studium, :ansicht=>@flip), :class=>"btn" %></div>
     </div>
-  <div>
+  </div>
+  <div class="row-fluid">
     <%= raw(@studium.desc) %>
     <% @studienphasen.each do |sp| %>
       <% sp[:modulgruppen].each do |row| %>
@@ -18,7 +21,7 @@
 	</div>
       <% end %>
     <% end %>
-    <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
   </div>
+  <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %><br>
   <%= render 'layouts/pretty_toolbar' %>
 </div>

config/routes.rb

@@ -1,4 +1,4 @@
-Fetsite::Application.routes.draw do
+ Fetsite::Application.routes.draw do
   
   resources :fragen
 
@@ -32,28 +32,31 @@ Fetsite::Application.routes.draw do
   get 'pages', :to =>'pages#show'
   scope '(:locale)' do
     
-    resources :studien, :only=>[:show,:new,:edit,:update,:destroy]
-    resources :modulgruppen,:only =>[:create,:index]
+    resources :studien, :only=>[:new,:edit,:update,:destroy]
+    scope '(:ansicht)' do
+  resources :studien, :only=>[:show]
+end
+resources :modulgruppen,:only =>[:create,:index]
 
-    resources :studien,:except=>[:show,:new,:edit,:update,:destroy], :shallow=>true do 
+resources :studien,:except=>[:show,:new,:edit,:update,:destroy], :shallow=>true do 
   resources :modulgruppen, :path => "(:locale)/modulgruppen"
   
-    end
-    get 'studien/:id/semesteransicht', :controller=>:studien, :action=>:semesteransicht, :as=>'studium_semesteransicht'
-    resources :semesters
-    resources :moduls
-    resources :lvas
-    resources :neuigkeiten
-    get 'rubriken/verwalten', :controller=>:rubriken, :action=>:alle_verwalten, :as=>'alle_verwalten_rubrik'
+end
+#    get 'studien/(:ansicht)/:id', :controller=>:studien, :action=>:show, :as=>'studium_ansicht'
+resources :semesters
+resources :moduls
+resources :lvas
+resources :neuigkeiten
+get 'rubriken/verwalten', :controller=>:rubriken, :action=>:alle_verwalten, :as=>'alle_verwalten_rubrik'
 
-    resources :rubriken do
+resources :rubriken do
   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'
-    resources :home, :only=>[:index]
-    get 'home/dev', :controller=>:home, :action=>:dev, :as=>'home_dev'
-    resources :beispiele
+end
+put 'rubriken/(:id)/addmoderator',:controller=>:rubriken,:action=>:addmoderator
+get 'rubriken/:id/verwalten',:controller=>:rubriken,:action=>:verwalten, :as=>'verwalten_rubrik'
+resources :home, :only=>[:index]
+get 'home/dev', :controller=>:home, :action=>:dev, :as=>'home_dev'
+resources :beispiele
 
   end