From f61681c5d0a9898e8bb79c1ddb4b998b82b9efae Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 20 May 2018 21:18:37 +0200 Subject: [PATCH 1/2] moved views from theme blue2 to default removed override by theme --- app/views/beispiele/_beispiel.html.erb | 36 ++- .../beispiele/_beispiel_form.html.erb | 0 .../{themes/blue2 => }/beispiele/edit.js.erb | 0 app/views/devise/sessions/new.html.erb | 5 +- app/views/fetprofiles/show.html.erb | 10 +- app/views/home/index.html.erb | 46 ++-- app/views/home/intern.html.erb | 64 ++++-- app/views/layouts/application.html.erb | 109 +++++---- app/views/layouts/menu.html.erb | 7 +- app/views/lvas/show.html.erb | 207 +++++++++++------- .../blue2 => }/neuigkeiten/_menu.html.erb | 0 .../neuigkeiten/_neuigkeit_view.html.erb | 41 +++- app/views/neuigkeiten/show.html.erb | 13 +- .../themes/blue2/beispiele/_beispiel.html.erb | 32 --- .../themes/blue2/fetprofiles/show.html.erb | 77 ------- app/views/themes/blue2/home/index.html.erb | 67 ------ app/views/themes/blue2/home/intern.html.erb | 62 ------ .../themes/blue2/layouts/application.html.erb | 66 ------ app/views/themes/blue2/layouts/menu.html.erb | 62 ------ app/views/themes/blue2/lvas/show.html.erb | 158 ------------- .../neuigkeiten/_neuigkeit_view.html.erb | 72 ------ .../themes/blue2/neuigkeiten/show.html.erb | 77 ------- 22 files changed, 308 insertions(+), 903 deletions(-) rename app/views/{themes/blue2 => }/beispiele/_beispiel_form.html.erb (100%) rename app/views/{themes/blue2 => }/beispiele/edit.js.erb (100%) rename app/views/{themes/blue2 => }/neuigkeiten/_menu.html.erb (100%) delete mode 100644 app/views/themes/blue2/beispiele/_beispiel.html.erb delete mode 100644 app/views/themes/blue2/fetprofiles/show.html.erb delete mode 100644 app/views/themes/blue2/home/index.html.erb delete mode 100644 app/views/themes/blue2/home/intern.html.erb delete mode 100755 app/views/themes/blue2/layouts/application.html.erb delete mode 100644 app/views/themes/blue2/layouts/menu.html.erb delete mode 100755 app/views/themes/blue2/lvas/show.html.erb delete mode 100644 app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb delete mode 100755 app/views/themes/blue2/neuigkeiten/show.html.erb diff --git a/app/views/beispiele/_beispiel.html.erb b/app/views/beispiele/_beispiel.html.erb index 27697f5..6141faf 100644 --- a/app/views/beispiele/_beispiel.html.erb +++ b/app/views/beispiele/_beispiel.html.erb @@ -1,33 +1,22 @@
-
+
<%=link_to ffi1_icon("note20")+" " + beispiel.name + " " + I18n.l(beispiel.datum), beispiel.beispieldatei.url, title: beispiel.desc %>
<%= (beispiel.beispieldatei.size/1024.0).round(2).to_s %>KiB
-
- - <%= - if can?(:like, beispiel) - link_to ffi1_icon("like3")+" like" + "("+beispiel.get_likes.size.to_s+")", like_beispiel_path(beispiel),title: "liked by " + ((current_user.liked?(beispiel)) ? ("you and " + ((beispiel.get_likes.size - 1).to_s + " others")) : beispiel.get_likes.size.to_s), remote: true - else - "liked by " + beispiel.get_likes.size.to_s - end - %> - - <%= - if can?(:dislike, beispiel) - link_to ffi1_icon("dislike")+" dislike" + "("+beispiel.get_dislikes.size.to_s+")", dislike_beispiel_path(beispiel),title:"disliked by " + ((current_user.disliked?(beispiel)) ? ("you and " + ((beispiel.get_dislikes.size - 1).to_s + " others")) : beispiel.get_dislikes.size.to_s) , remote: true - else - "disliked by " + beispiel.get_dislikes.size.to_s - end - - %> - - <%= link_to ff_icon("icon-pencil")+"edit", edit_beispiel_path(beispiel) if can? :edit, beispiel%> - <%= link_to fa_icon("trash")+"delete", beispiel_path(beispiel), :method=>:delete, :data=>{:confirm=>I18n.t('beispiel.sure')} if can? :delete, beispiel %> - <% link_to "Refresh", beispiel_path(beispiel,show_comments: true), remote: true %>
+
+ <%= beispiel.lecturer.try(:name).to_s %> +
+
+ <%= flag_link(beispiel, "goodquality")%> + <%= flag_link(beispiel, "badquality")%> + <%= flag_link(beispiel, "delete")%> + <%= like_dislike_for(beispiel) %> + <%= link_to ff_icon("icon-pencil")+"edit", edit_beispiel_path(beispiel), remote: true if can? :edit, beispiel %> + <%= link_to fa_icon("trash")+"delete", beispiel_path(beispiel), :method=>:delete, :data=>{:confirm=>I18n.t('beispiel.sure')} if can? :delete, beispiel %> + <% link_to "Refresh", beispiel_path(beispiel,show_comments: true), remote: true %>
<% unless beispiel.desc.nil? || beispiel.desc.empty? %> @@ -39,4 +28,5 @@
<% end %> +<%= render_comments_for(beispiel) %>
diff --git a/app/views/themes/blue2/beispiele/_beispiel_form.html.erb b/app/views/beispiele/_beispiel_form.html.erb similarity index 100% rename from app/views/themes/blue2/beispiele/_beispiel_form.html.erb rename to app/views/beispiele/_beispiel_form.html.erb diff --git a/app/views/themes/blue2/beispiele/edit.js.erb b/app/views/beispiele/edit.js.erb similarity index 100% rename from app/views/themes/blue2/beispiele/edit.js.erb rename to app/views/beispiele/edit.js.erb diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 872da13..52ab447 100755 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -9,7 +9,8 @@

