admin_it 1.2.8 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0101e52edd3399fdcf4416647198117ce5083c8
-  data.tar.gz: 77bee2f8fe7e18fb5abc519fa3d1d56a14d69b1f
+  metadata.gz: 117d0fbca72494a8c37ea5eb2abdd847521dd3fc
+  data.tar.gz: ab30fbe27aa45970be70c08c8c08f2dfdef0398f
 SHA512:
-  metadata.gz: 33ebb8e9b2fb9e1af7e3d8d0b0d174c1a647fb634eab9bcd9ffc2a691b6d1ccabe4c2436c319c3abd3733da48c507e7645096714f5176eaf74f451977eb9706a
-  data.tar.gz: 3deb6ba2467c316c8512b68476fd4629c071061996d48eca60140ee722b300342df8d13286be6845dc1d679f3bacff3c58b1f21f6b1c7221ca41aee634d247e0
+  metadata.gz: b8d5ea4ec7dbbe1a2284b19b765593ca158e8706900f2820e7eff81d66e08567a0a010b82a222e083532ecb69d3e9b735fda48b20d4a685b13327f7957f4aec1
+  data.tar.gz: c68d91a6fa29c710176ca48ddc2ac69a13452fe00a155a25413a0f3085adbda7c167772445051a25356df296f66c1eff8c38e0ac3dbeedcfe7a995bc8e1f96fc

data/app/assets/javascript/admin_it/admin_it.js

