[ckan-changes] [ckan/ckan] 30a3c8: [#2604] - File Upload UX

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 30a3c8485b8e639744e28864f1754be1e6c20a3c
      https://github.com/ckan/ckan/commit/30a3c8485b8e639744e28864f1754be1e6c20a3c
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  [#2604] - File Upload UX

Note: These changes only apply to data upload/linking.

I've changed the label from 'File' to 'Data' when there's no file/link.

When uploading a file from a local machine to a resource, the label will
change to 'File'. When adding a link to a resource, the label will
change to 'URL'.

When editing a resource, if the data is an upload, the data field will
only display the filename, rather than the url. The label for an upload
will also display as 'File'.

The remove data icon now uses text 'Remove' instead of an icon.


  Commit: 67129e15953f0f25c8e778faabe257d9075972b2
      https://github.com/ckan/ckan/commit/67129e15953f0f25c8e778faabe257d9075972b2
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css

  Log Message:
  -----------
  [#2604] - File Upload UX CSS

Updated main.css


  Commit: 0629933a25ac982f87f95743faf001126d3cc2e1
      https://github.com/ckan/ckan/commit/0629933a25ac982f87f95743faf001126d3cc2e1
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  Added strict comparison and removed whitespace

=== used for `this.options.field_url` and `this.options.field_upload` in
determining `this.is_data_resource`

Removed whitespace in variable assignments


  Commit: 696c66a6988b90df80c5a0ec34787bc416833b1b
      https://github.com/ckan/ckan/commit/696c66a6988b90df80c5a0ec34787bc416833b1b
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-07-14 (Thu, 14 Jul 2016)

  Changed paths:
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  Merge pull request #3079 from HighwayThree/2604-file-upload-ux

[#2604] file upload ux


Compare: https://github.com/ckan/ckan/compare/3e44254f4b41...696c66a6988b