Commit ab262b40 by Your Name

attempt to update front end with new assets

parent c2b13e0a
...@@ -60,11 +60,12 @@ if Backbone? ...@@ -60,11 +60,12 @@ if Backbone?
@vote() @vote()
toggleFlagAbuse: (event) -> toggleFlagAbuse: (event) ->
alert('flag')
event.preventDefault() event.preventDefault()
if window.user in @model.get("abuse_flaggers") if window.user in @model.get("abuse_flaggers")
@unFlagAbuse()
else
@flagAbuse() @flagAbuse()
else
@unFlagAbuse()
toggleFlagSpoiler: (event) -> toggleFlagSpoiler: (event) ->
event.preventDefault() event.preventDefault()
......
...@@ -2417,7 +2417,7 @@ body.discussion { ...@@ -2417,7 +2417,7 @@ body.discussion {
@extend .discussion-module @extend .discussion-module
} }
.flagdiv{ .discussion-flag-abuse {
font-size: 12px; font-size: 12px;
color: #888; color: #888;
float:right; float:right;
......
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<script type="text/template" id="thread-template"> <script type="text/template" id="thread-template">
<article class="discussion-article" data-id="${'<%- id %>'}"> <article class="discussion-article" data-id="${'<%- id %>'}">
<div class="thread-content-wrapper"></div> <div class="thread-content-wrapper"></div>
<div class = "flagdiv notflagged"><i class="icon"></i>Report Misuse</div> <a href="#" class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="flag">
<i class="icon"></i>Report Misuse</a>
<ol class="responses"> <ol class="responses">
<li class="loading"><div class="loading-animation"></div></li> <li class="loading"><div class="loading-animation"></div></li>
</ol> </ol>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment