andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Kosmetik

Browse Source
This commit is contained in:
Thomas Blazek
2013-07-29 21:10:40 +02:00
parent c03ecd3076
commit 15f5b599ff
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/studien_controller.rb
View File

@@ -41,7 +41,7 @@ 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_modulgruppe_path(@studium) }] @toolbar_elements=[{:icon =>:plus ,: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,: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<<{:text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>"Sure?" }
end end

5
app/views/lvas/_lva_semester.html.erb
View File

@@ -1,5 +1,6 @@
<div class="lva_semester"> <div class="lva_semester">
<%= %> <li><b> <%= link_to lva.name + " " + lva.lvanr.to_s, lva_path(lva) %> </b><br>
<b> <%= link_to lva.lvanr.to_s + " " + lva.name + "", lva_path(lva) %> </b><%= lva.ects %> ECTS/ <%= lva.stunden %> Std <%= lva.ects %> ECTS/ <%= lva.stunden %> Std </li>
</div class="lva_semester"> </div class="lva_semester">
<% #toolbar_html(@toolbar_elements) %> <% #toolbar_html(@toolbar_elements) %>

2
app/views/studien/_semesteransicht.html.erb
View File

@@ -10,7 +10,7 @@
<h2> Ohne Zuordnung </h2> <h2> Ohne Zuordnung </h2>
<% end %> <% end %>
<div class="span<%= sem[:width]%> min-width:13em;"> <div class="span<%= sem[:width]%> min-width:13em;">
<%= render :partial=>'lvas/lva_semester', :collection=>sem.lvas.sort_by{|n| [:name]}, :as=>:lva%> <ul><%= render :partial=>'lvas/lva_semester', :collection=>sem.lvas.sort_by{|n| n[:name]}, :as=>:lva%></ul>
</div> </div>
<% end %> <% end %>
</div> </div>

1
app/views/studien/show.html.erb
View File

@@ -16,7 +16,6 @@
<span class="span12"> <span class="span12">
<%= link_to '<i class="icon-plus-sign"></i>'.html_safe+I18n.t("studien.newmodulgroup"), new_studium_modulgruppe_path(@studium),:class=>"btn" %> | <%= link_to '<i class="icon-plus-sign"></i>'.html_safe+I18n.t("studien.newmodulgroup"), new_studium_modulgruppe_path(@studium),:class=>"btn" %> |
<%= link_to '<i class="icon-pencil"></i>'.html_safe+I18n.t("common.edit"), edit_studium_path(@studium) ,:class=>"btn"%> <%= link_to '<i class="icon-pencil"></i>'.html_safe+I18n.t("common.edit"), edit_studium_path(@studium) ,:class=>"btn"%>
<%= link_to 'Destroy', @studium, method: :delete, data: { confirm: 'Are you sure?' } %>
</span> </span>
</div> </div>