Merge branch 'marie' into develop

5 files changed, 33 insertions, 17 deletions

diff --git a/app/assets/images/Twitter_Logo_Blue.png b/app/assets/images/Avatar_Pic.png
index b5eebc8..b5eebc8 100644
--- a/app/assets/images/Twitter_Logo_Blue.png
+++ b/app/assets/images/Avatar_Pic.png
diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index b2233d0..a67c044 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -21,6 +21,7 @@
   position: absolute;
   left: 0;
   top: 0;
+  // background-image: url(/Avatar_Pic.png);
   }
 
 .twitter_image_frame > img {
diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 719f95e..9b1d78d 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,26 +22,33 @@ module TwitterHelper
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
-    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+<<<<<<< HEAD
+    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle, {:count => 200}).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
     if twitter_user_info[2] == nil
       error_handling
-      twitter_user_info[3] = "The twitter-handle does not exist or the account is private. Please change it or contact your provider-admin."
+      twitter_user_info[3] = "The twitter handle does not exist or the account's tweets are protected. Please change the privacy settings accordingly or contact your provider-admin."
     end
   rescue Twitter::Error::BadRequest
     error_handling
-    twitter_user_info[3] = "The request to have the tweets shown was invalid or cannot be otherwise served."
+    twitter_user_info[3] = "The request for displaying tweets is invalid or cannot be otherwise served."
   rescue Twitter::Error::Unauthorized
     error_handling
-    twitter_user_info[3] = "Please change your twitter-credentials, make sure that the twitter-account you access is public or contact your provider-admin to have the tweets shown."
+    twitter_user_info[3] = "Your bearer-token is invalid or the account's tweets are protected and cannot be displayed. Please change the privacy settings of the corresponding account, check your bearer-token in the secrets-file or contact your provider-admin to have the tweets shown."
   rescue Twitter::Error::Forbidden
     error_handling
-    twitter_user_info[3] = "The request to have the tweets shown is understood, but it has been refused or access is not allowed."
+    twitter_user_info[3] = "The request for displaying tweets is understood, but it has been refused or access is not allowed."
   rescue Twitter::Error::NotAcceptable
     error_handling
-    twitter_user_info[3] = "An invalid format is specified in the request to have the tweets shown."
+    twitter_user_info[3] = "An invalid format is specified in the request for displaying tweets."
   rescue Twitter::Error::TooManyRequests
     error_handling
-    twitter_user_info[3] = "The rate-limit for accessing the tweets is reached. You should be able to see the tweets in a couple of minutes."
+    twitter_user_info[3] = "The rate-limit for accessing the tweets is reached. You should be able to display tweets in a couple of minutes."
+  rescue Twitter::Error::NotFound
+    error_handling
+    twitter_user_info[3] = "The twitter hanlde does not exist."
+  rescue Twitter::Error
+    error_handling
+    twitter_user_info[3] = "An error occured while fetching the tweets."
   end
 
   def error_handling
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
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 8529b83..cdfff4b 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -3,8 +3,8 @@
 
       <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>
 
@@ -12,7 +12,7 @@
         <%if tweets == [] then%><%= error_message %><% end %>
           <% tweets.each do |e| %>
             <div class="tweet">
-              <div class="tweet_text"><%= " #{e.text}" %>
+              <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>