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

studium +picture new Layout

Browse Source
This commit is contained in:
Andreas Stephanides
2013-09-30 21:18:04 +02:00
parent 5c4bc925e6
commit 2c91a8db7e
4 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/studien/_form.html.erb
View File

@@ -15,6 +15,17 @@
<div class="row-fluid">
<%= f.input :desc, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%>
</div>
<div class="row-fluid">
<div class="span12">
<label>Bild</label>
<%= image_tag(@studium.picture.thumb.url) unless @studium.picture.nil? %>
<%= f.file_field :picture %>
<%= f.hidden_field :picture_cache %>
</div>
</div>
<% end %>
<%= tinymce %>

28
app/views/studien/_studium.html.erb
View File

@@ -1,14 +1,20 @@
<%= link_to studium_path(studium, :ansicht=>'semesteransicht') ,{:class=>"studium"} do %>
<%= link_to studium_path(studium, :ansicht=>'semesteransicht') ,{:class=>"linkbox"} do %>
<div class="media">
<div class="pull-left">
<%= image_tag studium.picture.thumb.url %>
</div>
<h2>
<%= studium.name + " " + studium.zahl.to_s %>
</h2>
<p>
<b><%= studium.typ%> </b>
</p>
<p><b><%=I18n.t("studien.desc")%>:</b><br>
<div class="media-body">
<h2>
<%= studium.name + " " + studium.zahl.to_s %>
</h2>
<p>
<b><%= studium.typ%> </b>
</p>
<p><b><%=I18n.t("studien.desc")%>:</b><br>
<%= !(studium.desc.to_s == "") ? studium.desc.html_safe : I18n.t("keine.beschreibung")%>
</p>
</p>
</div>
</div>
<% end %>

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

@@ -4,16 +4,15 @@
<h1><%= I18n.t("studien.list") %></h1>
<% @studien.each_slice(2) do |row| %>
<div class="row-fluid">
<% row.each do |studium|%>
<div class="span6">
<ul class="unstyled linkbox-list">
<% @studien.each do |studium|%>
<%= render studium%>
</div>
<% end %>
</div>
<%end%>
<% end %>
</ul>
<br>
</div>