- + <%= render "devise/shared/links" %> diff --git a/app/views/fetprofiles/show.html.erb b/app/views/fetprofiles/show.html.erb index da582a4..26180a8 100644 --- a/app/views/fetprofiles/show.html.erb +++ b/app/views/fetprofiles/show.html.erb @@ -65,5 +65,13 @@ end
- <%= render 'layouts/pretty_toolbar' %> +<% if can?(:edit, @fetprofile) %> +
+ + <%= link_to ff_icon("icon-pencil")+I18n.t('common.edit'), edit_fetprofile_path(@fetprofile) if can?(:edit, @fetprofile) %> + <%= link_to fa_icon("trash")+I18n.t('common.delete'), fetprofile_path(@fetprofile),method: :delete, data: { confirm: "Are you sure?" } if can?(:delete, @fetprofile) %> + +
+<% end %> + <%#= render 'layouts/pretty_toolbar' %> diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 83cf3db..89c88cc 100755 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -7,12 +7,14 @@ fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk')); -
+

<%= I18n.t('home.willkommen') %>

-<%= render partial: "themen/small", object: @starttopic %> +<%= raw(@starttopic.text) unless @starttopic.nil? %> + +
-
+
  • @@ -21,41 +23,43 @@
  • <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) ,class: :linkbox %>
    • -
  • <%= link_to ffi1_icon("quiz")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %>
    • -
  • <%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox unless Studium.first.nil? %>
    • +
  • <%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox if Studium.count > 0 %>
  • <%= link_to "Alte Beispielsammlung", "http://www.fet.at/alt/bin/view/Beispielsammlung/WebHome" ,class: :btn ,class: :linkbox %>
-
    + +<% cache("stickytopics_startpage_"+cache_array_key(@stickythemen)) do %> +
      <% @stickythemen.each do |t1| %>
    • - <%= link_to t1 do %> - <%= render partial: "themen/nlink", object: t %> - <%= end %> + <%= link_to t1,:class=>:linkbox do %> + <%= render partial: "themen/nlink", object: t1 %> + <% end %>
      • <% end %>
    +<% end %> +<%= render 'beispiele' %> - <%= render 'beispiele' %> -
-
-
    + +
    +
      <% @neuigkeiten.each do |n| %>
    • <%= render n if can?(:show, n) %>
      • <% end %> -
    -Verschiedene Styles -
      -
    • <%= link_to "Darkblue", home_index_path({:theme=>"darkblue"}) %>
      • -
    • <%= link_to "Blue1", home_index_path({:theme=>"blue1"}) %>
      • +
    +
    -
  • <%= link_to "2003", home_index_path({:theme=>"2003"}) %>
    • -
  • <%= link_to "white_1", home_index_path({:theme=>"white_1"}) %>
    • -
