diff --git a/app/models/studium.rb b/app/models/studium.rb index af783be..8fdff0c 100755 --- a/app/models/studium.rb +++ b/app/models/studium.rb @@ -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 diff --git a/app/views/studien/_form.html.erb b/app/views/studien/_form.html.erb index 6cdb5c2..bd49e55 100755 --- a/app/views/studien/_form.html.erb +++ b/app/views/studien/_form.html.erb @@ -15,6 +15,17 @@
<%= f.input :desc, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%>
+
+
+ + + <%= image_tag(@studium.picture.thumb.url) unless @studium.picture.nil? %> + <%= f.file_field :picture %> + <%= f.hidden_field :picture_cache %> + + +
+
<% end %> <%= tinymce %> diff --git a/app/views/studien/_studium.html.erb b/app/views/studien/_studium.html.erb index 3d5fb77..55b545d 100644 --- a/app/views/studien/_studium.html.erb +++ b/app/views/studien/_studium.html.erb @@ -1,14 +1,20 @@ - <%= link_to studium_path(studium, :ansicht=>'semesteransicht') ,{:class=>"studium"} do %> +<%= link_to studium_path(studium, :ansicht=>'semesteransicht') ,{:class=>"linkbox"} do %> +
+
+ <%= image_tag studium.picture.thumb.url %> +
-

- <%= studium.name + " " + studium.zahl.to_s %> -

-

- <%= studium.typ%> -

-

<%=I18n.t("studien.desc")%>:
+

+

+ <%= studium.name + " " + studium.zahl.to_s %> +

+

+ <%= studium.typ%> +

+

<%=I18n.t("studien.desc")%>:
<%= !(studium.desc.to_s == "") ? studium.desc.html_safe : I18n.t("keine.beschreibung")%> -

- - +

+ +
+
<% end %> diff --git a/app/views/studien/index.html.erb b/app/views/studien/index.html.erb index 23459f3..9bd4b5c 100755 --- a/app/views/studien/index.html.erb +++ b/app/views/studien/index.html.erb @@ -4,16 +4,15 @@

<%= I18n.t("studien.list") %>

- <% @studien.each_slice(2) do |row| %> -
- <% row.each do |studium|%> -
+ +
- <% end %> -
- <%end%> - + + + <% end %> +