andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
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-21 19:04:59 +02:00
parent a4538fa61a 24d21df84b
commit 6db4a40c59
13 changed files with 135 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/views/calendars/index.html.erb
View File

@@ -1,28 +1,28 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<%= render 'tabs' %>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<%= render 'tabs' %>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<h1><%= I18n.t 'calendars.calendar' %></h1>
<% @calendars.each do |calendar| %>
<div class="media">
<div class="row-fluid">
<div class="span12">
<h1><%= I18n.t 'calendars.calendar' %></h1>
<% @calendars.each do |calendar| %>
<div class="media">
<a class="pull-left" href="#">
<img class="media-object img-circle" src="<%= calendar.picture.thumb.url %>"/>
<img class="media-object img-circle" src="<%= calendar.picture.thumb.url %>"/>
</a>
<div class="media-body">
<h4><%= link_to calendar.name, calendar %></h4>
<h4><%= link_to calendar.name, calendar %></h4>
</div>
</div>
<% end %>
</div>
<% end %>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<%= link_to 'New Calendar', new_calendar_path unless cannot?(:new, Calendar) %>
</div>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<%= link_to 'New Calendar', new_calendar_path unless cannot?(:new, Calendar) %>
</div>
</div>
</div>

24
app/views/lecturers/_form.html.erb
View File

@@ -1,10 +1,28 @@
<%= semantic_form_for @lecturer do |f| %>
<%= f.inputs do %>
<div class="row-fluid">
<div class="span6">
<%= f.input :name %>
<%= f.input :email %>
<%= f.input :oid %>
<%= f.input :picture, :as=>:file %>
<%= f.input :lvas %>
<%= f.input :link %>
</div>
<div class="span3">
<p>
<label>Bild</label>
<%= image_tag(@lecturer.picture.thumb.url) unless @lecturer.picture.nil? %>
<%= f.file_field :picture %>
<%= f.hidden_field :picture_cache %>
</p>
<p>
<label>
<%= f.check_box :remove_picture %>
Bild Entfernen
</label>
</p>
</div>
<div class="span3">
<%= f.input :lvas, :as=>:check_boxes%>
</div>
<% end %>
<%= f.actions do %>

11
app/views/lecturers/_lec_lva.html.erb Normal file
View File

@@ -0,0 +1,11 @@
<div class="media">
<a class="pull-left" href="#">
<img class="media-object img" src="<%= lec_lva.picture.thumb.url %>"/>
</a>
<div class="media-body">
<h4><%= link_to lec_lva.name, lec_lva %></h4>
Email: <%= mail_to lec_lva.email %><br>
TISS: <%= link_to lec_lva.name, lec_lva.link %>
</div>
</div>

19
app/views/lvas/show.html.erb
View File

@@ -18,17 +18,11 @@
</div>
<div class="row-fluid">
<h2>Beispiele</h2>
<p><h4>Beschreibung</h4>
<%= @lva.desc %>
<%= link_to "Beispiel neu" , new_beispiel_path(:lva_id=>@lva.id) %>
</p>
<h4>Beispiele</h4>
<ul>
<% @lva.beispiele.each do |b|%>
<ul>
<% @lva.beispiele.each do |b|%>
<%= render b%>
<% end %>
<% end %>
</div>
</div>
<div class="span4">
@@ -53,6 +47,13 @@
<% end %>
</ul>
</div>
<div class="lva-sidebar">
<h2> <%= I18n.t "lecturers.lecturers" %> </h2>
<% @lva.lecturers.each do |lec| %>
<%= render :partial=>'lecturers/lec_lva', :object=>lec %>
<% end %>
</div>
</div>
</div>

9
app/views/studien/index.html.erb
View File

@@ -4,12 +4,15 @@
<h1><%= I18n.t("studien.list") %></h1>
<% @studien.sort_by{|z| z[:zahl]}.each do |studium| %>
<div class="span5">
<% @studien.each_slice(2) do |row| %>
<div class="row-fluid">
<% row.each do |studium|%>
<div class="span6">
<%= render studium%>
</div>
<% end %>
</div>
<%end%>
<br>

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

@@ -5,10 +5,10 @@
<h1><%= I18n.t("studien.verwaltung.title") %></h1>
<%= I18n.t("studien.verwaltung.explanation").html_safe %>
<h2>Studien </h2>
<h2><%= I18n.t "studien.studien"%> </h2>
<div class="verwalten-block">
<div class="row-fluid">
<% @studien.each_slice((Studium.count/2.0).ceil) do |col| %>
<% @studien.each_slice([(Studium.count/2.0).ceil, 1].max) do |col| %>
<div class="span6">
<% col.each do |s| %>
@@ -38,7 +38,7 @@
<h2>Vortragende </h2>
<div class="verwalten-block">
<div class="row-fluid">
<% @lecturers.each_slice((Lecturer.count/3.0).ceil) do |col| %>
<% @lecturers.each_slice([(Lecturer.count/3.0).ceil, 1].max) 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>
@@ -166,7 +166,7 @@
</ul>
<div class="verwalten-block">
<ul>
<% @messages.flatten.each do |m| %>
<% @messages.flatten.compact.each do |m| %>
<% if !m.strip.empty? %>
<li><%= m.html_safe %></li>
<% end %>