Merge branch 'master' of github.com:TracyWebTech/colab

Luan
2 parents dd792dc6 966ab4e4
Showing 2 changed files with 4 additions and 2 deletions Show diff stats
src/super_archives/templates/message-thread.html
src/templates/home.html
@@ -95,7 +95,9 @@
     });
  
     $('.vote.btn', this).on('click', vote);
-    $('.reply.btn', this).on('click', focus_reply);
+    {% if user.is_active %}
+      $('.reply.btn', this).on('click', focus_reply);
+    {% endif %}
   });
  
 </script>
@@ -72,7 +72,7 @@
           {% include "message-preview.html" with result=thread.latest_message %}
         {% endfor %}
       </ul>
-      <a href="{% url 'haystack_search' %}?type=thread&order=latest">
+      <a href="{% url 'haystack_search' %}?type=thread&amp;order=latest">
         {% trans "View more discussions..." %}
       </a>
       <div>&nbsp;</div>
...	...	@@ -95,7 +95,9 @@
95	95	});
96	96
97	97	$('.vote.btn', this).on('click', vote);
98		- $('.reply.btn', this).on('click', focus_reply);
	98	+ {% if user.is_active %}
	99	+ $('.reply.btn', this).on('click', focus_reply);
	100	+ {% endif %}
99	101	});
100	102
101	103	</script>
...	...
...	...	@@ -72,7 +72,7 @@
72	72	{% include "message-preview.html" with result=thread.latest_message %}
73	73	{% endfor %}
74	74	</ul>
75		- <a href="{% url 'haystack_search' %}?type=thread&order=latest">
	75	+ <a href="{% url 'haystack_search' %}?type=thread&order=latest">
76	76	{% trans "View more discussions..." %}
77	77	</a>
78	78	<div> </div>
...	...