From e7a7be8333f967db90615563e948f8f55330b873 Mon Sep 17 00:00:00 2001 From: HausdorffHimself Date: Mon, 19 Aug 2013 18:51:23 +0200 Subject: [PATCH 1/6] =?UTF-8?q?CHANGE:=20keine=20borders=20f=C3=BCr=20Them?= =?UTF-8?q?en?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/themengruppen.css.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/themengruppen.css.scss b/app/assets/stylesheets/themengruppen.css.scss index 5ea80bc..5aa1f26 100644 --- a/app/assets/stylesheets/themengruppen.css.scss +++ b/app/assets/stylesheets/themengruppen.css.scss @@ -4,8 +4,8 @@ div.themengruppe {padding:10px; margin:2px; -border-radius:10px; +border-radius: 10px; min-width:13em; -border: #91B4FF solid 2px; +border: #91B4FF solid 0px; height: 90% } From a5d694cc7ec5e0bdb4612d77d366cb92bcf990b3 Mon Sep 17 00:00:00 2001 From: HausdorffHimself Date: Mon, 19 Aug 2013 18:53:23 +0200 Subject: [PATCH 2/6] CHANGE: no link --- app/views/themen/_thema.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/themen/_thema.html.erb b/app/views/themen/_thema.html.erb index 50cbe00..ede7bb2 100644 --- a/app/views/themen/_thema.html.erb +++ b/app/views/themen/_thema.html.erb @@ -1,2 +1,2 @@ - <%= link_to thema.title,themengruppe_thema_path(thema.themengruppe,thema)%> + <%= thema.title%> From bb42e3b3a00fc53ada38da61cae4add50219856b Mon Sep 17 00:00:00 2001 From: HausdorffHimself Date: Mon, 19 Aug 2013 18:53:52 +0200 Subject: [PATCH 3/6] =?UTF-8?q?CHANGE:=20keine=20jQuery=20f=C3=BCr=20gleic?= =?UTF-8?q?he=20H=C3=B6he=20mehr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/themengruppen/index.html.erb | 28 ++++++++++++++------------ app/views/themengruppen/show.html.erb | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/views/themengruppen/index.html.erb b/app/views/themengruppen/index.html.erb index 9976ad2..b1ae6d9 100644 --- a/app/views/themengruppen/index.html.erb +++ b/app/views/themengruppen/index.html.erb @@ -1,24 +1,26 @@
-<% @themengruppen.each_slice(2) do |row| %> + <% @themengruppen.each_slice(2) do |row| %>
<% row.each do |themengruppe| %> -
-
- <%= render themengruppe %> -

- <%= link_to 'Edit', edit_themengruppe_path(themengruppe) %> -

-
-
- <% end %> +
+
+ <%= render themengruppe %> +

+ <%= link_to 'Edit', edit_themengruppe_path(themengruppe) %> +

+
+
+ <% end %>
-<% end %> + <% end %>

- <%= link_to 'New Themengruppe', new_themengruppe_path %> diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb index 374958f..d4041ca 100644 --- a/app/views/themengruppen/show.html.erb +++ b/app/views/themengruppen/show.html.erb @@ -14,7 +14,7 @@
- <%= render partial: "themen/small", object: thema %> + <%= render :partial => 'themen/small', :object => thema %>
From 29388ddcac1ae5c08418c78deea1f6acec539a50 Mon Sep 17 00:00:00 2001 From: HausdorffHimself Date: Mon, 19 Aug 2013 19:28:53 +0200 Subject: [PATCH 4/6] =?UTF-8?q?CHANGE:=20Beschreibungstext=20wird=20abgesc?= =?UTF-8?q?hnitten=20auf=20Themengruppe::WORD=5FCOUNT=20sowie=20locales=20?= =?UTF-8?q?f=C3=BCr=20Thema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/themengruppe.rb | 1 + app/views/themengruppen/_themengruppe.html.erb | 8 +++++++- config/locales/de.yml | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/models/themengruppe.rb b/app/models/themengruppe.rb index 034558f..0966914 100644 --- a/app/models/themengruppe.rb +++ b/app/models/themengruppe.rb @@ -1,4 +1,5 @@ class Themengruppe < ActiveRecord::Base + WORD_COUNT = 50 attr_accessible :text, :title has_many :themen, class_name: 'Thema' has_many :fragen, through: :themen diff --git a/app/views/themengruppen/_themengruppe.html.erb b/app/views/themengruppen/_themengruppe.html.erb index 9fe5849..450e18e 100644 --- a/app/views/themengruppen/_themengruppe.html.erb +++ b/app/views/themengruppen/_themengruppe.html.erb @@ -1,8 +1,14 @@

<%= link_to themengruppe.title, themengruppe %>

- <%=themengruppe.text %> + <%= if themengruppe.text.split.size > Themengruppe::WORD_COUNT + themengruppe.text.split[0..Themengruppe::WORD_COUNT].join(" ") + " ..." + else + themengruppe.text + end%>

+
+<%= I18n.t("themengruppe.themen") %>
    <% themengruppe.themen.each do |t| %>
  • diff --git a/config/locales/de.yml b/config/locales/de.yml index 2784350..9371d5b 100755 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -122,4 +122,6 @@ de: keine: "Keine Fehlermeldungen oder Warnungen" support: array: - two_words_connector: ', ' + two_words_connector: ', ' + themengruppe: + themen: "Themen" From 80fa19680b72097b93d3fc023ee77823789ea523 Mon Sep 17 00:00:00 2001 From: HausdorffHimself Date: Mon, 19 Aug 2013 19:41:49 +0200 Subject: [PATCH 5/6] =?UTF-8?q?NEW:=20Form=20f=C3=BCr=20Fragen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/frage.rb | 2 +- app/views/fragen/_form.html.erb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/frage.rb b/app/models/frage.rb index 0d26178..0508fc2 100644 --- a/app/models/frage.rb +++ b/app/models/frage.rb @@ -1,5 +1,5 @@ class Frage < ActiveRecord::Base - attr_accessible :text, :title + attr_accessible :text, :title, :thema_id belongs_to :thema validates :thema, :presence => true diff --git a/app/views/fragen/_form.html.erb b/app/views/fragen/_form.html.erb index bd59b87..ce19bc5 100644 --- a/app/views/fragen/_form.html.erb +++ b/app/views/fragen/_form.html.erb @@ -1,7 +1,9 @@ +<%= tinymce_assets %> <%= semantic_form_for @frage do |f| %> <%= f.inputs do %> <%= f.input :title %> - <%= f.input :text %> + <%= f.input :thema %> + <%= f.input :text, :as=>:tinymce_text%> <% end %> <%= f.actions do %> From 65b0ad8c19d884fa89165608a56ac317cd4ac618 Mon Sep 17 00:00:00 2001 From: HausdorffHimself Date: Mon, 19 Aug 2013 21:05:46 +0200 Subject: [PATCH 6/6] =?UTF-8?q?NEW:=20FAQs=20in=20Themen=20eingef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/fragen_controller.rb | 6 +++--- app/views/fragen/show.html.erb | 2 +- app/views/themen/_small.html.erb | 15 ++++++++++++++- app/views/themen/show.html.erb | 15 +++++++++++++++ app/views/themengruppen/show.html.erb | 1 + 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/app/controllers/fragen_controller.rb b/app/controllers/fragen_controller.rb index 7f3ac25..d30d79f 100644 --- a/app/controllers/fragen_controller.rb +++ b/app/controllers/fragen_controller.rb @@ -27,7 +27,7 @@ class FragenController < ApplicationController @frage = Frage.new respond_to do |format| - format.html # new.html.erb + format.html format.json { render json: @frage } end end @@ -44,7 +44,7 @@ class FragenController < ApplicationController respond_to do |format| if @frage.save - format.html { redirect_to @frage, notice: 'Frage was successfully created.' } + format.html { redirect_to @frage.thema, notice: 'Frage was successfully created.' } format.json { render json: @frage, status: :created, location: @frage } else format.html { render action: "new" } @@ -76,7 +76,7 @@ class FragenController < ApplicationController @frage.destroy respond_to do |format| - format.html { redirect_to fragen_url } + format.html { redirect_to @frage.thema } format.json { head :no_content } end end diff --git a/app/views/fragen/show.html.erb b/app/views/fragen/show.html.erb index 64cd962..6ba933b 100644 --- a/app/views/fragen/show.html.erb +++ b/app/views/fragen/show.html.erb @@ -10,4 +10,4 @@ <%= link_to 'Edit', edit_frage_path(@frage) %> | -<%= link_to 'Back', fragen_path %> +<%= link_to 'Back', @frage.thema %> diff --git a/app/views/themen/_small.html.erb b/app/views/themen/_small.html.erb index 49205ad..1884d43 100644 --- a/app/views/themen/_small.html.erb +++ b/app/views/themen/_small.html.erb @@ -1,3 +1,16 @@ <%= raw(small.text) %>
    -<%= link_to 'Edit', edit_thema_path(small) %> +<%= raw("FAQs:") unless small.fragen.empty? %> + +
    +<% small.fragen.each do |frage| %> +

    + <%= frage.title %>
    +<%= raw(frage.text) %> +

    +
    +<% end %> + + + +<%= link_to 'Edit', small %> diff --git a/app/views/themen/show.html.erb b/app/views/themen/show.html.erb index 31c2c49..936995f 100644 --- a/app/views/themen/show.html.erb +++ b/app/views/themen/show.html.erb @@ -8,3 +8,18 @@ <%= link_to 'Edit', edit_thema_path(@thema) %> | <%= link_to 'Back', themengruppe_path(@thema.themengruppe) %> + +

    FAQs:

    +<% @thema.fragen.each do |frage| %> +

    + <%= frage.title %>
    +<%= raw(frage.text) %> +
    +<%= link_to 'Edit', edit_frage_path(frage) %> | +<%= link_to 'Destroy',frage, method: :delete, data: { confirm: 'Are you sure?' } %> + +

    +<% end %> +
    + +<%= link_to 'Neue Frage', new_frage_path %> diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb index d4041ca..8b7258c 100644 --- a/app/views/themengruppen/show.html.erb +++ b/app/views/themengruppen/show.html.erb @@ -25,5 +25,6 @@

    + <%= link_to 'Edit', edit_themengruppe_path(@themengruppe) %> | <%= link_to 'Back', themengruppen_path %>