diff --git a/app/controllers/beispiele_controller.rb b/app/controllers/beispiele_controller.rb index ef93f78..d1bf706 100755 --- a/app/controllers/beispiele_controller.rb +++ b/app/controllers/beispiele_controller.rb @@ -16,11 +16,7 @@ class BeispieleController < ApplicationController def show # @lva = params([:lva]) unless params([:lva]).nil? @beispiel = Beispiel.find(params[:id]) - - respond_to do |format| - format.html # show.html.erb - format.json { render json: @beispiel } - end +redirect_to @beispiel.lva end # GET /beispiele/new diff --git a/app/controllers/themen_controller.rb b/app/controllers/themen_controller.rb index 520f2be..2f5fa51 100644 --- a/app/controllers/themen_controller.rb +++ b/app/controllers/themen_controller.rb @@ -16,7 +16,7 @@ class ThemenController < ApplicationController # GET /themen/1.json def show @thema = Thema.find(params[:id]) - redirect_to :controller=>'themengruppen', :id=>@thema.themengruppe.id, :action=>:show, :anchor=> params[:id].to_s + redirect_to :controller=>'themengruppen', :id=>@thema.themengruppe.id, :action=>:show, :anchor=> "thema_"+params[:id].to_s @fragen=@thema.fragen @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>"Verwalten", :path=>verwalten_thema_path(@thema)}] diff --git a/app/views/beispiele/show.html.erb b/app/views/beispiele/show.html.erb deleted file mode 100755 index 49501a7..0000000 --- a/app/views/beispiele/show.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -

<%= notice %>

- -

- Name: - <%= @beispiel.name %> -

- -

- Desc: - <%= @beispiel.desc %> - <%= @beispiel.beispieldatei.url %> -

-

- <%= @beispiel.lva.name %> -

- -<%= link_to 'Edit', edit_beispiel_path(@beispiel) %> | -<%= link_to 'Back', beispiele_path %> diff --git a/app/views/gremien/show.html.erb b/app/views/gremien/show.html.erb index 21482e5..5880e93 100644 --- a/app/views/gremien/show.html.erb +++ b/app/views/gremien/show.html.erb @@ -13,7 +13,7 @@ <% unless @gremium.thema.nil? %>

<%= link_to thema_path(@gremium.thema) do%> -<%= fa_icon "book 2x" %> Mehr über <%=@gremium.fall4 %> erfahren +<%= fa_icon "book 2x border" %> Mehr über <%=@gremium.fall4 %> erfahren <% end %>

<% end %> diff --git a/app/views/home/search.html.erb b/app/views/home/search.html.erb index f0a0f2f..e45c142 100644 --- a/app/views/home/search.html.erb +++ b/app/views/home/search.html.erb @@ -1,6 +1,6 @@
-<%= semantic_form_for :search,:remote=>true, :url=>search_home_index_path, :html=>{:id=>"search_form", :method=>'get'} do |f| %> -<%= f.input :query, :input_html => { :name => 'query' } , :label=>false %> +<%= semantic_form_for :search,:remote=>true, :url=>search_home_index_path, :html=>{:id=>"search_form",:class=>"navbar-search", :method=>'get'} do |f| %> +<%= f.input :query, :input_html => { :name => 'query' } , :label=>false, :class=>"search-query" %> <% end %>