diff --git a/app/assets/stylesheets/themes/2003/application.css.scss b/app/assets/stylesheets/themes/2003/application.css.scss index d45d70e..3583ed2 100755 --- a/app/assets/stylesheets/themes/2003/application.css.scss +++ b/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%); diff --git a/app/assets/stylesheets/themes/darkblue/application.css.scss b/app/assets/stylesheets/themes/darkblue/application.css.scss index 1cf6ef4..e623f4e 100755 --- a/app/assets/stylesheets/themes/darkblue/application.css.scss +++ b/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%); diff --git a/app/controllers/gremien_controller.rb b/app/controllers/gremien_controller.rb index c1c18d6..1f8da6a 100644 --- a/app/controllers/gremien_controller.rb +++ b/app/controllers/gremien_controller.rb @@ -94,7 +94,7 @@ class GremienController < ApplicationController @memberships<< Membership.new @memberships<< Membership.new render action: "edit", notice: 'gremium was successfully updated.' - + end } format.json { head :no_content } else diff --git a/app/models/thema.rb b/app/models/thema.rb index 2bfdeaf..9dbc511 100644 --- a/app/models/thema.rb +++ b/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?) diff --git a/app/views/beispiele/_form.html.erb b/app/views/beispiele/_form.html.erb index 8fd09ce..4424a41 100755 --- a/app/views/beispiele/_form.html.erb +++ b/app/views/beispiele/_form.html.erb @@ -21,7 +21,7 @@