Merge branch 'feature-remove-tabs' into 'master'

Feature replace tabs

See merge request !260

circle/dashboard/templates/dashboard/confirm/ajax-node-status.html

@@ -15,11 +15,11 @@
           <form action="{% url "dashboard.views.status-node" pk=object.pk %}" method="POST">
           <form action="{% url "dashboard.views.status-node" pk=object.pk %}" method="POST">
             {% csrf_token %}
             {% csrf_token %}
             <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel" %}</button>
             <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel" %}</button>
-	    <input type="hidden" name="change_status" value=""/>
+            <input type="hidden" name="change_status" value=""/>
             <button class="btn btn-warning">{% blocktrans with status=status %}Yes, {{status}}{% endblocktrans %}</button>
             <button class="btn btn-warning">{% blocktrans with status=status %}Yes, {{status}}{% endblocktrans %}</button>
           </form>
           </form>
         </div>
         </div>
-	<div class="clearfix"></div>
+        <div class="clearfix"></div>
 
 
       </div>
       </div>
     </div><!-- /.modal-content -->
     </div><!-- /.modal-content -->

circle/dashboard/templates/dashboard/confirm/ajax-remove.html

@@ -7,7 +7,7 @@
           {{ text }}
           {{ text }}
         {% else %}
         {% else %}
           {%blocktrans with object=object%}
           {%blocktrans with object=object%}
-	  Are you sure you want to remove <strong>{{ member }}</strong> from <strong>{{ object }}</strong>?
+            Are you sure you want to remove <strong>{{ member }}</strong> from <strong>{{ object }}</strong>?
           {%endblocktrans%}
           {%endblocktrans%}
         {% endif %}
         {% endif %}
         <br />
         <br />

circle/dashboard/templates/dashboard/confirm/node-flush.html

@@ -23,9 +23,9 @@
         <div class="pull-right">
         <div class="pull-right">
           <form action="" method="POST">
           <form action="" method="POST">
             {% csrf_token %}
             {% csrf_token %}
-	    <a class="btn btn-default">{% trans "Back" %}</a>
-	    <input type="hidden" name="flush" value=""/>
-	    <button class="btn btn-warning">{% trans "Yes" %}</button>
+            <a class="btn btn-default">{% trans "Back" %}</a>
+            <input type="hidden" name="flush" value=""/>
+            <button class="btn btn-warning">{% trans "Yes" %}</button>
           </form>
           </form>
         </div>
         </div>
       </div>
       </div>

circle/dashboard/templates/dashboard/confirm/node-status.html

@@ -26,7 +26,7 @@
             {% csrf_token %}
             {% csrf_token %}
             <a class="btn btn-default">{% trans "Cancel" %}</a>
             <a class="btn btn-default">{% trans "Cancel" %}</a>
             <button type="button" class="btn btn-default" data-dismiss="modal"></button>
             <button type="button" class="btn btn-default" data-dismiss="modal"></button>
-	    <input type="hidden" name="change_status" value=""/>
+            <input type="hidden" name="change_status" value=""/>
             <button class="btn btn-warning">{% blocktrans with status=status %}Yes, {{status}}{% endblocktrans %}</button>
             <button class="btn btn-warning">{% blocktrans with status=status %}Yes, {{status}}{% endblocktrans %}</button>
           </form>
           </form>
         </div>
         </div>

circle/dashboard/templates/dashboard/group-list.html

@@ -13,7 +13,7 @@
         <h3 class="no-margin"><i class="fa fa-group"></i> {% trans "Groups" %}</h3>
         <h3 class="no-margin"><i class="fa fa-group"></i> {% trans "Groups" %}</h3>
       </div>
       </div>
       <div class="panel-body">
       <div class="panel-body">
-	<div id="table_container">
+        <div id="table_container">
           <div id="rendered_table" class="panel-body">
           <div id="rendered_table" class="panel-body">
             {% render_table table %}
             {% render_table table %}
           </div>
           </div>

circle/dashboard/templates/dashboard/index-groups.html

@@ -26,7 +26,7 @@
         <div class="col-sm-6 text-right">
         <div class="col-sm-6 text-right">
           <a class="btn btn-primary btn-xs" href="{% url "dashboard.views.group-list" %}">
           <a class="btn btn-primary btn-xs" href="{% url "dashboard.views.group-list" %}">
             <i class="fa fa-chevron-circle-right"></i>
             <i class="fa fa-chevron-circle-right"></i>
-	    {% if more_groups > 0 %}
+            {% if more_groups > 0 %}
               {% blocktrans count more=more_groups %}
               {% blocktrans count more=more_groups %}
                 <strong>{{ more }}</strong>  more
                 <strong>{{ more }}</strong>  more
               {% plural %}
               {% plural %}

circle/dashboard/templates/dashboard/node-add-trait.html

@@ -16,7 +16,7 @@
   <div class="col-md-12">
   <div class="col-md-12">
     <div class="panel panel-default">
     <div class="panel panel-default">
       <div class="panel-heading">
       <div class="panel-heading">
-	      <h3 class="no-margin"><i class="fa fa-plus"></i> {% trans "Add Trait" %}</h3>
+        <h3 class="no-margin"><i class="fa fa-plus"></i> {% trans "Add Trait" %}</h3>
       </div>
       </div>
       <div class="panel-body">
       <div class="panel-body">
         {% with form=form %}
         {% with form=form %}

circle/dashboard/templates/dashboard/node-detail/home.html

@@ -8,11 +8,11 @@
           {% for t in node.traits.all %}
           {% for t in node.traits.all %}
             <div class="label label-success label-tag" style="display: inline-block">
             <div class="label label-success label-tag" style="display: inline-block">
               {{ t }}
               {{ t }}
-	      <a data-trait-pk="{{ t.pk }}" href="#" class="node-details-remove-trait"><i class="fa fa-times"></i></a>
+              <a data-trait-pk="{{ t.pk }}" href="#" class="node-details-remove-trait"><i class="fa fa-times"></i></a>
             </div>
             </div>
           {% endfor %}
           {% endfor %}
         {% else %}
         {% else %}
-	<small>{% trans "No trait added!" %}</small>
+          <small>{% trans "No trait added!" %}</small>
         {% endif %}
         {% endif %}
       </div>
       </div>
  {% load crispy_forms_tags %}
  {% load crispy_forms_tags %}