Merge pull request #1 from erdgeist/deployed-state

Deployed state

7 files changed, 33 insertions, 20 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 @@
   ("galleries/" + @page.node.unique_name)
 ) %>
 
+<% if 1 < @images.length %>
+  <div class="right">
+    <%= "#{@images.length} #{t(:images)}" %>
+  </div>
+<% end %>
+
 <div class="shadowbox_images" style="display: none">
   <% @images.each do |image| %>
     <%= link_to "hallo", image.upload.url, :class => "shadowbox_image" %>
diff --git a/app/views/custom/partials/_article.html.erb b/app/views/custom/partials/_article.html.erb
index 4f772ae..433c31c 100644
--- a/app/views/custom/partials/_article.html.erb
+++ b/app/views/custom/partials/_article.html.erb
@@ -3,5 +3,5 @@
   <div class="author_and_date">
     <%= date_for_page page %>, <%= author_for_page page %>
   </div>
-  <p class="excerpt"><%= page.abstract %></p>
+  <p class="excerpt"><%= page.abstract %> <%= link_to_path t(:more), page.node.unique_name %></p>
 </div>
\ No newline at end of file
diff --git a/app/views/search/_search_result.html.erb b/app/views/search/_search_result.html.erb
index b480f89..14898a2 100644
--- a/app/views/search/_search_result.html.erb
+++ b/app/views/search/_search_result.html.erb
@@ -1,4 +1,6 @@
+<% if node.head %>
 <div class="article_partial">
-  <h2 class="headline"><%= link_to node.head.title, content_path(node.unique_path) %></h2>
-  <p class="excerpt"><%= node.head.abstract %></p>
-</div>
\ No newline at end of file
+    <h2 class="headline"><%= link_to node.head.title, content_path(node.unique_path) %></h2>
+    <p class="excerpt"><%= node.head.abstract %></p>
+</div>
+<% end %>
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7196120..2663948 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1,7 +1,9 @@
-# German translations for Ruby on Rails 
+# German translations for Ruby on Rails
 # by Clemens Kofler (clemens@railway.at)
 
 de:
+  more: "mehr …"
+  images: Bilder
   sponsors: Sponsoren
   show_tag_headline: "Seiten mit dem Tag:"
   old_ccc_de: das alte ccc.de
@@ -17,7 +19,7 @@ de:
     month_names: [~, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember]
     abbr_month_names: [~, Jan, Feb, Mär, Apr, Mai, Jun, Jul, Aug, Sep, Okt, Nov, Dez]
     order: [ :day, :month, :year ]
-  
+
   time:
     formats:
       default: "%A, %e. %B %Y, %H:%M Uhr"
@@ -27,7 +29,7 @@ de:
 
     am: "vormittags"
     pm: "nachmittags"
-      
+
   datetime:
     distance_in_words:
       half_a_minute: 'eine halbe Minute'
@@ -63,7 +65,7 @@ de:
       over_x_years:
         one: 'mehr als 1 Jahr'
         other: 'mehr als {{count}} Jahre'
-      
+
   number:
     format:
       precision: 2
@@ -73,9 +75,9 @@ de:
       format:
         unit: '€'
         format: '%n%u'
-        separator: 
-        delimiter: 
-        precision: 
+        separator:
+        delimiter:
+        precision:
     percentage:
       format:
         delimiter: ""
@@ -91,11 +93,11 @@ de:
     array:
       sentence_connector: "und"
       skip_last_comma: true
-        
+
   activerecord:
     errors:
       template:
-        header: 
+        header:
           one: 1 error prohibited this {{model}} from being saved
           other: "{{count}} errors prohibited this {{model}} from being saved"
         body: "There were problems with the following fields:"
@@ -120,4 +122,3 @@ de:
         less_than_or_equal_to: "must be less than or equal to {{count}}"
         odd: "must be odd"
         even: "must be even"
-        
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e68cead..81fa48e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2,6 +2,8 @@
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
+  more: "more …"
+  images: images
   sponsors: sponsors
   hello: "Hello world"
   show_tag_headline: "Pages tagged with:"
diff --git a/public/images/events.png b/public/images/events.png
index b7faae3..31b8dee 100644
--- a/public/images/events.png
+++ b/public/images/events.png
diff --git a/public/stylesheets/ccc.css b/public/stylesheets/ccc.css
index 770c817..c58e3ae 100644
--- a/public/stylesheets/ccc.css
+++ b/public/stylesheets/ccc.css
@@ -29,19 +29,23 @@ pre {
   overflow: auto;
 }
 
+.right {
+  text-align: right;
+}
+
 /*------------------links-------------------*/
 
 a {
-  color: #535353;
-  text-decoration: underline;
+  color: #F8921E;
+  text-decoration: none;
 }
 
 a:visited {
-  color: #535353;
+  color: #5b8ca7;
 }
 
 a:hover {
-  color: #F8921E;
+  color: #5b8ca7;
 }
 
 /*------------------headlines-------------------*/
@@ -106,13 +110,11 @@ div.main_navigation a.inactive:hover {
 div.main_navigation a.active {
   color: #000000;
   text-decoration: none;
-  text-transform: lowercase;
   font-size: 13px;
 }
 
 div.main_navigation a.inactive {
   color: #aeadad;
-  text-transform: lowercase;
   font-size: 13px;
 }