comfortable_mexican_sofa 1.12.11 → 2.0.0

data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/zh-TW.js

@@ -0,0 +1,61 @@
+/* flatpickr v4.0.6, @license MIT */
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+	typeof define === 'function' && define.amd ? define(['exports'], factory) :
+	(factory((global.zh = {})));
+}(this, (function (exports) { 'use strict';
+
+var fp = typeof window !== "undefined" && window.flatpickr !== undefined
+    ? window.flatpickr
+    : {
+        l10ns: {},
+    };
+var Mandarin = {
+    weekdays: {
+        shorthand: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
+        longhand: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
+    },
+    months: {
+        shorthand: [
+            "一月",
+            "二月",
+            "三月",
+            "四月",
+            "五月",
+            "六月",
+            "七月",
+            "八月",
+            "九月",
+            "十月",
+            "十一月",
+            "十二月",
+        ],
+        longhand: [
+            "一月",
+            "二月",
+            "三月",
+            "四月",
+            "五月",
+            "六月",
+            "七月",
+            "八月",
+            "九月",
+            "十月",
+            "十一月",
+            "十二月",
+        ],
+    },
+    rangeSeparator: " 至 ",
+    weekAbbreviation: "周",
+    scrollTitle: "滚动切换",
+    toggleTitle: "点击切换 12/24 小时时制",
+};
+fp.l10ns.zh = Mandarin;
+var zh = fp.l10ns;
+
+exports.Mandarin = Mandarin;
+exports['default'] = zh;
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+})));

data/app/assets/javascripts/comfy/admin/cms/lib/redactor.js

@@ -1461,7 +1461,7 @@
 						if (this.start) return;
 						if (this.rtePaste) return;
 
-						if ($(e.target).closest('.redactor-editor, .redactor-toolbar, .redactor-dropdown').size() !== 0)
+						if ($(e.target).closest('.redactor-editor, .redactor-toolbar, .redactor-dropdown').length !== 0)
 						{
 							return;
 						}
@@ -4299,7 +4299,6 @@
 						if (tag == tags[i]) tag = replaced[i];
 					}
 
-
 					if (this.opts.allowedTags)
 					{
 						if ($.inArray(tag, this.opts.allowedTags) == -1) return;
@@ -6911,7 +6910,7 @@
 							inValues = typeof observe['in'] != 'undefined' ? observe['in'] : false,
 							outValues = typeof observe['out'] != 'undefined' ? observe['out'] : false;
 
-						if ($current.closest(element).size() > 0)
+						if ($current.closest(element).length > 0)
 						{
 							this.observe.setDropdownProperties($item, inValues, outValues);
 						}
@@ -7729,6 +7728,13 @@
 					{
 						var node2 = this.selection.getMarker(2);
 						this.selection.setMarker(this.range, node2, false);
+
+						// comfy fix
+						if (this.utils.browser('chrome'))
+						{
+							this.caret.set(node1, 0, node2, 0);
+						}
+						// end fix
 					}
 
 					this.savedSel = this.$editor.html();

data/app/assets/javascripts/comfy/admin/cms/uploader.js.coffee

@@ -13,19 +13,18 @@
       fileList = $(".cms-uploader-filelist", target)
 
       fileList.prepend("
-        <tr id='#{file.id}' class='temp'>
-          <td><div class='icon'></div></td>
-          <td class='main' colspan=2>
+        <li id='#{file.id}' class='row temp'>
+          <div class='col-md-9 d-flex align-items-center'>
             <div class='progress'>
-              <div class='progress-bar progress-bar-striped active'>
+              <div class='progress-bar progress-bar-striped progress-bar-animated'>
                 <span>#{file.name}</span>
               </div>
             </div>
-          </td>
-          <td>
+          </div>
+          <div class='col-md-3 d-flex align-items-center justify-content-md-end'>
             <a class='btn btn-sm btn-danger pull-right cms-uploader-file-delete' href='#'>Delete</a>
-          </td>
-        </tr>
+          </div>
+        </li>
       ")
 
       $("#" + file.id + " a.cms-uploader-file-delete").click (e) ->
@@ -124,7 +123,7 @@
     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)
+      $("li##{file.id}").replaceWith(info.response)
 
     uploader.bind 'FilesRemoved', (up, files) ->
       $.each files, (i, file) ->
@@ -134,4 +133,4 @@
     if settings.setup
       settings.setup(uploader)
 
-) jQuery, mOxie
+) jQuery, mOxie

data/app/assets/stylesheets/comfy/admin/cms/application.sass

@@ -1,11 +1,11 @@
 @import "jquery-ui"
 @import "codemirror"
-@import "bootstrap-sprockets"
 @import "bootstrap"
+@import "rails_bootstrap_forms"
+@import "font-awesome"
 @import "comfy/admin/cms/lib/redactor"
