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

Oberfläche aufräumen...

Browse Source
This commit is contained in:
Andreas Stephanides
2014-06-24 13:53:38 +05:30
parent a87990c338
commit 3a8ccdd205
37 changed files with 320 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,34 +1,19 @@
<% if params[:info].true? %>
<%= raw(@studium.desc) %>
<% else %>
<%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>
<% end %>
<div class="container-fluid">
<% if params[:info].true? %>
<%= raw(@studium.desc) %>
<% else %>
<%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>
<% end %>
<% @studium.semester.each do |sem| %>
<div class="row-fluid">
<div class="span12">
<div class="contentbox">
<div class="container-fluid">
<div class="row-fluid">
<div class="span8">
<h2><%= sem.name %></h2>
</div>
<div class="span4">
</div>
</div>
<% sem.lvas.each do |lva| %>
<div class="row-fluid">
<%= render :partial=>'lvas/lva_semester', :locals =>{:lva => lva}%>
</div>
<% end %>
</div>
</div>
</div>
<% @studium.semester.each_slice(2) do |row| %>
<div class="row-fluid">
<% row.each do |sem| %>
<div class="span6">
<%= render sem %>
</div>
<% end %>
<%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
</div>
<% end %>
</div>
<%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>

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

@@ -20,6 +20,6 @@
<% else %>
<li class="pull-right">
<% end %>
<%= link_to I18n.t("studien.verwaltung.title"), studien_verwalten_path %>
<%= link_to I18n.t("studien.verwaltung.title"), studien_verwalten_path if can? :verwalten, Studium %>
</li>
</ul>

52
app/views/studien/semesteransicht.html.erb
View File

@@ -1,52 +0,0 @@
<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" %>
<%= link_to "Infoansicht", studium_path(@studium, :ansicht=>'infoansicht'), :class=>"btn" unless params[:ansicht]=='infoansicht'%>
</div>
</div>
</div>
<% if params[:info].true? %>
<%= raw(@studium.desc) %>
<% else %>
<%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>
<% end %>
<% @studium.semester.each do |sem| %>
<div class="row-fluid">
<div class="span12">
<div class="contentbox">
<div class="container-fluid">
<div class="row-fluid">
<div class="span8">
<h2><%= sem.name %></h2>
</div>
<div class="span4">
<div class="pull-right"><!--<% link_to I18n.t("lva.addrem"), edit_semester_path(sem), :class=>"btn-small"%>--></div>
</div></div>
<% sem.lvas.each do |lva| %>
<div class="row-fluid">
<%= render :partial=>'lvas/lva_semester', :locals =>{:lva => lva}%>
</div>
<% end %>
</div>
</div>
</div>
</div>
<% end %>
<%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
</div>

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

@@ -2,6 +2,7 @@
<div class="content-wrap content-column">
<p id="notice"><%= notice %></p>
<h1><%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)</h1>
<div>
<p>
<div class="pull-right">
<%= link_to I18n.t("studien.ansicht.semester"), studium_path(@studium, :ansicht=>"semesteransicht"), :class=>"btn" unless params[:ansicht]=='semesteransicht' %>
@@ -9,6 +10,7 @@
<%= link_to I18n.t("studien.ansicht.info"), studium_path(@studium, :ansicht=>"infoansicht"), :class=>"btn" unless params[:ansicht]=='infoansicht' %>
</div>
</p>
</div>
<% if params[:ansicht]=='modulgruppenansicht' %>
<%= render partial: 'modulgruppenansicht' %>
<% else if params[:ansicht]=='infoansicht' %>