comfortable_mexican_sofa 1.12.2 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7db18b6f8e81d014cdeaed9da1654a5d44a8e98e
-  data.tar.gz: cb5272767a11c342a92192f2befa1b6971c1541f
+  metadata.gz: 6288406fcc2f264c4289e644ef4968d45c1c127e
+  data.tar.gz: 1e60695eae961a65244861eaeed32016d8d399aa
 SHA512:
-  metadata.gz: 22a37316a9dcb0dba85d6747c062f811b0f23b97bc3db2833ffbdcbd1b421f7e74b70b534f91d143a7efd94c8ca586da4bc8e8c6ecac8cd01b1be0ac98647030
-  data.tar.gz: ece6cf08ce291810b4e89d632379b096772d906d1628b2781c934588e4873a39b3b731011aa251c600674813690e1a0b666496178c9b9fe5164deeca81954a5d
+  metadata.gz: d006542f2574fa558cc49b4d4c1a2ac048cc76360598cad83de2becf828c577231a12b5ebc9f85eaaaf49a719389cf2448f4acaf3315e1346843e6258ecab9a6
+  data.tar.gz: 6b20e59908397502960f98e1699356b488e8fc8ba0bb1891979d636e8d6c038c2723446fc4ccbdf07366ef27aff85ce714ae505f99020ae9a39f78e1238f756f

data/app/assets/javascripts/comfortable_mexican_sofa/admin/application.js

@@ -1 +1 @@
-// Overwrite this file in your application /app/assets/javascripts/comfortable_mexican_sofa/admin/application.js 
+// Overwrite this file in your application /app/assets/javascripts/comfortable_mexican_sofa/admin/application.js

data/app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee

@@ -1,4 +1,5 @@
 #= require jquery
+#= require bootstrap-sprockets
 #= require jquery_ujs
 #= require jquery-ui
 #= require tinymce-jquery
@@ -12,28 +13,29 @@
 #= require bootstrap
 #= require comfortable_mexican_sofa/lib/bootstrap-datetimepicker
 #= require comfortable_mexican_sofa/lib/diff
+#= require comfortable_mexican_sofa/cms/uploader
+#= require comfortable_mexican_sofa/cms/files
+
+window.CMS ||= {}
+
+window.CMS.current_path           = window.location.pathname
+window.CMS.code_mirror_instances  = [ ]
 
 $ ->
   CMS.init()
 
-window.CMS =
-  current_path:           window.location.pathname
-  code_mirror_instances:  []
-  
-  init: ->
-    CMS.slugify()
-    CMS.wysiwyg()
-    CMS.codemirror()
-    CMS.sortable_list()
-    CMS.timepicker()
-    CMS.page_blocks()
-    CMS.mirrors()
-    CMS.page_update_preview()
-    CMS.page_update_publish()
-    CMS.categories()
-    CMS.uploader()
-    CMS.uploaded_files()
-
+window.CMS.init = ->
+  CMS.slugify()
+  CMS.wysiwyg()
+  CMS.codemirror()
+  CMS.sortable_list()
+  CMS.timepicker()
+  CMS.page_blocks()
+  CMS.mirrors()
+  CMS.page_update_preview()
+  CMS.page_update_publish()
+  CMS.categories()
+  CMS.files()
 
 window.CMS.slugify = ->
   slugify = (str) ->
@@ -46,19 +48,22 @@ window.CMS.slugify = ->
     str = str.replace(chars_to_replace_with_delimiter, '-')
     chars_to_remove = new RegExp('[^a-zA-Z0-9 -]', 'g')
     str = str.replace(chars_to_remove, '').replace(/\s+/g, '-').toLowerCase()
-    
+
   $('input[data-slugify=true]').bind 'keyup.cms', ->
     $('input[data-slug=true]').val(slugify($(this).val()))
 
 
 window.CMS.wysiwyg = ->
   tinymce.init
