From de8f3e532d857ec64a9ba17bf9e5a4de272a6cbd Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 26 Mar 2016 17:36:37 +0100
Subject: upgrade: use bootstrap3 row and col-md-*

---
 app/views/common/_action_buttons.html.haml    | 10 +++++-----
 app/views/common/_download_button.html.haml   |  8 ++++----
 app/views/common/_home_page_buttons.html.haml |  4 ++--
 app/views/home/_content.html.haml             |  6 +++---
 app/views/layouts/_content.html.haml          |  6 +++---
 app/views/layouts/application.html.haml       |  8 ++++----
 app/views/sessions/new.html.haml              |  4 ++--
 app/views/users/new.html.haml                 |  4 ++--
 app/views/users/show.html.haml                |  2 +-
 9 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'app/views')

diff --git a/app/views/common/_action_buttons.html.haml b/app/views/common/_action_buttons.html.haml
index 81ebf67..eb663c0 100644
--- a/app/views/common/_action_buttons.html.haml
+++ b/app/views/common/_action_buttons.html.haml
@@ -1,14 +1,14 @@
 .home-buttons
-  .row-fluid.second
-    .login.span4
+  .row.second
+    .login.col-md-4
       %span.link= btn icon('ok-sign') + t(:login), login_path
       %span.info= t(:login_info, default: "")
     - if APP_CONFIG[:allow_registration]
-      .signup.span4
+      .signup.col-md-4
         %span.link= btn icon('user') + t(:signup), signup_path
         %span.info= t(:signup_info, default: "")
     - else
-      .signup.span4
-    .help.span4
+      .signup.col-md-4
+    .help.col-md-4
       %span.link= btn icon('question-sign') + t(:get_help), new_ticket_path
       %span.info= t(:support_info, default: "")
diff --git a/app/views/common/_download_button.html.haml b/app/views/common/_download_button.html.haml
index 9c26860..1278230 100644
--- a/app/views/common/_download_button.html.haml
+++ b/app/views/common/_download_button.html.haml
@@ -1,8 +1,8 @@
 .home-buttons
-  .row-fluid.first
-    .span2
-    .download.span8
+  .row.first
+    .col-md-2
+    .download.col-md-8
       = btn client_download_url, type: [:large, :primary] do
         = big_icon('download')
         = t(:download_bitmask)
-    .span2
+    .col-md-2
diff --git a/app/views/common/_home_page_buttons.html.haml b/app/views/common/_home_page_buttons.html.haml
index fc6348e..cfe3734 100644
--- a/app/views/common/_home_page_buttons.html.haml
+++ b/app/views/common/_home_page_buttons.html.haml
@@ -1,6 +1,6 @@
 = render 'common/download_button'
 - if local_assigns[:divider]
-  .row-fluid
-    .span12
+  .row
+    .col-md-12
       = render local_assigns[:divider]
 = render 'common/action_buttons'
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?
diff --git a/app/views/layouts/_content.html.haml b/app/views/layouts/_content.html.haml
index d5c2fa3..21d2e12 100644
--- a/app/views/layouts/_content.html.haml
+++ b/app/views/layouts/_content.html.haml
@@ -8,12 +8,12 @@
   - content = yield
 
 - if @show_navigation
-  .span2
+  .col-md-2
     = render 'layouts/navigation'
-  .span10
+  .col-md-10
     = render 'layouts/messages'
     = content
 - else
-  .span12
+  .col-md-12
     = render 'layouts/messages'
     = content
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 0aeda8b..e242a5f 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -15,13 +15,13 @@
       #main
         .container-fluid
           - if @show_navigation && !admin?
-            .row-fluid
+            .row
               %h1= t(:user_control_panel)
           - if logged_in?
-            .row-fluid
-              .span12
+            .row
+              .col-md-12
                 = render 'layouts/header'
-          .row-fluid
+          .row
             = render 'layouts/content'
       #push
         -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index bb7e4bd..942c485 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -1,5 +1,5 @@
-.span1
-.span9
+.col-md-1
+.col-md-9
   %h2=t :login
   .lead=t :login_info
   = render :partial => 'users/warnings'
diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml
index bc0b1af..1b257d9 100644
--- a/app/views/users/new.html.haml
+++ b/app/views/users/new.html.haml
@@ -8,8 +8,8 @@
 
 - form_options = {url: '/not-used', html: {id: 'new_user', class: user_form_class('form-horizontal'), style: 'display:none'}, validate: true}
 
-.span1
-.span9
+.col-md-1
+.col-md-9
   %h2=t :signup
   .lead=t :signup_info
   = render :partial => 'warnings'
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index da8e467..3bdf952 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,6 +1,6 @@
 = render 'overview'
 .container-fluid
-  .row-fluid
+  .row
     %h4 To use bitmask services:
     = btn client_download_url, type: "primary" do
       %i.icon-arrow-down.icon-white
-- 
cgit v1.2.3


From 70d8ffc40ef57efaf75cd51e0c1ca654dc37dd4c Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 26 Mar 2016 18:22:22 +0100
Subject: upgrade: bootstrap control-group -> form-group

---
 app/views/users/_change_password.html.haml      | 2 +-
 app/views/users/_change_pgp_key.html.haml       | 2 +-
 app/views/users/_change_service_level.html.haml | 2 +-
 app/views/users/_contact_email.html.haml        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/views')

diff --git a/app/views/users/_change_password.html.haml b/app/views/users/_change_password.html.haml
index 425e3ee..64a4d0a 100644
--- a/app/views/users/_change_password.html.haml
+++ b/app/views/users/_change_password.html.haml
@@ -15,7 +15,7 @@
     = f.input :login, :label => t(:username), :required => false, :input_html => {:id => :srp_username}
   = f.input :password, :required => false, :validate => true, :input_html => { :id => :srp_password }
   = f.input :password_confirmation, :required => false, :input_html => { :id => :srp_password_confirmation }
-  .control-group
+  .form-group
     .controls
       = f.submit t(:save), :class => 'btn btn-primary'
 
diff --git a/app/views/users/_change_pgp_key.html.haml b/app/views/users/_change_pgp_key.html.haml
index e465125..af3eb5e 100644
--- a/app/views/users/_change_pgp_key.html.haml
+++ b/app/views/users/_change_pgp_key.html.haml
@@ -8,6 +8,6 @@
 = simple_form_for [:api, @user], form_options do |f|
   %legend= t(:advanced_options)
   = f.input :public_key, :as => :text, :hint => t(:use_ascii_key), :input_html => {:class => "full-width", :rows => 4}
-  .control-group
+  .form-group
     .controls
       = f.submit t(:save), :class => 'btn', :data => {"loading-text" => "Saving..."}
diff --git a/app/views/users/_change_service_level.html.haml b/app/views/users/_change_service_level.html.haml
index 42315a2..a2e9956 100644
--- a/app/views/users/_change_service_level.html.haml
+++ b/app/views/users/_change_service_level.html.haml
@@ -13,6 +13,6 @@
       %p
       = t(:effective_service_level)
       = f.select :effective_service_level_code, ServiceLevel.select_options, :selected => @user.effective_service_level.id
-    .control-group
+    .form-group
       .controls
         = f.submit t(:save), :class => 'btn', :data => {"loading-text" => "Saving..."}
diff --git a/app/views/users/_contact_email.html.haml b/app/views/users/_contact_email.html.haml
index ad768b7..1627ff6 100644
--- a/app/views/users/_contact_email.html.haml
+++ b/app/views/users/_contact_email.html.haml
@@ -4,6 +4,6 @@
   = f.input :contact_email, :label => false
   -# %p= t(:public_key)
   -# = f.text_area :contact_email_key, {:class => "full-width", :rows => 4}
-  .control-group
+  .form-group
     .controls
       = f.submit t(:save), :class => 'btn', :data => {"loading-text" => "Saving..."}
\ No newline at end of file
-- 
cgit v1.2.3


From a1b494e334406660a1f49fb7de9b043493809640 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 13 May 2016 16:23:10 +0200
Subject: ensure invalid user ids still render the ticket form

