diff --git a/app/assets/stylesheets/themes/blue2/application.css.scss b/app/assets/stylesheets/themes/blue2/application.css.scss index 18fdadb..1db0ed0 100755 --- a/app/assets/stylesheets/themes/blue2/application.css.scss +++ b/app/assets/stylesheets/themes/blue2/application.css.scss @@ -14,6 +14,7 @@ *= require jquery.fileupload-ui *= require jquery.datetimepicker *= require jquery.ui.dialog + *= require jquery.ui.tabs * require 'bootstrap' * require 'neuigkeiten' @@ -77,9 +78,9 @@ $sansFontFamily: Helvetica, Arial; div.header { display: block; -// backgro und: url('../../../../header1.png') no-repeat; -// background-color:white;// $color_prim; - // background-position: right; + // background: url('../../../../header1.png') no-repeat; + // background-color:white;// $color_prim; + // background-position: right; vertical-align:middle; float:left; color:#000; diff --git a/app/controllers/lvas_controller.rb b/app/controllers/lvas_controller.rb index ac8b380..760d3e4 100755 --- a/app/controllers/lvas_controller.rb +++ b/app/controllers/lvas_controller.rb @@ -47,6 +47,7 @@ class LvasController < ApplicationController def show @lva = Lva.find_by_id(params[:id]) @beispiel=Beispiel.new + @beispiele_all=@lva.beispiele.order(:datum).accessible_by(current_ability, :show) @beispiele = @lva.beispiele.not_flag_badquality.not_flag_delete.order(:datum).accessible_by(current_ability, :show) @beispiele_badQ = @lva.beispiele.flag_badquality.not_flag_delete.order(:datum).accessible_by(current_ability, :show) @beispiele_deleted = @lva.beispiele.flag_delete.order(:datum).accessible_by(current_ability, :show) diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb index 644c8d8..4bc6e79 100755 --- a/app/views/lvas/show.html.erb +++ b/app/views/lvas/show.html.erb @@ -85,7 +85,7 @@
<%= I18n.t("lva.ratebsp")%> <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_omniauth_authorize_path(:facebook) ,class: :linkbox %>
<%= link_to t("beispiel.zip") , beispiel_sammlung_lva_path(@lva), class: :linkbox %> - <% @lva.beispiele.order(:datum).each do |b| %> + <% @beispiele_all.each do |b| %> <% cache("beispiel_" +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + b.updated_at.try(:utc).try(:to_s)) do %> <%= render b%> <% end %> diff --git a/app/views/themes/blue2/lvas/show.html.erb b/app/views/themes/blue2/lvas/show.html.erb index d5710ba..cd7efcb 100755 --- a/app/views/themes/blue2/lvas/show.html.erb +++ b/app/views/themes/blue2/lvas/show.html.erb @@ -92,18 +92,22 @@ <%= render b%> <% end %> <% end %> + <% if @beispiele_badQ.count > 0 %>