-    selector:       'textarea[data-cms-rich-text]'
-    plugins:        ['link', 'image', 'code']
-    toolbar:        'undo redo | styleselect | bullist numlist | link unlink image | code'
-    menubar:        false
-    statusbar:      false
-    relative_urls:  false
+    selector:         'textarea[data-cms-rich-text]'
+    plugins:          ['link', 'image', 'code', 'autoresize']
+    toolbar:          'undo redo | styleselect | bullist numlist | link unlink image | code'
+    menubar:          false
+    statusbar:        false
+    relative_urls:    false
+    entity_encoding : 'raw'
+    autoresize_bottom_margin : 0
+
 
 window.CMS.codemirror = ->
   $('textarea[data-cms-cm-mode]').each (i, element) ->
@@ -75,8 +80,7 @@ window.CMS.codemirror = ->
   $('a[data-toggle="tab"]').on 'shown', ->
     for cm in CMS.code_mirror_instances
       cm.refresh()
-    return
-  return
+
 
 window.CMS.sortable_list = ->
   $('.sortable').sortable
@@ -103,12 +107,15 @@ window.CMS.page_blocks = ->
       url: $(this).data('url'),
       data:
         layout_id: $(this).val()
+      beforeSend: ->
+        tinymce.remove()
       complete: ->
         CMS.wysiwyg()
         CMS.timepicker()
         CMS.codemirror()
         CMS.reinitialize_page_blocks() if CMS.reinitialize_page_blocks?
 
+
 window.CMS.mirrors = ->
   $('#mirrors select').change ->
     window.location = $(this).val()
@@ -125,7 +132,7 @@ window.CMS.page_update_publish = ->
   widget = $('#form-save')
   $('input', widget).prop('checked', $('input#page_is_published').is(':checked'))
   $('button', widget).html($('input[name=commit]').val())
-  
+
   $('input', widget).click ->
     $('input#page_is_published').prop('checked', $(this).is(':checked'))
   $('input#page_is_published').click ->
@@ -143,32 +150,18 @@ window.CMS.categories = ->
     $('.done', '.categories-widget').toggle()
 
 
-window.CMS.uploader = ->
-  form    = $('.file-uploader form')
-  iframe  = $('iframe#file-upload-frame')
-  
-  $('input[type=file]', form).change -> form.submit()
-    
-  iframe.load -> upload_loaded()
-  
-  upload_loaded = ->
-    i = iframe[0]
-    d = if i.contentDocument
-      i.contentDocument
-    else if i.contentWindow
-      i.contentWindow.document
-    else
-      i.document
-    
-    if d.body.innerHTML
-      raw_string  = d.body.innerHTML
-      json_string = raw_string.match(/\{(.|\n)*\}/)[0]
-      json = $.parseJSON(json_string)
-      files = $('<div/>').html(json.view).hide()
-      $('.uploaded-files').prepend(files)
-      files.map ->
-        $(this).fadeIn()
-
-window.CMS.uploaded_files = ->
-  $('.uploaded-files').on 'click', 'input', ->
-    $(this).select()
+# If we are inside an iframe remove the columns and just keep the center column content.
+# This is used for the files widget that opens in a modal window.
+window.CMS.set_iframe_layout = ->
+  in_iframe = ->
+    try
+      return window.self != window.top
+    catch e
+      return true
+
+  $('body').ready ->
+    if in_iframe()
+      $('body').addClass('in-iframe')
+
+# Triggering this right away to prevent flicker
+window.CMS.set_iframe_layout()

data/app/assets/javascripts/comfortable_mexican_sofa/cms/files.js.coffee

@@ -0,0 +1,29 @@
+(($) ->
+  window.CMS or (window.CMS = {})
+  window.CMS.files = ->
+    modal = $('.cms-files-modal')
+    $('.cms-files-open-modal').on 'click', (e) ->
+      modal.on 'show.bs.modal', ->
+        iframe    = modal.find('iframe')
+        iframeSrc = modal.data('iframe-src')
+        if iframe.attr('src') != iframeSrc
+          iframe.attr('src', iframeSrc)
+
+      modal.modal(show: true)
+      e.preventDefault()
+
+    # Make the files library modal window fill the browsers available height.
+    modal.on 'show.bs.modal', (e) ->
+      height = $(window).height() - 60
+      $(e.target).find('.modal-content').css('height', "#{height}px")
+
+    $(window).on 'resize', ->
+      height = $(window).height() - 60
+      modal.find('.modal-content').css('height', "#{height}px")
+
+    # When clicking a file path in the file list select it to make
+    # it easy to copy&paste.
+    $(document).on 'click', '.cms-uploader-filelist input[type=text]', ->
+      $(this).select()
+
+) jQuery

