From 0e12cec427f453934bf7289dd966a681771ccda5 Mon Sep 17 00:00:00 2001 From: HausdorffHimself Date: Tue, 10 Sep 2013 01:55:47 +0200 Subject: [PATCH 1/6] CHANGE: New visualisation of Gallery --- app/assets/images/no_image_128.png | Bin 0 -> 2298 bytes app/assets/images/no_image_64.png | Bin 0 -> 1094 bytes app/assets/stylesheets/galleries.css.scss | 14 +++++- app/models/gallery.rb | 1 + app/views/galleries/index.html.erb | 51 +++++++++++++--------- config/locales/galleries.de.yml | 5 +++ config/locales/galleries.en.yml | 5 +++ 7 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 app/assets/images/no_image_128.png create mode 100644 app/assets/images/no_image_64.png create mode 100644 config/locales/galleries.de.yml create mode 100644 config/locales/galleries.en.yml diff --git a/app/assets/images/no_image_128.png b/app/assets/images/no_image_128.png new file mode 100644 index 0000000000000000000000000000000000000000..80446e2424d4fa50c00d4d7298c1c051cfb54a20 GIT binary patch literal 2298 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 I18n.t('fotos.galleries')%> - <%= %>
-
-
- <% @galleries.each do |gallery| %> - <%= link_to gallery do %> -
-
- <%= image_tag gallery.fotos.first.datei.big_thumb.url %> -
-
-

<%= gallery.datum %> - <%= gallery.name %>

-

<%= gallery.desc %> -

-
-
- <% end %> - - <% end %> -
+ <% @galleries.each_slice(2) do |row| %> +
+ <% row.each do |gallery| %> +
+ <%= link_to gallery, :class => 'gallery-block' do %> +
+
+ <%= if(gallery.fotos.empty?) + image_tag "no_image_128.png" + else + image_tag gallery.fotos.sample.datei.big_thumb.url + end %>
-
+ <%= gallery.fotos.size.to_s + " " + I18n.t('fotos.bilder')%> + <%=I18n.l(gallery.try(:datum).try(:to_date)) unless gallery.try(:datum).try(:to_date).nil? %>
+

<%= gallery.name %>

+

+ <%= if gallery.desc.split.size > Gallery::WORD_COUNT + gallery.desc.split[0..Gallery::WORD_COUNT].join(" ") + " ..." + else + gallery.desc + end%> +

+
+
+ <% end %> +
+ <% end %> +
+ <% end %> +
<%= link_to I18n.t('fotos.new-gallery'), new_gallery_path %> diff --git a/config/locales/galleries.de.yml b/config/locales/galleries.de.yml new file mode 100644 index 0000000..4b0bf4f --- /dev/null +++ b/config/locales/galleries.de.yml @@ -0,0 +1,5 @@ +de: + fotos: + galleries: "Bildergalerien" + new-gallery: "neue Galerie" + bilder: "Bilder" \ No newline at end of file diff --git a/config/locales/galleries.en.yml b/config/locales/galleries.en.yml new file mode 100644 index 0000000..a2316ba --- /dev/null +++ b/config/locales/galleries.en.yml @@ -0,0 +1,5 @@ +en: + fotos: + galleries: "Picture Gallery" + new-gallery: "new gallery" + bilder: "pictures" \ No newline at end of file From 4a6a111fd98187ef6ce2e48ebf7a8860231e9b49 Mon Sep 17 00:00:00 2001 From: HausdorffHimself Date: Tue, 10 Sep 2013 01:58:40 +0200 Subject: [PATCH 2/6] FIX: Unused div --- app/views/galleries/index.html.erb | 58 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/app/views/galleries/index.html.erb b/app/views/galleries/index.html.erb index fac0d89..fe5a107 100644 --- a/app/views/galleries/index.html.erb +++ b/app/views/galleries/index.html.erb @@ -1,37 +1,35 @@

<%= I18n.t('fotos.galleries')%>

-
- <% @galleries.each_slice(2) do |row| %> -
- <% row.each do |gallery| %> -
- <%= link_to gallery, :class => 'gallery-block' do %> -
-
- <%= if(gallery.fotos.empty?) - image_tag "no_image_128.png" - else - image_tag gallery.fotos.sample.datei.big_thumb.url - end %> -
-
- <%= gallery.fotos.size.to_s + " " + I18n.t('fotos.bilder')%> - <%=I18n.l(gallery.try(:datum).try(:to_date)) unless gallery.try(:datum).try(:to_date).nil? %>
-

<%= gallery.name %>

-

- <%= if gallery.desc.split.size > Gallery::WORD_COUNT - gallery.desc.split[0..Gallery::WORD_COUNT].join(" ") + " ..." +<% @galleries.each_slice(2) do |row| %> +

+ <% row.each do |gallery| %> +
+ <%= link_to gallery, :class => 'gallery-block' do %> +
+
+ <%= if(gallery.fotos.empty?) + image_tag "no_image_128.png" else - gallery.desc - end%> -

-
+ image_tag gallery.fotos.sample.datei.big_thumb.url + end %>
- <% end %> -
- <% end %> -
- <% end %> +
+ <%= gallery.fotos.size.to_s + " " + I18n.t('fotos.bilder')%> + <%=I18n.l(gallery.try(:datum).try(:to_date)) unless gallery.try(:datum).try(:to_date).nil? %>
+

<%= gallery.name %>

+

+ <%= if gallery.desc.split.size > Gallery::WORD_COUNT + gallery.desc.split[0..Gallery::WORD_COUNT].join(" ") + " ..." + else + gallery.desc + end%> +

+
+
+ <% end %> +
+ <% end %>
+<% end %>
<%= link_to I18n.t('fotos.new-gallery'), new_gallery_path %> From e1d730fd044603773f369826124ceb21e0c9c760 Mon Sep 17 00:00:00 2001 From: HausdorffHimself Date: Tue, 10 Sep 2013 02:12:14 +0200 Subject: [PATCH 3/6] CHANGE: galleries -> show --- app/views/galleries/show.html.erb | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb index f1d45b9..400798a 100644 --- a/app/views/galleries/show.html.erb +++ b/app/views/galleries/show.html.erb @@ -1,18 +1,17 @@

<%= notice %>

- <%= @gallery.datum %> + <%= @gallery.fotos.size.to_s + " " + I18n.t('fotos.bilder')%> + <%=I18n.l(@gallery.try(:datum).try(:to_date)) unless @gallery.try(:datum).try(:to_date).nil? %>

<%= @gallery.name %>

-
+

<%= @gallery.desc %>

- - - +