+
+<% cache("calendar_" + cache_array_key(@calentries)+params[:month].to_s+params[:year].to_s) do %> +<%= render 'calendars/calentries', :object=>@calentries %> +<% end %> + +
diff --git a/app/views/home/intern.html.erb b/app/views/home/intern.html.erb index edcae0b..bd98825 100644 --- a/app/views/home/intern.html.erb +++ b/app/views/home/intern.html.erb @@ -1,23 +1,49 @@ -

FET Intern NEU

+

FET Intern NEU blue2

-
    -
  • - <%= link_to "Adressliste", internlist_fetprofiles_path ,class: :linkbox %>
    • -
  • <%= link_to "Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %> -
    • -
  • -<%= link_to ff_icon("ffi1-setting")+"Neue Oberfläche" , set_preferred_theme_user_path(current_user, params: {theme: "blue2"}), class: :linkbox if can? :set_preferred_theme , current_user %> -
+
+
    +
  • + <%= link_to fa_icon("list")+"Adressliste", internlist_fetprofiles_path ,class: :linkbox %> +
    • +
  • + <%= link_to ff_icon("ffi1-setting")+"Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %> +
    • +
  • + <%= link_to ff_icon("fa fa-folder")+"Treeview" , treeview_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %> +
    • +
  • + <%= link_to ff_icon("ffi1-newspaper9")+"Crawler" , crawler_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %> +
    • +
  • + <%= link_to ff_icon("ffi1-setting")+"Meetings" , meetingtyps_path, class: :linkbox if current_user.has_role?(:fetadmin) %> +
    • +
  • + <%= link_to ff_icon("ffi1-setting")+"Alte Oberfläche" , set_preferred_theme_user_path(current_user, params: {theme: "blue1"}), class: :linkbox if can? :set_preferred_theme, current_user %> +
    • + +

+
+
Suche nach Protokollen + <%= semantic_form_for :search,:remote=>true, :url=>search_documents_path, :html=>{:id=>"search_form",:class=>"", :method=>'get'} do |f| %> + <%= f.input :query, :input_html => { :name => 'query' } , :label=>false, :class=>"search-query" %> + <% f.actions do %> + <% f.action :submit, :as => :input %> + <% end %> + <% end %> +
+ <%= render :partial=>"documents/search_results", :object=>@results %> +
+
    -
  • - <% @themengruppen.each do |themengruppe| %> -
    - <%= render themengruppe if can?(:show,themengruppe)%> -
    - <% end %> -
    • +
  • + <% @themengruppen.each do |themengruppe| %> +
    + <%= render themengruppe if can?(:show,themengruppe)%> +
    + <% end %> +
<%= link_to "Users", users_path %> @@ -25,9 +51,9 @@

Neuigkeiten

    - <% @neuigkeiten.each do |n| %> -
  • <%= render n if can?(:show, n) %>
    • - <% end %> + <% @neuigkeiten.each do |n| %> +
  • <%= render n if can?(:show, n) %>
    • + <% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1bde762..bf9ee0b 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,71 +1,66 @@ - + - - - - - <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty? %> - <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %> - <% theme_stylesheet_link_tag "test", :media => "all" %> - <% theme_stylesheet_link_tag "mod", :media=>"all" %> - <%= javascript_include_tag "application" %> - <%= csrf_meta_tags %> - <% if content_for?(:header) %> - <%= yield :header %> - <% else %> - Fetsite - <% end %> + + <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty? %> + <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> + <% if content_for?(:header) %> + <%= yield :header %> + <% else %> + Fetsite + <% end %> -