data/app/assets/javascripts/comfortable_mexican_sofa/cms/uploader.js.coffee

@@ -0,0 +1,139 @@
+# CMS Uploader using plupload http://www.plupload.com/. Code inspired by
+# plupload queue widget https://github.com/moxiecode/plupload/tree/master/js/jquery.plupload.queue
+#
+#= require moxie
+#= require plupload.dev
+
+(($, o) ->
+  window.CMS or (window.CMS = {})
+  window.CMS.uploader = (target, settings) ->
+
+    # Add a file to the file list.
+    addFile = (file) ->
+      fileList = $(".cms-uploader-filelist", target)
+
+      fileList.prepend("
+        <tr id='#{file.id}' class='temp'>
+          <td><div class='icon'></div></td>
+          <td class='main' colspan=2>
+            <div class='progress'>
+              <div class='progress-bar progress-bar-striped active'>
+                <span>#{file.name}</span>
+              </div>
+            </div>
+          </td>
+          <td>
+            <a class='btn btn-sm btn-danger pull-right cms-uploader-file-delete' href='#'>Delete</a>
+          </td>
+        </tr>
+      ")
+
+      $("#" + file.id + " a.cms-uploader-file-delete").click (e) ->
+        uploader.removeFile(file)
+        e.preventDefault()
+
+      updateFileStatus(file)
+
+    # Remove a file from the file list.
+    removeFile = (file) ->
+      $("#" + file.id).remove()
+
+    # Update a files upload status in the file list.
+    updateFileStatus = (file) ->
+      progress_bar = $("##{file.id} .progress-bar", target)
+      if file.status == plupload.UPLOADING
+        progress_bar.css('width', "#{file.percent}%")
+      if file.status == plupload.FAILED
+        progress_bar.css('width', '100%').addClass('progress-bar-danger')
+        $('span', progress_bar).html(file.error_message)
+
+    uploader = undefined
+    id      = target.attr("id")
+
+    unless id
+      id = plupload.guid()
+      target.attr('id', id)
+
+    settings = $.extend(
+      runtimes:       "html5,browserplus,silverlight,flash,gears"
+      dragdrop:       true
+      drop_element:   "#{id}-drag-drop-target"
+      browse_button:  "#{id}-browse"
+      container:      id
+      file_data_name: "file[file]"
+      headers:
+        Accept: "text/plupload"
+    , settings)
+
+    uploader = new plupload.Uploader(settings)
+    uploader.bind "PostInit", (up) ->
+
+      # Show drag and drop info and attach events if drag and drop is
+      # supported and enabled.
+      if up.settings.dragdrop and up.features.dragdrop
+        drop_element = $(up.settings.drop_element)
+
+        # When dragging over the document add a class to the drop target
+        # that puts it ontop of every element and remove that class when
+        # dropping or leaving the drop target. Otherwise the dragleave
+        # event would fire whenever we dragging over a child element inside
+        # the drop target such as text nodes or stuff.
+        $(document).bind 'dragenter', (e) ->
+          drop_element.addClass('cms-uploader-drag-drop-target-active')
+
+        drop_element.bind 'drop dragleave', (e) ->
+          drop_element.removeClass('cms-uploader-drag-drop-target-active')
+
+      else
+        $('.cms-uploader-drag-drop-info', target).hide()
+
+    # Need to bind this before initialization to handle initialization errors too.
+    uploader.bind 'Error', (up, err) ->
+      file    = err.file
+      message = undefined
+
+      if file
+        # Get error message from the server response. Not all runtimes
+        # support this though.
+        message = err.response
+
+        # If no error message is in the server response get standard
+        # plupload error messages. This will have descriptive error message
+        # for something like file size or file format errors but for
+        # server errors it will only display a general error message.
+        unless message
+          message = err.message
+          if err.details
+            message += " (#{err.details})"
+        file.status = plupload.FAILED
+        file.error_message = message
+        updateFileStatus file
+
+      if err.code == plupload.INIT_ERROR
+        alert _('Error: Initialisation error. Reload to try again.')
+
+    uploader.init()
+    uploader.bind 'FilesAdded', (up, files) ->
+      $.each files, (i, file) ->
+        addFile file
+
+      # Auto start upload when files are added.
+      uploader.start()
+
+    uploader.bind 'UploadProgress', (up, file) ->
+      updateFileStatus(file)
+
+    uploader.bind "FileUploaded", (up, file, info) ->
+      # Replace the dummy file entry in the file list with the the entry
+      # from the server response.
+      $("tr##{file.id}").replaceWith(info.response)
+
+    uploader.bind 'FilesRemoved', (up, files) ->
+      $.each files, (i, file) ->
+        removeFile file
+
+    # Call setup function
+    if settings.setup
+      settings.setup(uploader)
+
+) jQuery, mOxie

data/app/assets/stylesheets/comfortable_mexican_sofa/admin/application.css

@@ -1 +1 @@
-/* Overwrite this file in your application /app/assets/stylesheets/comfortable_mexican_sofa/admin/application.css */
+/* Overwrite this file in your application /app/assets/stylesheets/comfortable_mexican_sofa/admin/application.css */

data/app/assets/stylesheets/comfortable_mexican_sofa/application.css.sass

@@ -1,5 +1,6 @@
 @import "jquery-ui"
 @import "codemirror"
+@import "bootstrap-sprockets"
 @import "bootstrap"
 @import "comfortable_mexican_sofa/lib/bootstrap-datetimepicker"
 @import "comfortable_mexican_sofa/bootstrap_overrides"

data/app/assets/stylesheets/comfortable_mexican_sofa/base.css.sass

@@ -11,10 +11,18 @@
 
 html, body#comfy
   height: 100%
-  
+
+body#comfy.in-iframe
+  background: transparent
+  .left-column, .right-column, .body-footer
+    display: none
+  .body-wrapper .center-column
+    background: transparent
+    margin: 0
+
 body#comfy
   background-color: #252525
-  
+
   // -- Containers ----------------------------------------------------------
   .body-wrapper
     height: 100%
@@ -39,7 +47,7 @@ body#comfy
         padding: 25px 10px
         width: 250px
         position: fixed
-  
+
   // -- Navigation ----------------------------------------------------------
   .left-column-content ul.navigation
     list-style: none
@@ -64,16 +72,20 @@ body#comfy
       position: absolute
       top: 10px
       right: 0px
-      z-index: 9999
+      z-index: 2
       content: ''
       display: block
+    a.cms-files-open-modal
+      float: right
+      position: relative
+      z-index: 2
     ul
       list-style: none
       margin: 0
       padding: 0
       a
         padding: 7px 15px 7px 30px
-  
+
   // -- Right Side Boxes ----------------------------------------------------
   .right-column-content
     .box
@@ -88,71 +100,7 @@ body#comfy
     #form-save
       label
         padding-top: 0
-        
-  // -- File Uploads --------------------------------------------------------
-  .right-column-content .file-uploader
-    form
-      margin-bottom: 5px
-      .btn-file
-        width: 100%
-        position: relative
-        overflow: hidden
-        input
-          position: absolute
-          top: 0
-          left: 0
-          margin: 0
-          font-size: 23px
-          cursor: pointer
-          opacity: 0
-    .uploaded-files
-      margin: 0 -5px
-      max-height: 500px
-      overflow: auto
-      padding: 0 5px
-      .file
-        overflow: hidden
-        padding-bottom: 2px
-        &:hover .file-info
-          display: block
-        .file-name
-          overflow: hidden
-          border: 1px solid #ddd
-          border-radius: 3px
-          padding: 0 7px
-          &:hover
-            background-color: #f5f5f5
-          a.filename
-            display: block
-            margin-right: 20px
-            white-space: nowrap
-            overflow: hidden
-            font-size: 11px
-          a.delete
-            float: right
-        .file-info
-          display: none
-          padding: 1px 0
-          .thumb
-            height: 60px
-            width: 80px
-            float: left
-            background: url(image-path("comfortable_mexican_sofa/checkerboard.gif"))
-          .details
-            margin-left: 85px
-            font-size: 11px
-            line-height: 16px
-            input
-              padding: 2px
-              margin: 0
-              font-size: 11px
-              width: 100%
-              line-height: 12px
-              &:hover
-                cursor: default
-    iframe#file-upload-frame
-      display: none
-    
+
   // -- Common Elements -----------------------------------------------------
   table.table, ul.list
     .icon
@@ -186,7 +134,7 @@ body#comfy
   .item-meta
     font-size: 11px
     line-height: 14px
-    
+
   .cms-partial
     background-color: #252525
     color: #fff
@@ -197,7 +145,7 @@ body#comfy
     margin: 3px
     background-image: linear-gradient(-45deg, rgba(255, 255, 255, .05) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .05) 50%, rgba(255, 255, 255, .05) 75%, transparent 75%, transparent)
     background-size: 50px 50px