We still have strange urls requested like
 /pt/users/AnonymousUser.../tickets/new

Not sure where they are coming from - but this should make sure we
respond with sth. meaningful instead of erroring out.

Conflicts:
	app/views/layouts/_content.html.haml
---
 app/views/layouts/_content.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/layouts/_content.html.haml b/app/views/layouts/_content.html.haml
index 21d2e12..8e0bfbc 100644
--- a/app/views/layouts/_content.html.haml
+++ b/app/views/layouts/_content.html.haml
@@ -7,7 +7,7 @@
 - else
   - content = yield
 
-- if @show_navigation
+- if @show_navigation && @user
   .col-md-2
     = render 'layouts/navigation'
   .col-md-10
-- 
cgit v1.2.3


From e05a1b0f5ae40a2aa17976b3009cd563b8e4660a Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sun, 1 May 2016 10:55:33 -0300
Subject: api: allow version bumping - bump to 2

---
 app/views/api/sessions/new.json.erb | 3 +++
 app/views/v1/sessions/new.json.erb  | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 app/views/api/sessions/new.json.erb
 delete mode 100644 app/views/v1/sessions/new.json.erb

(limited to 'app/views')

diff --git a/app/views/api/sessions/new.json.erb b/app/views/api/sessions/new.json.erb
new file mode 100644
index 0000000..36154b8
--- /dev/null
+++ b/app/views/api/sessions/new.json.erb
@@ -0,0 +1,3 @@
+{
+"errors": <%= raw @errors.to_json %>
+}
diff --git a/app/views/v1/sessions/new.json.erb b/app/views/v1/sessions/new.json.erb
deleted file mode 100644
index 36154b8..0000000
--- a/app/views/v1/sessions/new.json.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-"errors": <%= raw @errors.to_json %>
-}
-- 
cgit v1.2.3


From 7f0c42a5fa6d6c1952e53b9b73bad0202f746f3e Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 23 May 2016 11:59:41 +0200
Subject: cleanup: remove service level code from users_controller

There's no route to this right now and it also seems to be tested
nowhere. Since i am about to split up the users_controller let's
get rid of this and put it in the place we want it once we actually finish
the implementation
---
 app/views/users/_change_service_level.html.haml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'app/views')

diff --git a/app/views/users/_change_service_level.html.haml b/app/views/users/_change_service_level.html.haml
index a2e9956..32ea8c0 100644
--- a/app/views/users/_change_service_level.html.haml
+++ b/app/views/users/_change_service_level.html.haml
@@ -1,8 +1,13 @@
--# TODO: probably won't want here, but here for now. Also, we will need way to ensure payment if they pick a non-free plan.
--#
--# SERVICE LEVEL
--#
-- if APP_CONFIG[:service_levels]
+:ruby
+  # DISABLED! this form points to a route that does not exist.
+  #   It's a draft for implementing service levels.
+  # TODO: probably won't want here, but here for now.
+  #       We will need way to ensure payment for a non-free plan.
+  #
+  # SERVICE LEVEL
+  #
+  #
+- if APP_CONFIG[:service_levels] && false
   - form_options = {:html => {:class => user_form_class('form-horizontal'), :id => 'update_service_level', :data => {token: session[:token]}}, :validate => true}
   = simple_form_for @user, form_options do |f|
     %legend= t(:service_level)
-- 
cgit v1.2.3


From f47fc9d6522886cf81cfea26ec1f396219c539ba Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 23 May 2016 12:17:31 +0200
Subject: move signup from users to account_controller

There was a lot of special case handling going on in the users_controller
for this. Lot simpler this way.
---
 app/views/account/new.html.haml        | 27 +++++++++++++++++++++++++++
 app/views/sessions/_warnings.html.haml | 12 ++++++++++++
 app/views/sessions/new.html.haml       |  2 +-
 app/views/users/_warnings.html.haml    | 12 ------------
 app/views/users/new.html.haml          | 27 ---------------------------
 5 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 app/views/account/new.html.haml
 create mode 100644 app/views/sessions/_warnings.html.haml
 delete mode 100644 app/views/users/_warnings.html.haml
 delete mode 100644 app/views/users/new.html.haml