-@import "comfy/admin/cms/lib/bootstrap-datetimepicker"
-@import "comfy/admin/cms/bootstrap_overrides"
+@import "comfy/admin/cms/lib/flatpickr.min"
 @import "comfy/admin/cms/codemirror_overrides"
 @import "comfy/admin/cms/redactor_overrides"
 @import "comfy/admin/cms/base"
-@import "comfy/admin/cms/custom"
+@import "comfy/admin/cms/custom"

data/app/assets/stylesheets/comfy/admin/cms/base.sass

@@ -1,296 +1,210 @@
-//= depend_on_asset "comfy/admin/cms/checkerboard.gif"
-//= depend_on_asset "comfy/admin/cms/icon_page.gif"
-//= depend_on_asset "comfy/admin/cms/icon_move.gif"
-//= depend_on_asset "comfy/admin/cms/arrow_bottom.gif"
-//= depend_on_asset "comfy/admin/cms/arrow_right.gif"
-//= depend_on_asset "comfy/admin/cms/icon_draft.gif"
-//= depend_on_asset "comfy/admin/cms/icon_site.gif"
-//= depend_on_asset "comfy/admin/cms/icon_layout.gif"
-//= depend_on_asset "comfy/admin/cms/icon_snippet.gif"
-//= depend_on_asset "comfy/admin/cms/icon_file.gif"
-
-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%
-    .left-column
-      width: 175px
-      float: left
-      .left-column-content
-        padding: 25px 0px
-        width: 175px
-        position: fixed
-    .center-column
-      position: relative
-      margin: 0px 250px 0px 175px
-      min-height: 100%
-      background-color: #fff
-      .center-column-content
-        padding: 25px
-    .right-column
-      width: 250px
-      float: right
-      .right-column-content
-        padding: 25px 10px
-        width: 250px
-        position: fixed
-        height: 100%
-        background-color: #f5f5f5
-
-  // -- Navigation ----------------------------------------------------------
-  .left-column-content ul.navigation
-    list-style: none
-    margin: 0
-    padding: 0
-    a
-      position: relative
-      display: block
-      padding: 7px 15px
-      color: #777
-      border-bottom: 1px solid #333
-      text-decoration: none
-      text-shadow: 0 0 2px #000
-    a:hover, a.active
-      color: #ddd
-    a.active
-      background-color: #1f1f1f
-      box-shadow: inset 0px 0px 10px #000
-    a.active:after
-      border: 7px solid transparent
-      border-right-color: #fff
-      position: absolute
-      top: 10px
-      right: 0px
-      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
-      background-color: #fff
-      padding: 5px
-      border-radius: 3px
-      margin-bottom: 10px
-      overflow: auto
-    #mirrors select
-      width: 100%
-      margin-bottom: 0
-    #form-save
-      label
-        padding-top: 0
-
-  // -- Common Elements -----------------------------------------------------
-  table.table, ul.list
-    .icon
-      width: 28px
-      height: 28px
-      background: url(image-path("comfy/admin/cms/icon_page.gif"))
-      .dragger
-        width: 28px
-        height: 28px
-        background: url(image-path("comfy/admin/cms/icon_move.gif"))
-        cursor: move
-        display: none
-        span
-          display: none
-      &:hover .dragger
-        display: block
-    div.category
-      display: inline-block
-      vertical-align: top
-      font-size: 11px
-      line-height: 11px
-      border: 1px solid #ddd
-      padding: 2px 5px
-      background-color: #fff
-      border-radius: 3px
-      border-left-width: 7px
-  .item-title
-    color: #000
-    a
-      color: #000
-  .item-meta
-    font-size: 11px
-    line-height: 14px
 
-  .cms-partial
-    background-color: #252525
-    color: #fff
-    outline: 1px dotted #444
+  .comfy-admin-partial
+    background-color: $gray-200
+    color: $black
     font-size: 9px
     line-height: 11px
     padding: 5px
-    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-image: linear-gradient(-45deg, rgba(0, 0, 0, .05) 25%, transparent 25%, transparent 50%, rgba(0, 0, 0, .05) 50%, rgba(0, 0, 0, .05) 75%, transparent 75%, transparent)
     background-size: 50px 50px
+    overflow: hidden
+    width: 100%
 
-  // -- Sofa Version --------------------------------------------------------
-  .center-column .body-footer
-    position: absolute
-    background: #000
-    bottom: 0px
-    left: -175px
-    width: 175px
-    padding: 5px 10px
-    font-size: 10px
-    a
-      color: #484848
-      text-decoration: none
-    a:hover
-      color: #f1f1f1
-    span.version
-      color: #f1f1f1
-      margin-left: 2px
+  &.in-iframe
+    height: 100%
+    #cms-left, #cms-right
+      display: none
+    #cms-main
+      padding-top: 0
+
+  .alert
+    border-radius: 0
+    margin: 0 -15px 1rem -15px
+    text-align: center
+
+  #cms-left
+    position: fixed
+    top: 0
+    bottom: 0
+    left: 0
+    z-index: 1001
+    padding: 0
 