-  
+
   // -- Sofa Version --------------------------------------------------------
   .center-column .body-footer
     position: absolute
@@ -215,7 +163,7 @@ body#comfy
     span.version
       color: #f1f1f1
       margin-left: 2px
-      
+
   // -- Categories Widget ---------------------------------------------------
   .categories-widget
     background: #f5f5f5
@@ -259,7 +207,7 @@ body#comfy
           padding: 3px
           font-size: 11px
           line-height: 11px
-          
+
   // -- Sortable List -------------------------------------------------------
   ul.list
     padding: 0
@@ -300,12 +248,12 @@ body#comfy
       list-style: none
       padding: 0
       margin: 0 0 0 28px
-          
+
   // -- Sites ---------------------------------------------------------------
   &.c-comfy-admin-cms-sites
     table .icon
       background: url(image-path("comfortable_mexican_sofa/icon_site.gif"))
-      
+
   // -- Layouts -------------------------------------------------------------
   &.c-comfy-admin-cms-layouts
     ul.list
@@ -314,14 +262,13 @@ body#comfy
           background: url(image-path("comfortable_mexican_sofa/icon_layout.gif"))
         .item-content
           margin-left: 35px
-      
+
   // -- Pages ---------------------------------------------------------------
   &.c-comfy-admin-cms-pages
     #form-blocks
       ul.nav-tabs
-        margin-left: 180px
+        margin-bottom: 10px
       .no-tags
-        margin-left: 180px
         text-align: center
         padding: 10px
         background-color: #f5f5f5
@@ -335,17 +282,53 @@ body#comfy
           padding: 0 5px
           margin-bottom: 5px
           font-size: 12px
-        
+
   // -- Snippets ------------------------------------------------------------
   &.c-comfy-admin-cms-snippets
     table .icon
       background: url(image-path("comfortable_mexican_sofa/icon_snippet.gif"))
-      
+
   // -- Files ---------------------------------------------------------------
+  .cms-files-modal iframe
+    width: 100%
+    height: 100%
+    border: 0
+
   &.c-comfy-admin-cms-files
-    table .icon
-      background: url(image-path("comfortable_mexican_sofa/icon_file.gif"))
-    
+    .file-image img
+      width: 100%
+    table
+      .icon
+        background: url(image-path("comfortable_mexican_sofa/icon_file.gif"))
+      .content-type
+        font-size: 9px
+        text-transform: uppercase
+      input.file-path
+        width: 400px
+        font-size: 10px
+
+      tr.temp td.main
+        vertical-align: middle
+        .progress
+          margin: 0
+          box-shadow: none
+          background-color: #424242
+          .progress-bar
+            text-align: left
+            padding-left: 8px
+            span
+              white-space: nowrap
+
+    .cms-uploader-drag-drop-target-active
+      position: fixed !important
+      z-index: 1000
+      top: 0
+      left: 0
+      width: 100%
+      height: 100%
+      border: dotted #ccc 1px
+      background-color: rgba(255, 255, 255, 0.7)
+
   // -- Revisions -----------------------------------------------------------
   &.c-comfy-admin-cms-revisions
     td.with-table