(limited to 'app/views')

diff --git a/app/views/account/new.html.haml b/app/views/account/new.html.haml
new file mode 100644
index 0000000..d40259e
--- /dev/null
+++ b/app/views/account/new.html.haml
@@ -0,0 +1,27 @@
+-#
+-# This form is handled entirely by javascript
+-# Please take care when changing element ids.
+-#
+-# The form is hidden when no js is available
+-# to prevent submission in the clear.
+-#
+
+- form_options = {url: '/not-used', html: {id: 'new_user', class: user_form_class('form-horizontal'), style: 'display:none'}, validate: true}
+
+.col-md-1
+.col-md-9
+  %h2=t :signup
+  .lead=t :signup_info
+  = render "sessions/warnings"
+  = simple_form_for(@user, form_options) do |f|
+    = f.input :login, :label => t(:username), :required => false, :input_html => { :id => :srp_username }
+    = f.input :password, :label => t(:password), :required => false, :validate => true, :input_html => { :id => :srp_password }
+    = f.input :password_confirmation, :label => t(:password_confirmation), :required => false, :validate => true, :input_html => { :id => :srp_password_confirmation }
+
+    - if APP_CONFIG[:invite_required]
+      = f.input :invite_code, :label => t(:invite_code), :input_html => { :id => :srp_invite_code }
+    - else
+      = f.input :invite_code, :as => "hidden", :input_html => { :value => " ", :id => :srp_invite_code }
+
+    = f.button :wrapped, cancel: home_path
+-#
diff --git a/app/views/sessions/_warnings.html.haml b/app/views/sessions/_warnings.html.haml
new file mode 100644
index 0000000..baf80a4
--- /dev/null
+++ b/app/views/sessions/_warnings.html.haml
@@ -0,0 +1,12 @@
+%noscript
+  %div.alert.alert-error=t :js_required_html
+#cookie_warning.alert.alert-error{:style => "display:none"}
+  =t :cookie_disabled_warning
+:javascript
+  document.cookie = "testing=cookies_enabled; path=/";
+  if(document.cookie.indexOf("testing=cookies_enabled") < 0)
+  {
+    document.getElementById('cookie_warning').style.display = 'block';
+  } else {
+    document.getElementById('cookie_warning').style.display = 'none';
+  }
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index 942c485..6695123 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -2,7 +2,7 @@
 .col-md-9
   %h2=t :login
   .lead=t :login_info
-  = render :partial => 'users/warnings'
+  = render 'warnings'
   = simple_form_for [:api, @session], validate: true, html: { id: :new_session, class: 'form-horizontal hidden js-show', style: "display:none;" } do |f|
     = f.input :login, :required => false, :label => t(:username), :input_html => { :id => :srp_username }
     = f.input :password, :required => false, :input_html => { :id => :srp_password }
diff --git a/app/views/users/_warnings.html.haml b/app/views/users/_warnings.html.haml
deleted file mode 100644
index baf80a4..0000000
--- a/app/views/users/_warnings.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-%noscript
-  %div.alert.alert-error=t :js_required_html
-#cookie_warning.alert.alert-error{:style => "display:none"}
-  =t :cookie_disabled_warning
-:javascript
-  document.cookie = "testing=cookies_enabled; path=/";
-  if(document.cookie.indexOf("testing=cookies_enabled") < 0)
-  {
-    document.getElementById('cookie_warning').style.display = 'block';
-  } else {
-    document.getElementById('cookie_warning').style.display = 'none';
-  }
diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml
deleted file mode 100644
index 1b257d9..0000000
--- a/app/views/users/new.html.haml
+++ /dev/null
@@ -1,27 +0,0 @@
--#
--# This form is handled entirely by javascript
--# Please take care when changing element ids.
--# 
--# The form is hidden when no js is available 
--# to prevent submission in the clear.
--#
-
-- form_options = {url: '/not-used', html: {id: 'new_user', class: user_form_class('form-horizontal'), style: 'display:none'}, validate: true}
-
-.col-md-1
-.col-md-9
-  %h2=t :signup
-  .lead=t :signup_info
-  = render :partial => 'warnings'
-  = simple_form_for(@user, form_options) do |f|
-    = f.input :login, :label => t(:username), :required => false, :input_html => { :id => :srp_username }
-    = f.input :password, :label => t(:password), :required => false, :validate => true, :input_html => { :id => :srp_password }
-    = f.input :password_confirmation, :label => t(:password_confirmation), :required => false, :validate => true, :input_html => { :id => :srp_password_confirmation }
-
-    - if APP_CONFIG[:invite_required]
-      = f.input :invite_code, :label => t(:invite_code), :input_html => { :id => :srp_invite_code }
-    - else
-      = f.input :invite_code, :as => "hidden", :input_html => { :value => " ", :id => :srp_invite_code }
-
-    = f.button :wrapped, cancel: home_path
--#
-- 
cgit v1.2.3