-  // -- Categories Widget ---------------------------------------------------
-  .categories-widget
-    background: #f5f5f5
-    border-radius: 3px
-    border: 1px solid #ddd
-    padding: 5px 10px
-    margin-bottom: 10px
-    .categories-widget-label
-      width: 100px
-      float: left
-      color: #777
-    .categories
-      overflow: hidden
-      margin: 0px 50px 0px 110px
-      &.editable
-        display: none
-      .category
-        display: inline-block
-        font-size: 11px
-        line-height: 20px
-        border-radius: 3px
-        background-color: #fff
-        padding: 0 7px
-        border: 1px solid #eee
-        &.active
-          border-color: #a5a5a5
-      form
-        display: inline-block
-        vertical-align: middle
-    .action-links
-      float: right
-      margin-left: 10px
-      .done
+    button.navbar-toggler
+      color: $white
+
+    nav.navbar
+      padding: 1rem
+
+      ul.nav
+        width: 100%
+        li
+          position: relative
+          width: 100%
+          a
+            color: $gray-500
+          a:hover, a.active
+            color: $white
+            background-color: $gray-700
+          a.cms-files-open-modal
+            height: 26px
+            width: 26px
+            line-height: 26px
+            position: absolute
+            text-align: center
+            right: 0
+            top: 7px
+            border-radius: 0.25rem
+
+    .left-footer
+      padding: 5px
+      position: absolute
+      width: 100%
+      text-align: center
+      bottom: 0
+      font-size: 12px
+      color: $white
+      a
+        color: $gray-500
+
+    @media (max-width: map-get($grid-breakpoints, lg))
+      right: 0
+      bottom: auto
+      nav.navbar
+        padding: 0.5rem
+      .left-footer
         display: none
-    form
-      margin: 0
-      .input-group
-        input.form-control
-          width: 125px
-          height: 22px
-          padding: 3px
-          font-size: 11px
-          line-height: 11px
 
-  // -- Sortable List -------------------------------------------------------
-  ul.list
+  #cms-right
+    background-color: $gray-100
+    position: fixed
+    top: 0
+    bottom: 0
+    right: 0
+    z-index: 999
     padding: 0
-    margin: 0
-    list-style: none
-    .item
-      overflow: hidden
-      padding: 5px
-      border-radius: 3px
-      margin-bottom: 5px
-      border: 1px solid #ddd
-      &:hover
-        background-color: #f5f5f5
-      .toggle
-        float: left
-        height: 28px
-        width: 28px
-        &.open a
-          background-image: url(image-path("comfy/admin/cms/arrow_bottom.gif"))
-        a
-          display: block
-          height: 28px
-          width: 28px
-          background: url(image-path("comfy/admin/cms/arrow_right.gif")) center center no-repeat
-          span
-            display: none
-      .icon
-        float: left
-        &.draft
-          background: url(image-path("comfy/admin/cms/icon_draft.gif"))
-      .item-content
-        margin-left: 60px
-        a.item-label
-          color: #000
-      .btn-group
-        float: right
-    li ul
-      list-style: none
-      padding: 0
-      margin: 0 0 0 28px
 
-  // -- Sites ---------------------------------------------------------------
-  &.c-comfy-admin-cms-sites
-    table .icon
-      background: url(image-path("comfy/admin/cms/icon_site.gif"))
+    @media (max-width: map-get($grid-breakpoints, lg))
+      position: relative
+      padding-bottom: 3.5rem
 
-  // -- Layouts -------------------------------------------------------------
-  &.c-comfy-admin-cms-layouts
-    ul.list
-      .item
-        .icon
-          background: url(image-path("comfy/admin/cms/icon_layout.gif"))
-        .item-content
-          margin-left: 35px
+    .box
+      padding: 1rem
+      margin: 0.5rem 0
+      background-color: $white
+      border: 1px solid $gray-200
+
+  #cms-main
+    padding-bottom: 3.5rem
+
+    @media (max-width: map-get($grid-breakpoints, lg))
+      padding-top: 3rem
+      padding-bottom: 0
+
+    .page-header
+      margin: 1rem 0
+      border-bottom: 1px solid $gray-300
+
+    .form-actions
+      padding: 0.5rem
+      position: fixed
+      bottom: 0
+      left: 0
+      right: 0
+      z-index: 1000
+      border-top: 1px solid $gray-200
+
+    .categories-widget
+      background-color: $gray-100
+      border: 1px solid $gray-300
+      padding: 10px 10px 5px 10px
+      margin-bottom: 1rem
+      .categories
+        .category, .edit_category
+          display: inline-block
+          margin-bottom: 5px
+        .toggle-cat-edit
+          float: right
+          margin-left: 5px
+        &.editable
+          display: none
 
