Merge branch 'MDL-61973-master' of git://github.com/mickhawkins/moodle

lib/classes/output/icon_system_fontawesome.php

@@ -109,7 +109,7 @@ class icon_system_fontawesome extends icon_system_font {
             'core:e/insert_date' => 'fa-calendar',
             'core:e/insert_edit_image' => 'fa-picture-o',
             'core:e/insert_edit_link' => 'fa-link',
-            'core:e/insert_edit_video' => 'fa-video-camera',
+            'core:e/insert_edit_video' => 'fa-file-video-o',
             'core:e/insert_file' => 'fa-file',
             'core:e/insert_horizontal_ruler' => 'fa-arrows-h',
             'core:e/insert_nonbreaking_space' => 'fa-square-o',

lib/editor/atto/db/upgrade.php

@@ -66,5 +66,36 @@ function xmldb_editor_atto_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2018041100, 'editor', 'atto');
     }
 
+    if ($oldversion < 2018051401) {
+        $toolbar = get_config('editor_atto', 'toolbar');
+        $glue = "\r\n";
+        $iconorderold = 'image, media, managefiles, recordrtc';
+        $iconordernew = 'image, media, recordrtc, managefiles';
+
+        if (strpos($toolbar, $glue) === false) {
+            $glue = "\n";
+        }
+
+        $groups = explode($glue, $toolbar);
+
+        // Reorder atto media icons if in default configuration.
+        foreach ($groups as $i => $group) {
+            $parts = explode('=', $group);
+
+            if (trim($parts[0]) == 'files') {
+                if (trim(preg_replace('/,\s*/', ', ', $parts[1])) == $iconorderold) {
+                    $groups[$i] = 'files = ' . $iconordernew;
+
+                    // Update config variable.
+                    $toolbar = implode($glue, $groups);
+                    set_config('toolbar', $toolbar, 'editor_atto');
+                }
+            }
+        }
+
+        // Atto editor savepoint reached.
+        upgrade_plugin_savepoint(true, 2018051401, 'editor', 'atto');
+    }
+
     return true;
 }

lib/editor/atto/plugins/image/lang/en/atto_image.php

@@ -37,7 +37,7 @@ $string['enterurl'] = 'Enter URL';
 $string['height'] = 'Height';
 $string['imageproperties'] = 'Image properties';
 $string['presentation'] = 'Description not necessary';
-$string['pluginname'] = 'Image';
+$string['pluginname'] = 'Insert or edit image';
 $string['presentationoraltrequired'] = 'Images must have a description, except if the description is marked as not necessary.';
 $string['preview'] = 'Preview';
 $string['saveimage'] = 'Save image';

lib/editor/atto/plugins/media/lang/en/atto_media.php

@@ -63,7 +63,7 @@ $string['metadata'] = 'Metadata';
 $string['metadata_help'] = 'Metadata tracks, for use from a script, may be used only if the player supports metadata.';
 $string['metadatasourcelabel'] = 'Metadata track URL';
 $string['mute'] = 'Muted';
-$string['pluginname'] = 'Media';
+$string['pluginname'] = 'Insert or edit an audio/video file';
 $string['poster'] = 'Thumbnail URL';
 $string['remove'] = 'Remove';
 $string['size'] = 'Size';

lib/editor/atto/plugins/recordrtc/lang/en/atto_recordrtc.php

@@ -30,7 +30,7 @@ $string['attachrecording'] = 'Attach recording';
 $string['audioandvideo'] = 'Audio and video';
 $string['audiobitrate'] = 'Audio bitrate';
 $string['audiobitrate_desc'] = 'Quality of audio recording (larger number means higher quality)';
-$string['audiortc'] = 'Insert audio recording';
+$string['audiortc'] = 'Record audio';
 $string['gumabort'] = 'Something strange happened which prevented the webcam/microphone from being used';
 $string['gumabort_title'] = 'Something happened';
 $string['gumnotallowed'] = 'The user must allow the browser access to the webcam/microphone';
@@ -72,4 +72,4 @@ $string['uploadfailed404'] = 'Upload failed: file too large';
 $string['uploadprogress'] = 'completed';
 $string['videobitrate'] = 'Video bitrate';
 $string['videobitrate_desc'] = 'Quality of video recording (larger number means higher quality)';
-$string['videortc'] = 'Insert video recording';
+$string['videortc'] = 'Record video';

lib/editor/atto/plugins/recordrtc/lib.php

@@ -113,7 +113,7 @@ function atto_recordrtc_strings_for_js() {
  */
 function atto_recordrtc_get_fontawesome_icon_map() {
     return [
-        'atto_recordrtc:i/audiortc' => 'fa-file-audio-o',
-        'atto_recordrtc:i/videortc' => 'fa-file-video-o'
+        'atto_recordrtc:i/audiortc' => 'fa-microphone',
+        'atto_recordrtc:i/videortc' => 'fa-video-camera'
     ];
 }

lib/editor/atto/settings.php

@@ -36,7 +36,7 @@ if ($ADMIN->fulltree) {
 style1 = title, bold, italic
 list = unorderedlist, orderedlist
 links = link
-files = image, media, managefiles, recordrtc
+files = image, media, recordrtc, managefiles
 style2 = underline, strike, subscript, superscript
 align = align
 indent = indent

lib/editor/atto/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2018051400;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2018051401;        // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires  = 2018050800;        // Requires this Moodle version.
 $plugin->component = 'editor_atto';  // Full name of the plugin (used for diagnostics).

pix/e/insert_edit_video.svg

@@ -1,3 +1,13 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M0 0v16h16V0H0zm3 15H1v-2h2v2zm0-4H1V9h2v2zm0-4H1V5h2v2zm0-4H1V1h2v2zm9 12H4V1h8v14zm3 0h-2v-2h2v2zm0-4h-2V9h2v2zm0-4h-2V5h2v2zm0-4h-2V1h2v2zm-5 5l-4 3V5l4 3z" fill="#999"/></svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#999999;}
+</style>
+<path class="st0" d="M14.9,4.9v10.3c0,0.5-0.4,0.9-0.9,0.9H2c-0.4-0.1-0.8-0.5-0.8-1V0.9C1.2,0.4,1.6,0,2.1,0l0,0h8
+	c0.5,0,1.1,0.2,1.5,0.6l2.8,2.8C14.6,3.8,14.9,4.3,14.9,4.9z M13.8,5.7H10c-0.5,0-0.9-0.4-0.9-0.8V1.1H2.2v13.7h11.4L13.8,5.7z
+	 M9.1,8v3.4c0,0.6-0.5,1.1-1.1,1.1H4.6c-0.6,0-1.1-0.5-1.1-1.1V8c0-0.6,0.5-1.1,1.1-1.1H8C8.6,6.9,9.1,7.4,9.1,8z M12.5,7.1v5.1
+	c0,0.1-0.1,0.2-0.2,0.3h-0.1c-0.1,0-0.2,0-0.2-0.1L9.6,10V9.3L12,6.9c0.1-0.1,0.1-0.1,0.2-0.1h0.1C12.5,6.9,12.5,7,12.5,7.1z
+	 M10.2,4.6h3.4c0-0.1-0.1-0.3-0.2-0.4l-2.8-2.8c-0.1-0.1-0.2-0.1-0.4-0.2C10.2,1.2,10.2,4.6,10.2,4.6z"/>
+</svg>