-
-
- <% cache("menu_u"+user_signed_in?.to_s+current_user.try(:id).to_s+"l"+I18n.locale.to_s+ can?(:seeintern, User).to_s+ can?(:index,Gallery).to_s+params[:theme].to_s, expires_in: 24.hours) do %> -
-
- <%= link_to home_index_path do %> - - <%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %> - <% end %> -
-
- <%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %> -
-
- Fachschaft Elektrotechnik -
-
- - -
- <% end %> -
+
+
+
+ <% cache("menu_u"+user_signed_in?.to_s+current_user.try(:id).to_s+"l"+I18n.locale.to_s+ can?(:seeintern, User).to_s+ can?(:index,Gallery).to_s+params[:theme].to_s, expires_in: 24.hours) do %> +
+
+ <%= link_to home_index_path do %> + + <%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %> + <% end %> +
+
+ <%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %> +
+
+ Fachschaft Elektrotechnik +
+
+ + +
+ <% end %> +
+
+
+
+ <%= yield %> +
+
-
-
- <%= yield %> -
-
-
- + diff --git a/app/views/layouts/menu.html.erb b/app/views/layouts/menu.html.erb index 5f3640b..e3ac8d5 100644 --- a/app/views/layouts/menu.html.erb +++ b/app/views/layouts/menu.html.erb @@ -43,9 +43,10 @@
  • <%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%>
    • - - <%= render 'layouts/login' %> - +
  • + <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %> + <%# render 'layouts/login' %> +
    • - <%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %> - <% end %> -
    -
    - <%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %> -
    -
    - Fachschaft Elektrotechnik -
    -
    - - -
    - <% end %> -
    -
    -
    -
    - <%= yield %> -
    -
    -
    - - - diff --git a/app/views/themes/blue2/layouts/menu.html.erb b/app/views/themes/blue2/layouts/menu.html.erb deleted file mode 100644 index 5f3640b..0000000 --- a/app/views/themes/blue2/layouts/menu.html.erb +++ /dev/null @@ -1,62 +0,0 @@ -
    -
    -
    - - - - - - -
    -
      -
    • <%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %> -
      • -
    • <%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %>
      • - -
    • <%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %>
      • -
    • <%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path %>
      • -<% if can? :index, Gallery %> -
    • <%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path %>
      • -<% end %> -
    • <%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %>
      • -
    • <%= link_to I18n.t("home.search"), search_home_index_path %>
      • -
    • <%= link_to I18n.t("home.kontakt"), kontakt_home_index_path %>
      • - <% if can?(:seeintern, User) %> -
    • - <%= link_to 'Intern' , intern_home_index_path %> -
      • <% end %> -
    -
      -
    • - - -
      - - -
      -
      • - <%= render 'layouts/login' %> -
    - - - -
    - -
    -
    -
    - diff --git a/app/views/themes/blue2/lvas/show.html.erb b/app/views/themes/blue2/lvas/show.html.erb deleted file mode 100755 index 84f6ed2..0000000 --- a/app/views/themes/blue2/lvas/show.html.erb +++ /dev/null @@ -1,158 +0,0 @@ -<%= content_for :header do %> -Fetsite - <%= @lva.full_name %> -<% set_meta_tags :og => { - :url=>lva_path(:theme=>nil) } -%> -<%= display_meta_tags %> -<% end %> -
    -
    - <%= render 'studien/tabs'%> -

    <%= notice %>

    - -
    -
    - <%= render 'layouts/pretty_toolbar' %> -
    -
    - -
    -
    -

    <%= @lva.full_name %>

    - -
      -
    • - <%= link_to ffi1_icon("live2")+"ET-Forum", @lva.forumlink, class: :linkbox, itemprop: "discussionUrl" unless @lva.forumlink.nil? or @lva.forumlink.empty?%> -
      • -
    • - <%= link_to "TISS", @lva.tisslink, class: :linkbox %> -
      • -
    -
    -

    <%= I18n.t('lva.pruefungsinfo')%>

    -
    - <%= @lva.pruefungsinformation.to_s.html_safe %> -
    - -

    <%= I18n.t('lva.lernaufwand')%>

    -
    - <%= @lva.lernaufwand %> -
    - -

    <%= I18n.t('lva.desc')%>

    -
    - <%= @lva.desc.to_s.html_safe %> -
    -
    - -
    -
    -
    -
      -
    • <%= I18n.t('lva.lvanr')%>: <%=@lva.lvanr %>
      • -
    • ECTS: <%=@lva.ects %>
      • -
    • <%= I18n.t('lva.stunden')%>: <%=@lva.stunden %>
      • -
    -

    <%= I18n.t('lva.module')%>

    -
      - <% @lva.modul.each do |modul| %> -
    • <%= link_to modul.name , modul_path(modul)%> -
        - <% modul.modulgruppen.each do |g| %> - -
      • <%= link_to g.studium.title_context , studium_path(g.studium)%> (<%=link_to g.name, modulgruppe_path(g)%>)
        • - <% end %> -
      -
      • - - <% end %> -
    -
    -
    -

    <%= I18n.t "lecturers.lecturers" %>

    - <% @lva.lecturers.each do |lec| %> - <%= render :partial=>'lecturers/lec_lva', :object=>lec %> - - <% end %> -
    -
    -
    - - -
    -
    - <%= new_question_for(@lva) %> - <% unless @questions.nil? %> - <% @questions.each do |q| %> - <%= render q if can? :show, q %> - <% end %> - <% end %> - - -

    <%= I18n.t("lva.bspe") %>

    -

    - <%= 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 %> - <% @beispiele.each do |b| %> - <% cache("beispiel_" +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + can?(:flag, b).to_s + "_" + can?(:like, b).to_s + "_" + b.updated_at.try(:utc).try(:to_s) + get_theme_help(current_user).to_s) do %> - <%= render b%> - <% end %> - <% end %> - <% if @beispiele_badQ.count > 0 %> -

    Bad Quality or Outdated

    - <% @beispiele_badQ.each do |b| %> - <% cache("beispiel_" +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + can?(:flag, b).to_s + "_" + can?(:like, b).to_s + "_" + b.updated_at.try(:utc).try(:to_s) + get_theme_help(current_user).to_s) do %> - <%= render b%> - <% end %> - <% end %> - <% end %> - <% if @beispiele_deleted.count > 0 %> -

    Trash

    - <% @beispiele_deleted.each do |b| %> - - <% cache("beispiel_" +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + can?(:flag, b).to_s + "_" + can?(:like, b).to_s + "_" + b.updated_at.try(:utc).try(:to_s) + get_theme_help(current_user).to_s) do %> - <%= render b%> - <% end %> - <% end %> - <% end %> - -
    - -
    - -
    -
    - - <% unless @lva.nlinks.empty? %> -

    <%= I18n.t("rubrik.title") %>

    - <% @lva.nlinks.each do |l| %> - <%= render l.neuigkeit %> - <% end %> - <% end %> - -
    -
    - <% cache("lva_beispiel_form_bulk_"+@lva.id.to_s+I18n.locale.to_s+@lva.updated_at.to_i.to_s) do %> -
    -
    - <%= render 'beispiele/form_bulk' %> -
    -
    - - <% end %> - - <% unless @crawlobjects.nil? %> -
    -
    - <% @crawlobjects.each do |co| %> - <%= render co %> - <% end %> -
    -
    - <% end %> - -
    -
    - diff --git a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb deleted file mode 100644 index 44c95b7..0000000 --- a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb +++ /dev/null @@ -1,72 +0,0 @@ -<% if neuigkeit_view.nil? -neuigkeit_view=@neuigkeit -end -%> -
    - <%= meta_itemprop("about", neuigkeit_view.text_first_words) %> - <%= meta_itemprop("sameAs", neuigkeit_url(neuigkeit_view,:theme=>nil)) %> - <%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %> - -
    -<% cache("menu_neuigkeit"+ neuigkeit_view.id.to_s + can?(:edit,neuigkeit_view).to_s + can?(:find_link, neuigkeit_view).to_s + can?(:new, Survey::Question).to_s + can?(:publish, neuigkeit_view).to_s + can?(:unpublish, neuigkeit_view).to_s + neuigkeit_view.published?.to_s + neuigkeit_view.flag_important.to_s + neuigkeit_view.flag_infoscreen.to_s) do %> - <%= render partial: "menu" , object: neuigkeit_view%> -<% end %> -
    -
    - - <%#= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %> -
    -
    - - <%= ff_icon(neuigkeit_view.rubrik.icon) unless neuigkeit_view.rubrik.icon.nil? or neuigkeit_view.rubrik.icon.empty? %> <%= neuigkeit_view.rubrik.name %> - - - - <% unless neuigkeit_view.try(:datum).try(:to_date).nil? %> - <%= " "+ I18n.t("neuigkeit.am")+" " %> - <% end %> -
    - - <% unless neuigkeit_view.published? %> -
    Not Published <%= link_to "Publish", publish_rubrik_neuigkeit_path(neuigkeit_view.rubrik,neuigkeit_view),remote:true, class: :btn if can? :publish, neuigkeit_view %>
    - <% end %> - <% unless neuigkeit_view.origurl.nil? || neuigkeit_view.origurl.empty? %> -
    <%= link_to "Zitiert von "+ neuigkeit_view.origurl, neuigkeit_view.origurl %> -
    - <% end %> -
    - <% unless neuigkeit_view.picture_robust.big_thumb.to_s.empty? %> -
    -


    <%= link_to image_tag(neuigkeit_view.picture_robust.big_thumb),neuigkeit_view.picture_robust.try(:url) %> -

    -
    - <% end %> -
    -

    - <%= raw(neuigkeit_view.title) %> <%#= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(neuigkeit_view.rubrik, neuigkeit_view), remote: true if can? :edit, neuigkeit_view %> -

    -
    - <%= raw(neuigkeit_view.text) %> -
    -
    -
    - - <%= render_calentries_for(neuigkeit_view)%> - <%= new_calentry_div(neuigkeit_view) %> - <% unless neuigkeit_view.meeting.nil? %> - <%= render neuigkeit_view.meeting %> - <% end%> - - - - <%= render_attachments_list_for(neuigkeit_view) %> - -
    - - - - <% @questions.each do |q| %> - <%= render q if can? :show, q %> - <% end %> diff --git a/app/views/themes/blue2/neuigkeiten/show.html.erb b/app/views/themes/blue2/neuigkeiten/show.html.erb deleted file mode 100755 index f5ee3fb..0000000 --- a/app/views/themes/blue2/neuigkeiten/show.html.erb +++ /dev/null @@ -1,77 +0,0 @@ -<%= content_for :header do %> - Fetsite - <%= @neuigkeit.title %> (<%= @neuigkeit.rubrik.name %>) - <% set_meta_tags :author => fetprofile_path(@neuigkeit.author.fetprofile) unless @neuigkeit.author.fetprofile.nil? %> - <% unless @neuigkeit.picture_robust.url.nil? %> - <% - picture_url=URI(root_url) - picture_url.path=@neuigkeit.picture_robust.url(:locale=>nil, :theme=>nil) - %> - <% end %> - <% set_meta_tags :og => - { - :image => picture_url.to_s, - :title => @neuigkeit.title.to_s + " (" + @neuigkeit.rubrik.name.to_s + ")", - :type => "article", - :description =>@neuigkeit.text_first_words, - :url=>neuigkeit_url(:theme=>nil) - } - %> - <%= display_meta_tags %> -<% end %> - -<%= render 'rubriken/tabs' %> - -
    - - - -
    - <%= link_to "Refresh", neuigkeit_path(@neuigkeit), remote: true %> -

    - <%= notice %> -

    - <%= render partial: "neuigkeit_view", object: @neuigkeit %> - -
    -
    " data-layout="standard" data-action="like" data-show-faces="true" data-share="true">
    - -<%= render_comments_for(@neuigkeit) %> - -<%# link_to fa_icon("link") + "Neue Verknüpfung" , "#", id: "findlink-open" if can? :find_link, @neuigkeit %> - -<% cache(cache_array_key(@neuigkeit.nlinks, "NLinks")) do %> - <%= render partial: 'neuigkeiten/nlink_list_whole', :object=>@neuigkeit.nlinks %> -<% end %> - -
    - <% if can? :find_link, @neuigkeit %> - Nach Element suchen: - <%= semantic_form_for :find_link, :url=>find_link_rubrik_neuigkeit_path(@rubrik,@neuigkeit), :html=>{:id=>"search_form", :method=>'get'} , :remote=> true do |f| %> - <%= f.input :query, :input_html => { :name => 'query' },:label=>false %> - <% end %> - <%= render partial: 'nlink_list_search_whole', object: @nlink_search %> - <% end %> -
    - - From 2ae99b4b9e7a7e7280ac72ca494dab0f31049aaf Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 20 May 2018 21:20:43 +0200 Subject: [PATCH 2/2] remove http header language detection --- app/controllers/application_controller.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5239999..7683d57 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -9,11 +9,9 @@ if params[:locale] if I18n.available_locales.include?(params[:locale].to_sym) session[:locale] = params[:locale] - else flash.now[:notice]= "#{params[:locale]} translation not available" logger.error flash.now[:notice] - end end http_header=request.env['HTTP_ACCEPT_LANGUAGE'] @@ -22,8 +20,8 @@ else ht=nil end - I18n.locale = session[:locale] || ht || I18n.default_locale - + I18n.locale = session[:locale] || I18n.default_locale + # removed ht from selection add || ht to check http header session[:locale] = I18n.locale end