smithycms 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ef3603f75dac8deb5a376d8b940d80929f143ed
-  data.tar.gz: daf866a5e6562242e7e68a856764e90010f7aa1b
+  metadata.gz: 018b01cf5ecc5da13736a8510d7b6f46896cbfd1
+  data.tar.gz: 64e2790ec5c0df3f046c09a6a590acdf6f2a0456
 SHA512:
-  metadata.gz: cd32f70f38a4f1a51b03c56ae5d601314b6aee76131ae75271fdbcb1ad87171c4ce037fe69b68fb54838c2bab4b9f75975ebf15e219affab94551a726efc7a47
-  data.tar.gz: ed284bb439bf70777fd51216ea4cd1a2ed183140d6f2fdd29673ae446f040a5e19a7c1f19f23814da9b89df69b39d917a70b5500a704294f396b837a285b054f
+  metadata.gz: 3fd38664b501d9fb6d06ef918d25fc479507df000393a21f624d8f760dd7c167a6d5c83b55563e71ea4e2ba29325217639739d225ca7c25b0ab71e16ec6499e7
+  data.tar.gz: 4454069334657b4d12569529fd9a9e88884252786bf9a679d9434efcf70a4b7028130f52baab27600d48292d47ddea115d0a2dd5540a181b0cee65126add86f8

data/app/assets/javascripts/smithy/asset_uploads.coffee

@@ -1,35 +1,37 @@
 $upload_button = $('#choose-files')
 $upload_form = $upload_button.closest('form')
-$file_input = $('#presigned_upload_field').find('input[type="file"]')
+file_input_selector = '#presigned_upload_field input[type="file"]'
 presigned_upload_field_url = $upload_button.attr('data-presigned-upload-field-url')
 
+$progress_bar = $($upload_form).append('<div class="progress" style="display:none;"><div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width:0;"></div></div>').find('.progress-bar')
+
 $upload_button.on 'click', (e) ->
-  $file_input.click();
+  $(file_input_selector).click();
+
+total_uploaded = 0
+total_size = 0
 
 upload_files = (e) ->
-  files = e.target.files
+  total_uploaded = 0
+  file_input = e.target
+  $file_input = $(file_input)
+  files = file_input.files
   if files.length
-    $upload_form.submit()
-
-    # Reset the file input, so that it can be used again
-    $.get presigned_upload_field_url, ->
-      $file_input = $('#presigned_upload_field').find('input[type="file"]')
-      bind_file_input()
-
-    $progress_bar = $($upload_form).append('<div class="progress"><div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width:0;"></div></div>').find('.progress-bar')
     total_size = 0; (total_size += file.size for file in files)
-    total_uploaded = 0
-
-    $(this).find("input[type=submit]").attr("disabled", true)
-    $(document).on "upload:success", $upload_form, (e) ->
-      total_uploaded += e.originalEvent.detail.file.size
-      progress = parseInt(total_uploaded/total_size * 100, 10)
-      $progress_bar.css('width', "#{progress}%").attr('aria-valuenow', progress)
-      setTimeout((-> $progress_bar.parent().remove()), 2000) !$upload_form.find("input.uploading").length
-    $(document).on "upload:failed", $upload_form, (e) ->
-      $(this).addClass("upload-failed").append("<p>Something went wrong, please check your connection and try again</p>")
-
-bind_file_input = ->
-  $file_input.on 'change', upload_files
+    $progress_bar.parent().show()
 
-bind_file_input()
+$(document).on 'change', file_input_selector, upload_files
+$(document).on "upload:success", $upload_form, (e) ->
+  total_uploaded += e.originalEvent.detail.file.size
+  progress = parseInt(total_uploaded/total_size * 100, 10)
+  $progress_bar.css('width', "#{progress}%").attr('aria-valuenow', progress)
+  if !$upload_form.find("input.uploading").length
+    $upload_form.submit()
+    setTimeout((-> $progress_bar.css('width', "0%").parent().hide()), 1000)
+$(document).on "upload:failure", $upload_form, (e) ->
+  $(this).addClass("upload-failed").append("<p>Something went wrong, please check your connection and try again</p>")
+$(document).on "upload:complete", $upload_form, (e) ->
+  console.log("Complete")
+  if !$upload_form.find("input.uploading").length
+    # Reset the file input, so that it can be used again
+    $.get presigned_upload_field_url

