Changing references from mentor to facilitator (#205)

hackadmin/templates/hackadmin_participants.html

@@ -22,7 +22,7 @@
                             <a class="nav-link ci-link" id="teams-tab" data-toggle="tab" href="#teams" role="tab" aria-controls="teams" aria-selected="false">Teams</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link ci-link" id="mentors-tab" data-toggle="tab" href="#mentors" role="tab" aria-controls="mentors" aria-selected="fase">Mentors</a>
+                            <a class="nav-link ci-link" id="mentors-tab" data-toggle="tab" href="#mentors" role="tab" aria-controls="mentors" aria-selected="fase">Facilitators</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link ci-link" id="judges-tab" data-toggle="tab" href="#judges" role="tab" aria-controls="judges" aria-selected="false">Judges</a>

hackadmin/templates/includes/add_judge.html

@@ -2,7 +2,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="addJudgesModalLabel">Add Judge to Hackathon</h5>
+                <h5 class="modal-title" id="addJudgesModalLabel">Add Judge/Facilitator to Hackathon</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span>
                 </button>

hackadmin/templates/includes/list_mentors.html

@@ -3,7 +3,7 @@
 <table class="table table-sm border-top-0" id="mentorsTable">
     <thead>
       <tr>
-        <th scope="col">Mentor Display Name</th>
+        <th scope="col">Facilitator Display Name</th>
         <th scope="col">Email</th>
         <th scope="col">Team Name</th>
         <th scope="col">Privileges</th>
@@ -38,7 +38,7 @@
         {% else %}
         <tr>
             <td colspan="4">
-                No mentors distributed yet.
+                No Facilitators distributed yet.
             </td>
         </tr>
         {% endif %}

hackadmin/templates/includes/list_teams.html

@@ -6,7 +6,7 @@
         <th scope="col">Team Name</th>
         <th scope="col">Team Members</th>
         <th scope="col">Project</th>
-        <th scope="col">Mentor</th>
+        <th scope="col">Facilitator</th>
         <th scope="col">Communication Channel</th>
         <th scope="col">Is Slack</th>
       </tr>

hackathon/forms.py

@@ -132,7 +132,7 @@ class HackTeamForm(forms.ModelForm):
     class Meta:
         model = HackTeam
         fields = ['id', 'display_name', 'mentor']
-    
+
     def __init__(self, *args, **kwargs):
         hackathon_id = kwargs.pop('hackathon_id', None)
         hackathon = Hackathon.objects.filter(id=hackathon_id).first()
@@ -143,6 +143,7 @@ def __init__(self, *args, **kwargs):
             self.fields['mentor'] = forms.ModelChoiceField(
                 queryset=judges)
             self.fields['mentor'].required = False
+            self.fields['mentor'].label = 'Facilitator'
 
 
 class HackAwardForm(forms.ModelForm):

hackathon/templates/hackathon/assign_mentors.html

@@ -25,7 +25,7 @@
             {% endfor %}
             <div class="row">
                 <div class="col-12">
-                    <button class="btn btn-primary pl-5 pr-5">Save Mentors</button>
+                    <button class="btn btn-primary pl-5 pr-5">Save Facilitators</button>
                 </div>
             </div>
         </form>

hackathon/templates/hackathon/hackathon_view.html

@@ -58,7 +58,7 @@
                                     <i class="fas fa-users mr-2"></i>{% if hackathon.teams.all|length == 0 %}Distribute{% else %}Change{% endif %} Teams
                                 </a>
                                 <a role="button" class="dropdown-item" href="/hackathon/{{hackathon.id}}/assign_mentors/">
-                                    <i class="fas fa-people-arrows mr-2"></i>Assign Mentors
+                                    <i class="fas fa-people-arrows mr-2"></i>Assign Facilitators
                                 </a>
                                 <a role="button" class="dropdown-item" href="/hackathon/{{hackathon.id}}/awards/">
                                     <i class="fas fa-award mr-2"></i>Change Awards

hackathon/templates/hackathon/includes/enrollstaff.html

@@ -9,9 +9,9 @@
         {% endif %}
     >
         {% if user in hackathon.judges.all %}
-        <i class="fas fa-user-times mr-2"></i>Withdraw as Judge
+        <i class="fas fa-user-times mr-2"></i>Withdraw as Judge/Facilitator
         {% else %}
-        <i class="fas fa-user-plus mr-2"></i>Enroll as Judge
+        <i class="fas fa-user-plus mr-2"></i>Enroll as Judge/Facilitator
         {% endif %}
     </button>
 </form>

hackathon/templates/hackathon/includes/hackathon_card.html

@@ -23,7 +23,7 @@ <h5 class="p-orange card-title"><a href="/hackathon/{{hackathon.id}}/" class="ci
                 </h5>
                 <p class="card-subtitle mb-2 text-muted"><i class="far fa-calendar-alt p-2"></i> {{ hackathon.start_date }} - {{ hackathon.end_date }}</p>
                 {% if request.user.is_authenticated %}
-                <p class="card-subtitle mb-2 text-muted"><i class="fas fa-building p-2"></i> Open to all {{ hackathon.organisation }} students</p>
+                <p class="card-subtitle mb-2 text-muted"><i class="fas fa-building p-2"></i> Open to all {{ hackathon.organisation }} students &amp; alumni</p>
                 {% if hackathon.end_date|date:"YmdHis" <= today|date:"YmdHis" or hackathon.status == 'finished' %}
                 {% if request.user in hackathon.participants.all %}
                 <p class="card-subtitle mb-2 ci-orange"><i class="fas fa-user p-2"></i>You participated in this hackathon</p>

hackathon/templates/hackathon/includes/judge_team_display.html

@@ -16,7 +16,7 @@
         {% endfor %}
         </ul>   
         {% else %}
-        You are currently not assigned as a mentor.
+        You are currently don't have a team assigned to you.
         {% endif %}
         {% endwith %}
 

hackathon/views.py

@@ -529,7 +529,7 @@ def assign_mentors(request, hackathon_id):
 
         if hack_mentors_formset.is_valid():
             hack_mentors_formset.save()
-            messages.success(request, "Mentors updated successfully!")
+            messages.success(request, "Facilitators updated successfully!")
             return redirect(reverse('hackathon:assign_mentors',
                                     kwargs={'hackathon_id': hackathon_id}))
         else:

teams/templates/team.html

@@ -44,11 +44,11 @@ <h3>About the team</h3>
                     {% if request.user in team.participants.all or request.user == team.mentor or request.user.user_type|is_types:authorised_types %}
 
                     <p>
-                        <strong class="mr-2">Mentor:</strong>
+                        <strong class="mr-2">Facilitator:</strong>
                         {% if team.mentor %}
                         <a class="ci-link" href="{{mentor_profile}}">{{team.mentor}}</a>
                         {% else %}
-                        No Mentor assigned
+                        No Facilitator assigned
                         {% endif %}
                     </p>
                     {% endif %}