ds_media_library 0.1.0 → 0.2.0

data/dummy/views.rb

@@ -21,68 +21,7 @@ end
 ApplicationController.prepend_view_path InMemoryResolver.new
 
 InMemoryResolver.store["layouts/test"] = <<-SLIM
-  sass:
-    .hidden
-      display: none
-
-    .media-nest
-      display: none
-
-    .expand-input:checked ~ .media-nest
-      display: block
-
-    .media-button, .flash-notice, .flash-alert
-      text-transform: uppercase
-
-    .modal-input
-      opacity: 0.001
-      &:checked ~ .modal-wrapper
-        left: 0
-        opacity: 1
-        .modal-content
-          display: inline-block
-        .modal-bg
-          background: white
-          opacity: 1
-
-    .modal-wrapper
-      position: fixed
-      display: -webkit-flex
-      display: flex
-      top: 0
-      left: -100vw
-      width: 100vw
-      height: 100vh
-      z-index: 9999
-      text-align: left
-
-    .modal-bg
-      background: rgba(#808080, 0.85)
-      opacity: 0
-      position: absolute
-      z-index: 2
-      width: 100vw
-      height: 100vh
-      top: 0
-      left: 0
-
-    .modal-content
-      display: none
-      margin: auto 0
-      width: 94vw
-      height: 100vh
-      padding: 40px
-      z-index: 3
-
-    .modal-close
-      position: absolute
-      top: -10px
-      right: 40px
-      margin: 0
-      width: 40px
-      height: 40px
-      line-height: 40px
-      text-align: center
+  = stylesheet_link_tag "ds_media_library"
 
   h1 TEST
 
@@ -102,13 +41,23 @@ SLIM
 InMemoryResolver.store["application/show"] = <<-SLIM
   = form_for @widget, url: "/" do |form|
     .field
-      = form.label :cat_picture
-      = form.media_library :cat_picture
+      = form.label :cat_picture, class: "dsml-label"
+      = form.media_library :cat_picture, optional: true
 
     .field
-      = form.label :dog_pictures
+      = form.label :dog_pictures, class: "dsml-label"
       = form.media_library :dog_pictures, multiple: true
 
+    .field
+      = form.media_library :baby_picture do
+        = form.label :baby_name
+        = form.text_field :baby_name
+
+    .field
+      = form.media_library :embarassing_pictures, multiple: true, preview: false do
+        label for="resource_{{id}}_context" Embarassing picture {{index}} context
+        input type="text" id="resource_{{id}}_context" name="resources[{{id}}][context]" value="{{context}}"
+
     = form.submit "Save"
 SLIM
 

data/lib/ds_media_library/engine.rb

@@ -1,5 +1,7 @@
 require "ds_node"
 require "slim"
+require "sass-rails"
+require "font-awesome-rails"
 require "jquery-rails"
 require "jquery-ui-rails"
 require "coffee-rails"
@@ -17,13 +19,13 @@ module DSMediaLibrary
         belongs_to :folder, class_name: "DSMediaLibrary::Folder", required: false
 
         def css_class
-          "media-link"
+          "dsml-media-link"
         end
       end
     end
 
     initializer "ds_media_library.assets" do
-      config.assets.precompile += %w( ds_media_library.js )
+      config.assets.precompile += %w( ds_media_library.css ds_media_library.js )
     end
 
     isolate_namespace DSMediaLibrary

data/lib/ds_media_library/version.rb

@@ -1,3 +1,3 @@
 module DSMediaLibrary
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/ds_media_library.rb

@@ -1,5 +1,4 @@
 require "ds_media_library/version"
-require "ds_media_library/form_helper"
 require "ds_media_library/engine"
 
 module DSMediaLibrary

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ds_media_library
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-25 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -276,6 +276,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: font-awesome-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Downstream Media Library Rails Engine
 email:
 - micah@botandrose.com
@@ -283,6 +297,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
@@ -293,32 +308,42 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/ds_media_library.coffee
-- app/assets/javascripts/toggle_all_checkboxes.coffee
+- app/assets/stylesheets/_breadcrumb-nav.sass
+- app/assets/stylesheets/_help-text.sass
+- app/assets/stylesheets/_media-tree.sass
+- app/assets/stylesheets/_modal.sass
+- app/assets/stylesheets/_placeholders.sass
+- app/assets/stylesheets/_preview-media.sass
+- app/assets/stylesheets/ds_media_library.sass
+- app/assets/stylesheets/mixins/_buttons.sass
+- app/assets/stylesheets/mixins/_icons.sass
+- app/assets/stylesheets/mixins/_notification-text.sass
 - app/controllers/ds_media_library/folders_controller.rb
 - app/controllers/ds_media_library/resources_controller.rb
+- app/helpers/ds_media_library/form_helper.rb
 - app/models/ds_media_library/folder.rb
-- app/views/ds_media_library/_folder.html.slim
-- app/views/ds_media_library/_form_helper.html.slim
-- app/views/ds_media_library/_image_preview.html.slim
-- app/views/ds_media_library/_resource.html.slim
-- app/views/ds_media_library/resources/_folder.html.slim
-- app/views/ds_media_library/resources/_resource.html.slim
-- app/views/ds_media_library/resources/folder_form.html.slim
-- app/views/ds_media_library/resources/form.html.slim
-- app/views/ds_media_library/resources/index.html.slim
-- app/views/shared/_image_preview.html.slim
-- app/views/shared/_submit.html.slim
+- app/views/ds_media_library/form_helper/_folder.html.slim
+- app/views/ds_media_library/form_helper/_media_library_helper.html.slim
+- app/views/ds_media_library/form_helper/_resource.html.slim
+- app/views/ds_media_library/form_helper/show.html.slim
+- app/views/ds_media_library/manage/_submit.html.slim
+- app/views/ds_media_library/manage/folders/_folder.html.slim
+- app/views/ds_media_library/manage/folders/form.html.slim
+- app/views/ds_media_library/manage/index.html.slim
+- app/views/ds_media_library/manage/resources/_image_preview.html.slim
+- app/views/ds_media_library/manage/resources/_resource.html.slim
+- app/views/ds_media_library/manage/resources/form.html.slim
 - bin/console
 - bin/server
 - bin/setup
 - config/routes.rb
 - ds_media_library.gemspec
 - dummy/app.rb
+- dummy/config.rb
 - dummy/database.rb
 - dummy/views.rb
 - lib/ds_media_library.rb
 - lib/ds_media_library/engine.rb
-- lib/ds_media_library/form_helper.rb
 - lib/ds_media_library/version.rb
 - tmp/.keep
 homepage: https://github.com/botandrose/ds_media_library

data/app/assets/javascripts/toggle_all_checkboxes.coffee

@@ -1,6 +0,0 @@
-$ ->
-  $("[data-toggle-all-checkboxes]").click (event) ->
-    event.preventDefault()
-    $checkboxes = $(this.getAttribute("data-toggle-all-checkboxes"))
-    $checkboxes.prop checked: !$checkboxes.is(":checked")
-

data/app/views/ds_media_library/_folder.html.slim

@@ -1,11 +0,0 @@
-li
-  input.expand-input type="checkbox" id="#{helper.field}-folder-#{folder.id}"
-  .media-container
-    label.expand-label.folder-link for="#{helper.field}-folder-#{folder.id}" = folder.name
-
-  - if folder.children.any? || folder.resources.any?
-    ul.media-nest
-      - with_options locals: { form: form, helper: helper } do |options|
-        = options.render collection: folder.children, partial: "ds_media_library/folder", as: :folder
-        = options.render collection: folder.resources, partial: "ds_media_library/resource", as: :resource
-

data/app/views/ds_media_library/_form_helper.html.slim

@@ -1,30 +0,0 @@
-.media-library data-media-library=helper.html_id data-media-library-ids=helper.ids required=helper.required
-  = form.label helper.file_field_name, helper.label, class: helper.label_css_class
-
-  - if helper.helptext
-    .ratio-text = helper.helptext
-
-  label.media-button for=helper.html_id Media library
-  em or
-  = form.file_field helper.file_field_name, multiple: helper.multiple
-
-  input.modal-input type="checkbox" id=helper.html_id
-  .modal-wrapper
-    .modal-bg
-    .modal-content
-      label.modal-close for=helper.html_id
-        .borders
-      .media-wrapper
-        .info-text Choose a media file below to associate with this field.  You can manage media in the <a href="/media_library">Media Library</a>. <br />Note that changing a file in the library will update it across all associated media fields in this app.
-
-        = link_to "Open all folders", "#", class: "open-all-label", data: { "toggle-all-checkboxes" => ".expand-input" }
-
-        input.text#search_media type="text" placeholder="Type keywords to search media (case sensitive)"
-
-        ul.media-nav
-          - with_options locals: { form: form, helper: helper } do |options|
-            = options.render collection: helper.root_folders, partial: "ds_media_library/folder", as: :folder
-            = options.render collection: helper.root_resources, partial: "ds_media_library/resource", as: :resource
-
-  dl.playlist-media id="selected_media_#{helper.html_id}"
-

data/app/views/ds_media_library/_image_preview.html.slim

@@ -1,17 +0,0 @@
-- if !defined?(preview) then preview = true
-
-- if image.present?
-  dfn.preview-form
-    .preview-wrapper
-      - if preview
-        - if image.video?
-          = video_tag image.url, controls: true
-        - else
-          = image_tag image.url
-
-      = yield
-
-      - unless defined?(hide_file_name) && hide_file_name
-        dt
-          figcaption = image.original_file_name
-

data/app/views/ds_media_library/_resource.html.slim

@@ -1,27 +0,0 @@
-li.resource class=("hidden" if resource.hidden?)
-  .media-container
-    label.expand-label
-      - if helper.multiple
-        input.modal-input.media-choice type="checkbox" value=resource.id checked=form.object.send(helper.field_id_name).include?(resource.id)
-      - else
-        = form.radio_button helper.field_id_name, resource.id, class: "modal-input media-choice"
-
-      span.media-link alt=resource.original_file_name
-        = resource.original_file_name
-
-      script.media-preview-template type="text/x-html-template"
-        = render "ds_media_library/image_preview", image: resource, preview: helper.preview do
-          - if helper.multiple
-            = form.check_box helper.field_id_name, { multiple: true, checked: true }, resource.id, nil
-            = form.check_box helper.remove_field_name, { multiple: true }, resource.id, nil
-            = form.label :"#{helper.remove_field_name}_#{resource.id}" do
-              span Remove #{helper.label.downcase.singularize} {{index}}
-
-          - else
-            - if helper.optional
-              = form.check_box helper.remove_field_name
-              = form.label helper.remove_field_name do
-                span Remove #{helper.label.downcase}
-
-          - helper.block.call(resource) if helper.block
-

data/app/views/ds_media_library/resources/_folder.html.slim

@@ -1,14 +0,0 @@
-li
-  input type="checkbox" class="expand-input" id="folder-#{folder.id}"
-  .media-container
-    label.expand-label.folder-link for="folder-#{folder.id}" = folder.name
-    .media-links
-      = link_to "Edit folder", [:edit, folder], class: "edit-icon", title: "Edit folder"
-      = link_to "Delete folder", folder, method: :delete, class: "delete-icon", title: "Delete folder",
-        data: { confirm: "Are you sure you want to delete this folder? This will move any folders and resources it may contain up into its parent folder." }
-
-  - if folder.children.any? || folder.resources.any?
-    ul.media-nest
-      = render collection: folder.children, partial: "ds_media_library/resources/folder"
-      = render collection: folder.resources, partial: "ds_media_library/resources/resource"
-

data/app/views/ds_media_library/resources/_resource.html.slim

@@ -1,12 +0,0 @@
-li.resource class=("hidden" if resource.hidden?)
-  .media-container
-    input.move-input type="checkbox" name="resource_ids[]" id="media-#{resource.id}" value=resource.id
-    label.expand-label for="media-#{resource.id}"
-      = link_to resource.original_file_name, edit_resource_path(resource), class: resource.css_class, alt: resource.original_file_name
-      / span.move-span.media-link alt=resource.original_file_name = resource.original_file_name
-
-    .media-links
-      = link_to "Edit media", edit_resource_path(resource), class: "edit-icon", title: "Edit media"
-      = link_to "Delete media", resource_path(resource), method: :delete, class: "delete-icon", title: "Delete media",
-        data: { confirm: "Are you sure you want to delete this media item? Note that this will just remove it from the media library." }
-

data/app/views/ds_media_library/resources/index.html.slim

@@ -1,28 +0,0 @@
-= content_for :breadcrumbs do
-  ul.breadcrumb-nav
-    li Media Library
-
-= form_tag nil, method: :put do
-  input type="checkbox" id="select-media"
-  .table-buttons-flex
-    .buttons-left
-      = link_to "Open all folders", "#", class: "open-all-label", data: { "toggle-all-checkboxes" => ".expand-input" }
-      label.select-media-button for="select-media" Select multiple media
-      .field.move-selected
-        label.move-selected-label for="folder_id" Move selected to:
-        select#folder_id name="folder_id"
-          - folders.each do |folder|
-            option value=folder.id
-              = "- " * folder.depth
-              = folder.name
-        button.move-button Move
-
-    .buttons-right
-      = link_to "Add new folder", [:new, :folder], class: "add-button"
-      = link_to "Add new media", [:new, :resource], class: "add-button"
-
-  input.text#search_media type="text" placeholder="Type keywords to search media (case sensitive)"
-  ul.media-nav
-    = render collection: root.children, partial: "ds_media_library/resources/folder"
-    = render collection: root.resources, partial: "ds_media_library/resources/resource"
-