EDUCATOR-1523 Fix Instructor photos size and dimensions.

course_discovery/conf/locale/en/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-25 06:07+0000\n"
+"POT-Creation-Date: 2017-11-01 07:46+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-25 06:08+0000\n"
+"POT-Creation-Date: 2017-11-01 07:46+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -45,9 +45,7 @@ msgid "Add staff member"
 msgstr ""
 
 #: static/js/publisher/instructors.js
-msgid ""
-"Please upload a instructor image. File must be smaller than 1 megabyte in "
-"size."
+msgid "Please upload a instructor image."
 msgstr ""
 
 #: static/js/publisher/instructors.js static/js/publisher/preview-url.js
@@ -55,7 +53,15 @@ msgid "Something went wrong!"
 msgstr ""
 
 #: static/js/publisher/instructors.js
-msgid "File must be smaller than 1 megabyte in size."
+msgid "The image size must be smaller than 256kb"
+msgstr ""
+
+#: static/js/publisher/instructors.js
+msgid "The image dimensions must be less than 110 x 110"
+msgstr ""
+
+#: static/js/publisher/instructors.js
+msgid " Unsupported Image extension"
 msgstr ""
 
 #: static/js/publisher/instructors.js

course_discovery/conf/locale/eo/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-25 06:07+0000\n"
+"POT-Creation-Date: 2017-11-01 07:46+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-25 06:08+0000\n"
+"POT-Creation-Date: 2017-11-01 07:46+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -50,24 +50,31 @@ msgid "Add staff member"
 msgstr "Àdd stäff mémßér Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
 
 #: static/js/publisher/instructors.js
-msgid ""
-"Please upload a instructor image. File must be smaller than 1 megabyte in "
-"size."
+msgid "Please upload a instructor image."
 msgstr ""
-"Pléäsé üplöäd ä ïnstrüçtör ïmägé. Fïlé müst ßé smällér thän 1 mégäßýté ïn "
-"sïzé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєт#"
+"Pléäsé üplöäd ä ïnstrüçtör ïmägé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#"
 
 #: static/js/publisher/instructors.js static/js/publisher/preview-url.js
 msgid "Something went wrong!"
 msgstr "Söméthïng wént wröng! Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
 
 #: static/js/publisher/instructors.js
-msgid "File must be smaller than 1 megabyte in size."
+msgid "The image size must be smaller than 256kb"
 msgstr ""
-"Fïlé müst ßé smällér thän 1 mégäßýté ïn sïzé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
+"Thé ïmägé sïzé müst ßé smällér thän 256kß Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
 "¢σηѕє¢тєтυя #"
 
 #: static/js/publisher/instructors.js
+msgid "The image dimensions must be less than 110 x 110"
+msgstr ""
+"Thé ïmägé dïménsïöns müst ßé léss thän 110 x 110 Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт "
+"αмєт, ¢σηѕє¢тєтυя α#"
+
+#: static/js/publisher/instructors.js
+msgid " Unsupported Image extension"
+msgstr " Ûnsüppörtéd Ìmägé éxténsïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢#"
+
+#: static/js/publisher/instructors.js
 msgid "Update staff member"
 msgstr "Ûpdäté stäff mémßér Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт,#"
 

course_discovery/static/js/publisher/instructors.js

@@ -30,9 +30,9 @@ $(document).ready(function () {
             url = $(this).data('url'),
             uuid = $('#addInstructorModal').data('uuid');
 
-        if (!editMode && $('#staffImageSelect').get(0).files.length === 0) {
-            addModalError(gettext("Please upload a instructor image. File must be smaller than 1 megabyte in size."));
-            return false;
+        if (!editMode && $('#staffImageSelect').get(0).files.length === 0 ) {
+            addModalError(gettext("Please upload a instructor image."));
+            return;
         }
         personData = {
             'given_name': $('#given-name').val(),
@@ -96,22 +96,37 @@ $(document).ready(function () {
     });
 });
 
-function loadSelectedImage(input) {
-    // 1mb in bytes
-    var maxFileSize = 1000000;
-
-    if (input.files && input.files[0]) {
-        if (input.files[0].size > maxFileSize) {
-            addModalError(gettext("File must be smaller than 1 megabyte in size."));
-        } else {
-            var reader = new FileReader();
-
-            clearModalError();
-            reader.onload = function (e) {
-                $('.select-image').attr('src', e.target.result).addClass('image-updated');
-            };
+function loadSelectedImage (input) {
+    var maxFileSize = 256, // Size in KB's
+        imageFile = input.files[0],
+        imageDimension = 110,
+        imgPath = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';
+    if (imageFile) {
+        if ( (/\.(png|jpeg|jpg|gif)$/i).test(imageFile.name) ) {
+            if (imageFile.size / 1024 > maxFileSize) {
+                addModalError(gettext("The image size must be smaller than 256kb"));
+            }
+            else {
+                var reader = new FileReader();
+                clearModalError();
 
-            reader.readAsDataURL(input.files[0]);
+                reader.addEventListener("load", function (e) {
+                    var image = new Image();
+                    image.addEventListener("load", function () {
+                        if (image.width > imageDimension && image.height > imageDimension) {
+                            addModalError(gettext("The image dimensions must be less than 110 x 110"));
+                            $('.select-image').attr('src', imgPath).removeClass('image-updated');
+                            $('#staffImageSelect').val('');
+                        }
+                    });
+                    $('.select-image').attr('src', e.target.result).addClass('image-updated');
+                    image.src = reader.result;
+                });
+                reader.readAsDataURL(imageFile);
+            }
+        }
+        else{
+            addModalError(gettext(imageFile.name +" Unsupported Image extension" ));
         }
     }
 }