reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

Merge branch 'master' into feature/shift_planning

Browse source
This commit is contained in:
Víðir Valberg Guðmundsson 2018-08-05 17:46:45 +02:00
parent 214026dfd7 e482b63c14
commit 6593d16966
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
schedule/src/Views/FilterView.elm
View file

@ -224,10 +224,10 @@ filterChoiceView filter currentFilters eventInstances slugLike =
"film" "film"
"to-be-recorded" -> "to-be-recorded" ->
"video-camera" "video"
"not-to-be-recorded" -> "not-to-be-recorded" ->
"ban" "video-slash"
_ -> _ ->
"" ""

4
schedule/src/Views/ScheduleOverview.elm
View file

@ -86,13 +86,13 @@ dayEventInstanceIcons eventInstance =
"to-be-recorded" -> "to-be-recorded" ->
[ i [ i
[ classList [ ( "fa", True ), ( "fa-video-camera", True ), ( "pull-right", True ), ( "fa-fw", True ) ] ] [ classList [ ( "fa", True ), ( "fa-video", True ), ( "pull-right", True ), ( "fa-fw", True ) ] ]
[] []
] ]
"not-to-be-recorded" -> "not-to-be-recorded" ->
[ i [ i
[ classList [ ( "fa", True ), ( "fa-ban", True ), ( "pull-right", True ), ( "fa-fw", True ) ] ] [ classList [ ( "fa", True ), ( "fa-video-slash", True ), ( "pull-right", True ), ( "fa-fw", True ) ] ]
[] []
] ]

8
src/program/static/js/elm_based_schedule.js
View file

@ -14453,9 +14453,9 @@ var _user$project$Views_FilterView$filterChoiceView = F4(
case 'has-recording': case 'has-recording':
return 'film'; return 'film';
case 'to-be-recorded': case 'to-be-recorded':
return 'video-camera'; return 'video';
case 'not-to-be-recorded': case 'not-to-be-recorded':
return 'ban'; return 'video-slash';
default: default:
return ''; return '';
} }
@ -16410,7 +16410,7 @@ var _user$project$Views_ScheduleOverview$dayEventInstanceIcons = function (event
_0: {ctor: '_Tuple2', _0: 'fa', _1: true}, _0: {ctor: '_Tuple2', _0: 'fa', _1: true},
_1: { _1: {
ctor: '::', ctor: '::',
_0: {ctor: '_Tuple2', _0: 'fa-video-camera', _1: true}, _0: {ctor: '_Tuple2', _0: 'fa-video', _1: true},
_1: { _1: {
ctor: '::', ctor: '::',
_0: {ctor: '_Tuple2', _0: 'pull-right', _1: true}, _0: {ctor: '_Tuple2', _0: 'pull-right', _1: true},
@ -16440,7 +16440,7 @@ var _user$project$Views_ScheduleOverview$dayEventInstanceIcons = function (event
_0: {ctor: '_Tuple2', _0: 'fa', _1: true}, _0: {ctor: '_Tuple2', _0: 'fa', _1: true},
_1: { _1: {
ctor: '::', ctor: '::',
_0: {ctor: '_Tuple2', _0: 'fa-ban', _1: true}, _0: {ctor: '_Tuple2', _0: 'fa-video-slash', _1: true},
_1: { _1: {
ctor: '::', ctor: '::',
_0: {ctor: '_Tuple2', _0: 'pull-right', _1: true}, _0: {ctor: '_Tuple2', _0: 'pull-right', _1: true},

6
src/teams/templates/team_members.html
View file

@ -22,6 +22,9 @@
Status Status
</th> </th>
{% if request.user in team.responsible_members.all %} {% if request.user in team.responsible_members.all %}
<th>
Email
</th>
<th> <th>
Action Action
</th> </th>
@ -40,6 +43,9 @@
{% if not member.approved %}(pending approval){% endif %} {% if not member.approved %}(pending approval){% endif %}
</td> </td>
{% if request.user in team.responsible_members.all %} {% if request.user in team.responsible_members.all %}
<td>
{{ member.user.email }}
</td>
<td> <td>
<div class="btn-group-vertical"> <div class="btn-group-vertical">
<a class="btn btn-danger" <a class="btn btn-danger"