Skip to content

Commit a47e989

Browse files
committed
Prefix table styles and rename js files
1 parent 28d78a0 commit a47e989

20 files changed

+47
-46
lines changed

classes/v1migration/v1migration.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ private function log_success_migration_event($turnitintooltwoid, $course_id, $v1
545545
}
546546

547547
/**
548-
* Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2018102601.min.js.
548+
* Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2020111101.min.js.
549549
*
550550
* @global type $DB
551551
* @return array return array of assignments to display

css/student_noscript.css

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
.mod_turnitintooltwo .submissionsDataTable {
1+
.mod_turnitintooltwo_submissions_data_table {
22
margin-top:16px;
33
}
44

5-
.mod_turnitintooltwo .submissionsDataTable th {
5+
.mod_turnitintooltwo_submissions_data_table th {
66
border:1px solid #999999;
77
}
88

9-
.mod_turnitintooltwo .submissionsDataTable td {
9+
.mod_turnitintooltwo_submissions_data_table td {
1010
border:1px solid #999999;
1111
}
1212

1313
.mod_turnitintooltwo #tabs ul#part_tabs_menu, .mod_turnitintooltwo a.toggle_summary, .mod_turnitintooltwo a.toggle_peermarks,
1414
.mod_turnitintooltwo a.toggle_peermark_instructions, .mod_turnitintooltwo .mod_turnitintooltwo_eula, .mod_turnitintooltwo_messages_inbox,
1515
.mod_turnitintooltwo .noscript_hide, .mod_turnitintooltwo .download_original_open, .mod_turnitintooltwo th.raw_data,
16-
.mod_turnitintooltwo td.raw_data, .mod_turnitintooltwo .submissionsDataTable th.cpart,
17-
.mod_turnitintooltwo .submissionsDataTable th.ccheckbox, .mod_turnitintooltwo .submissionsDataTable td.c0,
18-
.mod_turnitintooltwo .submissionsDataTable td.c1 {
16+
.mod_turnitintooltwo td.raw_data, .mod_turnitintooltwo_submissions_data_table th.cpart,
17+
.mod_turnitintooltwo_submissions_data_table th.ccheckbox, .mod_turnitintooltwo_submissions_data_table td.c0,
18+
.mod_turnitintooltwo_submissions_data_table td.c1 {
1919
display:none;
2020
}
2121

extras.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
$output .= $OUTPUT->box($categoryselectlabel." ".$categoryselect.$createassign.$createbutton, 'create_checkboxes navbar');
122122

123123
$table = new html_table();
124-
$table->id = "courseBrowserTable";
124+
$table->id = "mod_turnitintooltwo_course_browser_table";
125125
$rows = array();
126126

127127
// Make up json array for drop down in table.

jquery/plugins.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
$plugins = array(
2020
'turnitintooltwo-dataTables' => array('files' => array('jquery.dataTables.js', 'jquery.dataTables.css')),
2121
'turnitintooltwo-dataTables_plugins' => array('files' => array('jquery.dataTables.plugins.js')),
22-
'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2018102601.min.js')),
23-
'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2018102601.min.js')),
24-
'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2018102601.min.js')),
22+
'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2020111101.min.js')),
23+
'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2020111101.min.js')),
24+
'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2020111101.min.js')),
2525
'turnitintooltwo-datatables_columnfilter' => array('files' => array('jquery.dataTables.columnFilter.js')),
2626
'turnitintooltwo-cookie' => array('files' => array('jquery.cookie.js')),
2727
'turnitintooltwo-colorbox' => array('files' => array('jquery.colorbox.js', 'colorbox.css')),

jquery/turnitintooltwo-2018102601.min.js

-2
This file was deleted.

jquery/turnitintooltwo-2018102601.js jquery/turnitintooltwo-2020111101.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
sortby = 'asc';
202202
}
203203

204-
node.closest('.submissionsDataTable').DataTable()
204+
node.closest('.mod_turnitintooltwo_submissions_data_table').DataTable()
205205
.order( [ sortColumn, sortby ] )
206206
.draw();
207207

@@ -282,11 +282,11 @@
282282
// Define column definitions as there can be different number of columns.
283283
var submissionsDataTableColumns = [];
284284
var visibleCols = [];
285-
var noOfColumns = $('table.submissionsDataTable th').length / $('table.submissionsDataTable').length;
286-
var notStudentView = ($('table.submissionsDataTable th.sorting_name').length > 0) ? true : false;
287-
var showOrigReport = ($('table.submissionsDataTable th.creport').length > 0) ? true : false;
288-
var useGradeMark = ($('table.submissionsDataTable th.cgrade').length > 0) ? true : false;
289-
var multipleParts = ($('table.submissionsDataTable th.coverallgrade').length > 0) ? true : false;
285+
var noOfColumns = $('table.mod_turnitintooltwo_submissions_data_table th').length / $('table.mod_turnitintooltwo_submissions_data_table').length;
286+
var notStudentView = ($('table.mod_turnitintooltwo_submissions_data_table th.sorting_name').length > 0) ? true : false;
287+
var showOrigReport = ($('table.mod_turnitintooltwo_submissions_data_table th.creport').length > 0) ? true : false;
288+
var useGradeMark = ($('table.mod_turnitintooltwo_submissions_data_table th.cgrade').length > 0) ? true : false;
289+
var multipleParts = ($('table.mod_turnitintooltwo_submissions_data_table th.coverallgrade').length > 0) ? true : false;
290290

291291
if (notStudentView) {
292292
for (var i = 0; i < noOfColumns; i++) {
@@ -350,7 +350,7 @@
350350

351351
var partTables = [];
352352
var refreshRequested = [];
353-
$('table.submissionsDataTable').each(function () {
353+
$('table.mod_turnitintooltwo_submissions_data_table').each(function () {
354354

355355
var part_id = $(this).attr("id");
356356
refreshRequested[part_id] = 0;
@@ -410,7 +410,7 @@
410410
});
411411

412412

413-
$('table.submissionsDataTable').each(function () {
413+
$('table.mod_turnitintooltwo_submissions_data_table').each(function () {
414414
var part_id = $(this).attr("id");
415415

416416
// Populate Peermark Section of Part Details.
@@ -452,7 +452,7 @@
452452
$(".mod_turnitintooltwo_refresh_link").hide();
453453
$(".mod_turnitintooltwo_refreshing_link").show();
454454

455-
$('table.submissionsDataTable').each(function () {
455+
$('table.mod_turnitintooltwo_submissions_data_table').each(function () {
456456
refreshRequested[$(this).attr("id")] = 1;
457457
partTables[$(this).attr("id")].fnReloadAjax();
458458
partTables[$(this).attr("id")].fnStandingRedraw();

jquery/turnitintooltwo-2020111101.min.js

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jquery/turnitintooltwo_extra-2018102601.min.js

-2
This file was deleted.

jquery/turnitintooltwo_extra-2018102601.js jquery/turnitintooltwo_extra-2020111101.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
jQuery(document).ready(function($) {
22
// Add style to header row.
3-
$('.submissionsDataTable thead tr, #courseBrowserTable thead tr').toggleClass("header");
3+
$('.mod_turnitintooltwo_submissions_data_table thead tr, #mod_turnitintooltwo_course_browser_table thead tr').toggleClass("header");
44

55
// Configure datatables language settings.
66
var dataTablesLang = {
@@ -176,7 +176,7 @@ jQuery(document).ready(function($) {
176176
$.datepicker.setDefaults($.datepicker.regional['']);
177177

178178
// Configure the course browser data table and show classes from Turnitin acocunt.
179-
var courseBrowserTable = $('#courseBrowserTable').dataTable({
179+
var courseBrowserTable = $('#mod_turnitintooltwo_course_browser_table').dataTable({
180180
"bProcessing": true,
181181
"oLanguage": dataTablesLang,
182182
"aaSorting": [[ 6, 'asc']],

0 commit comments

Comments
 (0)