Permalink
Browse files

ENHANCEMENT New UploadField class to replace FileIframeField, ImageFi…

…eld and SimpleImageField
  • Loading branch information...
1 parent b8cc208 commit c0d187071a5d438d0c7f994f6ae1cf1e0c885cad @chillu chillu committed Feb 2, 2012
Showing with 4,924 additions and 17 deletions.
  1. +5 −1 README.md
  2. +1 −1 admin/css/screen.css
  3. +3 −1 admin/javascript/LeftAndMain.EditForm.js
  4. +1 −1 admin/scss/themes/_default.scss
  5. +42 −0 css/AssetUploadField.css
  6. +58 −0 css/UploadField.css
  7. +5 −0 docs/en/changelogs/3.0.0.md
  8. +1 −1 docs/en/reference/dataextension.md
  9. +1 −5 docs/en/reference/form-field-types.md
  10. +3 −3 docs/en/reference/image.md
  11. +2 −2 docs/en/tutorials/2-extending-a-basic-site.md
  12. +23 −0 filesystem/File.php
  13. +5 −1 forms/FileField.php
  14. +746 −0 forms/UploadField.php
  15. BIN images/progressbar_blue.gif
  16. BIN images/sprites_16x16-scf81c570f3.png
  17. BIN images/sprites_16x16/cross-circle.png
  18. BIN images/sprites_16x16/cross-circle_disabled.png
  19. BIN images/sprites_16x16/drive-upload.png
  20. BIN images/sprites_16x16/drive-upload_disabled.png
  21. BIN images/sprites_16x16/minus-circle.png
  22. BIN images/sprites_16x16/minus-circle_disabled.png
  23. BIN images/sprites_16x16/navigation.png
  24. BIN images/sprites_16x16/navigation_disabled.png
  25. BIN images/sprites_16x16/network-cloud.png
  26. BIN images/sprites_16x16/network-cloud_disabled.png
  27. BIN images/sprites_16x16/pencil.png
  28. BIN images/sprites_16x16/pencil_disabled.png
  29. BIN images/sprites_16x16/plug-disconnect-prohibition.png
  30. BIN images/sprites_16x16/plug-disconnect-prohibition_disabled.png
  31. +14 −0 javascript/AssetUploadField.js
  32. +164 −0 javascript/UploadField.js
  33. +29 −0 javascript/UploadField_downloadtemplate.js
  34. +28 −0 javascript/UploadField_uploadtemplate.js
  35. +16 −1 javascript/lang/en_US.js
  36. +215 −0 scss/AssetUploadField.scss
  37. +215 −0 scss/UploadField.scss
  38. +80 −0 scss/_sprites.scss
  39. 0 scss/newfile
  40. +22 −0 templates/AssetUploadField.ss
  41. +9 −0 templates/Includes/UploadField_FileButtons.ss
  42. +58 −0 templates/UploadField.ss
  43. +11 −0 templates/UploadField_FileEdit.ss
  44. +551 −0 tests/forms/uploadfield/UploadFieldTest.php
  45. +45 −0 tests/forms/uploadfield/UploadFieldTest.yml
  46. +8 −0 thirdparty/javascript-loadimage/.piston.yml
  47. +112 −0 thirdparty/javascript-loadimage/README.md
  48. +114 −0 thirdparty/javascript-loadimage/load-image.js
  49. +3 −0 thirdparty/javascript-loadimage/load-image.min.js
  50. +45 −0 thirdparty/javascript-loadimage/package.json
  51. +8 −0 thirdparty/javascript-templates/.piston.yml
  52. +309 −0 thirdparty/javascript-templates/README.md
  53. +40 −0 thirdparty/javascript-templates/package.json
  54. +85 −0 thirdparty/javascript-templates/tmpl.js
  55. +2 −0 thirdparty/javascript-templates/tmpl.min.js
  56. +8 −0 thirdparty/jquery-fileupload/.piston.yml
  57. +68 −0 thirdparty/jquery-fileupload/README.md
  58. +108 −0 thirdparty/jquery-fileupload/cors/jquery.postmessage-transport.js
  59. +76 −0 thirdparty/jquery-fileupload/cors/jquery.xdr-transport.js
  60. +538 −0 thirdparty/jquery-fileupload/jquery.fileupload-ui.js
  61. +831 −0 thirdparty/jquery-fileupload/jquery.fileupload.js
  62. +156 −0 thirdparty/jquery-fileupload/jquery.iframe-transport.js
  63. +60 −0 thirdparty/jquery-fileupload/package.json
View
@@ -34,4 +34,8 @@ and [installation from source](http://doc.silverstripe.org/sapphire/en/installat
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
+ OF SUCH DAMAGE.
+
+## Attribution ##
+
+ * Some icons by [Yusuke Kamiyamane](http://p.yusukekamiyamane.com/). All rights reserved. Licensed under a [Creative Commons Attribution 3.0 License](http://creativecommons.org/licenses/by/3.0/).
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -31,7 +31,9 @@
* Variable: ChangeTrackerOptions
* (Object)
*/
- ChangeTrackerOptions: {},
+ ChangeTrackerOptions: {
+ ignoreFieldSelector: '.ss-upload :input'
+ },
/**
* Constructor: onmatch
@@ -84,4 +84,4 @@ $grid-horizontal: 8px;
/** -----------------------------------------------
* Application Logo (CMS Logo) Must be 24px x 24px
* ------------------------------------------------ */
-$application-logo-small: image-url("logo_small.png");
+$application-logo-small: url("../images/logo_small.png");
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit c0d1870

Please sign in to comment.