Dropped "Remove Thread/Reply" labels from posts #96

static/cranefly/css/cranefly.css

@@ -1125,12 +1125,12 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:0.9;filter:alpha(opa
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-rating form .btn-link.post-hate:hover,.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating form .btn-link.post-hate:active,.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating form .btn-link.post-hate:focus,.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating form .btn-link.post-hate:disabled{color:#cf402e;}
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-rating form .btn-link:disabled:hover,.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating form .btn-link:disabled:active,.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating form .btn-link:disabled:focus{text-decoration:none;}
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-actions{border-left:1px dotted #e7e7e7;float:right;padding:7px 14px;color:#999999;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions a,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions span,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions form{float:left;overflow:auto;}
-.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions form{margin:0px;padding:0px;}
+.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions form{margin:0px;padding:0px;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions form .btn{float:right;margin:0px;margin-left:14px;opacity:1;filter:alpha(opacity=100);padding:0px;color:#999999;font-weight:normal;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions form .btn:hover,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions form .btn:active,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions form .btn:focus{color:#cf402e;text-decoration:underline;}
+.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions form .btn.btn-hide:hover,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions form .btn.btn-hide:active,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions form .btn.btn-hide:focus{color:#f89406;}
+.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions form:first-child .btn{margin-left:0px;}
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-actions a{margin-left:14px;color:#999999;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions a:hover,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions a a:active{color:#333333;}
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-actions a:first-child{margin-left:0px;}
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-actions a.post-reply{color:#555555;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions a.post-reply:hover,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions a.post-reply a:active{color:#049cdb;}
-.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn{float:right;margin:0px;margin-left:14px;opacity:1;filter:alpha(opacity=100);padding:0px;color:#999999;font-weight:normal;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn:hover,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn:active,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn:focus{color:#cf402e;text-decoration:underline;}
-.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn.btn-hide:hover,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn.btn-hide:active,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn.btn-hide:focus{color:#f89406;}
 .thread-body .post-wrapper .post-body.post-muted .user-avatar{width:50px;height:50px;opacity:0.75;filter:alpha(opacity=75);}
 .thread-body .post-wrapper .post-body.post-muted .post-content{margin-left:71px;min-height:0px;opacity:0.75;filter:alpha(opacity=75);padding:14px;}.thread-body .post-wrapper .post-body.post-muted .post-content .post-header{float:right;margin:0px;margin-top:-7px;margin-right:-14px;}.thread-body .post-wrapper .post-body.post-muted .post-content .post-header .post-header-compact{float:left;margin-right:14px;}
 .thread-body .post-wrapper .post-body.post-muted .post-content .post-message{color:#999999;font-size:17.5px;}.thread-body .post-wrapper .post-body.post-muted .post-content .post-message strong,.thread-body .post-wrapper .post-body.post-muted .post-content .post-message a{color:#333333;font-weight:normal;}

static/cranefly/css/cranefly/thread.less

@@ -268,6 +268,32 @@
             form {
               margin: 0px;
               padding: 0px;
+
+              .btn {
+                float: right;
+                margin: 0px;
+                margin-left: @baseFontSize;
+                .opacity(100);
+                padding: 0px;
+
+                color: @grayLight;
+                font-weight: normal;
+
+                &:hover, &:active, &:focus {
+                  color: @red;
+                  text-decoration: underline;
+                }
+
+                &.btn-hide {
+                  &:hover, &:active, &:focus {
+                    color: @orange;
+                  }
+                }
+              }
+
+              &:first-child .btn {
+                margin-left: 0px;
+              }
             }
 
             a {
@@ -291,28 +317,6 @@
                 }
               }
             }
-
-            .btn {
-              float: right;
-              margin: 0px;
-              margin-left: @baseFontSize;
-              .opacity(100);
-              padding: 0px;
-
-              color: @grayLight;
-              font-weight: normal;
-
-              &:hover, &:active, &:focus {
-                color: @red;
-                text-decoration: underline;
-              }
-
-              &.btn-hide {
-                &:hover, &:active, &:focus {
-                  color: @orange;
-                }
-              }
-            }
           }
         }
       }

templates/cranefly/private_threads/thread.html

@@ -249,13 +249,11 @@
                   {% if post.deleted %}
                   <form action="{% url 'private_thread_show' thread=thread.pk, slug=thread.slug %}" class="form-inline" method="post">
                     <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
-                    <span>{% trans %}Delete thread:{% endtrans %}</span>
                     <button type="submit" class="btn btn-link btn-hide tooltip-top" title="{% trans %}Make this thread visible to other users{% endtrans %}">{% trans %}Restore{% endtrans %}</button>
                   </form>
                   {% else %}
                   <form action="{% url 'private_thread_hide' thread=thread.pk, slug=thread.slug %}" class="form-inline" method="post">
                     <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
-                    <span>{% trans %}Delete thread:{% endtrans %}</span>
                     <button type="submit" class="btn btn-link btn-hide tooltip-top" title="{% trans %}Hide this thread from other users{% endtrans %}">{% trans %}Hide{% endtrans %}</button>
                   </form>
                   {% endif %}
@@ -273,13 +271,11 @@
                   {% if post.deleted %}
                   <form action="{% url 'private_post_show' thread=thread.pk, slug=thread.slug, post=post.pk %}" class="form-inline" method="post">
                     <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
-                    <span>{% trans %}Delete reply:{% endtrans %}</span>
                     <button type="submit" class="btn btn-link btn-hide tooltip-top" title="{% trans %}Make this reply visible to other users{% endtrans %}">{% trans %}Restore{% endtrans %}</button>
                   </form>
                   {% else %}
                   <form action="{% url 'private_post_hide' thread=thread.pk, slug=thread.slug, post=post.pk %}" class="form-inline" method="post">
                     <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
-                    <span>{% trans %}Delete reply:{% endtrans %}</span>
                     <button type="submit" class="btn btn-link btn-hide tooltip-top" title="{% trans %}Hide this reply from other users{% endtrans %}">{% trans %}Hide{% endtrans %}</button>
                   </form>
                   {% endif %}

templates/cranefly/threads/thread.html

@@ -272,13 +272,11 @@
               {% if post.deleted %}
               <form action="{% url 'thread_show' thread=thread.pk, slug=thread.slug %}" class="form-inline" method="post">
                 <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
-                <span>{% trans %}Delete thread:{% endtrans %}</span>
                 <button type="submit" class="btn btn-link btn-hide tooltip-top" title="{% trans %}Make this thread visible to other users{% endtrans %}">{% trans %}Restore{% endtrans %}</button>
               </form>
               {% else %}
               <form action="{% url 'thread_hide' thread=thread.pk, slug=thread.slug %}" class="form-inline" method="post">
                 <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
-                <span>{% trans %}Delete thread:{% endtrans %}</span>
                 <button type="submit" class="btn btn-link btn-hide tooltip-top" title="{% trans %}Hide this thread from other users{% endtrans %}">{% trans %}Hide{% endtrans %}</button>
               </form>
               {% endif %}
@@ -296,13 +294,11 @@
               {% if post.deleted %}
               <form action="{% url 'post_show' thread=thread.pk, slug=thread.slug, post=post.pk %}" class="form-inline" method="post">
                 <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
-                <span>{% trans %}Delete reply:{% endtrans %}</span>
                 <button type="submit" class="btn btn-link btn-hide tooltip-top" title="{% trans %}Make this reply visible to other users{% endtrans %}">{% trans %}Restore{% endtrans %}</button>
               </form>
               {% else %}
               <form action="{% url 'post_hide' thread=thread.pk, slug=thread.slug, post=post.pk %}" class="form-inline" method="post">
                 <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
-                <span>{% trans %}Delete reply:{% endtrans %}</span>
                 <button type="submit" class="btn btn-link btn-hide tooltip-top" title="{% trans %}Hide this reply from other users{% endtrans %}">{% trans %}Hide{% endtrans %}</button>
               </form>
               {% endif %}