From 32f75bfe9edd71e2b92ed0fd4484b18aede5213d Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 20 Mar 2013 11:58:47 -0400 Subject: [PATCH] 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 @@
-
    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 @@
    {{group_string}}
    -
    +
      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 @@
      + {{votes.up_count}}

      {{title}}

      +
      +Pinned
      +

      {{#user}} {{username}}