From e1e98d0229b8b79de2105515f0312903a23dc335 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
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 ++-
 app/views/twitter/_index.html.erb | 26 ++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 app/views/twitter/_index.html.erb

(limited to 'app/views')

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'
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
new file mode 100644
index 0000000..9825afa
--- /dev/null
+++ b/app/views/twitter/_index.html.erb
@@ -0,0 +1,26 @@
+<% unless Rails.application.secrets.twitter['enabled'] == false %>
+  <div class=twitter>
+      <div class="twitter_header">
+        Tweets by <%= @twitter_name %></p>
+      </div>
+    <!-- <p><a href="/followers"> You have <%= @num_followers %> followers.</a></p> -->
+    <% @tweets.each do |e| %>
+      <div class=tweets>
+          <div class="tweets_pic twitter-image-frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
+          <!-- <img class="tweets_pic"></img> -->
+        <div class=tweets_name>
+          @<%= @twitter_screen_name %>
+        </div>
+        <div class=tweet_text>
+          <%= " #{e.text}" %>
+        </div>
+        <div class=text_date>
+          <%= @tweet_time %> <% t = e.created_at%> <%="#{t.strftime("%m/%d/%Y")}"%>
+        </div>
+      </div>
+    <% end %>
+      <div class="twitter_footer">
+        To prevent leakage no links are displayed. For more information visit @<%= @twitter_name %> on twitter.com.</p>
+      </div>
+    </div>
+  <% end %>
-- 
cgit v1.2.3


From fecc0e9e1985be2d3767664453d4776ac20897c0 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
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 +++++++------
 app/views/twitter/_index.html.erb | 38 ++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 26 deletions(-)

(limited to 'app/views')

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?
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 9825afa..3dab567 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,26 +1,24 @@
-<% unless Rails.application.secrets.twitter['enabled'] == false %>
-  <div class=twitter>
+  <div class="twitter">
       <div class="twitter_header">
-        Tweets by <%= @twitter_name %></p>
+        Tweets by <%= twitter_name %></p>
       </div>
-    <!-- <p><a href="/followers"> You have <%= @num_followers %> followers.</a></p> -->
-    <% @tweets.each do |e| %>
-      <div class=tweets>
-          <div class="tweets_pic twitter-image-frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
-          <!-- <img class="tweets_pic"></img> -->
-        <div class=tweets_name>
-          @<%= @twitter_screen_name %>
-        </div>
-        <div class=tweet_text>
-          <%= " #{e.text}" %>
-        </div>
-        <div class=text_date>
-          <%= @tweet_time %> <% t = e.created_at%> <%="#{t.strftime("%m/%d/%Y")}"%>
-        </div>
+      <div class="twitter_list">
+        <% tweets.each do |e| %>
+          <div class="tweet">
+              <div class="tweet_pic twitter_image_frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
+            <div class="tweet_name">
+              @<%= twitter_handle %>
+            </div>
+            <div class="tweet_text">
+              <%= " #{e.text}" %>
+            </div>
+            <div class="tweet_text_date">
+              tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
+            </div>
+          </div>
+        <% end %>
       </div>
