From de8f3e532d857ec64a9ba17bf9e5a4de272a6cbd Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 26 Mar 2016 17:36:37 +0100 Subject: upgrade: use bootstrap3 row and col-md-* --- app/views/home/_content.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/views/home') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index d96a1e0..67e4533 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -1,12 +1,12 @@ -.row-fluid +.row %h1= t(:welcome, :provider => APP_CONFIG[:domain]) .p=t(:welcome_message_html) -.row-fluid +.row = home_page_buttons - if Rails.env == 'development' - .row-fluid + .row %hr %p = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present? -- cgit v1.2.3 From e1e98d0229b8b79de2105515f0312903a23dc335 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Wed, 24 Aug 2016 15:23:07 +0200 Subject: Update with Twitter --- app/views/home/_content.html.haml | 6 ++++-- app/views/home/index.html.haml | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'app/views/home') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index 67e4533..725c391 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -1,10 +1,12 @@ -.row +.left.column %h1= t(:welcome, :provider => APP_CONFIG[:domain]) .p=t(:welcome_message_html) -.row = home_page_buttons +.right.column + = render :partial => 'twitter/index' + - if Rails.env == 'development' .row %hr diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 147cacd..7f07460 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -3,7 +3,8 @@ #main .container-fluid = render 'home/content' + #push -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3 #footer - = render 'layouts/footer' \ No newline at end of file + = render 'layouts/footer' -- cgit v1.2.3 From fecc0e9e1985be2d3767664453d4776ac20897c0 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Thu, 25 Aug 2016 20:50:12 +0200 Subject: Twitter controller now as helper, some more styling in CSS, bug fix --- app/views/home/_content.html.haml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'app/views/home') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index 725c391..6efd2d0 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -1,14 +1,15 @@ -.left.column +.row %h1= t(:welcome, :provider => APP_CONFIG[:domain]) .p=t(:welcome_message_html) - = home_page_buttons - -.right.column - = render :partial => 'twitter/index' +.row + .col-md-9 + = home_page_buttons + .col-md-3 + = render 'twitter/index' - if Rails.env == 'development' .row %hr %p - = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present? += link_to "make donation", new_payment_path if APP_CONFIG[:payment].present? -- cgit v1.2.3 From e3af6664f997d4dff227fdcd0246eff516520e96 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Fri, 26 Aug 2016 18:02:55 +0200 Subject: Adding config/config.yml file into .gitignore, cleaning up smaller typos --- app/views/home/_content.html.haml | 10 +++++----- app/views/home/index.html.haml | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'app/views/home') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index 6efd2d0..a299295 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -8,8 +8,8 @@ .col-md-3 = render 'twitter/index' - - if Rails.env == 'development' - .row - %hr - %p -= link_to "make donation", new_payment_path if APP_CONFIG[:payment].present? + - if Rails.env == 'development' + .row + %hr + %p + = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present? diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 7f07460..5e33e62 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -3,7 +3,6 @@ #main .container-fluid = render 'home/content' - #push -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3 #footer -- cgit v1.2.3 From 92e7b90d619111fdaaf50ab0b8538c39605fe005 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Thu, 1 Sep 2016 12:17:05 +0200 Subject: Updating the view and CSS, no pic and twitter handle in each tweet; Displaying only 3 most tweets --- app/views/home/_content.html.haml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'app/views/home') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index a299295..ecd8524 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -1,11 +1,13 @@ -.row - %h1= t(:welcome, :provider => APP_CONFIG[:domain]) - .p=t(:welcome_message_html) +.col-md-9 + .row + %h1= t(:welcome, :provider => APP_CONFIG[:domain]) + .p=t(:welcome_message_html) -.row - .col-md-9 + .row = home_page_buttons - .col-md-3 + +.col-md-3 + .row = render 'twitter/index' - if Rails.env == 'development' -- cgit v1.2.3 From 42459748e9e8e30a9cc0c64eaf4b8e10814d2dc2 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Fri, 9 Sep 2016 13:19:51 +0200 Subject: Added changes in css, view and main view file, as well as default avatar is now set as twitter official logo (added 2 official twitter logo images; changed footer text. --- app/views/home/_content.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/views/home') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index ecd8524..5341189 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -1,4 +1,4 @@ -.col-md-9 +.col-md-8 .row %h1= t(:welcome, :provider => APP_CONFIG[:domain]) .p=t(:welcome_message_html) @@ -6,6 +6,8 @@ .row = home_page_buttons +.col-md-1 + .col-md-3 .row = render 'twitter/index' -- cgit v1.2.3 From 8d825a904f4d84e388a5af2c873b06b344512795 Mon Sep 17 00:00:00 2001 From: thea Date: Tue, 13 Sep 2016 14:59:46 +0200 Subject: reseted index.html.haml old state --- app/views/home/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/home') diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 5e33e62..147cacd 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -6,4 +6,4 @@ #push -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3 #footer - = render 'layouts/footer' + = render 'layouts/footer' \ No newline at end of file -- cgit v1.2.3 From f70199b16fc759d020ea8eea6ecaaf8eeced8abb Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 22 Sep 2016 14:16:16 +0200 Subject: customize: provider message more fine grained We used to replace all of home/content - so we missed the twitter feed on the providers. Instead one should now customize home/provider_message only. --- app/views/home/_content.html.haml | 2 ++ app/views/home/_provider_message.html.haml | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 app/views/home/_provider_message.html.haml (limited to 'app/views/home') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index 5341189..3f4f36e 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -5,6 +5,8 @@ .row = home_page_buttons + .row + = render 'home/provider_message' .col-md-1 diff --git a/app/views/home/_provider_message.html.haml b/app/views/home/_provider_message.html.haml new file mode 100644 index 0000000..928215a --- /dev/null +++ b/app/views/home/_provider_message.html.haml @@ -0,0 +1,2 @@ +-# please overwrite me in your customization files at +-# config/customization/views/home/_provider_message.html.haml -- cgit v1.2.3 From 6f9c4fdab2caef90e49ca965617e767b50bcbbb2 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Thu, 22 Sep 2016 15:31:52 +0200 Subject: initializer/twitter.rb file unnecessary; added change in main view only if twitter feature is set enabled == true --- app/views/home/_content.html.haml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'app/views/home') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index 5341189..950f85e 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -1,4 +1,18 @@ -.col-md-8 +- if twitter_enabled == true + .col-md-8 + .row + %h1= t(:welcome, :provider => APP_CONFIG[:domain]) + .p=t(:welcome_message_html) + + .row + = home_page_buttons + + .col-md-1 + + .col-md-3 + .row + = render 'twitter/index' +- else .row %h1= t(:welcome, :provider => APP_CONFIG[:domain]) .p=t(:welcome_message_html) @@ -6,12 +20,6 @@ .row = home_page_buttons -.col-md-1 - -.col-md-3 - .row - = render 'twitter/index' - - if Rails.env == 'development' .row %hr -- cgit v1.2.3 From e3158f56e9e17dc959c98825b7f005e0749b3c29 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 26 Sep 2016 09:57:50 +0200 Subject: Display provider message next to tweets aswell The content.html.haml was modified to pick the layout based on wether tweets are enabled or not. We need to display the provider message in both cases. --- app/views/home/_content.html.haml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/views/home') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index 45afd92..c7902b1 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -6,6 +6,8 @@ .row = home_page_buttons + .row + = render 'home/provider_message' .col-md-1 -- cgit v1.2.3