data/app/assets/javascripts/smithy/editor.coffee

@@ -46,7 +46,7 @@ create_ace_toolbar = (editor, assets_modal_url, pages_modal_url) ->
   ]
   actions = [
     $("<a href='javascript:void(0);' data-command='bold'><i class='fa fa-bold'></i></a>"),
-    $("<a href='javascript:void(0);' data-command='bold'><i class='fa fa-italic'></i></a>"),
+    $("<a href='javascript:void(0);' data-command='italic'><i class='fa fa-italic'></i></a>"),
     heading_dropdown,
     $("<a href='javascript:void(0);'><i class='fa fa-link'></i></a>").click(-> open_link_selector(pages_modal_url, editor))
     $("<a href='javascript:void(0);'>Image</a>").click(-> open_asset_selector(assets_modal_url, editor))
@@ -89,10 +89,16 @@ open_link_selector = (url, editor) ->
     $form = $modal.find('form')
     $label_field = $form.find('input[name="label"]')
 
+    $label_field.on 'keypress', ->
+      $(this).data('custom-text', true)
+
     $modal.on 'shown.bs.modal', ->
-      $label_field.val(editor.getSelectedText()) if !editor.selection.isEmpty()
+      $label_field.val(editor.getSelectedText()).trigger('keypress') if !editor.selection.isEmpty()
     .trigger('shown.bs.modal')
 
+    $modal.on 'hidden.bs.modal', ->
+      $modal.find('form').trigger('reset')
+
     $url_fields = $form.find('select[name="page"], input[name="url"]')
     $form.find('select[name="type"]').on 'change', (e) ->
       $url_fields.closest('.form-group').addClass('hidden')
@@ -100,7 +106,7 @@ open_link_selector = (url, editor) ->
     .change()
 
     $form.find('select[name="page"]').on 'change', (e) ->
-      $label_field.val($(this).find('option:selected').text().replace(/^[- ]+/, '')) if !$label_field.val().length
+      $label_field.val($(this).find('option:selected').text().replace(/^[- ]+/, '')) if !$label_field.data('custom-text')
 
     $modal.find('.btn.select').click ->
       $form.submit()
@@ -113,7 +119,6 @@ open_link_selector = (url, editor) ->
       link_string = link_string + '{:target="_blank"}' if form.open_in_new_tab.checked
       editor.insert(link_string)
       $modal.modal('toggle')
-      $form.trigger('reset')
       editor.focus()
       return false
 

data/app/models/smithy/assets_datatable.rb

@@ -3,7 +3,7 @@ module Smithy
     include AssetsHelper
     delegate :params, :link_to, :image_tag, :number_to_human_size, :attachment_url, :attachment_image_tag, :file_type_icon, :check_box_tag, :render, to: :@view
 
-    def initialize(view, view_type)
+    def initialize(view, view_type='index_view')
       @view = view
       @view_type = view_type
     end
@@ -38,7 +38,8 @@ module Smithy
           asset_preview_link(asset),
           asset.name,
           number_to_human_size(asset.file_size),
-          asset.file_content_type
+          asset.file_content_type,
+          asset.updated_at.strftime('%b %e, %Y %H:%M:%S')
         ]
       else
         [
@@ -47,6 +48,7 @@ module Smithy
           asset.name,
           number_to_human_size(asset.file_size),
           asset.file_content_type,
+          asset.updated_at.strftime('%b %e, %Y %H:%M:%S'),
           render(partial: '/smithy/assets/actions', formats: :html, locals: { asset: asset })
         ]
       end
