diff options
Diffstat (limited to 'workshop_app/templates')
3 files changed, 25 insertions, 24 deletions
diff --git a/workshop_app/templates/workshop_app/activation.html b/workshop_app/templates/workshop_app/activation.html index 29dd6ac..f9fc805 100644 --- a/workshop_app/templates/workshop_app/activation.html +++ b/workshop_app/templates/workshop_app/activation.html @@ -63,7 +63,7 @@ <div class="container"> <div class="jumbotron"> <h1>Activation Awaiting</h1> - <p>Please check your email to activate your account. The key expires in <strong>24hours</strong> from the date of registeration. You will be logged out automatically.</p> + <p>The Activation Link has been sent to your email. The link expires in <strong>24hours</strong> from the date of registration. You will be logged out automatically.</p> </div> </div> {% endif %} diff --git a/workshop_app/templates/workshop_app/my_workshops.html b/workshop_app/templates/workshop_app/my_workshops.html index 16eefec..c36485e 100644 --- a/workshop_app/templates/workshop_app/my_workshops.html +++ b/workshop_app/templates/workshop_app/my_workshops.html @@ -101,12 +101,12 @@ <tr> {% if workshop.status == 'Pending' and workshop.requested_workshop_instructor %} {% if request.user.profile.position == 'instructor' %} - <td>{{ workshop.requested_workshop_coordinator }}</td> + <td>{{ workshop.requested_workshop_coordinator.get_full_name }}</td> {% else %} - <td>{{ workshop.requested_workshop_instructor }}</td> + <td>{{ workshop.requested_workshop_instructor.get_full_name }}</td> {% endif %} <td>{{ workshop.requested_workshop_title }}</td> - <td>{{ workshop.requested_workshop_date }}</td> + <td>{{ workshop.requested_workshop_date | date }}</td> <td><span class = "label label-warning">{{ workshop.status }}</span></td> {% endif %} {% if request.user.profile.position == 'instructor' and workshop.status == 'Pending' and workshop.requested_workshop_instructor %} @@ -142,22 +142,22 @@ <tr> {% if workshop.status == 'ACCEPTED' and workshop.requested_workshop_title %} {% if request.user.profile.position == 'instructor' %} - <td>{{ workshop.requested_workshop_coordinator }}</td> + <td>{{ workshop.requested_workshop_coordinator.get_full_name }}</td> {% else %} - <td>{{ workshop.requested_workshop_instructor }}</td> + <td>{{ workshop.requested_workshop_instructor.get_full_name }}</td> {% endif %} - <td>{{ workshop.requested_workshop_title }}</td> - <td>{{ workshop.requested_workshop_date }}</td> + <td>{{ workshop.requested_workshop_title |capfirst }}</td> + <td>{{ workshop.requested_workshop_date | date }}</td> <td><span class = "label label-success">{{ workshop.status }}</span></td> {% endif %} {% if workshop.status == 'ACCEPTED' and workshop.condition_one %} {% if request.user.profile.position == 'instructor' %} - <td>{{ workshop.proposed_workshop_coordinator }}</td> + <td>{{ workshop.proposed_workshop_coordinator.get_full_name }}</td> {% else %} - <td>{{ workshop.proposed_workshop_instructor }}</td> + <td>{{ workshop.proposed_workshop_instructor.get_full_name }}</td> {% endif %} - <td>{{ workshop.proposed_workshop_title }}</td> - <td>{{ workshop.proposed_workshop_date }}</td> + <td>{{ workshop.proposed_workshop_title }}</td> + <td>{{ workshop.proposed_workshop_date | date }}</td> <td><span class = "label label-success">{{ workshop.status }}</span></td> {% endif %} </tr> @@ -191,10 +191,10 @@ <tr> {% if workshop.status == 'Pending' and workshop.condition_one %} {% if request.user.profile.position == 'instructor' %} - <td>{{ workshop.proposed_workshop_coordinator }}</td> + <td>{{ workshop.proposed_workshop_coordinator.get_full_name }}</td> {% endif %} - <td>{{ workshop.proposed_workshop_title }}</td> - <td>{{ workshop.proposed_workshop_date }}</td> + <td>{{ workshop.proposed_workshop_title }}</td> + <td>{{ workshop.proposed_workshop_date | date }}</td> <td><span class = "label label-warning">{{ workshop.status }}</span></td> {% if request.user.profile.position == 'instructor' and workshop.status == 'Pending' %} @@ -231,12 +231,12 @@ <tr> {% if workshop.status == 'DELETED' or workshop.status == 'REJECTED' %} {% if request.user.profile.position == 'instructor' %} - <td>{{ workshop.requested_workshop_coordinator }}</td> + <td>{{ workshop.requested_workshop_coordinator.get_full_name }}</td> {% else %} - <td>{{ workshop.requested_workshop_instructor }}</td> + <td>{{ workshop.requested_workshop_instructor.get_full_name }}</td> {% endif %} - <td>{{ workshop.requested_workshop_title }}</td> - <td>{{ workshop.requested_workshop_date }}</td> + <td>{{ workshop.requested_workshop_title | capfirst }}</td> + <td>{{ workshop.requested_workshop_date | date }}</td> <td><span class = "label label-danger">{{ workshop.status }}</span></td> {% endif %} diff --git a/workshop_app/templates/workshop_app/scheduled_workshops.html b/workshop_app/templates/workshop_app/scheduled_workshops.html index 7fcd2f7..8ebb2e6 100644 --- a/workshop_app/templates/workshop_app/scheduled_workshops.html +++ b/workshop_app/templates/workshop_app/scheduled_workshops.html @@ -31,6 +31,7 @@ <thead> <tr> <th>Coordinator Name</th> + <th>Institute Name</th> <th>Instructor Name</th> <th>Workshop Name</th> <th>Workshop Date</th> @@ -41,10 +42,10 @@ {% if workshop.status == 'ACCEPTED' %} <tbody> <tr> - - <td>{{ workshop.proposed_workshop_coordinator }}</td> - <td>{{ workshop.proposed_workshop_instructor }}</td> - <td>{{ workshop.proposed_workshop_title }}</td> + <td>{{ workshop.proposed_workshop_coordinator.get_full_name | capfirst }}</td> + <td>{{ workshop.proposed_workshop_coordinator.profile.institute | capfirst }}</td> + <td>{{ workshop.proposed_workshop_instructor.get_full_name }}</td> + <td>{{ workshop.proposed_workshop_title.workshoptype_name }}</td> <td>{{ workshop.proposed_workshop_date | date}}</td> </tr> </tbody> @@ -57,7 +58,7 @@ </div> {% endif %} </div> - } + {% endblock %}
\ No newline at end of file |