@@ -72,6 +72,7 @@ var initTabs = function() {
     $('[data-tab="' + $(e.relatedTarget).attr('href') + '"]').removeClass('in');
     $('[data-tab="' + $(e.target).attr('href') + '"]').addClass('in');
     $('form input[type="hidden"][name="section"]').val($(this).attr('href').substr(1));
+    initTiles();
   });
   var active = $('.active > [data-toggle="tab"]');
   if (active.length > 0) {
@@ -90,33 +91,10 @@ var initLinks = function() {
 }
 
 var initImageUploads = function() {
-  $form = $('form[data-sign-url]');
-  $form.fileupload({
-    url: $form.attr('action'),
-    autoUpload: true,
-    dataType: 'xml',
-    add: function(evt, data) {
-      $.ajax({
-        url: $form.data('signUrl') + '/',
-        type: 'GET',
-        dataType: 'json',
-        data: { doc: { title: data.files[0].name } },
-        async: false,
-        success: function(data) {
-          // Now that we have our data, we update the form so it contains all
-          // the needed data to sign the request
-          $form.find('input[name=key]').val(data.key)
-          $form.find('input[name=policy]').val(data.policy)
-          $form.find('input[name=signature]').val(data.signature)
-        }
-      });
-      data.submit();
-    },
-    success: function(data) {
-      // Here we get the file url on s3 in an xml doc
-      var url = $(data).find('Location').text()
-      $($form.data('input')).val(url) // Update the real input in the other form
-    },
+  $('[data-toggle="file-upload"]').fileUpload({
+    success: function(el, response) {
+      $(el.data('image')).attr('src', response.small_url);
+    }
   });
 }
 
@@ -153,12 +131,12 @@ var initControls = function() {
   initImageUploads();
   initSelects();
   initGeoPickers();
+  initTiles();
 }
 
 $(document).on('ready page:load', function() {
   initPartials();
   // initDialogs();
-  initTiles();
   initTabs();
   initPopups();
   initLinks();

data/app/assets/javascript/admin_it/file_upload.js

@@ -0,0 +1,109 @@
+(function($) {
+  function parseOptions(element, options) {
+    var opts = $.extend({}, $.fn.fileUpload.defaults, element.data(), options);
+    opts.target = $(opts.target).first();
+    if (opts.target.length == 0) opts.target = null;
+    return opts;
+  };
+
+  function getCss(target) {
+    var pos = (target) ? target.position() : { top: 0, left: 0 };
+    if (target) {
+      pos.top -= parseInt(target.css('border-top-width'));
+      pos.left -= parseInt(target.css('border-left-width'));
+      pos.width = target.outerWidth();
+      pos.height = target.outerHeight();
+    }
+    return pos;
+  };
+
+  function completed(opts, success, response) {
+    // replace file input element to preven file uploading while form submitting
+    var input = opts.input
+      .clone()
+      .on('change', function() { addFile.apply(this, [opts]); });
+    opts.input.remove();
+    opts.input = input.appendTo(opts.wrapper);
+    if (!success) {
+      alert('Ошибка загрузки файла');
+      return;
+    }
+    if ($.isFunction(opts.success)) opts.success(input, response);
+  };
+
+  function addFile(opts) {
+    if (opts.started) {
+      alert('В данный момент загружается другой файл. ' +
+            'Дождитесь окончания загрузки');
+      return;
+    }
+    opts.started = true;
+    var xhr = new XMLHttpRequest();
+    var uploaded = false;
+
+    if (xhr.upload) {
+      xhr.upload.addEventListener("load", function(e) { uploaded = true; }, false);
+    } else {
+      uploaded = true;
+    }
+
+    xhr.onreadystatechange = function() {
+      if (this.readyState == 4) {
+        opts.started = false;
+        if (this.status < 400) {
+          completed(
+            opts,
+            uploaded,
+            (uploaded) ? $.parseJSON(this.responseText) : null
+          );
+        } else {
+          completed(opts, false, null);
+        }
+      }
+    };
+
+    var el = opts.input.get(0);
+    var filename = el.files[0].name;
+    var method = (opts.method || opts.uploadMethod || 'POST').toUpperCase();
+    xhr.open(method, opts.url || opts.uploadUrl);
+    xhr.setRequestHeader('Accept', 'application/json');
+
+    // W3C (IE9, Chrome, Safari, Firefox 4+)
+    var formData = new FormData();
+    formData.append(opts.fieldName || 'file', el.files[0], filename);
+    if (opts.token) {
+      formData.append(opts.tokenName || 'token', opts.token);
+    }
+    xhr.send(formData);
+  };
+
+  function init(element, opts) {
+    if (!opts.target) return;
+    if (element.parent().hasClass('file-upload-wrapper')) return;
+    opts.wrapper = $('<div class="file-upload-wrapper"></div>').append(element);
+    // small timeout needed to take effect in DOM model
+    setTimeout(function() {
+      opts.css = getCss(opts.target);
+      opts.wrapper
+        .css(opts.css)
+        .appendTo(opts.target);
+      opts.input = element.on('change', function() { addFile.apply(this, [opts]); });
+    }, 100);
+    return opts;
+  };
+
+  $.fn.fileUpload = function(action, options) {
+    if ($.isPlainObject(action)) options = action;
+    if (typeof action !== 'string') action = 'init';
+    return this.each(function() {
+      var $this = $(this);
+      var opts = parseOptions($this, options);
+      if (action === 'init') {
+        init($this, opts);
+      }
+    });
+  };
+
+  $.fn.fileUpload.defaults = {
+  }
+})(jQuery);

data/app/assets/javascript/admin_it/index.js

@@ -7,4 +7,5 @@
 //= require admin_it/jquery.fileupload-process
 //= require admin_it/jquery.geolocationpicker.js
 //= require select2
+//= require admin_it/file_upload.js
 //= require admin_it/admin_it

data/app/assets/stylesheets/admin_it/admin_it.css

@@ -27,3 +27,24 @@
 .fileupload-image img, .admin-show-image {
   max-width: 500px;
 }
+
+[data-toggle="file-upload"] {
+  opacity: 0,
+  filter: alpha(opacity:0);
+  font-size: 600px;
+  cursor: pointer;
+  padding: 0;
+  margin: 0;
+  border: none;
+  margin-left: -450px;
+}
+
+.file-upload-wrapper {
+  position: absolute;
+  overflow: hidden;
+  z-index: 10000;
+}
+
+#image_image_button {
+  margin-top: 10px;
+}

data/app/controllers/admin_it/signed_url_controller.rb

@@ -23,6 +23,7 @@ module AdminIt
             { bucket: AdminIt.config.s3[:bucket] },
             { acl: 'public-read' },
             ['starts-with', '$key', 'uploads/'],
+            ['starts-with', '$Content-Type', ''],
             { success_action_status: '201' }
           ]
         }.to_json

data/app/views/admin_it/editors/_image.html.slim

@@ -1,50 +1,34 @@
 - for_context ||= context
-- id ||= "#{for_context.resource.name}_#{field.name}_fileupload"
-/- opts = { name: name || "#{for_context.resource.name}[#{field.name}]", \
-/           id: , \
-/           value: value || field.read(for_context.entity) }
 
-form.form-horizontal(
-  data-sign-url=AdminIt::Engine.routes.url_helpers.signed_url_index_path
-  data-input="##{for_context.resource.name}_#{field.name}"
-  enctype="multipart/form-data"
-  method="POST"
-  action="https://#{AdminIt.config.s3[:bucket]}.s3.amazonaws.com"
-)
-  input type="hidden" name="key"
-  input type="hidden" name="AWSAccessKeyId" value=AdminIt.config.s3[:access_key_id]
-  input type="hidden" name="acl" value="public-read"
-  input type="hidden" name="policy"
-  input type="hidden" name="signature"
-  input type="hidden" name="success_action_status" value="201"
-  .form-group
-    - control_width = 'col-sm-12'
-    - if field.show_label?
-      label.col-sm-2.control-label for="#{id}"
-        = field.display_name
-        - control_width = 'col-sm-10'
-    div class=control_width
-      .row.fileupload-image
-        img src=field.read(for_context.entity)
-      .row.fileupload-buttonbar
-        .col-lg-9
-          .btn-group
-            span.btn.btn-success.fileinput-button>
-              i.fa.fa-plus>
-              span = t('admin_it.image.select')
-              input type="file" name="file"
-            /button.btn.btn-primary.start> type="submit"
-              i.fa.fa-upload>
-              span = t('admin_it.image.upload')
-            /button.btn.btn-warning.cancel type="reset"
-              i.fa.fa-ban>
-              span = t('admin_it.image.cancel')
-          /! The global file processing state
-          span.fileupload-process
-        /! The global progress state
-        .col-lg-3.fileupload-progress.fade
-          /! The global progress bar
-          .progress.progress-striped.active aria-valuemax="100" aria-valuemin="0" role="progressbar"
-            .progress-bar.progress-bar-success style="width:0%;"
-          /! The extended global progress state
-          .progress-extended  
+- name ||= "#{for_context.resource.name}[#{field.name}]"
+- buttonId = "#{for_context.resource.name}_#{field.name}_button"
+- imageId = "#{for_context.resource.name}_#{field.name}_image"
+- value ||= field.read(for_context.entity)
+- upload_url = field.options[:upload_url]
+- unless upload_url.blank?
+  - upload_url.gsub!(/:[a-zA-Z][a-zA-Z_0-9]+/) { |n| for_context.entity.send(n[1..-1]) }
+- opts = { name: name, value: value }
+- opts[:id] = id if defined? id
+- opts['data-toggle'] = 'file-upload'
+- opts['data-target'] = "##{buttonId}"
+- opts['data-upload-url'] = field.options[:upload_url] if field.options.key?(:upload_url)
+- opts['data-token-name'] = 'authenticity_token'
+- opts['data-token'] = form_authenticity_token
+- opts['data-delete-url'] = field.options[:delete_url] if field.options.key?(:delete_url)
+- opts['data-image'] = "##{imageId}"
+
+- url = field.show(for_context.entity)
+- collapsed = url.blank? ? {} : { class: 'in' }
+
+div
+  .collapsed *collapsed
+    img src=url id=imageId
+  .btn-group
+    - if opts.key?('data-upload-url')
+      .btn.btn-success id=buttonId
+        i.fa.fa-upload data-toggle="file-select"
+        input type="file" *opts
+    - if opts.key?('data-delete-url') && !url.blank?
+      .btn.btn-danger
+        i.fa.fa-trash-o data-toggle="file-delete"
+

data/app/views/admin_it/shared/_fields.html.slim

@@ -18,7 +18,7 @@
 
 / visible fields
 - fields.each do |field|
-  - if field.editor == :image
+  /- if field.type == :image
     - locals = { field: field, for_context: for_context, id: "#{for_context.resource.name}_#{field.name}" }
     = render partial: File.join(%w(admin_it editors hidden)), locals: locals
     - next

data/app/views/admin_it/shared/_form.html.slim

@@ -8,11 +8,6 @@
 - elsif for_context.is_a?(AdminIt::EditContext)
   - action = resource.single_path(for_context.entity)
 
-/ images
-- for_context.fields(scope: { editor: :image }).each do |field|
-  - locals = { field: field, for_context: for_context }
-  = render partial: File.join(%w(admin_it editors image)), locals: locals
-
 form.form-horizontal role="form" action=action method="POST"
   input name="authenticity_token" type="hidden" value=form_authenticity_token
   input name="section" type="hidden" value=parent.section

data/lib/admin_it/field/field.rb

@@ -28,6 +28,7 @@ module AdminIt
       dsl_accessor :type, default: TYPES[0]
       dsl_accessor :placeholder
       dsl_accessor :partial
+      dsl_accessor :options, default: {}
       dsl_accessor :editor, default: EDITORS[0]
       dsl_boolean :readable, :writable, :visible, :sortable, :show_label
       dsl_block :read, :write, :render, :display
@@ -42,7 +43,7 @@ module AdminIt
     end
 
     class << self
-      attr_reader :read, :write, :render, :display, :type, :partial
+      attr_reader :read, :write, :render, :display, :type, :partial, :options
 
       protected
 
@@ -78,12 +79,17 @@ module AdminIt
       Class.new(base) do
         @field_name, @entity_class = name, _entity_class
         import_data_module(base)
+        self.type = opts[:type]
         @readable = opts[:readable].nil? ? true : opts[:readable] == true
         @writable = opts[:writable].nil? ? true : opts[:writable] == true
         @visible = opts[:visible].nil? ? true : opts[:visible] == true
         @sortable = opts[:sortable].nil? ? true : opts[:sortable] == true
+        @options = opts[:options].is_a?(Hash) ? opts[:options] : {}
+        if type == :image
+          @options[:s3] = {} unless @options[:s3].is_a?(Hash)
+          @options[:s3] = {}.merge(AdminIt.config.s3, @options[:s3])
+        end
         @show_label = opts[:show_label].nil? ? true : opts[:show_label] == true
-        self.type = opts[:type]
         self.editor = opts[:editor] unless opts[:editor].nil?
       end
     end
@@ -104,6 +110,10 @@ module AdminIt
       @partial ||= nil
     end
 
+    def self.optionis
+      @options ||= {}
+    end
+
     def self.hide
       @visible = false
     end
@@ -120,10 +130,12 @@ module AdminIt
       @editor = EDITORS[0]
     end
 
-    class_attr_reader :entity_class, :display_name, :type, :partial, :editor
+    class_attr_reader :entity_class, :display_name, :type, :partial, :editor,
+                      :options
     attr_writer :visible, :readable, :writable
 
-    def initialize(readable: nil, writable: nil, visible: nil, sortable: nil, show_label: nil)
+    def initialize(readable: nil, writable: nil, visible: nil, sortable: nil,
+                   show_label: nil, options: nil)
       run_callbacks :initialize do
         @readable = readable.nil? ? self.class.readable? : readable == true
         @writable = writable.nil? ? self.class.writable? : writable == true
@@ -226,7 +238,7 @@ module AdminIt
 #    end
 
     def show_value(entity)
-      value = read_value(entity)
+      value = read(entity)
       if type == :enum
         value.text
       elsif type == :geo_point

data/lib/admin_it/version.rb

@@ -1,5 +1,5 @@
 #
 module AdminIt
   # Current gem version
-  VERSION = '1.2.8'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admin_it
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.0
 platform: ruby
 authors:
 - Alexey Ovchinnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -247,6 +247,7 @@ files:
 - app/assets/fonts/admin_it/glyphicons-halflings-regular.woff
 - app/assets/javascript/admin_it/admin_it.js
 - app/assets/javascript/admin_it/bootstrap.min.js
+- app/assets/javascript/admin_it/file_upload.js
 - app/assets/javascript/admin_it/index.js
 - app/assets/javascript/admin_it/jquery.fileupload-main.js
 - app/assets/javascript/admin_it/jquery.fileupload-process.js