forked from bofh/fetsite
error fixes
This commit is contained in:
@@ -17,6 +17,19 @@
|
|||||||
* require 'neuigkeiten'
|
* require 'neuigkeiten'
|
||||||
*/
|
*/
|
||||||
// Colorshema #0A64A4
|
// 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: #7070a0;
|
||||||
$color_prim_light: lighten($color_prim ,10%);
|
$color_prim_light: lighten($color_prim ,10%);
|
||||||
$color_prim_vlight: lighten($color_prim ,30%);
|
$color_prim_vlight: lighten($color_prim ,30%);
|
||||||
|
|||||||
@@ -16,6 +16,18 @@
|
|||||||
|
|
||||||
* require 'neuigkeiten'
|
* 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
|
// Colorshema #0A64A4
|
||||||
$color_prim: #071672;
|
$color_prim: #071672;
|
||||||
$color_prim_light: lighten($color_prim ,10%);
|
$color_prim_light: lighten($color_prim ,10%);
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ class GremienController < ApplicationController
|
|||||||
@memberships<< Membership.new
|
@memberships<< Membership.new
|
||||||
@memberships<< Membership.new
|
@memberships<< Membership.new
|
||||||
render action: "edit", notice: 'gremium was successfully updated.'
|
render action: "edit", notice: 'gremium was successfully updated.'
|
||||||
|
end
|
||||||
}
|
}
|
||||||
format.json { head :no_content }
|
format.json { head :no_content }
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -27,7 +27,11 @@ include Rails.application.routes.url_helpers
|
|||||||
}
|
}
|
||||||
translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true
|
translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true
|
||||||
def is_outdated?
|
def is_outdated?
|
||||||
|
unless translation.try(:updated_at).nil?
|
||||||
translation.updated_at < 2.month.ago
|
translation.updated_at < 2.month.ago
|
||||||
|
else
|
||||||
|
true
|
||||||
|
end
|
||||||
end
|
end
|
||||||
def is_wiki?
|
def is_wiki?
|
||||||
!(wikiname.nil? || wikiname.empty?)
|
!(wikiname.nil? || wikiname.empty?)
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<ul class="unstyled linkbox-list">
|
<ul class="unstyled linkbox-list">
|
||||||
<% @beispiele.each do |b| %>
|
<% @beispiele.each do |b| %>
|
||||||
<li>
|
<li>
|
||||||
<%= link_to b, {:class=> :linkbox} do %>
|
<%= link_to b.lva, {:class=> :linkbox} do %>
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span8">
|
<div class="span8">
|
||||||
<b><%=b.name%></b> (<%=b.lva.full_name%>)
|
<b><%=b.name%></b> (<%=b.lva.full_name%>)
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
<% thema.nlinks.each do |l| %>
|
<% thema.nlinks.each do |l| %>
|
||||||
<li>
|
<li>
|
||||||
<%= render l.neuigkeit %>
|
<%= render l.neuigkeit if can? :show, l.neuigkeit%>
|
||||||
</li>
|
</li>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user