From 359de858b4c6e890e8ff2532f3be2d86270845f8 Mon Sep 17 00:00:00 2001
From: Kevin Chugh <kevinchugh@gmail.com>
Date: Wed, 20 Mar 2013 09:21:51 -0400
Subject: [PATCH 1/4] merge master

---
 lms/templates/discussion/mustache/_inline_thread.mustache        | 1 +
 .../discussion/mustache/_inline_thread_cohorted.mustache         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lms/templates/discussion/mustache/_inline_thread.mustache b/lms/templates/discussion/mustache/_inline_thread.mustache
index b52d3924e7..2fce7b0a00 100644
--- a/lms/templates/discussion/mustache/_inline_thread.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread.mustache
@@ -1,4 +1,5 @@
 <article class="discussion-article" data-id="{{id}}">
+<div class="pinned-{{pinned}}"></div>
     <div class="thread-content-wrapper"></div>
 
     <ol class="responses post-extended-content">
diff --git a/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache b/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
index 9223dfd388..6bc1f1f5fe 100644
--- a/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
@@ -1,5 +1,6 @@
 <article class="discussion-article" data-id="{{id}}">
 <div class="group-visibility-label">{{group_string}}</div>
+<div class="pinned-{{pinned}}"></div>
     <div class="thread-content-wrapper"></div>
 
     <ol class="responses post-extended-content">

From 32f75bfe9edd71e2b92ed0fd4484b18aede5213d Mon Sep 17 00:00:00 2001
From: Your Name <kevinchugh@edx.org>
Date: Wed, 20 Mar 2013 11:58:47 -0400
Subject: [PATCH 2/4] added pinning UI to inline

---
 lms/static/sass/_discussion.scss                     | 12 ++++++++++++
 .../discussion/mustache/_inline_thread.mustache      |  1 -
 .../mustache/_inline_thread_cohorted.mustache        |  2 +-
 .../discussion/mustache/_inline_thread_show.mustache |  3 +++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 2f044ca5a3..9ef6b85e26 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -2450,6 +2450,13 @@ body.discussion {
       padding-right: 5px;
       font-style: italic; 
     }  
+
+.discussion-pin-inline {
+      font-size: 12px;
+      float:right;
+      padding-right: 5px;
+      font-style: italic; 
+    }  
     
 .notpinned .icon
 {
@@ -2477,4 +2484,9 @@ body.discussion {
 .notpinned span {
   color: #888;
   font-style: italic;
+}
+
+.pinned-false
+{
+display:none;
 }
\ No newline at end of file
diff --git a/lms/templates/discussion/mustache/_inline_thread.mustache b/lms/templates/discussion/mustache/_inline_thread.mustache
index 2fce7b0a00..b52d3924e7 100644
--- a/lms/templates/discussion/mustache/_inline_thread.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread.mustache
@@ -1,5 +1,4 @@
 <article class="discussion-article" data-id="{{id}}">
-<div class="pinned-{{pinned}}"></div>
     <div class="thread-content-wrapper"></div>
 
     <ol class="responses post-extended-content">
diff --git a/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache b/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
index 6bc1f1f5fe..40921aeb4e 100644
--- a/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
@@ -1,6 +1,6 @@
 <article class="discussion-article" data-id="{{id}}">
 <div class="group-visibility-label">{{group_string}}</div>
-<div class="pinned-{{pinned}}"></div>
+
     <div class="thread-content-wrapper"></div>
 
     <ol class="responses post-extended-content">
diff --git a/lms/templates/discussion/mustache/_inline_thread_show.mustache b/lms/templates/discussion/mustache/_inline_thread_show.mustache
index 733fbc4ca1..0a72201a41 100644
--- a/lms/templates/discussion/mustache/_inline_thread_show.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread_show.mustache
@@ -3,6 +3,9 @@
     <header>
         <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>
+<div class="discussion-pin-inline pinned  pinned-{{pinned}}" data-tooltip="This thread has been pinned by course staff.">                
+<i class="icon"></i><span class="pin-label">Pinned</span></div>
+
         <p class="posted-details">
             {{#user}}
             <a href="{{user_url}}" class="username">{{username}}</a>

From 7ecf0e5bc1edbc46a4fb8dfd3253bcc4f6697a93 Mon Sep 17 00:00:00 2001
From: marco <marcotuts@gmail.com>
Date: Thu, 21 Mar 2013 14:27:10 -0400
Subject: [PATCH 3/4] small positioning adjustments to inline pins;

---
 lms/static/sass/_discussion.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 9ef6b85e26..9583a8d30f 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -2454,8 +2454,10 @@ body.discussion {
 .discussion-pin-inline {
       font-size: 12px;
       float:right;
-      padding-right: 5px;
-      font-style: italic; 
+      font-style: italic;
+      position: relative;
+      right:-20px;
+      top:-13px;
     }  
     
 .notpinned .icon

From f59b74e27f4f8074bb353b1c85b5e47a80b718d2 Mon Sep 17 00:00:00 2001
From: Kevin Chugh <kevinchugh@gmail.com>
Date: Mon, 8 Apr 2013 17:19:28 -0400
Subject: [PATCH 4/4] fix nitpick and merge master

---
 .../discussion/mustache/_inline_thread_show.mustache          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/templates/discussion/mustache/_inline_thread_show.mustache b/lms/templates/discussion/mustache/_inline_thread_show.mustache
index 0a72201a41..b961aadcc4 100644
--- a/lms/templates/discussion/mustache/_inline_thread_show.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread_show.mustache
@@ -3,8 +3,8 @@
     <header>
         <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>
-<div class="discussion-pin-inline pinned  pinned-{{pinned}}" data-tooltip="This thread has been pinned by course staff.">                
-<i class="icon"></i><span class="pin-label">Pinned</span></div>
+        <div class="discussion-pin-inline pinned  pinned-{{pinned}}" data-tooltip="This thread has been pinned by course staff.">                
+        <i class="icon"></i><span class="pin-label">Pinned</span></div>
 
         <p class="posted-details">
             {{#user}}