Skip to content

Commit f74eaf8

Browse files
mbillowmbillow
committed
Address design concerns raised by #53 
1 parent 762174b commit f74eaf8

File tree

4 files changed

+96
-39
lines changed

4 files changed

+96
-39
lines changed

‎conditional/templates/intro_evals.html‎

Lines changed: 48 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</div>
3131
<!---->
3232
</div>
33-
<div class="col-sm-5 col-md-4 col-lg-5">
33+
<div class="col-sm-5 col-md-4 col-lg-6">
3434
<h4 class="eval-name">{{m['name']}}</h4>
3535
{% if not m['ldap_account'] %}
3636
<span class="label label-default">Internal Account: {{m['uid']}}</span>
@@ -40,41 +40,71 @@ <h6 class="eval-uid">{{ m['uid'] }}</h6>
4040

4141
</div>
4242
<!---->
43-
<div class="col-sm-5 col-md-6 col-lg-5 vcenter">
44-
<div class="row">
43+
<div class="col-sm-5 col-md-6 col-lg-4 vcenter">
44+
<div class="intro-info row">
4545
<div class="text-center">
4646
{% if m['signatures_missed'] == 0 %}
47-
<div class="eval-info-label success">Signatures Missed: {{m['signatures_missed']}}</div>
47+
<div class="eval-info-label">
48+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span>Sigantures Missed
49+
<span class="eval-info-number">{{ m['signatures_missed'] }}</span>
50+
</div>
4851
{% elif m['signatures_missed'] > 0 %}
49-
<div class="eval-info-label danger">Signatures Missed: {{m['signatures_missed']}}</div>
52+
<div class="eval-info-label">
53+
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span>Sigantures Missed
54+
<span class="eval-info-number">{{ m['signatures_missed'] }}</span>
55+
</div>
5056
{% else %}
51-
<div class="eval-info-label warning"><span class="glyphicon glyphicon-hourglass white"></span> Packet in Progress</div>
57+
<div class="eval-info-label">
58+
<span class="glyphicon glyphicon-hourglass yellow eval-info-status"></span>Packet In Progress
59+
<span class="eval-info-number">Pending</span>
60+
</div>
5261
{% endif %}
5362
</div>
5463
<div class="text-center">
55-
{% if m['committee_meetings']
56-
< 10 %} <div class="eval-info-label danger">Directorship Meetings: {{m['committee_meetings']}}</div>
57-
{% else %}
58-
<div class="eval-info-label success">Directorship Meetings: {{m['committee_meetings']}}</div>
59-
{% endif %}
64+
{% if m['committee_meetings'] < 25 %}
65+
<div class="eval-info-label">
66+
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span>Directorship Meetings
67+
<span class="eval-info-number">{{m['committee_meetings']}} / 10</span>
68+
</div>
69+
{% else %}
70+
<div class="eval-info-label">
71+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span>Directorship Meetings
72+
<span class="eval-info-number">{{m['committee_meetings']}} / 10</span>
73+
</div>
74+
{% endif %}
6075

6176
</div>
6277
<div class="text-center">
6378
{% if m['freshman_project'] == "Pending" %}
64-
<div class="eval-info-label warning"><span class="glyphicon glyphicon-hourglass white"></span> Project Results Pending</div>
79+
<div class="eval-info-label">
80+
<span class="glyphicon glyphicon-hourglass yellow eval-info-status"></span>Freshmen Project
81+
<span class="eval-info-number">Pending</span>
82+
</div>
6583
{% elif m['freshman_project'] == "Passed" %}
66-
<div class="eval-info-label success">Freshman Project: <span class="glyphicon glyphicon-ok-sign white"></span></div>
84+
<div class="eval-info-label">
85+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span>Freshmen Project
86+
<span class="eval-info-number">Passed</span>
87+
</div>
6788
{% else %}
68-
<div class="eval-info-label danger">Freshman Project: <span class="glyphicon glyphicon-remove-sign white"></span></div>
89+
<div class="eval-info-label">
90+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span>Freshmen Project
91+
<span class="eval-info-number">Passed</span>
92+
</div>
6993
{% endif %}
7094

7195
</div>
7296
<div class="text-center">
7397
{% if m['house_meetings_missed']|length > 0 %}
74-
<div class="eval-info-label danger">House Meetings Missed: {{m['house_meetings_missed']|length}}</div>
75-
{% else %}
76-
<div class="eval-info-label success">House Meetings Missed: {{m['house_meetings_missed']|length}}</div>
77-
{% endif %}
98+
<div class="eval-info-label">
99+
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span>House Meetings Missed
100+
<span class="eval-info-number">{{m['house_meetings_missed']|length}}</span>
101+
</div>
102+
{% else %}
103+
<div class="eval-info-label">
104+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span>House Meetings Missed
105+
<span class="eval-info-number">{{m['house_meetings_missed']|length}}</span>
106+
</div>
107+
{% endif %}
78108
</div>
79109

80110
</div>

‎conditional/templates/spring_evals.html‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,36 +26,52 @@
2626
</div>
2727
<!---->
2828
</div>
29-
<div class="col-sm-5 col-md-4 col-lg-5">
29+
<div class="col-sm-5 col-md-4 col-lg-6">
3030
<h4 class="eval-name">{{m['name']}}</h4>
3131
<h6 class="eval-uid">{{m['uid']}}</h6>
3232
</div>
3333
<!---->
34-
<div class="col-sm-5 col-md-6 col-lg-5 vcenter">
34+
<div class="col-sm-5 col-md-6 col-lg-4 vcenter">
3535
<div class="spring-info row">
3636
<div class="text-center">
3737
{% if m['committee_meetings'] < 25 %}
38-
<div class="eval-info-label danger">Directorship Meetings: {{m['committee_meetings']}}</div>
38+
<div class="eval-info-label">
39+
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span>Directorship Meetings
40+
<span class="eval-info-number">{{m['committee_meetings']}} / 25</span>
41+
</div>
3942
{% else %}
40-
<div class="eval-info-label success">Directorship Meetings: {{m['committee_meetings']}}</div>
43+
<div class="eval-info-label">
44+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span>Directorship Meetings
45+
<span class="eval-info-number">{{m['committee_meetings']}} / 25</span>
46+
</div>
4147
{% endif %}
4248

4349
</div>
4450
<div class="text-center">
4551
{% if m['major_project_passed'] %}
46-
<div class="eval-info-label success">Major Project: <span class="glyphicon glyphicon-ok-sign white"></span></div>
47-
{% elif m['major_project_passed'] %}
48-
<div class="eval-info-label warning">Major Project: <span class="glyphicon glyphicon-hourglass white"></span></div>
52+
<div class="eval-info-label">
53+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span>Major Project
54+
<span class="eval-info-number">Passed</span>
55+
</div>
4956
{% else %}
50-
<div class="eval-info-label danger">Major Project: <span class="glyphicon glyphicon-remove-sign white"></span></div>
57+
<div class="eval-info-label">
58+
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span>Major Project
59+
<span class="eval-info-number">None</span>
60+
</div>
5161
{% endif %}
5262

5363
</div>
5464
<div class="text-center">
5565
{% if m['house_meetings_missed']|length > 0 %}
56-
<div class="eval-info-label danger">House Meetings Missed: {{m['house_meetings_missed']|length}}</div>
66+
<div class="eval-info-label">
67+
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span>House Meetings Missed
68+
<span class="eval-info-number">{{m['house_meetings_missed']|length}}</span>
69+
</div>
5770
{% else %}
58-
<div class="eval-info-label success">House Meetings Missed: {{m['house_meetings_missed']|length}}</div>
71+
<div class="eval-info-label">
72+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span>House Meetings Missed
73+
<span class="eval-info-number">{{m['house_meetings_missed']|length}}</span>
74+
</div>
5975
{% endif %}
6076
</div>
6177

‎frontend/stylesheets/pages/_evals.scss‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
.eval-info-label {
2-
margin: 4px auto;
3-
border-radius: .25em;
42
padding: .3em .6em .4em;
5-
width: 100%;
6-
max-width: 400px;
7-
vertical-align: baseline;
8-
text-align: center;
3+
text-align: left;
94
line-height: 1;
10-
white-space: nowrap;
11-
color: #fff;
12-
font-size: 90%;
13-
font-weight: 700;
5+
color: #444;
6+
font-weight: 500;
7+
}
8+
9+
.eval-info-status {
10+
margin: 2px 0 0;
11+
padding: 0 5px 0 0;
12+
}
13+
14+
.eval-info-number {
15+
float: right;
1416
}
1517

1618
.eval-user-img {
@@ -26,7 +28,7 @@
2628
float: right;
2729
margin: -25px 5px;
2830
border-radius: 50%;
29-
padding: 5.5px;
31+
padding: 6px;
3032
width: 25px;
3133
height: 25px;
3234
}

‎frontend/stylesheets/partials/_responsive.scss‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,12 @@
2626
text-align: center;
2727
}
2828
}
29+
30+
@media(min-width: 991px) {
31+
.intro-info {
32+
padding: 0 50px 0 0;
33+
}
34+
.spring-info {
35+
padding: 10px 50px 0 0;
36+
}
37+
}

0 commit comments

Comments
 (0)