diff options
| author | hukl <contact@smyck.org> | 2012-02-18 22:02:12 +0100 |
|---|---|---|
| committer | hukl <contact@smyck.org> | 2012-02-18 22:02:12 +0100 |
| commit | 99579f95be6deb2d2e4b7de1ba42f082971906b9 (patch) | |
| tree | 942b20cafcf7aeb6fffccf14115f461c99010017 | |
| parent | 16ffafb4ebbc7118b50a09205666ffafda05ad6b (diff) | |
show number of gallery images if more than one
| -rw-r--r-- | app/views/content/_headline_image.html.erb | 6 | ||||
| -rw-r--r-- | config/locales/de.yml | 20 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | public/stylesheets/ccc.css | 4 |
4 files changed, 21 insertions, 10 deletions
diff --git a/app/views/content/_headline_image.html.erb b/app/views/content/_headline_image.html.erb index ac2e86a..71a4cb3 100644 --- a/app/views/content/_headline_image.html.erb +++ b/app/views/content/_headline_image.html.erb | |||
| @@ -3,6 +3,12 @@ | |||
| 3 | ("galleries/" + @page.node.unique_name) | 3 | ("galleries/" + @page.node.unique_name) |
| 4 | ) %> | 4 | ) %> |
| 5 | 5 | ||
| 6 | <% if 1 < @images.length %> | ||
| 7 | <div class="right"> | ||
| 8 | <%= "#{@images.length} #{t(:images)}" %> | ||
| 9 | </div> | ||
| 10 | <% end %> | ||
| 11 | |||
| 6 | <div class="shadowbox_images" style="display: none"> | 12 | <div class="shadowbox_images" style="display: none"> |
| 7 | <% @images.each do |image| %> | 13 | <% @images.each do |image| %> |
| 8 | <%= link_to "hallo", image.upload.url, :class => "shadowbox_image" %> | 14 | <%= link_to "hallo", image.upload.url, :class => "shadowbox_image" %> |
diff --git a/config/locales/de.yml b/config/locales/de.yml index 7196120..2724b11 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | # German translations for Ruby on Rails | 1 | # German translations for Ruby on Rails |
| 2 | # by Clemens Kofler (clemens@railway.at) | 2 | # by Clemens Kofler (clemens@railway.at) |
| 3 | 3 | ||
| 4 | de: | 4 | de: |
| 5 | images: Bilder | ||
| 5 | sponsors: Sponsoren | 6 | sponsors: Sponsoren |
| 6 | show_tag_headline: "Seiten mit dem Tag:" | 7 | show_tag_headline: "Seiten mit dem Tag:" |
| 7 | old_ccc_de: das alte ccc.de | 8 | old_ccc_de: das alte ccc.de |
| @@ -17,7 +18,7 @@ de: | |||
| 17 | month_names: [~, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember] | 18 | month_names: [~, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember] |
| 18 | abbr_month_names: [~, Jan, Feb, Mär, Apr, Mai, Jun, Jul, Aug, Sep, Okt, Nov, Dez] | 19 | abbr_month_names: [~, Jan, Feb, Mär, Apr, Mai, Jun, Jul, Aug, Sep, Okt, Nov, Dez] |
| 19 | order: [ :day, :month, :year ] | 20 | order: [ :day, :month, :year ] |
| 20 | 21 | ||
| 21 | time: | 22 | time: |
| 22 | formats: | 23 | formats: |
| 23 | default: "%A, %e. %B %Y, %H:%M Uhr" | 24 | default: "%A, %e. %B %Y, %H:%M Uhr" |
| @@ -27,7 +28,7 @@ de: | |||
| 27 | 28 | ||
| 28 | am: "vormittags" | 29 | am: "vormittags" |
| 29 | pm: "nachmittags" | 30 | pm: "nachmittags" |
| 30 | 31 | ||
| 31 | datetime: | 32 | datetime: |
| 32 | distance_in_words: | 33 | distance_in_words: |
| 33 | half_a_minute: 'eine halbe Minute' | 34 | half_a_minute: 'eine halbe Minute' |
| @@ -63,7 +64,7 @@ de: | |||
| 63 | over_x_years: | 64 | over_x_years: |
| 64 | one: 'mehr als 1 Jahr' | 65 | one: 'mehr als 1 Jahr' |
| 65 | other: 'mehr als {{count}} Jahre' | 66 | other: 'mehr als {{count}} Jahre' |
| 66 | 67 | ||
| 67 | number: | 68 | number: |
| 68 | format: | 69 | format: |
| 69 | precision: 2 | 70 | precision: 2 |
| @@ -73,9 +74,9 @@ de: | |||
| 73 | format: | 74 | format: |
| 74 | unit: '€' | 75 | unit: '€' |
| 75 | format: '%n%u' | 76 | format: '%n%u' |
| 76 | separator: | 77 | separator: |
| 77 | delimiter: | 78 | delimiter: |
| 78 | precision: | 79 | precision: |
| 79 | percentage: | 80 | percentage: |
| 80 | format: | 81 | format: |
| 81 | delimiter: "" | 82 | delimiter: "" |
| @@ -91,11 +92,11 @@ de: | |||
| 91 | array: | 92 | array: |
| 92 | sentence_connector: "und" | 93 | sentence_connector: "und" |
| 93 | skip_last_comma: true | 94 | skip_last_comma: true |
| 94 | 95 | ||
| 95 | activerecord: | 96 | activerecord: |
| 96 | errors: | 97 | errors: |
| 97 | template: | 98 | template: |
| 98 | header: | 99 | header: |
| 99 | one: 1 error prohibited this {{model}} from being saved | 100 | one: 1 error prohibited this {{model}} from being saved |
| 100 | other: "{{count}} errors prohibited this {{model}} from being saved" | 101 | other: "{{count}} errors prohibited this {{model}} from being saved" |
| 101 | body: "There were problems with the following fields:" | 102 | body: "There were problems with the following fields:" |
| @@ -120,4 +121,3 @@ de: | |||
| 120 | less_than_or_equal_to: "must be less than or equal to {{count}}" | 121 | less_than_or_equal_to: "must be less than or equal to {{count}}" |
| 121 | odd: "must be odd" | 122 | odd: "must be odd" |
| 122 | even: "must be even" | 123 | even: "must be even" |
| 123 | \ No newline at end of file | ||
diff --git a/config/locales/en.yml b/config/locales/en.yml index e68cead..a565ffe 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. | 2 | # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. |
| 3 | 3 | ||
| 4 | en: | 4 | en: |
| 5 | images: images | ||
| 5 | sponsors: sponsors | 6 | sponsors: sponsors |
| 6 | hello: "Hello world" | 7 | hello: "Hello world" |
| 7 | show_tag_headline: "Pages tagged with:" | 8 | show_tag_headline: "Pages tagged with:" |
diff --git a/public/stylesheets/ccc.css b/public/stylesheets/ccc.css index 770c817..a78d3eb 100644 --- a/public/stylesheets/ccc.css +++ b/public/stylesheets/ccc.css | |||
| @@ -29,6 +29,10 @@ pre { | |||
| 29 | overflow: auto; | 29 | overflow: auto; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | .right { | ||
| 33 | text-align: right; | ||
| 34 | } | ||
| 35 | |||
| 32 | /*------------------links-------------------*/ | 36 | /*------------------links-------------------*/ |
| 33 | 37 | ||
| 34 | a { | 38 | a { |
