forked from bofh/fetsite
studium +picture new Layout
This commit is contained in:
@@ -27,13 +27,14 @@
|
||||
# created_at :datetime not null
|
||||
# updated_at :datetime not null
|
||||
class Studium < ActiveRecord::Base
|
||||
attr_accessible :desc, :name,:abkuerzung, :typ, :zahl, :semester
|
||||
attr_accessible :desc, :name,:abkuerzung, :typ, :zahl, :semester, :picture, :picture_cache
|
||||
has_many :modulgruppen, inverse_of: :studium, :class_name => "Modulgruppe", :dependent => :destroy
|
||||
has_many :semester, :dependent => :destroy
|
||||
validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$/}
|
||||
validates :typ, :inclusion => {:in => ["Bachelor","Master"] }
|
||||
validates :name, :uniqueness => true, :presence=>true
|
||||
validates :zahl, :presence=>true, :format=>{:with=>/^0(33|66)[0-9]{3}$/}, :uniqueness => true
|
||||
mount_uploader :picture, PictureUploader
|
||||
translates :desc,:shortdesc, :versioning =>true,:fallbacks_for_empty_translations => true
|
||||
def title_context
|
||||
return self.abkuerzung.to_s.strip.empty? ? self.name : self.abkuerzung
|
||||
|
||||
@@ -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 %>
|
||||
|
||||
@@ -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 %>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user