Skip to content

Commit

Permalink
Merge branch 'features/course-template' into 'master'
Browse files Browse the repository at this point in the history
Update screenshot and fix typo

See merge request !8
  • Loading branch information
KillianKemps committed May 21, 2017
2 parents 0ef6c27 + 86c0090 commit dfc669a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ In order to use the software, the Staff has to prepare CSV (or Excel) files with
with for each of them the email of the teacher and the mailing list of the students.
Then, they only need to upload it into the Classroom Admin interface and click on the "Create courses" button. And voilà! Each Google Classroom will be created with students automatically added to it and the teachers will receive an email with all the information they need to manage their classroom.

In case some teacher tells you something like *"Where is my Google Classroom? I don't know where I have to put my classroom materials!"*, there is also a feature which allows you to resend the email with all the information for given courses. You just need to upload the right CSV file, select the courses for which you want to resend and click on "Resend manually emails".
In case some teacher tells you something like *"Where is my Google Classroom? I don't know where I have to put my classroom materials!"*, there is also a feature which allows you to resend the email with all the information for given courses. You just need to upload the right CSV file, select the courses for which you want to resend and click on "Resend emails manually".

This feature has also been added for technical reasons because Gmail can't guarantee that all emails are sent accordingly and you may need to resend the emails in case Gmail has not been able to process everything.

Expand Down
2 changes: 1 addition & 1 deletion classroom_admin/conf/course.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ section-values:
- Promotion
section-format: '{0} - {1} - {2}'
teacher: Teacher Email
students: Students email
students: Students Email
member-email-domain: '@my-school.com'
2 changes: 1 addition & 1 deletion classroom_admin/templates/courses.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% block navbar %}
<button id="create-courses" class="btn btn-primary btn-lg" v-on:click="create" v-bind:class="{ 'loading': isLoading }">Create courses</button>
<button id="send-manually-emails" class="btn btn-primary btn-lg" v-on:click="send" v-bind:class="{ 'loading': isLoadingEmails }">Resend manually emails</button>
<button id="send-manually-emails" class="btn btn-primary btn-lg" v-on:click="send" v-bind:class="{ 'loading': isLoadingEmails }">Resend emails manually</button>
{% endblock %}

{% block content %}
Expand Down
Binary file modified classroom_admin_screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit dfc669a

Please sign in to comment.