From 56a0fda8f079528c2141bf6632c352c5681c1254 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Thu, 25 Jul 2013 17:36:57 +0200 Subject: [PATCH 1/3] uploader --- app/uploaders/beispieldatei_uploader.rb | 51 +++++++++++++++++++++++++ app/views/beispiele/_beispiel.html.erb | 1 + 2 files changed, 52 insertions(+) create mode 100644 app/uploaders/beispieldatei_uploader.rb create mode 100644 app/views/beispiele/_beispiel.html.erb diff --git a/app/uploaders/beispieldatei_uploader.rb b/app/uploaders/beispieldatei_uploader.rb new file mode 100644 index 0000000..86da81e --- /dev/null +++ b/app/uploaders/beispieldatei_uploader.rb @@ -0,0 +1,51 @@ +# encoding: utf-8 + +class BeispieldateiUploader < CarrierWave::Uploader::Base + + # Include RMagick or MiniMagick support: + # include CarrierWave::RMagick + # include CarrierWave::MiniMagick + + # Choose what kind of storage to use for this uploader: + storage :file + # storage :fog + + # Override the directory where uploaded files will be stored. + # This is a sensible default for uploaders that are meant to be mounted: + def store_dir + "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" + end + + # Provide a default URL as a default if there hasn't been a file uploaded: + # def default_url + # # For Rails 3.1+ asset pipeline compatibility: + # # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_')) + # + # "/images/fallback/" + [version_name, "default.png"].compact.join('_') + # end + + # Process files as they are uploaded: + # process :scale => [200, 300] + # + # def scale(width, height) + # # do something + # end + + # Create different versions of your uploaded files: + # version :thumb do + # process :scale => [50, 50] + # end + + # Add a white list of extensions which are allowed to be uploaded. + # For images you might use something like this: + # def extension_white_list + # %w(jpg jpeg gif png) + # end + + # Override the filename of the uploaded files: + # Avoid using model.id or version_name here, see uploader/store.rb for details. + # def filename + # "something.jpg" if original_filename + # end + +end diff --git a/app/views/beispiele/_beispiel.html.erb b/app/views/beispiele/_beispiel.html.erb new file mode 100644 index 0000000..d15d58c --- /dev/null +++ b/app/views/beispiele/_beispiel.html.erb @@ -0,0 +1 @@ +<%=link_to beispiel.name, beispiel.beispieldatei.url%> From b5173f00625e6d909b126f77caa20c17a77b5aeb Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Thu, 25 Jul 2013 17:39:51 +0200 Subject: [PATCH 2/3] gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index f66e129..864b11d 100755 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,8 @@ /log/*.log /tmp /config/initializers/devise.rb + +/console +/server +/public/uploads/ +*~ \ No newline at end of file From c6e75842537280e6d31832e51e9a40635d995ca5 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Thu, 25 Jul 2013 20:10:25 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Layout=20=C3=A4nderungen=20f=C3=BCr=20Modul?= =?UTF-8?q?=20und=20Modulgruppenindex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tabellenformatierung durch render-div kombination ersetzt, modul/lang- version für Modulanzeige mit Modulgruppen eingefügt --- app/views/modulgruppen/index.html.erb | 22 +----------------- app/views/moduls/_lang.html.erb | 32 ++++++++++++++++++++++++++ app/views/moduls/index.html.erb | 33 ++------------------------- 3 files changed, 35 insertions(+), 52 deletions(-) create mode 100755 app/views/moduls/_lang.html.erb diff --git a/app/views/modulgruppen/index.html.erb b/app/views/modulgruppen/index.html.erb index 871c406..fb37c87 100755 --- a/app/views/modulgruppen/index.html.erb +++ b/app/views/modulgruppen/index.html.erb @@ -1,29 +1,9 @@

<%= I18n.t("modulgruppe.show.title")%>

- - - - - - - - - - <% @modulgruppen.sort_by{|n| n[:name]}.each do |modulgruppe| %> - - - - - - - - - + <%= render modulgruppe%> <% end %> -
TypePhaseStudiumName
<%= modulgruppe.typ %><%= modulgruppe.phase %><%= modulgruppe.studium.name unless modulgruppe.studium.nil? %><%= modulgruppe.name %><%= link_to 'Show', modulgruppe %><%= link_to 'Edit', edit_modulgruppe_path(modulgruppe) %><%= link_to 'Destroy', modulgruppe, method: :delete, data: { confirm: 'Are you sure?' } %>
-
<% if !@studium.nil? %> <%= link_to 'New Modulgruppe', new_studium_modulgruppe_path(@studium) %> diff --git a/app/views/moduls/_lang.html.erb b/app/views/moduls/_lang.html.erb new file mode 100755 index 0000000..1dbb929 --- /dev/null +++ b/app/views/moduls/_lang.html.erb @@ -0,0 +1,32 @@ +

+ <%= +if modul.name.nil? +name="" +else +name=modul.name +end +link_to "Modul "+name , modul_path(modul) %> +

+

+ <%= raw(modul.desc) %> +

+LVAs: + +
    + +<% modul.lvas.each do |lv| %> +
  • +<%= link_to lv.name.to_s, lva_path(lv.id) %> +
    • +<% end %> + +
+ +Modulgruppen: +
    +<% modul.modulgruppen.each do |mg| %> +
  • <%=mg.name%> (<%= mg.studium.name unless mg.studium.nil?%>)
    • +<%end%> +
+<% # @toolbar_elements << {:icon=>:pencil,:text=>I18n.t("common.edit"),:path=> edit_modul_path(modul)} %> +
diff --git a/app/views/moduls/index.html.erb b/app/views/moduls/index.html.erb index 933d4a7..98ade7d 100755 --- a/app/views/moduls/index.html.erb +++ b/app/views/moduls/index.html.erb @@ -1,36 +1,7 @@ +

<%= I18n.t("modul.show.title") %>

- - - - - - - - - - -<% @moduls.sort_by{|n| n[:name]}.each do |modul| %> - - - - - - - - - -<% end %> -
Modulgruppe (Studium)NameDesc
- <%modul.modulgruppen.sort_by{|n| n[:name]}.each do |m|%> - - - <%=m.name unless m.nil? %> (<%=m.studium.name unless m.studium.nil? %>) - -
- <% end %> - - 		<%= modul.name %><%= modul.desc %><%= link_to 'Show', modul_path(modul) %><%= link_to 'Edit', edit_modul_path(modul) %><%= link_to 'Destroy', [modul], method: :delete, data: { confirm: 'Are you sure?' } %>
+<%= render :partial=>'moduls/lang', :collection=>@moduls, :as=>:modul%>
<% #if !@studium.nil? %>