From caebc366447aa4b239f9ca79c0b1c50068215534 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Wed, 23 Jul 2014 22:57:14 +0530 Subject: [PATCH] contact page new --- app/controllers/config_controller.rb | 2 + app/controllers/home_controller.rb | 7 +++ app/controllers/lvas_controller.rb | 11 ++++- app/controllers/neuigkeiten_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/views/home/admin.html.erb | 8 ++++ app/views/home/kontakt.html.erb | 14 +++--- app/views/themengruppen/show.html.erb | 16 +++---- app/views/themes/blue1/home/index.html.erb | 21 +++++---- .../white_1/themengruppen/show.html.erb | 47 +++++++++++-------- config/routes.rb | 4 +- 11 files changed, 87 insertions(+), 47 deletions(-) diff --git a/app/controllers/config_controller.rb b/app/controllers/config_controller.rb index 5caffd0..53cb795 100755 --- a/app/controllers/config_controller.rb +++ b/app/controllers/config_controller.rb @@ -4,4 +4,6 @@ class ConfigController < ApplicationController end + def choose_contact_topics + end end diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 516cabb..df28c51 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -8,6 +8,8 @@ class HomeController < ApplicationController end def kontakt + t=YAML.load_file("#{::Rails.root.to_s}/config/contact_topic.yml") + @themen = Thema.where(:id=>t) end def intern authorize! :seeintern, User @@ -51,4 +53,9 @@ class HomeController < ApplicationController format.js end end + def choose_contact_topics +File.open("config/contact_topic.yml",'w'){|f| f.write(params[:themen].to_yaml)} + redirect_to admin_home_index_path + end + end diff --git a/app/controllers/lvas_controller.rb b/app/controllers/lvas_controller.rb index 5423e28..ee2732c 100755 --- a/app/controllers/lvas_controller.rb +++ b/app/controllers/lvas_controller.rb @@ -1,7 +1,7 @@ class LvasController < ApplicationController # GET /lvas require 'zip' - before_filter :load_toolbar, :only => [:show] + before_filter :load_toolbar, :only => [:verwalten] load_and_authorize_resource def index @lvas = Lva.all @@ -43,6 +43,15 @@ class LvasController < ApplicationController def show @lva = Lva.find_by_id(params[:id]) @beispiel=Beispiel.new + @toolbar_elements =[] + @toolbar_elements<<{:hicon=>'icon-pencil', :icon=>:pencil,:text =>I18n.t('common.manage'),:path => verwalten_lva_path(@lva)} if can? :verwalten, @lva + + end + def verwalten + @lva = Lva.find_by_id(params[:id]) + @beispiel=Beispiel.new + + render :show end # GET /lvas/new diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb index 0af5eac..3e05c2c 100755 --- a/app/controllers/neuigkeiten_controller.rb +++ b/app/controllers/neuigkeiten_controller.rb @@ -69,7 +69,7 @@ class NeuigkeitenController < ApplicationController unless @neuigkeit.published? redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit muss veröffentlicht sein um sie auf Facebook zu posten.' else - page=YAML.load_file("#{::Rails.root.to_s}/tmp/page.yml") + page=YAML.load_file("#{::Rails.root.to_s}/config/page.yml") page.feed!(:access_token=>page.access_token, :message=>@neuigkeit.text_first_words, :name=>@neuigkeit.title, :link=>rubrik_neuigkeit_url(@neuigkeit.rubrik, @neuigkeit)+".html", :picture=>@neuigkeit.picture.url) redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit auf Facebook gepostet' diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index f5a0334..35a3051 100755 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -17,7 +17,7 @@ class UsersController < ApplicationController redirect_to intern_home_index_path else @fbu=FbGraph::User.new(current_user.uid.to_s).fetch(:access_token=>session["fbuser_access_token"]) - File.open("tmp/page.yml",'w'){|f| f.write(@fbu.accounts(:access_token=>session["fbuser_access_token"]).select { |p| p.name == params["page"] }.first.to_yaml)} + File.open("config/page.yml",'w'){|f| f.write(@fbu.accounts(:access_token=>session["fbuser_access_token"]).select { |p| p.name == params["page"] }.first.to_yaml)} logger.debug @fbu.to_s redirect_to admin_home_index_path end diff --git a/app/views/home/admin.html.erb b/app/views/home/admin.html.erb index 55cc15d..1c65a34 100644 --- a/app/views/home/admin.html.erb +++ b/app/views/home/admin.html.erb @@ -9,4 +9,12 @@ <%= semantic_form_for :set_page, url: fb_set_default_publish_page_user_path(current_user), html:{method: :get} do |f| %> <%= f.input :page , :input_html => { :name => 'page' }%> <% end %> + +<%= semantic_form_for :set_thema, url: choose_contact_topics_home_index_path, html:{method: :get} do |f| %> +<%= f.input :themen, :input_html=> {:name=>'themen'}, :as=>:select ,:multiple=>true,:collection =>Thema.all%> + + <%= f.actions do %> + <%= f.action :submit, :as => :button, :label=> I18n.t("common.save" ) %> +<% end %> +<% end %>

