Merge branch 'discussion3' of github.com:dementrock/mitx

Conflicts:
	lms/static/coffee/src/discussion/templates.coffee

lms/static/coffee/src/discussion/templates.coffee

@@ -11,7 +11,7 @@ Discussion = @Discussion
       <ul class="discussion-errors"></ul>    
       <input type="text" class="new-post-title title-input" placeholder="Title"/>
       <div class="new-post-similar-posts-wrapper" style="display: none">
-        Do you mean... <a class="hide-similar-posts" href="javascript:void(0)">No you got it wrong lol</a>
+        Similar Posts: <a class="hide-similar-posts" href="javascript:void(0)">These are not what I want</a>
         <div class="new-post-similar-posts"></div>
       </div>
       <div class="new-post-body body-input"></div>

lms/static/sass/_discussion.scss

@@ -45,6 +45,9 @@ form label {
       margin-left: 5px;
     }
   }
+  .blank {
+    margin: 2%;
+  }
   //SORTING
   .discussion-sort {
     float: right;
@@ -213,11 +216,17 @@ form label {
       display: block;
       margin-left: -5%;
     }
+    .new-post-similar-posts-wrapper {
+      font-size: $comment_body_size;
+      line-height: 150%;
+      padding: 1%;
+    }
     .new-post-similar-posts {
+      font: inherit;
       .similar-post {
         display: block;
+        line-height: 150%;
       }
-
     }
     .new-post-body {
       margin-top: flex-gutter();
@@ -243,6 +252,10 @@ form label {
   }
   .discussion-content-edit, .discussion-reply-new, .new-post-form {
     margin: 10px 0 10px 0;
+    a:hover {
+      color: #1C71DD;
+      text-decoration: none;
+    };
     .new-post-control {
       margin-left: 80%;
       margin-top: 1%;
@@ -265,6 +278,9 @@ form label {
       padding-top: 9px;
       text-decoration: none;
       width: inherit;
+      &:hover {
+        color: white;
+      }
     }
   }
   .new-post-form {
@@ -326,6 +342,12 @@ form label {
       font-size: $comment_info_size;
       font-style: italic;
       margin-top: 2%;
+      a {
+        &:hover {
+        text-decoration: none;
+        color: #1C71DD;
+        }
+      }
       .comment-time {
         display: inline;
         float: right;
@@ -342,6 +364,10 @@ form label {
         color: #1d9dd9;
         display: inline;
         margin-left: 2px;
+        &:hover {
+          text-decoration: none;
+          color: #1C71DD;
+        }
       }
     }
     .discussion-content {

lms/templates/discussion/_blank_slate.html

@@ -1,7 +1,7 @@
 <div class="blank-state">
   % if performed_search:
-    There is no result matching your search parameters.
+    Sorry! We can't find anything matching your search. Please try another search.
   % else:
-    There is no post here yet. Be the first one to post!
+    There are no posts here yet. Be the first one to post!
   % endif
 </div>

lms/templates/discussion/_forum.html

@@ -14,18 +14,20 @@
     </div>
     <div class="discussion-new-post control-button" href="javascript:void(0)">New Post</div>
   </div>
-  <%include file="_sort.html" />
   % if len(threads) == 0:
-    <%include file="_blank_slate.html" />
+    <div class="blank">
+      <%include file="_blank_slate.html" />
+    </div>
     <div class="threads"></div>
   % else:
+    <%include file="_sort.html" />
     <div class="threads">
       % for thread in threads:
         ${renderer.render_thread(course_id, thread, show_comments=False)}
       % endfor
     </div>
+    <%include file="_paginator.html" />
   % endif
-  <%include file="_paginator.html" />
 </section>
 
 <%!

lms/templates/discussion/_inline.html

@@ -6,19 +6,21 @@
       <%include file="_search_bar.html" />
     </div>
     <div class="discussion-new-post control-button" href="javascript:void(0)">New Post</div>
-    <%include file="_sort.html" />
   </div>
   % if len(threads) == 0:
-    <%include file="_blank_slate.html" />
+    <div class="blank">
+      <%include file="_blank_slate.html" />
+    </div>
     <div class="threads"></div>
   % else:
+    <%include file="_sort.html" />
     <div class="threads">
       % for thread in threads:
         ${renderer.render_thread(course_id, thread, show_comments=False)}
       % endfor
     </div>
+    <%include file="_paginator.html" />
   % endif
-  <%include file="_paginator.html" />
 </section>
 
 <%!