-    <% end %>
       <div class="twitter_footer">
-        To prevent leakage no links are displayed. For more information visit @<%= @twitter_name %> on twitter.com.</p>
+        To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
       </div>
     </div>
-  <% end %>
-- 
cgit v1.2.3


From e87d797cdbfe5ebe8dff789742adb6a82d92aae4 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 26 Aug 2016 17:16:35 +0200
Subject: Small updates on method to check if twitter feed enabled

---
 app/views/twitter/_index.html.erb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/views')

diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 3dab567..8ac65be 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,3 +1,4 @@
+<% if twitter_enabled == true %>
   <div class="twitter">
       <div class="twitter_header">
         Tweets by <%= twitter_name %></p>
@@ -22,3 +23,4 @@
         To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
       </div>
     </div>
+<% end %>
-- 
cgit v1.2.3


From e3af6664f997d4dff227fdcd0246eff516520e96 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
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')

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 ea3fc6ffbb8f90aff28ce56fe4432a8d3ff18caa Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Mon, 29 Aug 2016 17:39:46 +0200
Subject: Changes mainly on CSS 'fine tuning' and shortening the Twitter API
 credentials, - only bearer token is needed to access Twitter API

---
 app/views/twitter/_index.html.erb | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'app/views')

diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 8ac65be..eba9675 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,26 +1,34 @@
 <% if twitter_enabled == true %>
   <div class="twitter">
+
       <div class="twitter_header">
-        Tweets by <%= twitter_name %></p>
+        Tweets by </br><%= twitter_name %></p>
       </div>
+
       <div class="twitter_list">
         <% tweets.each do |e| %>
           <div class="tweet">
+
+            <div class="tweet_title">
               <div class="tweet_pic twitter_image_frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
-            <div class="tweet_name">
-              @<%= twitter_handle %>
+                <div class="tweet_name">
+                  @<%= twitter_handle %>
+                </div>
             </div>
-            <div class="tweet_text">
-              <%= " #{e.text}" %>
+
+            <div class="tweet_text"><%= " #{e.text}" %>
             </div>
-            <div class="tweet_text_date">
-              tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
+
+            <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
             </div>
+
           </div>
         <% end %>
       </div>
+
       <div class="twitter_footer">
         To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
       </div>
+
     </div>
 <% end %>
-- 
cgit v1.2.3


From 92e7b90d619111fdaaf50ab0b8538c39605fe005 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
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 ++++++++------
 app/views/twitter/_index.html.erb | 18 +++++++-----------
 2 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'app/views')

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'
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index eba9675..2d17aad 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -2,20 +2,17 @@
   <div class="twitter">
 
       <div class="twitter_header">
-        Tweets by </br><%= twitter_name %></p>
+        <p>These are the most recent tweets by </br><%= twitter_name%></p>
+
+        <div class="twitter_id">
+          <div class="twitter_pic twitter_image_frame"><%= image_tag("rails.png") %></div>
+          <div class="twitter_name"><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
+        </div>
       </div>
 
       <div class="twitter_list">
         <% tweets.each do |e| %>
           <div class="tweet">
-
-            <div class="tweet_title">
-              <div class="tweet_pic twitter_image_frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
-                <div class="tweet_name">
-                  @<%= twitter_handle %>
-                </div>
-            </div>
-
             <div class="tweet_text"><%= " #{e.text}" %>
             </div>
 
@@ -29,6 +26,5 @@
       <div class="twitter_footer">
         To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
       </div>
-
-    </div>
+</div>
 <% end %>
-- 
cgit v1.2.3


From b62bc48bc3bfbd2781cef16d210749ded8d96c37 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Wed, 7 Sep 2016 16:22:20 +0200
Subject: changed naming for tweets-method in _index and included time-checking
 and a twitter call will only be made every 15 minutes

---
 app/views/twitter/_index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 2d17aad..ac10aa4 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -11,7 +11,7 @@
       </div>
 
       <div class="twitter_list">
