Change dashboard for inactive members #34

Author: mbillow

conditional/templates/dashboard.html

@@ -116,7 +116,7 @@ <h3 class="panel-title">Membership Evaluations
                         <span class="pull-right"><span class="glyphicon glyphicon-ok-sign green"></span> Passed</span>
                         {% elif spring['status'] == "Failed" %}
                         <span class="pull-right"><span class="glyphicon glyphicon-remove-sign red"></span> Failed</span>
-                        {% else %}
+                        {% elif active %}
                         <span class="pull-right"><span class="glyphicon glyphicon-hourglass yellow"></span> Pending</span>
                         {% endif %}
                     </h3>
@@ -194,9 +194,9 @@ <h3 class="panel-title">Conditionals</h3>
             </div>
             {% endif %}
 
-            {% if major_projects_count == 0 %}
+            {% if major_projects_count == 0 and not active%}
             <div class="alert alert-warning" role="alert"> <span class="glyphicon glyphicon-exclamation-sign white" style="padding-right:5px"> </span> You have no major projects.</div>
-            {% else %}
+            {% elif major_projects_count > 0 %}
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <h3 class="panel-title">Major Projects</h3>
@@ -237,6 +237,7 @@ <h3 class="panel-title">Housing Status</h3>
                             <td class="title">Housing Points</td>
                             <td><span class="pull-right">{{housing['points']}}</span></td>
                         </tr>
+                        {% if active %}
                         <tr>
                             <td class="title">Room Number</td>
                             <td><span class="pull-right">{{housing['room']}}</span></td>
@@ -245,17 +246,18 @@ <h3 class="panel-title">Housing Status</h3>
                             <td class="title">Housing Queue Position</td>
                             <td><span class="pull-right">{{housing['queue_pos']}}</span></td>
                         </tr>
+                        {% endif %}
                         </tbody>
                     </table>
                     {% endif %}
                 </div>
             </div>
 
-            {% if hm_attendance_len == 0 %}
+            {% if hm_attendance_len == 0 and active%}
             <div class="alert alert-success">
                 <span class="glyphicon glyphicon-ok-sign white" style="padding-right:5px"> </span> You haven't missed any house meetings.
             </div>
-            {% else %}
+            {% elif hm_attendance_len > 0 %}
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <h3 class="panel-title">Missed House Meetings</h3>
@@ -279,9 +281,9 @@ <h3 class="panel-title">Missed House Meetings</h3>
             </div>
             {% endif %}
 
-            {% if cm_attendance_len == 0 %}
+            {% if cm_attendance_len == 0 and active%}
             <div class="alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign white" style="padding-right:5px"></span> You have not attended any directorship meetings.</div>
-            {% else %}
+            {% elif cm_attendance_len > 0 %}
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <h3 class="panel-title">Directorship Meeting Attendance</h3>