Merge branch 'master' of http://github.com/fetsite/fetsite

app/assets/stylesheets/themes/2003/application.css.scss

@@ -17,6 +17,19 @@
  * require 'neuigkeiten'
  */
 // Colorshema #0A64A4
+$color_schema_1: #006599;
+$color_schema_2: #630CE8;
+$color_schema_3: #FF0021;
+$color_schema_4: #E8820C;
+$color_schema_5: #FFF30D;
+
+$color_schema_1_dark: darken($color_schema_1, 10%);
+$color_schema_2_dark: darken($color_schema_2, 10%);
+$color_schema_3_dark: darken($color_schema_3, 10%);
+$color_schema_4_dark: darken($color_schema_4, 10%);
+$color_schema_5_dark: darken($color_schema_5, 10%);
+
+
 $color_prim: #7070a0;
 $color_prim_light: lighten($color_prim ,10%);
 $color_prim_vlight: lighten($color_prim ,30%);

app/assets/stylesheets/themes/darkblue/application.css.scss

@@ -16,6 +16,18 @@
 
  * require 'neuigkeiten'
  */
+$color_schema_1: #006599;
+$color_schema_2: #630CE8;
+$color_schema_3: #FF0021;
+$color_schema_4: #E8820C;
+$color_schema_5: #FFF30D;
+
+$color_schema_1_dark: darken($color_schema_1, 10%);
+$color_schema_2_dark: darken($color_schema_2, 10%);
+$color_schema_3_dark: darken($color_schema_3, 10%);
+$color_schema_4_dark: darken($color_schema_4, 10%);
+$color_schema_5_dark: darken($color_schema_5, 10%);
+
 // Colorshema #0A64A4
 $color_prim: #071672;
 $color_prim_light: lighten($color_prim ,10%);

app/models/thema.rb

@@ -27,7 +27,11 @@ include Rails.application.routes.url_helpers
 }
   translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true
   def is_outdated?
+   unless translation.try(:updated_at).nil?
     translation.updated_at < 2.month.ago
+   else
+     true
+   end
   end
   def is_wiki?
      !(wikiname.nil? || wikiname.empty?)

app/views/beispiele/_form.html.erb

@@ -21,7 +21,7 @@
 
     </div>
     <div class="span4">
-        <%= f.input :lva, :as=>:radio, :collection => Lva.all%>
+        <%= f.input :lva, :as=>:radio, :collection => Lva.all %>
       </div>
 </div>
 

app/views/home/_beispiele.html.erb

@@ -10,7 +10,7 @@
   <ul class="unstyled linkbox-list">
     <% @beispiele.each do |b| %>
     <li>
-      <%= link_to b, {:class=> :linkbox} do %>
+      <%= link_to b.lva, {:class=> :linkbox} do %>
       <div class="row-fluid">
 	<div class="span8">
 	  <b><%=b.name%></b> (<%=b.lva.full_name%>)

app/views/themengruppen/show.html.erb

@@ -31,7 +31,7 @@
 	  
 	  <% thema.nlinks.each do |l| %> 
 	  <li>
-	    <%= render l.neuigkeit %>
+	    <%= render l.neuigkeit if can? :show, l.neuigkeit%>
 	  </li>
 	  <% end %>