Change opacity and user messages

cms/djangoapps/contentstore/views/tests/test_videos.py

@@ -632,7 +632,7 @@ class VideoImageTestCase(VideoUploadTestBase, CourseTestCase):
         """
         video_image_upload_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': 'test1'})
         response = self.client.post(video_image_upload_url, {})
-        self.verify_error_message(response, 'No file provided for video image')
+        self.verify_error_message(response, 'An image file is required.')
 
     def test_invalid_image_file_info(self):
         """
@@ -652,7 +652,7 @@ class VideoImageTestCase(VideoUploadTestBase, CourseTestCase):
                 size=settings.VIDEO_IMAGE_SETTINGS['VIDEO_IMAGE_MIN_BYTES']
             )
             error = validate_video_image(image_file)
-            self.assertEquals(error, 'This image file is corrupted.')
+            self.assertEquals(error, 'There is a problem with this image file. Try to upload a different file.')
 
     @override_switch(VIDEO_IMAGE_UPLOAD_ENABLED, True)
     def test_no_video_image(self):

cms/djangoapps/contentstore/views/videos.py

@@ -188,7 +188,7 @@ def validate_video_image(image_file):
         try:
             image_file_width, image_file_height = get_image_dimensions(image_file)
         except TypeError:
-            return _('This image file is corrupted.')
+            return _('There is a problem with this image file. Try to upload a different file.')
         image_file_aspect_ratio = abs(image_file_width / float(image_file_height) - settings.VIDEO_IMAGE_ASPECT_RATIO)
         if image_file_width < settings.VIDEO_IMAGE_MIN_WIDTH or image_file_height < settings.VIDEO_IMAGE_MIN_HEIGHT:
             error = _('Recommended image resolution is {image_file_max_width}x{image_file_max_height}. '
@@ -220,7 +220,7 @@ def video_images_handler(request, course_key_string, edx_video_id=None):
         return HttpResponseNotFound()
 
     if 'file' not in request.FILES:
-        return JsonResponse({'error': _(u'No file provided for video image')}, status=400)
+        return JsonResponse({'error': _(u'An image file is required.')}, status=400)
 
     image_file = request.FILES['file']
     error = validate_video_image(image_file)

cms/static/sass/views/_video-upload.scss

@@ -256,7 +256,7 @@
       &.focused {
         img, .video-duration {
           @include transition(all 0.3s linear);
-          opacity: 0.5;
+          opacity: 0.1;
         }
       }
     }

requirements/edx/github.txt

@@ -77,7 +77,7 @@ git+https://github.com/edx/lettuce.git@0.2.20.002#egg=lettuce==0.2.20.002
 git+https://github.com/edx/edx-ora2.git@1.4.3#egg=ora2==1.4.3
 -e git+https://github.com/edx/edx-submissions.git@2.0.0#egg=edx-submissions==2.0.0
 git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3
-git+https://github.com/edx/edx-val.git@ammar/auto-generated-images-fixes
+git+https://github.com/edx/edx-val.git@0.0.16#egg=edxval==0.0.16
 git+https://github.com/pmitros/RecommenderXBlock.git@v1.2#egg=recommender-xblock==1.2
 git+https://github.com/solashirai/crowdsourcehinter.git@518605f0a95190949fe77bd39158450639e2e1dc#egg=crowdsourcehinter-xblock==0.1
 -e git+https://github.com/pmitros/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock