Compare commits

..

No commits in common. "c3129511c669705540a5e73a90d3da1f435b69e8" and "d318cf3c3f9dac78903696628e74150f2b5a35c4" have entirely different histories.

7 changed files with 67 additions and 3 deletions

View File

@ -61,7 +61,7 @@ tests locally:
## TODOs ## TODOs
- Figure out why `filter_text` is set to `0` and document that? - Clean up mod buttons from non-mod views
- Stop working on this and start the imageboard - Stop working on this and start the imageboard
## AGPL-3.0+ANTIFA compliance ## AGPL-3.0+ANTIFA compliance

View File

@ -87,13 +87,13 @@ subtest Login => sub {
}; };
subtest 'Buttons for mods', sub { subtest 'Buttons for mods', sub {
$t->get_ok('/moderator/thread/single/1') $t->get_ok('/thread/single/1')
->status_is(200) ->status_is(200)
->element_exists('a[href*="/hide/1"]' ) ->element_exists('a[href*="/hide/1"]' )
->element_exists('a[href*="/unhide/1"]') ->element_exists('a[href*="/unhide/1"]')
->element_exists('a[href*="/unflag/1"]'); ->element_exists('a[href*="/unflag/1"]');
$t->get_ok('/moderator/remark/single/1') $t->get_ok('/remark/single/1')
->status_is(200) ->status_is(200)
->element_exists('a[href*="/hide/1"]' ) ->element_exists('a[href*="/hide/1"]' )
->element_exists('a[href*="/unhide/1"]') ->element_exists('a[href*="/unhide/1"]')

View File

@ -12,6 +12,15 @@
<div class="post__body"> <div class="post__body">
<%== markdown $remark->{'body'} =%> <%== markdown $remark->{'body'} =%>
</div> </div>
<nav class="post__nav">
<%= link_to Thread => single_thread =>
{thread_id => $remark->{'thread_id'}}, (class => 'click') %>
<%= link_to Remark => post_remark =>
{thread_id => $remark->{'thread_id'}}, (class => 'click') %>
<%= link_to Flag => flag_remark => {remark_id => $remark->{'id'}},
(class => 'click') %>
</nav>
<% if (is_mod) { =%>
<nav class="post__nav"> <nav class="post__nav">
<%= link_to Hide => hide_remark => {remark_id => $remark->{'id'}}, <%= link_to Hide => hide_remark => {remark_id => $remark->{'id'}},
(class => 'click') %> (class => 'click') %>
@ -20,6 +29,7 @@
<%= link_to Unflag => unflag_remark => {remark_id => $remark->{'id'}}, <%= link_to Unflag => unflag_remark => {remark_id => $remark->{'id'}},
(class => 'click') %> (class => 'click') %>
</nav> </nav>
<% } =%>
</article> </article>
</main> </main>
<% } =%> <% } =%>

View File

@ -13,6 +13,19 @@
<div class="post__body"> <div class="post__body">
<%== markdown $thread->{'body'} =%> <%== markdown $thread->{'body'} =%>
</div> </div>
<nav class="post__nav">
<%= link_to post_remark => {thread_id => $thread->{'id'}},
(class => 'click'), begin %>
Remark (<%= $thread->{'remark_tally'} %>)
<% end %>
<%= link_to bump_thread => {thread_id => $thread->{'id'}},
(class => 'click'), begin %>
Bump (<%= $thread->{'bump_tally'} %>)
<% end %>
<%= link_to Flag => flag_thread => {thread_id => $thread->{'id'}},
(class => 'click') %>
</nav>
<% if (is_mod) { =%>
<nav class="post__nav"> <nav class="post__nav">
<%= link_to Hide => hide_thread => {thread_id => $thread->{'id'}}, <%= link_to Hide => hide_thread => {thread_id => $thread->{'id'}},
(class => 'click') %> (class => 'click') %>
@ -21,6 +34,7 @@
<%= link_to Unflag => unflag_thread => {thread_id => $thread->{'id'}}, <%= link_to Unflag => unflag_thread => {thread_id => $thread->{'id'}},
(class => 'click') %> (class => 'click') %>
</nav> </nav>
<% } =%>
</article> </article>
</main> </main>
<% } =%> <% } =%>

View File

@ -36,6 +36,16 @@
<%= link_to Flag => flag_remark => {remark_id => $remark->{'id'}}, <%= link_to Flag => flag_remark => {remark_id => $remark->{'id'}},
(class => 'click') %> (class => 'click') %>
</nav> </nav>
<% if (is_mod) { =%>
<nav class="post__nav">
<%= link_to Hide => hide_remark => {remark_id => $remark->{'id'}},
(class => 'click') %>
<%= link_to Unhide => unhide_remark => {remark_id => $remark->{'id'}},
(class => 'click') %>
<%= link_to Unflag => unflag_remark => {remark_id => $remark->{'id'}},
(class => 'click') %>
</nav>
<% } =%>
</article> </article>
</main> </main>
<% } =%> <% } =%>

View File

@ -82,6 +82,16 @@
<%= link_to Flag => flag_remark => {remark_id => $last_remark->{'id'}}, <%= link_to Flag => flag_remark => {remark_id => $last_remark->{'id'}},
(class => 'click') %> (class => 'click') %>
</nav> </nav>
<% if (is_mod) { =%>
<nav class="post__nav">
<%= link_to Hide => hide_remark => {remark_id => $last_remark->{'id'}},
(class => 'click') %>
<%= link_to Unhide => unhide_remark => {remark_id =>
$last_remark->{'id'}}, (class => 'click') %>
<%= link_to Unflag => unflag_remark => {remark_id =>
$last_remark->{'id'}}, (class => 'click') %>
</nav>
<% } =%>
</article> </article>
</section> </section>
<% } =%><%# Close the last_remark 'if' %> <% } =%><%# Close the last_remark 'if' %>
@ -112,6 +122,16 @@
<%= link_to Flag => flag_thread => {thread_id => $thread->{'id'}}, <%= link_to Flag => flag_thread => {thread_id => $thread->{'id'}},
(class => 'click') %> (class => 'click') %>
</nav> </nav>
<% if (is_mod) { =%>
<nav class="post__nav">
<%= link_to Hide => hide_thread => {thread_id => $thread->{'id'}},
(class => 'click') %>
<%= link_to Unhide => unhide_thread => {thread_id => $thread->{'id'}},
(class => 'click') %>
<%= link_to Unflag => unflag_thread => {thread_id => $thread->{'id'}},
(class => 'click') %>
</nav>
<% } =%>
</article> </article>
</section> </section>
<% } =%><%# Close the thread 'if' %> <% } =%><%# Close the thread 'if' %>

View File

@ -38,6 +38,16 @@
<%= link_to Flag => flag_thread => {thread_id => $thread->{'id'}}, <%= link_to Flag => flag_thread => {thread_id => $thread->{'id'}},
(class => 'click') %> (class => 'click') %>
</nav> </nav>
<% if (is_mod) { =%>
<nav class="post__nav">
<%= link_to Hide => hide_thread => {thread_id => $thread->{'id'}},
(class => 'click') %>
<%= link_to Unhide => unhide_thread => {thread_id => $thread->{'id'}},
(class => 'click') %>
<%= link_to Unflag => unflag_thread => {thread_id => $thread->{'id'}},
(class => 'click') %>
</nav>
<% } =%>
</article> </article>
</main> </main>
<% } =%> <% } =%>