-        <% tweets.each do |e| %>
+        <% twitter_timeline.each do |e| %>
           <div class="tweet">
             <div class="tweet_text"><%= " #{e.text}" %>
             </div>
-- 
cgit v1.2.3


From 3408ac694a60df0380a3bf444077165a1f30e87e Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
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 +++-
 app/views/twitter/_index.html.erb | 41 +++++++++++++++++++++++----------------
 2 files changed, 27 insertions(+), 18 deletions(-)

(limited to 'app/views')

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'
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 2d17aad..2cba033 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,30 +1,37 @@
 <% if twitter_enabled == true %>
   <div class="twitter">
 
-      <div class="twitter_header">
-        <p>These are the most recent tweets by </br><%= twitter_name%></p>
+    <div class="twitter_header">
+      <div class="twitter_id">
+        <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div>
+          <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
+      </div>
+    </div>
+
+      <!-- <div class="twitter_header">
+        <p>These are the most recent tweets by <%= twitter_name%></p>
 
         <div class="twitter_id">
-          <div class="twitter_pic twitter_image_frame"><%= image_tag("rails.png") %></div>
+          <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div>
           <div class="twitter_name"><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
         </div>
-      </div>
+      </div> -->
 
-      <div class="twitter_list">
-        <% tweets.each do |e| %>
-          <div class="tweet">
-            <div class="tweet_text"><%= " #{e.text}" %>
-            </div>
-
-            <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
-            </div>
+    <div class="twitter_list">
+      <% tweets.each do |e| %>
+        <div class="tweet">
+          <div class="tweet_text"><%= " #{e.text}" %>
+          </div>
 
+          <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
           </div>
-        <% end %>
-      </div>
 
-      <div class="twitter_footer">
-        To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
-      </div>
+        </div>
+      <% end %>
+    </div>
+
+    <div class="twitter_footer">
+      <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p>
+    </div>
 </div>
 <% end %>
-- 
cgit v1.2.3


From 42459748e9e8e30a9cc0c64eaf4b8e10814d2dc2 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
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 +++-
 app/views/twitter/_index.html.erb | 25 +++++++++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)

(limited to 'app/views')

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'
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index ac10aa4..ba618b3 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,30 +1,35 @@
 <% if twitter_enabled == true %>
   <div class="twitter">
 
-      <div class="twitter_header">
-        <p>These are the most recent tweets by </br><%= twitter_name%></p>
+    <div class="twitter_header">
+      <div class="twitter_id">
+        <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div>
+          <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
+      </div>
+    </div>
+
+      <!-- <div class="twitter_header">
+        <p>These are the most recent tweets by <%= twitter_name%></p>
 
         <div class="twitter_id">
-          <div class="twitter_pic twitter_image_frame"><%= image_tag("rails.png") %></div>
+          <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div>
           <div class="twitter_name"><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
         </div>
-      </div>
+      </div> -->
 
       <div class="twitter_list">
         <% twitter_timeline.each do |e| %>
           <div class="tweet">
             <div class="tweet_text"><%= " #{e.text}" %>
             </div>
-
             <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
             </div>
-
           </div>
         <% end %>
-      </div>
+    </div>
 
-      <div class="twitter_footer">
-        To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
-      </div>
+    <div class="twitter_footer">
+      <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p>
+    </div>
 </div>
 <% end %>
-- 
cgit v1.2.3


From 2ef8707a7539622007b6d679a7708a5979594ff3 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 12:20:12 +0200
Subject: Cleaning CSS &view code, updating twitter helper with develop

---
 app/views/twitter/_index.html.erb | 41 +++++++++++++++------------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

(limited to 'app/views')

diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 2cba033..41fbf26 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,37 +1,28 @@
 <% if twitter_enabled == true %>
   <div class="twitter">
 
-    <div class="twitter_header">
-      <div class="twitter_id">
-        <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div>
+      <div class="twitter_header">
+        <div class="twitter_id">
+          <div class="twitter_image_frame"><%= image_tag("Twitter_Logo_Blue.png") %></div>
           <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
+        </div>
       </div>
-    </div>
-
-      <!-- <div class="twitter_header">
-        <p>These are the most recent tweets by <%= twitter_name%></p>
 
-        <div class="twitter_id">
-          <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div>
-          <div class="twitter_name"><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
-        </div>
-      </div> -->
+      <div class="twitter_list">
+        <% twitter_timeline.each do |e| %>
+          <div class="tweet">
+            <div class="tweet_text"><%= " #{e.text}" %>
+            </div>
 
-    <div class="twitter_list">
-      <% tweets.each do |e| %>
-        <div class="tweet">
-          <div class="tweet_text"><%= " #{e.text}" %>
-          </div>
+            <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
+            </div>
 
-          <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
           </div>
+        <% end %>
+      </div>
 
-        </div>
-      <% end %>
-    </div>
-
-    <div class="twitter_footer">
-      <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p>
-    </div>
+      <div class="twitter_footer">
+        <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p>
+      </div>
 </div>
 <% end %>
-- 
cgit v1.2.3


From 8d825a904f4d84e388a5af2c873b06b344512795 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
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')

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 782be39862394c05a069eab9b7dd8f6779354917 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 17:26:51 +0200
Subject: Change in code for caching

---
 app/views/twitter/_index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index e31117e..a7ebd1b 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -9,7 +9,7 @@
       </div>
 
       <div class="twitter_list">
-        <% twitter_timeline.each do |e| %>
+        <% tweets.each do |e| %>
           <div class="tweet">
             <div class="tweet_text"><%= " #{e.text}" %>
             </div>
-- 
cgit v1.2.3


From f70199b16fc759d020ea8eea6ecaaf8eeced8abb Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
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')

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 306b36c045cd62638db179115ed002c6ab7c5cd8 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 22 Sep 2016 14:36:10 +0200
Subject: included Theas work on error-handling \o/; changed link to
 twitter-account in header; fixed erb escaping characters problem without
 letting evil code pass; setting customized image file 'Avatar_Pic.png' in
 config/custo../assets to get loaded instead of default twitter-logo

---
 app/views/twitter/_index.html.erb | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'app/views')

diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index a7ebd1b..cdfff4b 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -3,20 +3,21 @@
 
       <div class="twitter_header">
         <div class="twitter_id">
-          <div class="twitter_image_frame"><%= image_tag("Twitter_Logo_Blue.png") %></div>
-          <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
+          <div class="twitter_image_frame"><%= image_tag("Avatar_Pic.png") %></div>
+          <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/<%= twitter_handle %>">@<%= twitter_handle %></a></div>
         </div>
       </div>
 
       <div class="twitter_list">
-        <% tweets.each do |e| %>
-          <div class="tweet">
-            <div class="tweet_text"><%= " #{e.text}" %>
+        <%if tweets == [] then%><%= error_message %><% end %>
+          <% tweets.each do |e| %>
+            <div class="tweet">
+              <div class="tweet_text"><%= sanitize(e.text) %>
+              </div>
+              <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
+              </div>
             </div>
-            <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
-            </div>
-          </div>
-        <% end %>
+          <% end %>
     </div>
 
     <div class="twitter_footer">
-- 
cgit v1.2.3


From 6f9c4fdab2caef90e49ca965617e767b50bcbbb2 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
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')

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 <azul@riseup.net>
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')

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


From 8a9ef9e96193a737b8d21e1f21db43d0d69394ef Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Fri, 30 Sep 2016 12:13:22 +0200
Subject: added 'show more tweets'-link when more tweets are existing than
 displayed, method included to set number of tweets which should be displayed

---
 app/views/twitter/_index.html.erb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index cdfff4b..6e592c7 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -18,9 +18,16 @@
               </div>
             </div>
           <% end %>
-    </div>
+          <%if all_tweets_count > num_of_tweets then%>
+            <div class="tweet">
+              <div class="more_tweets_link"><a href="https://twitter.com/<%= twitter_handle %>">Show more tweets...</a>
+              </div>
+            </div>
+          <% end %>
+      </div>
 
     <div class="twitter_footer">
+
       <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p>
     </div>
 </div>
-- 
cgit v1.2.3