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;

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

@@ -14,6 +14,7 @@
<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>

28
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,8 +27,8 @@
<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>
@@ -31,11 +37,15 @@
</div> </div>
<h2>Vortragende </h2> <h2>Vortragende </h2>
<div class="verwalten-block"> <div class="verwalten-block">
<div class="row-fluid">
<% @lecturers.each do |lec| %> <% @lecturers.each_slice((Lecturer.count/3.0).ceil) do |col| %>
<%= (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)%> || <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 %> <% 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="#">
@@ -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">