[#1382] Adds tooltips to button

ckan · Dec 12, 2013 · 6e9f114 · 6e9f114
1 parent 589bb75
commit 6e9f114
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ckan/public/base/javascript/modules/image-upload.js b/ckan/public/base/javascript/modules/image-upload.js
@@ -15,7 +15,9 @@ this.ckan.module('image-upload', function($, _) {
         upload: _('Upload'),
         url: _('Link'),
         remove: _('Remove'),
-        upload_label: _('Upload'),
+        upload_label: _('Image'),
+        upload_tooltip: _('Upload a file on your computer'),
+        url_tooltip: _('Link to a URL on the internet (you can also link to a API)'),
         remove_tooltip: _('Reset this')
       },
       template: [
@@ -59,6 +61,7 @@ this.ckan.module('image-upload', function($, _) {
 
       // Button to set the field to be a URL
       this.button_url = $('<a href="javascript:;" class="btn"><i class="icon-globe"></i> '+this.i18n('url')+'</a>')
+        .prop('title', this.i18n('url_tooltip'))
         .on('click', this._onFromWeb)
         .insertAfter(this.input);
 
@@ -86,6 +89,7 @@ this.ckan.module('image-upload', function($, _) {
         .on('mouseover', this._onInputMouseOver)
         .on('mouseout', this._onInputMouseOut)
         .on('change', this._onInputChange)
+        .prop('title', this.i18n('upload_tooltip'))
         .css('width', this.button_upload.outerWidth());
 
       // Fields storage. Used in this.changeState

diff --git a/ckan/templates/macros/form.html b/ckan/templates/macros/form.html
@@ -408,7 +408,7 @@
                       url_label='', upload_label='')  %}
   {% set placeholder = placeholder if placeholder else _('http://example.com/my-image.jpg') %}
   {% set url_label = url_label or _('Image URL')  %}
-  {% set upload_label = upload_label or _('Upload Image')  %}
+  {% set upload_label = upload_label or _('Image')  %}
 
   {% if is_upload_enabled %}
   <div class="image-upload" data-module="image-upload" data-module-is_url="{{ 'true' if is_url else 'false' }}" data-module-is_upload="{{ 'true' if is_upload else 'false' }}"