@@ -75,7 +77,11 @@ module Smithy
     end
 
     def sort_column
-      columns = %w[delete preview name file_size file_content_type actions]
+      if @view_type == 'selector_view'
+        columns = %w[url preview name file_size file_content_type updated_at]
+      else
+        columns = %w[delete preview name file_size file_content_type updated_at actions]
+      end
       columns[params[:order][:"0"][:column].to_i]
     end
 

data/app/views/smithy/assets/_actions.html.erb

@@ -1,3 +1,3 @@
-<%= link_to "Copy URL", asset.url, class: "btn btn-primary btn-xs copy-to-clipboard", data: { 'clipboard-text' => asset.url } %>
+<%= link_to "Copy URL", asset_path(asset), class: "btn btn-primary btn-xs copy-to-clipboard", data: { 'clipboard-text' => asset_path(asset) } %>
 <%= link_to "Edit", [:edit, asset], class: "btn btn-primary btn-xs" %>
 <%= link_to "Delete", asset, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: "Are you sure?" } %>

data/app/views/smithy/assets/index.html.erb

@@ -5,7 +5,7 @@
     <%= f.inputs do %>
       <a id="choose-files" data-presigned-upload-field-url="<%= presigned_upload_field_asset_source_path(@asset_source) %>" class="btn btn-default" href="javascript:void(0);"><%= icon('cloud-upload') %> Upload files</a>
       <div id="presigned_upload_field" style="display:none;"><%= f.attachment_field :assets_files, multiple: true, direct: true, presigned: true %></div>
-      <%= f.action :submit, label: 'Upload All', button_html: { style: 'display:none;' } %>
+      <%= f.action :submit, button_html: { style: 'display:none;' } %>
     <% end %>
   <% end %>
 </div>
@@ -14,7 +14,7 @@
 <%= semantic_form_for 'Asset', as: "assets", url: batch_destroy_assets_path, remote: true do |f| %>
   <%= f.action :submit, label: 'Delete Selected', button_html: { id: "delete_selected_assets", class: 'btn btn-danger', style: "display:none;" } %>
 
-  <%= content_tag :table, id: "assets", class: "table table-striped responsive no-wrap display", data: { source: "#{ assets_url(format: "json") }" } do %>
+  <%= content_tag :table, id: "assets", class: "table table-striped responsive no-wrap display", data: { source: "#{ assets_url(format: "json") }", order: '[[ 5, "desc" ]]' } do %>
     <thead>
       <tr>
         <%= content_tag :th, check_box_tag("assets_table_select_all"), class: 'column_delete', style: 'width:20px;', data: { orderable: false, searchable: false } %>
@@ -22,6 +22,7 @@
         <th>Name</th>
         <th>Size</th>
         <th>Type</th>
+        <th>Last Updated</th>
         <%= content_tag :th, "Actions", data: { orderable: false, searchable: false } %>
       </tr>
     </thead>

data/app/views/smithy/assets/selector_modal.html.erb

@@ -2,7 +2,7 @@
   Insert Image(s)
 <% end %>
 <div>
-  <%= content_tag :table, id: "assets", class: "table table-striped no-wrap display", data: { source: "#{ assets_url(format: "json", type: :selector_view) }" } do %>
+  <%= content_tag :table, id: "assets", class: "table table-striped no-wrap display", data: { source: "#{ assets_url(format: "json", type: :selector_view) }", order: '[[ 5, "desc" ]]' } do %>
     <thead>
       <tr>
         <%= content_tag :th, "", data: { orderable: false, searchable: false, visible: false } %>
@@ -10,6 +10,7 @@
         <th>Name</th>
         <th>Size</th>
         <th>Type</th>
+        <th>Last Updated</th>
       </tr>
     </thead>
   <% end %>

data/lib/smithy/version.rb

@@ -1,3 +1,3 @@
 module Smithy
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smithycms
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Tim Glen