From d7d42ae24176f7fffe88af42f57ec3ff4a94785f Mon Sep 17 00:00:00 2001 From: Markus Graf Date: Thu, 6 Jul 2017 16:50:10 +0200 Subject: [PATCH] refactored statements --- .gitignore | 1 + app/assets/javascripts/statements.js | 6 +++--- app/views/pages/statements.de.slim | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 63888d9..742d311 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /log/* !/log/.keep /tmp +.Rproj.user diff --git a/app/assets/javascripts/statements.js b/app/assets/javascripts/statements.js index a3636fc..f3220a8 100644 --- a/app/assets/javascripts/statements.js +++ b/app/assets/javascripts/statements.js @@ -1,5 +1,5 @@ $(document).ready(function(){ - $('.statement p').each(function(){ + $('.statement article').each(function(){ var trimLength = 300; var trimMargin = 1.2; // don't trim just a couple of words if($(this).text().length > (trimLength * trimMargin)) { @@ -12,8 +12,8 @@ $(document).ready(function(){ }); $('.toggle a').click(function(e){ e.preventDefault(); - var para = $(this).closest('p'); - var initialHeight = $(this).closest('p').innerHeight(); + var para = $(this).closest('article'); + var initialHeight = $(this).closest('article').innerHeight(); para.find('.read-more').show(); para.find('.toggle').hide(); var newHeight = para.innerHeight(); diff --git a/app/views/pages/statements.de.slim b/app/views/pages/statements.de.slim index f181ab0..cb81bf3 100644 --- a/app/views/pages/statements.de.slim +++ b/app/views/pages/statements.de.slim @@ -1,5 +1,5 @@ - supporters = Supporter.where('publicity.state' => :approved).desc('publicity.created_at') - +== Redcarpet::Markdown.new(Redcarpet::Render::HTML).render "**test**" h1 = title t('.title') - supporters.each do |supporter| .statement @@ -8,7 +8,7 @@ h1 = title t('.title') - unless supporter.publicity.organisation.blank? em= ", #{supporter.publicity.organisation}" br - p = supporter.publicity.statement + article== Redcarpet::Markdown.new(Redcarpet::Render::HTML).render supporter.publicity.statement hr.clearfix .text-center = link_to t(".submit_your_own_statement"), new_publicity_path \ No newline at end of file