bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Einrückungen

Browse Source
This commit is contained in:
Thomas Blazek
2013-08-02 10:39:58 +02:00
parent 110069d497
commit 0053a4de0c
4 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/controllers/studien_controller.rb
View File

@@ -4,18 +4,14 @@ class StudienController < ApplicationController
def index def index
@studien = Studium.all @studien = Studium.all
@toolbar_elements<<{:icon =>:plus, :text=> I18n.t('studien.new') ,:path=>new_studium_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 } # @toolbar_elements<<{:text=> I18n.t('modulgruppe.show.link') ,:path=>modulgruppen_path }
@toolbar_elements<<{:text=> I18n.t('modul.show.link') ,:path=>moduls_path } @toolbar_elements<<{:hicon=> 'icon-list', :text=> I18n.t('modul.show.link') ,:path=>moduls_path }
@toolbar_elements<<{:text=> 'Alle LVas auflisten', :path=>lvas_path} @toolbar_elements<<{:hicon=> 'icon-list', :text=> 'Alle LVas auflisten', :path=>lvas_path}
end end
def show def show
@studium= Studium.find(params[:id]) @studium= Studium.find(params[:id])
@sem = 'false'
if @sem.nil?
@sem = 'true'
end
@text = 'Zu Semesteransicht wechseln' @text = 'Zu Semesteransicht wechseln'
@path = studium_semesteransicht_path(@studium) @path = studium_semesteransicht_path(@studium)
@@ -35,9 +31,9 @@ class StudienController < ApplicationController
end end
@studienphasen << {:modulgruppen=>modulgruppen, :phase => ph}.merge(opts) @studienphasen << {:modulgruppen=>modulgruppen, :phase => ph}.merge(opts)
end end
@toolbar_elements=[{:icon =>:plus ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) }] @toolbar_elements=[{:icon=>:plus, :hicon =>'icon-plus-sign' ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) }]
@toolbar_elements<<{:icon=>:pencil,:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)} @toolbar_elements<<{:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)}
@toolbar_elements<<{:text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>"Sure?" } @toolbar_elements<<{:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>"Sure?" }
end end
def new def new
@@ -82,6 +78,9 @@ class StudienController < ApplicationController
end end
@text = 'Zu Modulgruppenansicht wechseln' @text = 'Zu Modulgruppenansicht wechseln'
@path = studium_path(@studium) @path = studium_path(@studium)
@toolbar_elements=[{:icon=>:plus, :hicon =>'icon-plus-sign' ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) }]
@toolbar_elements<<{:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)}
@toolbar_elements<<{:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>"Sure?" }
end end
def destroy def destroy

15
app/views/studien/_studium.html.erb
View File

@@ -1,10 +1,9 @@
<div class="studium"> <div class="studium">
<b ><%= link_to studium.name + " " + studium.zahl.to_s, studium_semesteransicht_path(studium)%></b>(<%=link_to "Modulgruppenansicht",studium_path(studium) %>)<br> <h2><%= link_to studium.name + " " + studium.zahl.to_s, studium_semesteransicht_path(studium)%></h2>
<div> <ul>
<b>Typ: </b><%= studium.typ%> <li><b><%= studium.typ%> </b></li>
</div> <li><b>Beschreibung:</b><br>
<p> <%= !(studium.desc.to_s == "") ? studium.desc.html_safe : I18n.t("keine.beschreibung")%></li>
<b>Beschreibung:</b><br> <li><%=link_to "Link zur Modulgruppenansicht",studium_path(studium) %> </li>
<%= studium.desc %> </ul>
</p>
</div> </div>