Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AC-523 - duplicate-id - instructor_dashboard.py

Browse Source
This commit is contained in:
Chris Rodriguez
2016-07-01 08:51:39 -04:00
parent ded0885c5c
commit a4a7948b1d
7 changed files with 122 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/static/coffee/fixtures/autoenrollment.html
View File

@@ -10,11 +10,11 @@
<input disabled="disabled" id="browseFile" placeholder="choose file"/>
<div class="file-browse btn btn-primary">
<span class="browse"> Browse </span>
<input class="file_field" id="browseBtn" name="students_list" type="file" accept=".csv"/>
<label for="browseBtn-auto_enroll_csv" class="browse">Browse</label>
<input class="file_field" id="browseBtn-auto_enroll_csv" name="students_list" type="file" accept=".csv"/>
</div>
</div>
<button type="submit" name="enrollment_signup_button">${_("Upload CSV")}</button>
<button type="submit" id="submitBtn-auto_enroll_csv" name="enrollment_signup_button">Upload CSV</button>
</form>
<div class="results"></div>
</div>

12
lms/static/coffee/src/instructor_dashboard/membership.coffee
View File

@@ -117,7 +117,7 @@ class AuthListWidget extends MemberListWidget
# create revoke button and insert it into the row
label_trans = gettext("Revoke access")
$revoke_btn = $ _.template('<div class="revoke"><span class="icon fa fa-times-circle" aria-hidden="true"></span> <%= label %></div>')({label: label_trans}),
$revoke_btn = $ _.template('<div class="revoke"><span class="icon fa fa-times-circle" aria-hidden="true"></span> <%- label %></div>')({label: label_trans}),
class: 'revoke'
$revoke_btn.click =>
@modify_member_access member.email, 'revoke', (error) =>
@@ -166,10 +166,10 @@ class AuthListWidget extends MemberListWidget
@clear_errors()
@clear_input()
if data.userDoesNotExist
msg = gettext("Could not find a user with username or email address '<%= identifier %>'.")
msg = gettext("Could not find a user with username or email address '<%- identifier %>'.")
@show_errors _.template(msg, {identifier: data.unique_student_identifier})
else if data.inactiveUser
msg = gettext("Error: User '<%= username %>' has not yet activated their account. Users must create and activate their accounts before they can be assigned a role.")
msg = gettext("Error: User '<%- username %>' has not yet activated their account. Users must create and activate their accounts before they can be assigned a role.")
@show_errors _.template(msg, {username: data.unique_student_identifier})
else if data.removingSelfAsInstructor
@show_errors gettext "Error: You cannot remove yourself from the Instructor group!"
@@ -181,12 +181,12 @@ class @AutoEnrollmentViaCsv
# Wrapper for the AutoEnrollmentViaCsv subsection.
# This object handles buttons, success and failure reporting,
# and server communication.
@$student_enrollment_form = @$container.find("form#student-auto-enroll-form")
@$enrollment_signup_button = @$container.find("[name='enrollment_signup_button']")
@$student_enrollment_form = @$container.find("#student-auto-enroll-form")
@$enrollment_signup_button = @$container.find("#submitBtn-auto_enroll_csv")
@$students_list_file = @$container.find("input[name='students_list']")
@$csrf_token = @$container.find("input[name='csrfmiddlewaretoken']")
@$results = @$container.find("div.results")
@$browse_button = @$container.find("#browseBtn")
@$browse_button = @$container.find("#browseBtn-auto_enroll_csv")
@$browse_file = @$container.find("#browseFile")
@processing = false

4
lms/templates/instructor/instructor_dashboard_2/certificate-bulk-white-list.underscore
View File

@@ -7,8 +7,8 @@
<div class="customBrowseBtn">
<input disabled="disabled" class="browse-file" placeholder="<%- gettext("Choose File") %>" />
<div class="file-browse btn btn-primary">
<span class="browse"> <%- gettext("Browse") %> </span>
<input class="file_field" id="browseBtn" name="students_list" type="file" accept=".csv"/>
<label for="browseBtn-bulk-exc-students" class="browse"><%- gettext("Browse") %></label>
<input class="file_field" id="browseBtn-bulk-exc-students" name="students_list" type="file" accept=".csv"/>
</div>
</div>
<div><button class="btn-blue upload-csv-button" type="submit"><%- gettext('Add to Exception List') %></button></div>

6
lms/templates/instructor/instructor_dashboard_2/membership.html
View File

@@ -96,11 +96,11 @@ from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_
<input disabled="disabled" id="browseFile" placeholder="choose file" />
<div class="file-browse btn btn-primary">
<span class="browse"> Browse </span>
<label for="browseBtn" class="sr">${_("Upload a CSV for bulk enrollment")}</label>
<input class="file_field" id="browseBtn" name="students_list" type="file" accept=".csv"/>
<label for="browseBtn-auto_enroll_csv" class="sr">${_("Upload a CSV for bulk enrollment")}</label>
<input class="file_field" id="browseBtn-auto_enroll_csv" name="students_list" type="file" accept=".csv"/>
</div>
</div>
<button type="submit" name="enrollment_signup_button">${_("Upload CSV")}</button>
<button type="submit" id="submitBtn-auto_enroll_csv" name="enrollment_signup_button">${_("Upload CSV")}</button>
<input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
</form>
<div class="results"></div>