diff --git a/conditional/templates/base.html b/conditional/templates/base.html index 84ba265a..45f1deef 100644 --- a/conditional/templates/base.html +++ b/conditional/templates/base.html @@ -24,7 +24,7 @@ {% endblock %} {% else %}
- +
{% endif %} diff --git a/conditional/templates/dashboard.html b/conditional/templates/dashboard.html index a77b3592..e6a6c0d9 100644 --- a/conditional/templates/dashboard.html +++ b/conditional/templates/dashboard.html @@ -34,11 +34,11 @@
{{username}}@csh.rit.edu

Freshman Evaluations {% if freshman['status'] == "Passed" %} - Passed + Passed {% elif freshman['status'] == "Pending" %} - Pending + Pending {% else %} - Failed + Failed {% endif %}

@@ -53,8 +53,8 @@

Freshman Evaluations Signatures Missed {% if freshman['sig_missed'] == 0 %} - None {% else %} - {{freshman['sig_missed']}} {% endif %} + None {% else %} + {{freshman['sig_missed']}} {% endif %} @@ -62,8 +62,8 @@

Freshman Evaluations Directorship Meetings {% if freshman['committee_meetings'] >= 10 %} - {% else %} - {% endif %} {{freshman['committee_meetings']}} / 10 + {% else %} + {% endif %} {{freshman['committee_meetings']}} / 10 @@ -71,8 +71,8 @@

Freshman Evaluations House Meetings Missed {% if freshman['hm_missed'] == 0 %} - None {% else %} - {{ freshman['hm_missed'] }} {% endif %} + None {% else %} + {{ freshman['hm_missed'] }} {% endif %} @@ -80,11 +80,11 @@

Freshman Evaluations Freshman Project {% if freshman['fresh_proj'] == "Passed" %} - Passed + Passed {% elif freshman['fresh_proj'] == "Pending" %} - Pending + Pending {% else %} - Failed + Failed {% endif %} @@ -113,11 +113,11 @@

Freshman Evaluations

Membership Evaluations {% if spring['status'] == "Passed" %} - Passed + Passed {% elif spring['status'] == "Failed" %} - Failed + Failed {% else %} - Pending + Pending {% endif %}

@@ -128,16 +128,16 @@

Membership Evaluations Directorship Meetings {% if spring['committee_meetings'] >= 25 %} - {% else %} - {% endif %} {{ spring['committee_meetings'] }} / 25 + {% else %} + {% endif %} {{ spring['committee_meetings'] }} / 25 House Meetings Missed {% if spring['hm_missed'] == 0 %} - None {% else %} - {{spring['hm_missed']}} + None {% else %} + {{spring['hm_missed']}} {% endif %} @@ -147,9 +147,9 @@

Membership Evaluations {% if spring['mp_status'] == "Passed" %} - Passed {% elif spring['mp_status'] == "Pending" %} - Pending {% else %} - None {% endif %} + Passed {% elif spring['mp_status'] == "Pending" %} + Pending {% else %} + None {% endif %} @@ -180,9 +180,9 @@

Conditionals

{{c['description']}} {% if c['status'] == "Passed" %} - {% elif c['status'] == "Pending" %} - Pending {% else %} - Failed {% endif %} + {% elif c['status'] == "Pending" %} + Pending {% else %} + Failed {% endif %} {% endfor %} @@ -195,7 +195,7 @@

Conditionals

{% endif %} {% if major_projects_count == 0 %} - + {% else %}
@@ -205,13 +205,13 @@

Major Projects

{% for p in major_projects %} {% if p['status'] == "Passed" %} - {{p['name']}} + {{p['name']}} {% elif p['status'] == "Pending" %} - {{p['name']}} + {{p['name']}} {% else %} - {{p['name']}} + {{p['name']}} {% endif %}
{{p['description']}}
@@ -229,7 +229,7 @@

Major Projects

Housing Status

- + @@ -252,7 +252,7 @@