-  // -- Pages ---------------------------------------------------------------
+    ul.list
+      padding: 0
+      li
+        list-style: none
+        .row
+          background-color: $gray-100
+          margin-bottom: 5px
+          padding: 5px 0
+          .item
+            display: flex
+            .item-controls
+              width: 30px
+              padding: 2px 0
+              .dragger, .toggle
+                display: block
+                color: $gray-500
+                &:hover
+                  color: $gray-800
+              .dragger
+                cursor: move
+              .toggle
+                .collapse
+                  display: none
+                .expand
+                  display: inline
+              .toggle.open
+                .collapse
+                  display: inline
+                .expand
+                  display: none
+
+            .item-content
+              .item-title
+                a
+                  font-size: 1.2rem
+                  color: $black
+                a.draft
+                  color: $gray-600
+              .item-meta
+                font-size: 0.75rem
+          .btn-group
+            background-color: $white
+        .row:hover
+          background-color: $white
+        ul.list
+          padding-left: 2rem
+
+  // -- Pages ------------------------------------------------------------------
   &.c-comfy-admin-cms-pages
-    #form-blocks
+    #form-fragments
       ul.nav-tabs
-        margin-bottom: 10px
-      .no-tags
-        text-align: center
-        padding: 10px
-        background-color: #f5f5f5
-        margin-bottom: 10px
+        margin-bottom: 1rem
+      label.renderable-false
+        color: $gray-600
       .files
-        margin: 5px 0
-        .file
-          display: inline-block
-          border: 1px solid #ccc
-          border-radius: 3px
-          padding: 0 5px
+        padding: 5px 0
+        .btn
           margin-bottom: 5px
-          font-size: 12px
-
-  // -- Snippets ------------------------------------------------------------
-  &.c-comfy-admin-cms-snippets
-    table .icon
-      background: url(image-path("comfy/admin/cms/icon_snippet.gif"))
-
-  // -- Files ---------------------------------------------------------------
+        .custom-checkbox
+          margin: 0
+          vertical-align: middle
+          padding-left: 1rem
+          .custom-control-indicator
+            background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M1.41 0l-1.41 1.41.72.72 1.78 1.81-1.78 1.78-.72.69 1.41 1.44.72-.72 1.81-1.81 1.78 1.81.69.72 1.44-1.44-.72-.69-1.81-1.78 1.81-1.81.72-.72-1.44-1.41-.69.72-1.78 1.78-1.81-1.78-.72-.72z' /%3E%3C/svg%3E")
+          .custom-control-input:checked ~ .custom-control-indicator
+            background-color: $red
+    .box.translations
+      a.translation
+        text-align: left
+        overflow: hidden
+        color: $black
+      a.draft
+        color: $gray-600
+
+  // -- Files ------------------------------------------------------------------
   .cms-files-modal
     z-index: 99999
     iframe
@@ -299,69 +213,32 @@ body#comfy
       border: 0
 
   &.c-comfy-admin-cms-files
-    .file-image img
-      width: 100%
-    table
-      .icon
-        background: url(image-path("comfy/admin/cms/icon_file.gif"))
-      .content-type
-        font-size: 9px
-        text-transform: uppercase
+    ul.list
       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)
+        border: 0
+        color: $gray-500
+        background: inherit
+      .progress
+        width: 100%
+        height: 25px
+    form
+      .file-image
+        img
+          width: 100%
 
-  // -- Revisions -----------------------------------------------------------
+  // -- Revisions --------------------------------------------------------------
   &.c-comfy-admin-cms-revisions
-    td.with-table
-      padding: 0
-    table.diff
-      th, td
-        border: 0
-      th
-        color: #ccc
-      width: 100%
-      ins, del
-        display: inline
-      ins
-        background-color: #c6ffc6
-        text-decoration: none
-      del
-        background-color: #ffc6c6
-      tr.hide
-        display: none
-    .box.revisions
-      a
-        font-size: 11px
-        border: 1px solid #ddd
-        display: block
-        padding: 0 7px
-        border-radius: 3px
-        margin-bottom: 2px
-        text-decoration: none
-      a:hover
-        background-color: #f5f5f5
-      a.active
-        border-color: #0088CC
+    .label
+      padding: 15px 0
+      font-weight: bold
+    .revision
+      margin-bottom: 5px
+      .content
+        padding: 15px 0
+        ins, del
+          display: inline
+        ins
+          background-color: #c6ffc6
+          text-decoration: none
+        del
+          background-color: #ffc6c6