smithycms 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5729808381e189d354b575a074129abbb0bd33b6
-  data.tar.gz: 49a72ccb62fb0f11a31edf3f70cc2f1af81fd372
+  metadata.gz: 9ef3603f75dac8deb5a376d8b940d80929f143ed
+  data.tar.gz: daf866a5e6562242e7e68a856764e90010f7aa1b
 SHA512:
-  metadata.gz: 390e6f97961063ad08c0e2d673c01896e4f296b9ffe4e37c5384033ebfde23f04fcee62f2c0b31bd787f4508900099a05c5a45d4db8236cb8c4589ff3ba55539
-  data.tar.gz: 2dd09ff917ef0d96379610d38b29b7af7d78cd95cb5e1d983b4d80972d416e99f640c8e328df21eeebb96f2b14348eb1cac7765cab0f4e5243a33888678f3083
+  metadata.gz: cd32f70f38a4f1a51b03c56ae5d601314b6aee76131ae75271fdbcb1ad87171c4ce037fe69b68fb54838c2bab4b9f75975ebf15e219affab94551a726efc7a47
+  data.tar.gz: ed284bb439bf70777fd51216ea4cd1a2ed183140d6f2fdd29673ae446f040a5e19a7c1f19f23814da9b89df69b39d917a70b5500a704294f396b837a285b054f

data/app/assets/javascripts/smithy/application.js

@@ -3,15 +3,19 @@
 //= require jquery.remotipart
 //= require 'smithy/jquery-ui.min'
 //= require bootstrap-sprockets
-//= require dataTables/jquery.dataTables
-//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
-//= require dataTables/extras/dataTables.responsive
+//= require datatables
+//= require datatables-responsive
+//= require datatables/dataTables.bootstrap
+//= require datatables-select
 //= require ace-1.1.3/ace
 //= require ace-1.1.3/mode-css.js
 //= require ace-1.1.3/mode-html.js
 //= require ace-1.1.3/mode-javascript.js
 //= require ace-1.1.3/mode-liquid.js
 //= require ace-1.1.3/mode-markdown.js
+//= require ace-1.1.3/ext-language_tools
+//= require ace-1.1.3/snippets/snippets
+//= require ace-1.1.3/snippets/markdown
 //= require zeroclipboard-2.2.0/ZeroClipboard.min.js
 //= require refile
 //= require_tree .

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

@@ -25,7 +25,7 @@ upload_files = (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) if progress >= 100
+      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>")
 

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

@@ -1,40 +1,47 @@
-$select_all_checkbox = $('#assets_table_select_all')
-$delete_selected_button = $('#delete_selected_assets')
-
-$('#assets').DataTable {
-  "responsive": true,
-  "serverSide": true,
-  "processing": true,
-  "ajax": $('#assets').attr('data-source'),
-  "order": [[2, 'asc']],
-  "columnDefs": [
-    { "targets": [0,1,5], "searchable": false, "orderable": false },
-    { "targets": [1], "className": "preview" }
-  ],
-  "language": {
-    "emptyTable": "No assets have been added yet. Upload files above to create new assets.",
-    "processing": "<span>Processing...</span>"
-  },
-  "dom": 'l<"toolbar">frtip'
-}
-
-window.$assets_table = $('#assets').dataTable()
-window.assets_table_api = $assets_table.api()
-
-$('#assets_wrapper').find('.toolbar').append($delete_selected_button.remove())
-
-$(document).on 'click', '#assets_table_select_all', (e) ->
-  $checkbox = $(e.target)
-  $assets_table.find('input.delete').prop('checked', $checkbox.prop('checked'))
-
-$(document).on 'click', '#assets_wrapper input[type="checkbox"]', (e) ->
-  if $('#assets_wrapper input[type="checkbox"]:checked').length > 0
-    $delete_selected_button.show()
-  else
-    $delete_selected_button.hide()
-
-$assets_table.on 'draw.dt', ->
-  $(document).trigger('updateCopyLinks')
+$ ->
+  load_assets_table()
+
+window.load_assets_table = ->
+  return if $('#assets').length == 0
+  $select_all_checkbox = $('#assets_table_select_all')
+  $delete_selected_button = $('#delete_selected_assets')
+
+  $('#assets').DataTable {
+    select: true
+    "responsive": true,
+    "serverSide": true,
+    "processing": true,
+    "ajax": $('#assets').attr('data-source'),
+    "order": [[2, 'asc']],
+    "language": {
+      "emptyTable": "No assets have been added yet. Upload files above to create new assets.",
+      "processing": "<span><i class='fa fa-spinner fa-spin fa-large'></i></span>"
+    },
+    "dom": 'l<"toolbar">frtip'
+  }
+
+  window.$assets_table = $('#assets').dataTable()
+  window.assets_table_api = $assets_table.api()
+
+  $('#assets_wrapper').find('.toolbar').append($delete_selected_button.remove())
+
+  assets_table_api.on "select", (e, dt, type, indexes) ->
+    $(assets_table_api.rows(indexes).nodes()).find('input[type="checkbox"]').prop('checked', true) if type == "row"
+    $delete_selected_button.show() if assets_table_api.rows({ selected: true }).any()
+  assets_table_api.on "deselect", (e, dt, type, indexes) ->
+    $(assets_table_api.rows(indexes).nodes()).find('input[type="checkbox"]').prop('checked', false) if type == "row"
+    $delete_selected_button.hide() unless assets_table_api.rows({ selected: true }).any()
+
+  $(document).on 'click', '#assets_table_select_all', (e) ->
+    $checkbox = $(e.target)
+    if $checkbox.prop('checked')
+      assets_table_api.rows().select()
+    else
+      assets_table_api.rows().deselect()
+
+  $assets_table.on 'draw.dt', ->
+    $(document).trigger('updateCopyLinks')
+
 
 window.assets_table_add_rows = (rows) ->
   assets_table_api.rows.add(rows).draw()

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

@@ -0,0 +1,142 @@
+window.ace_edit = (id, template_type, name) ->
+  name = 'template_content' if !name
+  textarea_id = name + '-' + id
+  editor_id = name + '_editor-' + id
+  $('#'+editor_id).show()
+  editor = ace.edit(editor_id)
+  $textarea = $('#'+textarea_id)
+  $textarea.hide()
+  create_ace_toolbar(editor, $textarea.attr('data-assets-url'), $textarea.attr('data-pages-url'))
+  session = editor.getSession()
+  session.setMode("ace/mode/" + template_type)
+  session.setValue($textarea.val())
+  session.setTabSize(2)
+  session.setUseSoftTabs(true)
+  session.setUseWrapMode(true)
+  session.on 'change', ->
+    $textarea.val(editor.getSession().getValue())
+  editor.commands.addCommand({
+    name: 'save',
+    bindKey: {win: 'Ctrl-S',  mac: 'Command-S'},
+    exec: (editor) ->
+      $("#"+editor.container.id).closest('form').submit()
+    ,
+    readOnly: false
+  })
+  editor.setOptions({
+    enableBasicAutocompletion: true,
+    enableSnippets: true
+  })
+  return editor
+
+create_ace_toolbar = (editor, assets_modal_url, pages_modal_url) ->
+  $toolbar = $("<ul class='nav ace-editor-toolbar'></ul>").insertBefore($(editor.container))
+  heading_dropdown = $("
+    <li class='dropdown'>
+      <a class='dropdown-toggle' data-toggle='dropdown' href='javascript:void(0)' role='button' aria-haspopup='true' aria-expanded='false'><i class='fa fa-header'></i><span class='caret'></span></a>
+      <ul class='dropdown-menu'>
+      </ul>
+    </li>
+  ")
+  heading_actions = [
+    $("<a href='javascript:void(0);' data-command='h1' class='h1'>Heading</a>"),
+    $("<a href='javascript:void(0);' data-command='h2' class='h2'>Heading</a>"),
+    $("<a href='javascript:void(0);' data-command='h3' class='h3'>Heading</a>"),
+    $("<a href='javascript:void(0);' data-command='h4' class='h4'>Heading</a>")
+  ]
+  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>"),
+    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))
+  ]
+  for $action in actions
+    $toolbar.append($action)
+  for $action in heading_actions
+    $toolbar.find('ul').append($action)
+  $toolbar.find('a').each ->
+    if $(this).attr('data-command')
+      $(this).click(-> edit_selection(editor, $(this).attr('data-command')))
+  $toolbar.find('> a, ul > a').wrap("<li></li>")
+
+open_asset_selector = (url, editor) ->
+  open_modal url, 'asset_selector_modal', editor, ->
+    $modal = $(this)
+
+    $select_button = $modal.find('.btn.select')
+    $select_button.on 'click', ->
+      selected_assets = window.assets_table_api.rows({ selected: true })
+      return if selected_assets.count() == 0
+      insert_assets(selected_assets.data(), $modal, editor)
+
+    load_assets_table($select_button)
+    assets_table_api.on "select", (e, dt, type, indexes) ->
+      $select_button.prop('disabled', !assets_table_api.rows({ selected: true}).any()) if type == 'row'
+    assets_table_api.on "deselect", (e, dt, type, indexes) ->
+      $select_button.prop('disabled', !assets_table_api.rows({ selected: true}).any()) if type == 'row'
+
+open_modal = (url, name, editor, callback) ->
+  if $('#' + name).length > 0
+    $('#'+ name).modal('toggle')
+  else
+    $.get url, (data) ->
+      $('<div id="' + name + '" class="modal fade">' + data + '</div>').appendTo('body').modal().one 'shown.bs.modal', callback
+
+open_link_selector = (url, editor) ->
+  open_modal url, 'page_selector_modal', editor, ->
+    $modal = $(this)
+    $form = $modal.find('form')
+    $label_field = $form.find('input[name="label"]')
+
+    $modal.on 'shown.bs.modal', ->
+      $label_field.val(editor.getSelectedText()) if !editor.selection.isEmpty()
+    .trigger('shown.bs.modal')
+
+    $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')
+      $url_fields.filter('[name="' + e.target.value + '"]').closest('.form-group').removeClass('hidden')
+    .change()
+
+    $form.find('select[name="page"]').on 'change', (e) ->
+      $label_field.val($(this).find('option:selected').text().replace(/^[- ]+/, '')) if !$label_field.val().length
+
+    $modal.find('.btn.select').click ->
+      $form.submit()
+
+    $form.on 'submit', (e) ->
+      form = e.target
+      url = (if (form.type.value == "page") then form.page.value else form.url.value)
+      label = form.label.value
+      link_string = '['+label+']('+url+')'
+      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
+
+insert_assets = (asset_rows, $selector_modal, editor) ->
+  editor.insert(("!["+name+"]("+path+" '"+name+"')" for [path, preview, name, size, type] in asset_rows).join('\n') + "\n")
+  $selector_modal.modal('toggle')
+  editor.focus()
+
+edit_selection = (editor, command) ->
+  snippetManager = ace.require("ace/snippets").snippetManager
+  session = editor.session
+  current_row = editor.selection.getRange().start.row
+  switch command
+    when 'bold'
+      snippetManager.insertSnippet(editor, "**${0:$SELECTION}**")
+    when 'italic'
+      snippetManager.insertSnippet(editor, "*${0:$SELECTION}*")
+    when 'h1'
+      session.insert({ row: current_row, column: 0 }, '# ')
+    when 'h2'
+      session.insert({ row: current_row, column: 0 }, '## ')
+    when 'h3'
+      session.insert({ row: current_row, column: 0 }, '### ')
+    when 'h4'
+      session.insert({ row: current_row, column: 0 }, '#### ')
+  editor.focus()