Housing Status

{% if hm_attendance_len == 0 %}
- You haven't missed any house meetings. + You haven't missed any house meetings.
{% else %}
@@ -279,7 +279,7 @@

Missed House Meetings

{% endif %} {% if cm_attendance_len == 0 %} -
You have not attended any directorship meetings.
+
You have not attended any directorship meetings.
{% else %}
diff --git a/conditional/templates/intro_evals.html b/conditional/templates/intro_evals.html index 9ed6ae8f..a811b3e6 100644 --- a/conditional/templates/intro_evals.html +++ b/conditional/templates/intro_evals.html @@ -36,7 +36,7 @@
{{ m['uid'] }}
{% elif m['signatures_missed'] > 0 %}
Signatures Missed: {{m['signatures_missed']}}
{% else %} -
Packet in Progress
+
Packet in Progress
{% endif %}
@@ -49,11 +49,11 @@
{{ m['uid'] }}
{% if m['freshman_project'] == "Pending" %} -
Project Results Pending
+
Project Results Pending
{% elif m['freshman_project'] == "Passed" %} -
Freshman Project:
+
Freshman Project:
{% else %} -
Freshman Project:
+
Freshman Project:
{% endif %}
@@ -128,7 +128,7 @@

Other Comments

{% endfor %} {% else %} - + {% endif %}
{% endblock %} diff --git a/conditional/templates/intro_evals_form.html b/conditional/templates/intro_evals_form.html index 2b0f4dd7..12fef16a 100644 --- a/conditional/templates/intro_evals_form.html +++ b/conditional/templates/intro_evals_form.html @@ -27,7 +27,7 @@

Introductory Evaluations Form

{% else %} - + {% endif %} {% endblock %} diff --git a/conditional/templates/member_management.html b/conditional/templates/member_management.html index 9423f13c..cfc699b9 100644 --- a/conditional/templates/member_management.html +++ b/conditional/templates/member_management.html @@ -86,7 +86,7 @@

Add Users

{% if is_eval_director %} {% if freshmen|length == 0 %} - + {% else %}
@@ -209,7 +209,7 @@

Missed House Meetings

- +
07/31/2016
@@ -224,7 +224,7 @@
07/31/2016
@@ -278,7 +278,7 @@

Missed House Meetings

- +
07/31/2016
@@ -293,7 +293,7 @@
07/31/2016
diff --git a/conditional/templates/nav.html b/conditional/templates/nav.html index 1ce326fa..8aa6771a 100644 --- a/conditional/templates/nav.html +++ b/conditional/templates/nav.html @@ -14,45 +14,45 @@
{% if m['major_project_passed'] %} -
Major Project:
+
Major Project:
{% elif m['major_project_passed'] %} -
Major Project:
+
Major Project:
{% else %} -
Major Project:
+
Major Project:
{% endif %}
@@ -116,11 +116,11 @@

Major Projects

{% if p['status'] == "Passed" %} - + {% elif p['status'] == "Pending" %} - + {% else %} - + {% endif %} diff --git a/frontend/stylesheets/app.scss b/frontend/stylesheets/app.scss index 3e79bd76..d855d8c1 100644 --- a/frontend/stylesheets/app.scss +++ b/frontend/stylesheets/app.scss @@ -17,6 +17,7 @@ @import 'components/select'; @import 'components/dropzone'; @import 'components/sweet-alert/sweet-alert'; +@import 'components/icons'; // Pages @import 'pages/dashboard'; diff --git a/frontend/stylesheets/components/_icons.scss b/frontend/stylesheets/components/_icons.scss new file mode 100644 index 00000000..4b330a95 --- /dev/null +++ b/frontend/stylesheets/components/_icons.scss @@ -0,0 +1,7 @@ +.icon-space-r { + margin-right: 0.4em; +} + +.icon-space-l { + margin-left: 0.4em; +}
{{p['name']}} Passed Passed Pending Pending Failed Failed{{p['description']}}