Merge pull request #65 from open-craft/smarnach/image-url-placeholder

Add placeholder text to item image URL input field.  Bump version to 2.0.4.

.travis.yml

@@ -9,7 +9,7 @@ install:
     - "sh install_test_deps.sh"
     - "pip uninstall -y xblock-drag-and-drop-v2"
     - "python setup.py sdist"
-    - "pip install dist/xblock-drag-and-drop-v2-2.0.3.tar.gz"
+    - "pip install dist/xblock-drag-and-drop-v2-2.0.4.tar.gz"
 script:
     - pep8 drag_and_drop_v2 tests --max-line-length=120
     - pylint drag_and_drop_v2 tests

Changelog.md

-Version 2.0.3 (2016-02-18)
+Version 2.0.4 (2016-03-10)
+--------------------------
+
+* Add a placeholder text to the input field to set the item image. (PR #65)
+
+Version 2.0.3 (2016-03-07)
 --------------------------
 
 * Bugfix: When omitting the background image description in Studio, the red halo

drag_and_drop_v2/templates/html/js_templates.html

@@ -77,6 +77,7 @@
             <label for="item-{{id}}-image-url">{{i18n "Image URL (alternative to the text)"}}</label>
             <input type="text"
                    id="item-{{id}}-image-url"
+                   placeholder="{{i18n 'For example, http://example.com/image.png or /static/image.png'}}"
                    class="item-image-url"
                    value="{{ imageURL }}" />
         </div>

setup.py

@@ -23,7 +23,7 @@ def package_data(pkg, root_list):
 
 setup(
     name='xblock-drag-and-drop-v2',
-    version='2.0.3',
+    version='2.0.4',
     description='XBlock - Drag-and-Drop v2',
     packages=['drag_and_drop_v2'],
     install_requires=[