data/app/assets/stylesheets/smithy/application.scss

@@ -20,8 +20,8 @@
  */
 
 @import 'bootstrap_and_overrides';
-@import 'dataTables/bootstrap/3/jquery.dataTables.bootstrap';
-@import 'dataTables/extras/dataTables.responsive';
+@import 'datatables/dataTables.bootstrap';
+@import 'datatables-responsive';
 @import 'layout';
 @import 'forms';
 @import 'guides';

data/app/assets/stylesheets/smithy/assets.scss

@@ -1,9 +1,5 @@
-
-
-// .table-striped > tbody > tr:nth-child(odd) > td,
-// .table-striped > tbody > tr:nth-child(odd) > th { background:darken($table-bg-accent, 5%); }
-
 table#assets {
+  tr.selected td { background:darken($table-bg-accent, 5%); }
   td { vertical-align:middle; }
   .preview a {
     height:30px; width:30px; display:block; position:relative;
@@ -11,14 +7,14 @@ table#assets {
   }
 }
 
-#assets_wrapper {
-  position:relative;
-  #assets_processing {
-    width:100%; height:100%; top:0; left:0; text-align:center; margin:0; padding:0;
-    &:before { display:inline-block; vertical-align:middle; content:""; height:100%; }
-    span { display:inline-block; vertical-align:middle; }
-  }
+.dataTables_info {
+  .select-info { margin-left:5px; font-style:italic; color:$gray-light; }
+}
+#upload_assets {
+  .progress { margin:5px 0; }
+}
 
+#assets_wrapper {
   #assets_length,
   .toolbar { float:left; margin-right:10px; }
   th.column_delete {

data/app/assets/stylesheets/smithy/templates.scss

@@ -15,3 +15,16 @@ textarea[name="content[content]"],
     min-height:10em;
   }
 }
+
+.ace_editor .ace_content { padding:10px; }
+.ace-editor-toolbar {
+  background:#f9f9f9; border:1px solid darken(#f9f9f9,10%); border-radius:$border-radius-base $border-radius-base 0 0; line-height:40px; width:97%; margin:0; padding:0;
+  li {
+    list-style-type:none; margin:0; display:inline-block;
+    a {
+      color:inherit; padding:0 10px; display:block; margin:0 !important;
+      &:hover { background:darken(#f9f9f9,10%); text-decoration:none; }
+    }
+  }
+  .dropdown li { display:list-item; }
+}

data/app/controllers/smithy/assets_controller.rb

@@ -10,7 +10,14 @@ module Smithy
       @asset_source = AssetSource.first
       respond_with @assets, :layout => 'smithy/wide' do |format|
         format.html
-        format.json { render json: ::Smithy::AssetsDatatable.new(view_context) }
+        format.json { render json: ::Smithy::AssetsDatatable.new(view_context, params[:type]) }
+      end
+    end
+
+    def show
+      @asset = Asset.find(params[:id])
+      respond_with @asset do |format|
+        format.html { redirect_to @asset.url }
       end
     end
 
@@ -19,18 +26,6 @@ module Smithy
       respond_with @asset
     end
 
-    # def create
-    #   @asset = Asset.new(filtered_params)
-    #   @asset.save
-    #   respond_with @asset do |format|
-    #     format.html {
-    #       flash.notice = "Your asset was created" if @asset.persisted?
-    #       redirect_to assets_path
-    #     }
-    #     format.js { render json: ::Smithy::AssetsDatatable.new(view_context).new_row(@asset), callback: 'assets_table_add_row' }
-    #   end
-    # end
-
     def edit
       @asset = Asset.find(params[:id])
       respond_with @asset
@@ -50,6 +45,12 @@ module Smithy
       respond_with @asset
     end
 
+    def selector_modal
+      respond_to do |format|
+        format.html { render :layout => 'smithy/modal' }
+      end
+    end
+
     def batch_destroy
       @assets = Asset.where(id: params[:ids])
       @assets.destroy_all

data/app/controllers/smithy/pages_controller.rb

@@ -7,7 +7,7 @@ module Smithy
     before_filter :load_page_from_path, :only => [ :show ]
     before_filter :initialize_page, :only => [ :new, :create ]
     before_filter :load_page, :only => [ :edit, :update, :destroy ]
-    before_filter :load_parent, :except => [ :index, :show, :order ]
+    before_filter :load_parent, :except => [ :index, :show, :order, :selector_modal ]
     before_filter :load_root, :only => [ :index ]
     respond_to :html, :json
 
@@ -65,6 +65,12 @@ module Smithy
       redirect_to pages_path
     end
 
+    def selector_modal
+      respond_to do |format|
+        format.html { render :layout => 'smithy/modal' }
+      end
+    end
+
     private
       def initialize_page
         @page = Page.new(filtered_params)

data/app/models/smithy/assets_datatable.rb

@@ -3,8 +3,9 @@ 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)
+    def initialize(view, view_type)
       @view = view
+      @view_type = view_type
     end
 
     def as_json(options = {})
@@ -31,14 +32,24 @@ module Smithy
     end
 
     def render_asset(asset)
-      [
-        check_box_tag('ids[]', asset.id, false, class: "delete"),
-        asset_preview_link(asset),
-        asset.name,
-        number_to_human_size(asset.file_size),
-        asset.file_content_type,
-        "#{render(partial: '/smithy/assets/actions', formats: :html, locals: { asset: asset })}"
-      ]
+      if @view_type == 'selector_view'
+        [
+          "/smithy/assets/#{asset.id}",
+          asset_preview_link(asset),
+          asset.name,
+          number_to_human_size(asset.file_size),
+          asset.file_content_type
+        ]
+      else
+        [
+          check_box_tag('ids[]', asset.id, false, class: "delete"),
+          asset_preview_link(asset),
+          asset.name,
+          number_to_human_size(asset.file_size),
+          asset.file_content_type,
+          render(partial: '/smithy/assets/actions', formats: :html, locals: { asset: asset })
+        ]
+      end
     end
 
     def assets

data/app/models/smithy/page.rb

@@ -23,6 +23,17 @@ module Smithy
     attr_accessor :publish
     attr_reader :liquid_context
 
+    def self.page_selector_options
+      items = Array(self.roots)
+      result = []
+      items.each do |root|
+        result += Page.associate_parents(root.self_and_descendants).map do |i|
+          ["#{'-' * i.level} #{i.title}", i.url]
+        end.compact
+      end
+      result
+    end
+
     def container?(container_name)
       containers.where(:name => container_name).count > 0
     end

data/app/models/smithy/page_content.rb

@@ -16,8 +16,6 @@ module Smithy
     scope :for_container, ->(container) { where(:container => container) }
     scope :publishable, -> { where(:publishable => true) }
 
-    delegate :name, to: :content_block, prefix: :content_block
-
     def attributes=(attributes = {})
       self.content_block_type = attributes[:content_block_type]
       super

data/app/views/layouts/smithy/modal.html.erb

@@ -9,6 +9,7 @@
     </div>
     <div class="modal-footer">
       <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
+      <%= yield :footer %>
     </div>
   </div>
 </div>

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

@@ -1,4 +1,3 @@
-<%- full_url = attachment_url(asset, :file) -%>
-<%= link_to "Copy URL", full_url, class: "btn btn-primary btn-xs copy-to-clipboard", data: { 'clipboard-text' => full_url } %>
+<%= link_to "Copy URL", asset.url, class: "btn btn-primary btn-xs copy-to-clipboard", data: { 'clipboard-text' => asset.url } %>
 <%= 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

@@ -1,6 +1,6 @@
 <% content_for :title, "Assets" %>
 
-<div class="well">
+<div class="well" id="upload_assets">
   <%= semantic_form_for @asset_source, remote: true, multipart: true do |f| %>
     <%= 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>
@@ -17,12 +17,12 @@
   <%= content_tag :table, id: "assets", class: "table table-striped responsive no-wrap display", data: { source: "#{ assets_url(format: "json") }" } do %>
     <thead>
       <tr>
-        <th style="width:20px;" class="column_delete"><%= check_box_tag "assets_table_select_all" %></th>
-        <th style="width:30px;">&nbsp;</th>
+        <%= content_tag :th, check_box_tag("assets_table_select_all"), class: 'column_delete', style: 'width:20px;', data: { orderable: false, searchable: false } %>
+        <%= content_tag :th, "", style: 'width:30px;', data: { orderable: false, searchable: false, class_name: 'preview' } %>
         <th>Name</th>
         <th>Size</th>
         <th>Type</th>
-        <th>Actions</th>
+        <%= content_tag :th, "Actions", data: { orderable: false, searchable: false } %>
       </tr>
     </thead>
   <% end %>

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

@@ -0,0 +1,20 @@
+<%= content_for :title do %>
+  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 %>
+    <thead>
+      <tr>
+        <%= content_tag :th, "", data: { orderable: false, searchable: false, visible: false } %>
+        <%= content_tag :th, "", style: 'width:30px;', data: { orderable: false, searchable: false, class_name: 'preview' } %>
+        <th>Name</th>
+        <th>Size</th>
+        <th>Type</th>
+      </tr>
+    </thead>
+  <% end %>
+</div>
+<%= content_for :footer do %>
+  <button class='btn btn-primary select' disabled="disabled">Select</button>
+<% end %>
+

data/app/views/smithy/contents/_form_fields.html.erb

@@ -1,12 +1,12 @@
 <%= f.inputs do %>
-  <%= f.input :content, :as => :text, :input_html => { :class => "col-md-12", :id => "template_content-#{f.object.id || 'new'}" }, :hint => "Use markdown syntax for formatting. You can also use HTML directly. <a href=\"#{guide_path('markdown')}\" data-toggle=\"remote-load\" data-target=\"#content-guide\">See our markdown syntax reference</a>".html_safe %>
+  <%= f.input :content, :as => :text, :input_html => { :class => "col-md-12", :id => "template_content-#{f.object.id || 'new'}", data: { assets_url: selector_modal_assets_path, pages_url: selector_modal_pages_path } }, :hint => "Use markdown syntax for formatting. You can also use HTML directly. <a href=\"#{guide_path('markdown')}\" data-toggle=\"remote-load\" data-target=\"#content-guide\">See our markdown syntax reference</a>".html_safe %>
   <div id="template_content_editor-<%= f.object.id || 'new' %>" class="template_content_editor"></div>
   <div id="content-guide"></div>
 <% end %>
 
 <% content_for :javascript do %>
   <%= javascript_tag do %>
-    var editor = ace_edit('<%= f.object.id || 'new' %>', 'markdown');
+    var editor = ace_edit('<%= f.object.id || 'new' %>', 'markdown', '');
     editor.renderer.setShowGutter(false);
   <% end %>
 <% end %>

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

@@ -0,0 +1,33 @@
+<%= content_for :title do %>
+  Insert Link
+<% end %>
+<form class="formtastic">
+  <div class="form-group">
+    <%= label_tag :label, nil, class: "control-label" %>
+    <%= text_field_tag :label, nil, class: "form-control" %>
+  </div>
+  <fieldset>
+    <div class="form-group">
+      <%= label_tag :type, "Link To", class: "control-label" %>
+      <%= select_tag :type, options_for_select([["Page", "page"], ["External URL", "url"]]), class: "form-control" %>
+    </div>
+    <div class="form-group hidden">
+      <%= label_tag :page, nil, class: "control-label" %>
+      <%= select_tag :page, options_for_select(Smithy::Page.page_selector_options), class: "form-control" %>
+    </div>
+    <div class="form-group hidden">
+      <%= label_tag :url, nil, class: "control-label" %>
+      <%= text_field_tag :url, nil, class: "form-control" %>
+    </div>
+    <div class="form-group">
+      <%= label_tag :open_in_new_tab, nil, class: "control-label" do %>
+        <%= check_box_tag :open_in_new_tab %>
+        Open link in new tab
+      <% end %>
+    </div>
+  </fieldset>
+</form>
+<%= content_for :footer do %>
+  <button class='btn btn-primary select'>Select</button>
+<% end %>
+

data/config/initializers/refile.rb

@@ -7,6 +7,16 @@ Rails.application.routes.prepend do
   mount Refile.app, at: Refile.mount_point, as: :refile_app
 end
 
+# aws = {
+#   access_key_id: 'AKIAJTMAZVFVSBOL6AKQ',
+#   secret_access_key: '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',
+#   region: 'us-west-2',
+#   bucket: 'testsmithy',
+# }
+
+# Refile.cache = Refile::S3.new(prefix: "cache", **aws)
+# Refile.store = Refile::S3.new(prefix: "store", **aws)
+
 if ENV['AWS_ACCESS_KEY_ID'].present? && ENV['AWS_SECRET_ACCESS_KEY'].present? && ENV['AWS_S3_BUCKET'].present?
   aws = {
     access_key_id: ENV['AWS_ACCESS_KEY_ID'],

data/config/routes.rb

@@ -8,6 +8,7 @@ Smithy::Engine.routes.draw do
     resources :assets do
       collection do
         post :batch_destroy
+        get :selector_modal
       end
     end
     resources :asset_sources do
@@ -20,6 +21,7 @@ Smithy::Engine.routes.draw do
     resources :pages do
       collection do
         get :order
+        get :selector_modal
       end
       resources :contents, :controller => "page_contents", :except => [ :index ] do
         member do

data/lib/smithy/dependencies.rb

@@ -9,10 +9,11 @@ require 'formtastic-bootstrap'
 require 'friendly_id'
 require 'httparty'
 require 'kaminari'
-require 'jquery-fileupload-rails'
-require 'jquery-datatables-rails'
 require 'jquery/rails'
 require 'liquid'
+require 'rails-assets-datatables'
+require 'rails-assets-datatables-select'
+require 'rails-assets-datatables-responsive'
 require 'refile/rails'
 require 'refile/mini_magick'
 require 'remotipart'