Merge remote-tracking branch 'origin/master'

This commit is contained in:
Raynaldo Rivera
2014-11-22 15:54:39 -07:00

View File

@@ -26,7 +26,7 @@
<td class="text-center"> <td class="text-center">
{% ifequal authinfo.forum_username "" %} {% ifequal authinfo.forum_username "" %}
<a href="{% url 'auth_activate_forum' %}"> <a href="{% url 'auth_activate_forum' %}">
<button type="button" class="btn btn-success"><span <button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button> class="glyphicon glyphicon-ok"></span></button>
</a> </a>
{% else %} {% else %}
@@ -49,7 +49,7 @@
<td class="text-center"> <td class="text-center">
{% ifequal authinfo.ipboard_username "" %} {% ifequal authinfo.ipboard_username "" %}
<a href="{% url 'auth_activate_ipboard' %}"> <a href="{% url 'auth_activate_ipboard' %}">
<button type="button" class="btn btn-success"><span <button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button> class="glyphicon glyphicon-ok"></span></button>
</a> </a>
{% else %} {% else %}
@@ -73,7 +73,7 @@
<td class="text-center"> <td class="text-center">
{% ifequal authinfo.jabber_username "" %} {% ifequal authinfo.jabber_username "" %}
<a href="{% url 'auth_activate_jabber' %}"> <a href="{% url 'auth_activate_jabber' %}">
<button type="button" class="btn btn-success"><span <button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button> class="glyphicon glyphicon-ok"></span></button>
</a> </a>
{% else %} {% else %}
@@ -98,7 +98,7 @@
<td class="text-center"> <td class="text-center">
{% ifequal authinfo.mumble_username "" %} {% ifequal authinfo.mumble_username "" %}
<a href="{% url 'auth_activate_mumble' %}"> <a href="{% url 'auth_activate_mumble' %}">
<button type="button" class="btn btn-success"><span <button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button> class="glyphicon glyphicon-ok"></span></button>
</a> </a>
{% else %} {% else %}
@@ -133,7 +133,7 @@
<td class="text-center"> <td class="text-center">
{% ifequal authinfo.forum_username "" %} {% ifequal authinfo.forum_username "" %}
<a href="{% url 'auth_activate_forum' %}"> <a href="{% url 'auth_activate_forum' %}">
<button type="button" class="btn btn-success"><span <button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button> class="glyphicon glyphicon-ok"></span></button>
</a> </a>
{% else %} {% else %}
@@ -157,7 +157,7 @@
<td class="text-center"> <td class="text-center">
{% ifequal authinfo.ipboard_username "" %} {% ifequal authinfo.ipboard_username "" %}
<a href="{% url 'auth_activate_ipboard' %}"> <a href="{% url 'auth_activate_ipboard' %}">
<button type="button" class="btn btn-success"><span <button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button> class="glyphicon glyphicon-ok"></span></button>
</a> </a>
{% else %} {% else %}
@@ -181,7 +181,7 @@
<td class="text-center"> <td class="text-center">
{% ifequal authinfo.jabber_username "" %} {% ifequal authinfo.jabber_username "" %}
<a href="{% url 'auth_activate_jabber' %}"> <a href="{% url 'auth_activate_jabber' %}">
<button type="button" class="btn btn-success"><span <button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button> class="glyphicon glyphicon-ok"></span></button>
</a> </a>
{% else %} {% else %}
@@ -206,7 +206,7 @@
<td class="text-center"> <td class="text-center">
{% ifequal authinfo.mumble_username "" %} {% ifequal authinfo.mumble_username "" %}
<a href="{% url 'auth_activate_mumble' %}"> <a href="{% url 'auth_activate_mumble' %}">
<button type="button" class="btn btn-success"><span <button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button> class="glyphicon glyphicon-ok"></span></button>
</a> </a>
{% else %} {% else %}