Merge pull request #599 from turnitin/prefix_all_styles

Prefix all styles

Author: jmcgettrick

classes/digitalreceipt/instructor_message.php

@@ -53,12 +53,7 @@ public function send_instructor_message($instructors, $message, $courseid) {
 
         $subject = get_string('receipt_instructor_copy_subject', 'turnitintooltwo');
 
-        // Pre 2.9 does not have \core\message\message()
-        if ($CFG->branch >= 29) {
-            $eventdata = new \core\message\message();
-        } else {
-            $eventdata = new stdClass();
-        }
+        $eventdata = new \core\message\message();
 
         $eventdata->component         = 'mod_turnitintooltwo';
         $eventdata->name              = 'notify_instructor_of_submission'; // This is the message name from messages.php.

classes/digitalreceipt/receipt_message.php

@@ -29,12 +29,7 @@ public function send_message($userid, $message, $courseid) {
 
         $subject = get_string('digital_receipt_subject', 'turnitintooltwo');
 
-        // Pre 2.9 does not have \core\message\message()
-        if ($CFG->branch >= 29) {
-            $eventdata = new \core\message\message();
-        } else {
-            $eventdata = new stdClass();
-        }
+        $eventdata = new \core\message\message();
 
         $eventdata->component         = 'mod_turnitintooltwo';
         $eventdata->name              = 'submission'; // This is the message name from messages.php.

classes/v1migration/v1migration.php

@@ -545,7 +545,7 @@ private function log_success_migration_event($turnitintooltwoid, $course_id, $v1
     }
 
     /**
-     * Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2018102601.min.js.
+     * Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2020111101.min.js.
      *
      * @global type $DB
      * @return array return array of assignments to display

classes/view/members.php

@@ -41,18 +41,17 @@ public function __construct($course=null, $coursemodule=null, $turnitintooltwovi
      * @return string Members HTML for a role
      */
     public function build_members_view($displayrole = "students") {
-        $output  = "";
         $istutor = $this->is_tutor();
 
         if (!$istutor) {
             turnitintooltwo_print_error('permissiondeniederror', 'turnitintooltwo');
             exit();
         }
 
-        $wrapperclass = $displayrole == "tutors" ? "members members-instructors" : "members members-students";
+        $wrapperclass = $displayrole == "tutors" ? "members-instructors" : "members-students";
 
-        // wrapper element for strong CSS selectors
-        $output .= html_writer::start_tag("div", array("class" => $wrapperclass));
+        // Wrapper element for strong CSS selectors.
+        $output = html_writer::start_tag("div", array("class" => "mod_turnitintooltwo_members " . $wrapperclass));
 
         $output .= $this->build_intro_message($displayrole);
         $output .= $this->build_members_table($displayrole);

css/student_noscript.css

@@ -1,33 +1,28 @@
-.mod_turnitintooltwo .submissionsDataTable {
+.mod_turnitintooltwo_submissions_data_table {
 	margin-top:16px;
 }
 
-.mod_turnitintooltwo .submissionsDataTable th {
+.mod_turnitintooltwo_submissions_data_table th {
     border:1px solid #999999;
 }
 
-.mod_turnitintooltwo .submissionsDataTable td {
+.mod_turnitintooltwo_submissions_data_table td {
     border:1px solid #999999;
 }
 
-.mod_turnitintooltwo #tabs ul#part_tabs_menu, .mod_turnitintooltwo a.toggle_summary, .mod_turnitintooltwo a.toggle_peermarks, 
-.mod_turnitintooltwo a.toggle_peermark_instructions, .mod_turnitintooltwo .turnitin_ula, .mod_turnitintooltwo a.messages_inbox, 
-.mod_turnitintooltwo .noscript_hide, .mod_turnitintooltwo .download_original_open, .mod_turnitintooltwo th.raw_data, 
-.mod_turnitintooltwo td.raw_data, .mod_turnitintooltwo .submissionsDataTable th.cpart, 
-.mod_turnitintooltwo .submissionsDataTable th.ccheckbox, .mod_turnitintooltwo .submissionsDataTable td.c0, 
-.mod_turnitintooltwo .submissionsDataTable td.c1 {
+.mod_turnitintooltwo #tabs ul#part_tabs_menu, .mod_turnitintooltwo a.toggle_summary, .mod_turnitintooltwo a.toggle_peermarks,
+.mod_turnitintooltwo a.toggle_peermark_instructions, .mod_turnitintooltwo .mod_turnitintooltwo_eula, .mod_turnitintooltwo_messages_inbox,
+.mod_turnitintooltwo .noscript_hide, .mod_turnitintooltwo .download_original_open, .mod_turnitintooltwo th.raw_data,
+.mod_turnitintooltwo td.raw_data, .mod_turnitintooltwo_submissions_data_table th.cpart,
+.mod_turnitintooltwo_submissions_data_table th.ccheckbox, .mod_turnitintooltwo_submissions_data_table td.c0,
+.mod_turnitintooltwo_submissions_data_table td.c1 {
 	display:none;
 }
 
 .mod_turnitintooltwo .peermark_instructions {
 	display: block;
 }
 
-.mod_turnitintooltwo .turnitin_ula_noscript {
-	line-height: 28px;
-	margin-top:16px;
-}
-
 .mod_turnitintooltwo .part_table {
 	background:#EFEFEF;
 	border:1px solid #DEDEDE;

extras.php

@@ -39,13 +39,7 @@
 
 // Get course and module data that we've linked to here from and set context accordingly.
 if ($id != 0) {
-    // Pre 2.8 does not have the function get_course_and_cm_from_cmid.
-    if ($CFG->branch >= 28) {
-        list($course, $cm) = get_course_and_cm_from_cmid($id, 'turnitintooltwo');
-    } else {
-        $cm = get_coursemodule_from_id('turnitintooltwo', $id, 0, false, MUST_EXIST);
-        $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
-    }
+    list($course, $cm) = get_course_and_cm_from_cmid($id, 'turnitintooltwo');
 
     if (!$cm) {
         turnitintooltwo_print_error('coursemodidincorrect', 'turnitintooltwo');
@@ -127,7 +121,7 @@
         $output .= $OUTPUT->box($categoryselectlabel." ".$categoryselect.$createassign.$createbutton, 'create_checkboxes navbar');
 
         $table = new html_table();
-        $table->id = "courseBrowserTable";
+        $table->id = "mod_turnitintooltwo_course_browser_table";
         $rows = array();
 
         // Make up json array for drop down in table.

gulpfile.js

@@ -1,7 +1,7 @@
 var gulp = require('gulp');
 var sass = require('gulp-sass');
 
-var minifyCss = require('gulp-minify-css');
+var minifyCss = require('gulp-clean-css');
 var sourcemaps = require('gulp-sourcemaps');
 var notify = require('gulp-notify');
 var uglify = require('gulp-uglify');
@@ -30,8 +30,8 @@ gulp.task('jsmin', function() {
 });
 
 gulp.task('watch', function() {
-    gulp.watch('./sass/**/*.scss', ['sass']);
-    gulp.watch('./jquery/turnitintooltwo*.js', ['jsmin']);
+    gulp.watch('./sass/**/*.scss', gulp.series('sass'));
+    gulp.watch('./jquery/turnitintooltwo*.js', gulp.series('jsmin'));
 });
 
-gulp.task('default', ['sass', 'jsmin', 'watch']);
+gulp.task('default', gulp.series(['sass', 'jsmin', 'watch']));

jquery/plugins.php

@@ -19,9 +19,9 @@
 $plugins = array(
     'turnitintooltwo-dataTables' => array('files' => array('jquery.dataTables.js', 'jquery.dataTables.css')),
     'turnitintooltwo-dataTables_plugins' => array('files' => array('jquery.dataTables.plugins.js')),
-    'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2018102601.min.js')),
-    'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2018102601.min.js')),
-    'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2018102601.min.js')),
+    'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2020111101.min.js')),
+    'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2020111101.min.js')),
+    'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2020111101.min.js')),
     'turnitintooltwo-datatables_columnfilter' => array('files' => array('jquery.dataTables.columnFilter.js')),
     'turnitintooltwo-cookie' => array('files' => array('jquery.cookie.js')),
     'turnitintooltwo-colorbox' => array('files' => array('jquery.colorbox.js', 'colorbox.css')),