From 239e6e8cc57c4a73c0c8cb031edb926610544e2d Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@edx.org>
Date: Fri, 14 Sep 2012 19:55:13 -0400
Subject: [PATCH 1/2] Add AWS storage bucket name for S3 to make file uploads
 work

---
 lms/envs/aws.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 136f311a5d..08150c9acd 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -70,6 +70,7 @@ SECRET_KEY = AUTH_TOKENS['SECRET_KEY']
 
 AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"]
 AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"]
+AWS_STORAGE_BUCKET_NAME = 'edxuploads'
 
 DATABASES = AUTH_TOKENS['DATABASES']
 

From 17c3dd913e1e6e71c0f44ef455944d8167eb60a7 Mon Sep 17 00:00:00 2001
From: Ibrahim Awwal <ibrahim.awwal@gmail.com>
Date: Fri, 14 Sep 2012 16:55:02 -0700
Subject: [PATCH 2/2] Tooltips on follow and vote.

---
 lms/templates/discussion/_underscore_templates.html           | 4 ++--
 .../discussion/mustache/_inline_thread_show.mustache          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index ea70ac2910..36378c24e5 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -20,9 +20,9 @@
 
 <script type="text/template" id="thread-show-template">
   <div class="discussion-post">
-      <div><a href="javascript:void(0)" class="dogear action-follow"></a></div>
+      <div><a href="javascript:void(0)" class="dogear action-follow" data-tooltip="follow"></a></div>
       <header>
-          <a href="#" class="vote-btn discussion-vote discussion-vote-up" data-role="discussion-vote"><span class="plus-icon">+</span> <span class='votes-count-number'>${'<%- votes["up_count"] %>'}</span></a>
+          <a href="#" class="vote-btn discussion-vote discussion-vote-up" data-role="discussion-vote" data-tooltip="vote"><span class="plus-icon">+</span> <span class='votes-count-number'>${'<%- votes["up_count"] %>'}</span></a>
           <h1>${'<%- title %>'}</h1>
           <p class="posted-details">
               ${"<% if (obj.username) { %>"}
diff --git a/lms/templates/discussion/mustache/_inline_thread_show.mustache b/lms/templates/discussion/mustache/_inline_thread_show.mustache
index f844b7c12c..733fbc4ca1 100644
--- a/lms/templates/discussion/mustache/_inline_thread_show.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread_show.mustache
@@ -1,7 +1,7 @@
 <div class="discussion-post local">
-    <div><a href="javascript:void(0)" class="dogear action-follow"></a></div>
+    <div><a href="javascript:void(0)" class="dogear action-follow" data-tooltip="follow"></a></div>
     <header>
-        <a href="#" class="vote-btn discussion-vote discussion-vote-up" data-role="discussion-vote"><span class="plus-icon">+</span> <span class='votes-count-number'>{{votes.up_count}}</span></a>
+        <a href="#" class="vote-btn discussion-vote discussion-vote-up" data-role="discussion-vote" data-tooltip="vote"><span class="plus-icon">+</span> <span class='votes-count-number'>{{votes.up_count}}</span></a>
         <h3>{{title}}</h3>
         <p class="posted-details">
             {{#user}}