diff --git a/app/views/home/kontakt.html.erb b/app/views/home/kontakt.html.erb index f2d4a8b..68ff483 100644 --- a/app/views/home/kontakt.html.erb +++ b/app/views/home/kontakt.html.erb @@ -1,12 +1,10 @@

<%= I18n.t "kontakt.H1" %>

-

- <%= I18n.t "kontakt.text" %> -

-

<%= I18n.t "kontakt.service" %>

- <%= raw(I18n.t( "kontakt.service_text")) %> -

<%= I18n.t "kontakt.adresse" %>

-

<%= raw(I18n.t("kontakt.adresse_text")) %>

-

<%= raw(I18n.t ("kontakt.telefon_text")) %>

+<% @themen.each do |th| %> +<%= render partial: "themen/small", object: th %> +<% end %> + + +
diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb index 73681e3..3764af0 100644 --- a/app/views/themengruppen/show.html.erb +++ b/app/views/themengruppen/show.html.erb @@ -1,13 +1,13 @@
+ <% if @themengruppe.public %> +
  • <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("themengruppe.showall"), themengruppen_path, :class=>"linkbox" %>
    • + <% else %> +
  • <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("common.intern"), intern_home_index_path, :class=>"linkbox" %>
    • + <% end %> +
  • <%= link_to fa_icon("question 2x")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %> +
    • + <%= render :partial=>'layouts/pretty_toolbar' %>

    <% unless @themengruppe.icon.nil? or @themengruppe.icon.empty? %> diff --git a/app/views/themes/blue1/home/index.html.erb b/app/views/themes/blue1/home/index.html.erb index 65429b0..5160276 100644 --- a/app/views/themes/blue1/home/index.html.erb +++ b/app/views/themes/blue1/home/index.html.erb @@ -3,11 +3,18 @@
    - - -

    -<%= ffi1_icon "academic" %><%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %> -

    + +
      +
    • + <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) ,class: :linkbox %> +
      • +
    • + <%= link_to "Entwicklungsstatus" , dev_home_index_path ,class: :linkbox %> +
      • +
    • + <%= link_to "FAQS", faqs_themengruppen_path,class: :btn ,class: :linkbox %> +
      • +

    Beta Test

    Die Webseite befindet sich derzeit in einem Entwicklungsstadium, @@ -28,9 +35,7 @@

    - <%= link_to "Entwicklungsstatus" , dev_home_index_path %> -

    - <%= link_to "FAQS", faqs_themengruppen_path,class: :btn %> +

    <%= render 'beispiele' %> diff --git a/app/views/themes/white_1/themengruppen/show.html.erb b/app/views/themes/white_1/themengruppen/show.html.erb index 6da95cd..36f2358 100644 --- a/app/views/themes/white_1/themengruppen/show.html.erb +++ b/app/views/themes/white_1/themengruppen/show.html.erb @@ -1,29 +1,38 @@ -

    <%= @themengruppe.title %>

    - +

    <% unless @themengruppe.icon.nil? or @themengruppe.icon.empty? %> + <% end %><%= @themengruppe.title %>

    <%= @themengruppe.text %>

    <% @themen.each do |thema| %> -
    -
    - - <%= thema.title %> - -
    -
    -
    - <% unless thema.gremium.nil? %> -

    <%= link_to "Zu dem Gremium ..." , thema.gremium %> -

    -<% end %> - <%= render :partial => 'themen/small', :object => thema %> - +
    +
    + + <%= thema.title %> + +
    +
    +
    -
    -
    -
    + <%= render :partial => 'themen/small', :object => thema %> +
      + <% unless thema.gremium.nil? %> +
    • + <%= link_to fa_icon("users 2x")+thema.gremium.name , thema.gremium,:class=>"linkbox" %> +
      • + <% end %> + + <% thema.nlinks.each do |l| %> +
    • + <%= render l.neuigkeit if can? :show, l.neuigkeit%> +
      • + <% end %> + +
    +
    +
    +
    <% end %>
    diff --git a/config/routes.rb b/config/routes.rb index 07d5b8f..d01752e 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -73,6 +73,7 @@ Fetsite::Application.routes.draw do get 'beispiel_sammlung' get 'compare_tiss' get 'load_tiss' + get 'verwalten' end resources :beispiele#, :only=>[:show,:index,:create] @@ -135,7 +136,8 @@ Fetsite::Application.routes.draw do get 'dev' get 'startdev' get 'linksnotimplemented' - get 'kontakt' + get 'kontakt' + get 'choose_contact_topics' end end