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

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

Browse Source
This commit is contained in:
Andreas Stephanides
2013-08-20 13:58:36 +02:00
parent 0a910386d7 18dfe60309
commit e4f45b3390
3 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/lvas.css.scss
View File

@@ -4,7 +4,7 @@
div.lva-semester { div.lva-semester {
border: solid; border: solid;
border-width: 1px; border-width: 0px;
margin: 1px; margin: 1px;
padding: 5px; padding: 5px;
border-color: green; border-color: green;

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

@@ -14,8 +14,9 @@
<div class="studien-semester"> <div class="studien-semester">
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span8"> <div class="span8">
<h2><%= sem.name %></h2> <h2><%= sem.name %></h2>
</div> </div>
<div class="span4"><div class="pull-right"><%= link_to 'Lvas hinzufügen/entfernen', edit_semester_path(sem), :class=>"btn-small"%></div> <div class="span4"><div class="pull-right"><%= link_to 'Lvas hinzufügen/entfernen', edit_semester_path(sem), :class=>"btn-small"%></div>
</div></div> </div></div>

68
app/views/studien/verwalten.html.erb
View File

@@ -7,10 +7,16 @@
<%= I18n.t("studien.verwaltung.explanation").html_safe %> <%= I18n.t("studien.verwaltung.explanation").html_safe %>
<h2>Studien </h2> <h2>Studien </h2>
<div class="verwalten-block"> <div class="verwalten-block">
<div class="row-fluid">
<% @studien.each_slice((Studium.count/2.0).ceil) do |col| %>
| <div class="span6">
<% @studien.each do |s| %> <% col.each do |s| %>
<%= (s.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe %> <%= link_to s.name, s %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_studium_path(s)%> ||<% end %> <%= (s.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe %> <%= link_to s.name, s %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_studium_path(s)%> <br>
<% end %>
</div>
<% end %>
</div>
<div class="btn-toolbar"> <div class="btn-toolbar">
<div class="btn-group"> <div class="btn-group">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
@@ -21,38 +27,42 @@
<li> <%= link_to 'Alle Studien', studien_verwalten_path(:std_verw=>nil) %></li> <li> <%= link_to 'Alle Studien', studien_verwalten_path(:std_verw=>nil) %></li>
<% for s in @studien %> <% for s in @studien %>
<li> <%= link_to s.name, studien_verwalten_path(:std_verw=>s)%> </li> <li> <%= link_to s.name, studien_verwalten_path(:std_verw=>s)%> </li>
<% end %> <% end %>
</ul> </ul>
</div> </div>
<%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%> <%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%>
</div> </div>
</div>
<h2>Vortragende </h2>
<div class="verwalten-block">
<div class="row-fluid">
<% @lecturers.each_slice((Lecturer.count/3.0).ceil) do |col| %>
<div class="span4">
<% col.each do |lec| %>
<%= (lec.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe %> <%= link_to lec.name, lec %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_lecturer_path(lec)%> <br>
<% end %>
</div> </div>
<h2>Vortragende </h2>
<div class="verwalten-block">
<% @lecturers.each do |lec| %>
<%= (lec.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe %> <%= link_to lec.name, lec %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_lecturer_path(lec)%> ||
<% end %> <% end %>
<div class="btn-toolbar"> </div>
<div class="btn-group"> <div class="btn-toolbar">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> <div class="btn-group">
<%= params[:lec_verw].nil? ? I18n.t("filter.lecturer") : Lecturer.find(params[:lec_verw]).name %> <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
<%= params[:lec_verw].nil? ? I18n.t("filter.lecturer") : Lecturer.find(params[:lec_verw]).name %>
<span class="caret"></span> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <%= link_to 'Alle Vortragenden', studien_verwalten_path(:lec_verw=>nil) %></li> <li> <%= link_to 'Alle Vortragenden', studien_verwalten_path(:lec_verw=>nil) %></li>
<% for lec in @lecturers %> <% for lec in @lecturers %>
<li> <%= link_to lec.name, studien_verwalten_path(:lec_verw=>lec)%> </li> <li> <%= link_to lec.name, studien_verwalten_path(:lec_verw=>lec)%> </li>
<% end %> <% end %>
</ul> </ul>
</div> </div>
<%= link_to "Neuer Vortragender", new_lecturer_path, :class=>"btn"%> <%= link_to "Neuer Vortragender", new_lecturer_path, :class=>"btn"%>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
@@ -60,7 +70,7 @@
<h2>Modulgruppen </h2> <h2>Modulgruppen </h2>
<div class="verwalten-block"> <div class="verwalten-block">
<% @modulgruppen.each do |mg| %> <% @modulgruppen.each do |mg| %>
<%= (mg.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe %> <%= link_to mg.name, mg %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_modulgruppe_path(mg)%><br> <%= (mg.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe %> <%= link_to mg.name, mg %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_modulgruppe_path(mg)%><br>
<% end %> <% end %>
<div class="btn-toolbar"> <div class="btn-toolbar">
<div class="btn-group"> <div class="btn-group">
@@ -118,7 +128,7 @@
<% @lvas.each do |lva| %> <% @lvas.each do |lva| %>
<%= (lva.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe %><%= link_to lva.name, lva %> | <%= (lva.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe %><%= link_to lva.name, lva %> |
<%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_lva_path(lva)%><br> <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_lva_path(lva)%><br>
<% end %> <% end %>
<div class="btn-toolbar"> <div class="btn-toolbar">
@@ -147,7 +157,7 @@
</div> </div>
</div> </div>
<div class="span3"> <div class="span3">
<%= link_to I18n.t("filter.reset"), studien_verwalten_path(:std_verw=>nil, :mg_verw=>nil, :m_verw=>nil, :lva_verw=>nil, :b_verw=>nil), :class=>"btn" %> <%= link_to I18n.t("filter.reset"), studien_verwalten_path(:std_verw=>nil, :mg_verw=>nil, :m_verw=>nil, :lva_verw=>nil, :b_verw=>nil), :class=>"btn" %>
<h2>Error Log</h2> <h2>Error Log</h2>
<ul> <ul>
<li><font color="red"><b>Red</b></font>: Error, Solve immediately</li> <li><font color="red"><b>Red</b></font>: Error, Solve immediately</li>
@@ -169,7 +179,7 @@
<% @beispiele.each do |b| %> <% @beispiele.each do |b| %>
<%= (b.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe %> <%= link_to b.name, b %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_beispiel_path(b)%> <%= (b.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe %> <%= link_to b.name, b %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_beispiel_path(b)%>
<% end %> <% end %>
<div class="btn-toolbar"> <div class="btn-toolbar">
<div class="btn-group"> <div class="btn-group">