Merge pull request #180 from zthart/fix-onfloor-label

Change 'On-floor' label to 'On-floor Status'

Author: devinmatte

conditional/templates/dashboard.html

@@ -17,8 +17,8 @@ <h5 class="email">{{username}}@csh.rit.edu</h5>
                         {% if active %}
                         <span class="label label-success">Active</span> {% else %}
                         <span class="label label-danger">Inactive</span> {% endif %} {% if onfloor %}
-                        <span class="label label-primary">On-floor</span> {% else %}
-                        <span class="label label-default">Off-floor</span> {% endif %} {% if voting %}
+                        <span class="label label-primary">On-floor Status</span> {% else %}
+                        <span class="label label-default">Off-floor Status</span> {% endif %} {% if voting %}
                         <span class="label label-primary">Voting</span> {% else %}
                         <span class="label label-default">Non-Voting</span> {% endif %}
                     </div>