From 54a2aee4c392ae3149df67ccbbf406df063bad83 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 20 Oct 2014 16:10:37 +0200 Subject: [PATCH 1/4] translate lva --- app/views/lvas/show.html.erb | 8 ++++---- config/locales/studien_public.de.yml | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb index a121897..cba979e 100755 --- a/app/views/lvas/show.html.erb +++ b/app/views/lvas/show.html.erb @@ -36,11 +36,11 @@
    -
  • LVA-Nummer: <%=@lva.lvanr %>
    • +
  • <%= I18n.t('lva.lvanr')%>: <%=@lva.lvanr %>
  • ECTS: <%=@lva.ects %>
    • -
  • Stunden: <%=@lva.stunden %>
    • +
  • <%= I18n.t('lva.stunden')%>: <%=@lva.stunden %>
-

Module

+

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

    <% @lva.modul.each do |modul| %>
  • <%= link_to modul.name , modul_path(modul)%> @@ -78,7 +78,7 @@
    <% unless @lva.nlinks.empty? %> -

    Neuigkeiten

    +

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

    <% @lva.nlinks.each do |l| %> <%= render l.neuigkeit %> <% end %> diff --git a/config/locales/studien_public.de.yml b/config/locales/studien_public.de.yml index 151a1b0..33952bf 100644 --- a/config/locales/studien_public.de.yml +++ b/config/locales/studien_public.de.yml @@ -29,5 +29,8 @@ de: lernaufwand: "Lernaufwand" desc: "Beschreibung" bspe: "Beispiele" + module: "Module" + lvanr: "LVA-Nummer" + stunden: "Stunden" home: newexamples: "Neueste Beispiele" \ No newline at end of file From 88b1a53fc7799c99a9ebff1959dea8041d7efec8 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Tue, 21 Oct 2014 13:28:59 +0200 Subject: [PATCH 2/4] Rate Beispiele text --- app/views/lvas/show.html.erb | 2 ++ config/locales/studien_public.de.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb index cba979e..a1d5bc9 100755 --- a/app/views/lvas/show.html.erb +++ b/app/views/lvas/show.html.erb @@ -68,6 +68,8 @@

    <%= 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 %> <% @lva.beispiele.order(:datum).each do |b| %> <%= render b%> diff --git a/config/locales/studien_public.de.yml b/config/locales/studien_public.de.yml index 33952bf..faab50d 100644 --- a/config/locales/studien_public.de.yml +++ b/config/locales/studien_public.de.yml @@ -32,5 +32,6 @@ de: module: "Module" lvanr: "LVA-Nummer" stunden: "Stunden" + ratebsp: "Möchtest du die Beispiele bewerten musst du dich einloggen. Derzeit funktioniert das über Facebook, wir arbeiten an einem Login über TISS!" home: newexamples: "Neueste Beispiele" \ No newline at end of file From ba8a20c3d1e9766253838890704fa08836e4b2fd Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Tue, 21 Oct 2014 13:29:14 +0200 Subject: [PATCH 3/4] sanitize --- app/views/themen/_verw_liste.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/themen/_verw_liste.html.erb b/app/views/themen/_verw_liste.html.erb index 0c6f554..920fef3 100644 --- a/app/views/themen/_verw_liste.html.erb +++ b/app/views/themen/_verw_liste.html.erb @@ -6,6 +6,8 @@
    • <%= link_to thema_path(thema),:remote=>true do %> <%= fa_icon('eye') %> Show <% end %>
    • <%= link_to edit_thema_path(thema),:remote=>true do %> <%= ff_icon('icon-pencil') %> Edit <% end %>
      • +
    • <%= link_to sanitize_thema_path(thema),:remote=>true do %> <%= ff_icon('icon-leaf') %> Sanitize <% end %>
      • +
    • <%= link_to fragen_thema_path(thema),:remote=>true do %> Fragen <% end %>
    • <%= link_to attachments_thema_path(thema),:remote=>true do %> Attachments <% end %>
    From 42ecb7dbcb2622f8694a70ace0db359d44e93b5d Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Tue, 21 Oct 2014 13:29:42 +0200 Subject: [PATCH 4/4] themen scope+ fix search --- app/controllers/themengruppen_controller.rb | 4 ++-- app/models/thema.rb | 3 ++- app/views/home/search.html.erb | 19 +++++++++++-------- .../themengruppen/_themengruppe.html.erb | 5 +++-- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/controllers/themengruppen_controller.rb b/app/controllers/themengruppen_controller.rb index b43a1c1..0838c5c 100644 --- a/app/controllers/themengruppen_controller.rb +++ b/app/controllers/themengruppen_controller.rb @@ -23,9 +23,9 @@ class ThemengruppenController < ApplicationController def show @themengruppe = Themengruppe.find(params[:id]) if can? :showdraft , Thema - @themen = @themengruppe.themen.order(:priority).reverse + @themen = @themengruppe.themen else - @themen = @themengruppe.themen.where(:isdraft=>false).order(:priority).reverse + @themen = @themengruppe.themen.public end @toolbar_elements = [] @toolbar_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t("themengruppe.manage"), :path=>themengruppe_verwalten_path(@themengruppe)} if can? :edit, @themengruppe diff --git a/app/models/thema.rb b/app/models/thema.rb index 73f77fe..a12469e 100644 --- a/app/models/thema.rb +++ b/app/models/thema.rb @@ -21,7 +21,8 @@ include Rails.application.routes.url_helpers validates :themengruppe, :presence => true validates :title, :presence => true validates :text, :presence => true - + scope :public, where(:isdraft=>false) + default_scope order(:priority).reverse_order scope :search, ->(query) {where("text like ? or title like ?", "%#{query}%", "%#{query}%")} scope :outdated, -> {includes(:translations).where("thema_translations.updated_atI18n.t.locale) } diff --git a/app/views/home/search.html.erb b/app/views/home/search.html.erb index e45c142..c8051e6 100644 --- a/app/views/home/search.html.erb +++ b/app/views/home/search.html.erb @@ -1,17 +1,20 @@
    +

    <%= 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" %> + <%= f.actions do %> + <%= f.action :submit, :as => :input %> + <% end %> + <% end %> - + +

    +

    +

    <%= render :partial=>"home/search_results" %>
    + +

    diff --git a/app/views/themengruppen/_themengruppe.html.erb b/app/views/themengruppen/_themengruppe.html.erb index 73c5c4f..a64641c 100644 --- a/app/views/themengruppen/_themengruppe.html.erb +++ b/app/views/themengruppen/_themengruppe.html.erb @@ -34,8 +34,9 @@
      - <% themengruppe.themen.where(" (NOT hidelink) and ( NOT isdraft) ").order(:priority).reverse.each do |t| %> + --> +
        + <% themengruppe.themen.where(:hidelink=>false).where(:isdraft=>false).each do |t| %>
      • <%= render t %>