ab_admin 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9ac96fefdb305b914a27a302af787dfd92e1bfa9ec02d6078579f26d1c49f87
-  data.tar.gz: 59026b1d51c0d63026d8655a69e2a536fb52e919e3c3babe2abd74996757dac5
+  metadata.gz: 6e4cff3af876fcd7ea0ee9a0a340b10ceb31d22c2a3728910692c0048c8f0e6c
+  data.tar.gz: 7c66e65f59261910436f0c4d18cf069e1f94e42cec845c39bb5d7ee07de434e5
 SHA512:
-  metadata.gz: 53db71976b5d9bfb9f0647a3c3ab1f536ee14a514d2ed3269fa468b5a94fc3c17588c1542c7c315e9a4c4853e86a7bc0ea4891890a26a4583222bd7e7ceab871
-  data.tar.gz: d19391ed5b4323dd40cbc0df5ccc1728447f4f54c262ebbb0ec01520f6efc8af30e3bf24ee01c3ef5d5b324fb0887368e897a964c850ab63e9870e1686dff935
+  metadata.gz: 0c5926ca259601ec0369db9588748dc3c6b34fca63816ea9ef2adda4a238f45eb26f2f215d2337a38fe7a5061e870e0bdae466dcd46b5f51c7b0f2118e3e9084
+  data.tar.gz: 8ecd6b3078af74eee5d0135eb8fe1764d27f2dbd623c6e0f663d5e9b8e4e808323e968e6c87955e4f4f0c9ad7431743307b364a22a870fda1874b5a3fd9942e3

data/app/assets/javascripts/ab_admin/components/in_place_edit.js.coffee

@@ -6,7 +6,10 @@ EditableForm.prototype.saveWithUrlHook = (value) ->
       originalUrl.call(@options.scope, params)
     else
       params[@options.model] ||= {}
-      params[@options.model][params.name] = params.value
+      if _.isString(params.value) && params.value.match(/@\d+/)
+        params[@options.model][params.name] = params.value.replace('@', '')
+      else
+        params[@options.model][params.name] = params.value
       params._method = 'PATCH'
       ajax_opts =
         url: originalUrl
@@ -27,29 +30,30 @@ EditableForm.prototype.saveWithoutUrlHook = EditableForm.prototype.save
 EditableForm.prototype.save = EditableForm.prototype.saveWithUrlHook
 
 window.initInPlaceEditable = ->
-  $('.editable').editable
-    onblur: 'submit'
-    placement: 'bottom'
-    emptytext: I18n.lookup('admin.js.empty') || 'Empty'
-    error: (response, newValue) ->
-      log response
-      if response.status == 422
-        flash JSON.parse(response.responseText).errors.join(', ')
-      else
-        response.responseText
-    success: (response) ->
-      if response && $(this).data().options?.accept == 'script'
-        $.globalEval(response.responseText)
-    datetimepicker:
-      format: "dd.mm.yyyy hh:ii"
-      autoclose: true
-      todayBtn: true
-      language: I18n.locale
-    ajaxOptions:
-      xhrFields:
-        withCredentials: true
-      headers:
-        Accept: 'application/json'
+  $('.editable').each ->
+    $el = $(this)
+    $el.editable
+      onblur: 'submit'
+      placement: 'bottom'
+      emptytext: $el.attr('placeholder') || I18n.t('admin.js.empty') || 'Empty'
+      error: (response) ->
+        if response.status == 422
+          Object.entries(response.responseJSON.errors).map((i) -> i.join(': ')).join(', ')
+        else
+          response.responseText
+      success: (response) ->
+        if response && $(this).data().options?.accept == 'script'
+          $.globalEval(response.responseText)
+      datetimepicker:
+        format: "dd.mm.yyyy hh:ii"
+        autoclose: true
+        todayBtn: true
+        language: I18n.locale
+      ajaxOptions:
+        xhrFields:
+          withCredentials: true
+        headers:
+          Accept: 'application/json'
 
 
 $(document).on 'admin:init', initInPlaceEditable

data/app/assets/javascripts/ab_admin/core/batch_actions.js.coffee

@@ -1,6 +1,6 @@
 $ ->
   if $('#list')[0]
-    input_name = 'by_ids'
+    input_name = 'q[id_in]'
     $(document).on 'click', '#list input.toggle', ->
       checked = $(this).is(":checked")
       $("#list [name='#{input_name}[]']").attr "checked", checked

data/app/assets/javascripts/ab_admin/core/init.js.coffee

@@ -29,6 +29,7 @@ $ ->
 
   $(document).on 'admin:list_init', ->
     initPopover()
+    initInPlaceEditable()
 
   $(document).on 'admin:form_init', 'form', ->
     initEditor()

data/app/assets/javascripts/ab_admin/core/ui_utils.js.coffee

@@ -85,4 +85,24 @@ window.initNestedFields = (opts={}) ->
     window.initFancySelect() unless opts.skip_fancy
     window.initPickers() unless opts.skip_pickers
     window.initEditor() unless opts.skip_editor
-    opts.callback.call(e) if opts.callback
+    opts.callback.call(e) if opts.callback
+
+window.initCkeditor = (dom_id, options={}) ->
+  if window.CKEDITOR
+    CKEDITOR.replace(dom_id, options) unless CKEDITOR.instances[dom_id]
+  else
+    $.getScript $("##{dom_id}").data('cdnUrl'), ->
+      CKEDITOR.replaceClass = null;
+      CKEDITOR.replace(dom_id, options) unless CKEDITOR.instances[dom_id]
+
+window.lazyInitCkeditor = (dom_id, options={}) ->
+  $el = $("##{dom_id}")
+  $form = $el.closest('form')
+  height = options.height || 200
+  height += if options.toolbar == 'mini' then 34 else 67
+  $el.height(height)
+  callback = (intersectionRatio) ->
+    initCkeditor(dom_id, options) if intersectionRatio
+  window.ckeditorVisibilityObserver = new IntersectionObserver (entries, observer) =>
+    entries.forEach(((entry) => callback(entry.intersectionRatio)), {root: $form[0]})
+  window.ckeditorVisibilityObserver.observe document.getElementById(dom_id)

data/app/assets/javascripts/ab_admin/core/utils.js.coffee

@@ -174,3 +174,11 @@ window.localeToFlag = (l) ->
   l = {'JA': 'JP', 'EN': 'GB', 'UK': 'UA'}[l] || l
   chars = {"A":"🇦","B":"🇧","C":"🇨","D":"🇩","E":"🇪","F":"🇫","G":"🇬","H":"🇭","I":"🇮","J":"🇯","K":"🇰","L":"🇱","M":"🇲","N":"🇳","O":"🇴","P":"🇵","Q":"🇶","R":"🇷","S":"🇸","T":"🇹","U":"🇺","V":"🇻","W":"🇼","X":"🇽","Y":"🇾","Z":"🇿"}
   l.replace /[A-Z]/g, (m) -> chars[m]
+
+window.I18n ||= {}
+window.I18n.locale = 'en'
+window.I18n.translations ||= {}
+I18n.t = (key) ->
+  keys = key.split('.')
+  keys.unshift(I18n.locale)
+  _.get(I18n.translations, keys)

data/app/assets/javascripts/ab_admin/inputs/datetime_input.js.coffee

@@ -7,6 +7,7 @@ $ ->
       viewSelect: 'month'
       minView: 'day'
       language: I18n.locale
+      weekStart: 1
 
     search_form_options = _.defaults({pickerPosition: "bottom-left datetimepicker-bottom-left-custom"}, base_options)
     search_form_options_gt = _.defaults({initialDate: new Date(new Date().setHours(0,0,0,0))}, search_form_options)

data/app/assets/javascripts/ab_admin/main.js

@@ -1,4 +1,3 @@
-//= require i18n
 //= require i18n/translations
 //= require jquery.min
 //= require jquery_ujs
@@ -17,7 +16,7 @@
 //= require moment.min
 //= require ab_admin/bootstrap-editable
 //= require ab_admin/bootbox.min
-//= require select2
+//= require select2_3_5_2/select2
 //= require ab_admin/jquery-ui-1.10.3.custom.min
 //= require jquery.ui.nestedSortable
 //= require clipboard.min

data/app/assets/stylesheets/ab_admin/bootstrap_and_overrides.scss

@@ -88,6 +88,15 @@ ul.nav li.dropdown:hover ul.dropdown-menu {
   width: auto;
 }
 
+.label a {
+  color: white;
+  font-size: 12px;
+  font-weight: 500;
+  text-decoration: none;
+  border: none;
+  line-height: 1.4;
+}
+
 .label-primary, .badge-primary {
   background-color: #05C;
 }
@@ -145,28 +154,6 @@ label.control-label.label-reset {
   text-align: left;
 }
 
-.table tbody {
-  tr.success > td, &.success > tr > td {
-    background-color: #dff0d8;
-  }
-
-  tr.error > td, &.error > tr > td {
-    background-color: #f2dede;
-  }
-
-  tr.warning > td, &.warning > tr > td {
-    background-color: #fcf8e3;
-  }
-
-  tr.muted > td, &.muted > tr > td {
-    background-color: #ededed;
-  }
-
-  tr.info > td, &.info > tr > td {
-    background-color: #d9edf7;
-  }
-}
-
 .js-copy-popup {
   position: relative;
   &:before {
@@ -184,6 +171,27 @@ label.control-label.label-reset {
     top: -5px;
   }
 }
+
+.pulse.badge-important {
+  cursor: pointer;
+  box-shadow: 0 0 0 rgba(185, 74, 72, 0.7);
+  animation: pulse-important 1s infinite;
+}
+.pulse:hover {
+  animation: none;
+}
+@keyframes pulse-important {
+  0% {
+    box-shadow: 0 0 0 0 rgba(185, 74, 72, 0.7);
+  }
+  70% {
+    box-shadow: 0 0 0 10px rgba(185, 74, 72, 0);
+  }
+  100% {
+    box-shadow: 0 0 0 0 rgba(185, 74, 72, 0);
+  }
+}
+
 @keyframes text-pop-up-top {
   0% {
     transform: translateY(0);
@@ -202,10 +210,23 @@ label.control-label.label-reset {
 .clear {
   clear: both;
 }
-.white-space-nowrap {
+
+.white-space-nowrap, .wsn {
   white-space: nowrap;
 }
 
+.text-pink {
+  color: #F52887;
+}
+
+.text-violet {
+  color: #BA55D3;
+}
+
+.text-turquoise {
+  color: #07d3d3;
+}
+
 @media (max-width: 767px) {
   body, .container-fluid {
     padding: 0;

data/app/assets/stylesheets/ab_admin/components/_colored_tabs.scss

@@ -25,7 +25,7 @@
     border-top: none;
     padding: 10px;
   }
-  margin: 20px 0;
+  margin: 10px 0;
 }
 
 .colored_tabs {

data/app/assets/stylesheets/ab_admin/components/_form.scss

@@ -17,7 +17,9 @@ input[type="color"],
 .uneditable-input {
   padding: 4px;
 }
-
+.save-error {
+  box-shadow: 0 0 4px 4px rgba(232,109,109,1);
+}
 .simple_form {
   input, textarea.text {
     width: 100%;

data/app/assets/stylesheets/ab_admin/components/_navigation.scss

@@ -36,6 +36,12 @@
   margin-bottom: 5px;
 }
 
+.btn.btn-symbol {
+  font-size: 22px;
+  padding-top: 2px;
+  padding-bottom: 6px;
+}
+
 .resource_actions {
   float: left;
   margin-top: -10px;
@@ -64,13 +70,12 @@
 
 #main .content_actions {
   margin-bottom: 10px;
-  margin-left: -30px;
   .btn-group {
     float: left;
     margin-left: 10px;
   }
   > *:first-child {
-    margin-left: 30px;
+    margin-left: 0;
   }
 }
 

data/app/assets/stylesheets/ab_admin/components/_table_view.scss

@@ -7,6 +7,16 @@
 }
 
 table.index_table {
+  &.table th, &.table td {
+    padding: 3px 3px 5px;
+  }
+  input[type='checkbox'] {
+    margin-right: 5px;
+    margin-top: 0;
+  }
+  p {
+    margin: 0 0 4px;
+  }
   & > thead th {
     background: #EFEFEF;
     @include gradient-vertical(#EFEFEF, #DFE1E2);
@@ -21,9 +31,9 @@ table.index_table {
     color: #2E3439;
     border-right: none;
     text-align: left;
-    padding-left: 6px;
-    padding-right: 6px;
-
+    & > thead th a.sort_link {
+      white-space: normal;
+    }
     a, a:link, a:visited {
       text-decoration: none;
       display: block;
@@ -31,22 +41,18 @@ table.index_table {
       -webkit-font-smoothing: antialiased;
       color: #2E3439;
     }
-
     a:hover {
       color: #2E3439;
     }
-
     &.sortable a {
-      background: url("/images/admin/orderable.png") no-repeat 0 4px; padding-left: 13px;
+      background: url("/images/admin/orderable.png") no-repeat 0 4px;
+      padding-left: 13px;
     }
-
     &.sorted-asc a { background-position: 0 -27px; }
     &.sorted-desc a {  background-position: 0 -56px;}
-
     &.sorted-asc, &.sorted-desc {
       @include gradient-vertical(#e2e2e2, #d2d4d6);
     }
-
     &:last-child {
       border-right: solid 1px #d4d4d4;
     }
@@ -130,6 +136,66 @@ table.index_table {
   }
 }
 
+@mixin colored_row($color) {
+  background-color: $color !important;
+  & > td, &:hover > td {
+    background-color: $color !important;
+  }
+}
+.table tbody {
+  .bg-green {
+    @include colored_row(#a4f58a);
+  }
+  .bg-skyblue {
+    @include colored_row(#9de8f7);
+  }
+  .bg-blue {
+    @include colored_row(#bbddfb);
+  }
+  .bg-orange {
+    @include colored_row(#fce492);
+  }
+  .bg-yellow {
+    @include colored_row(#ffefd5);
+  }
+  .bg-pink {
+    @include colored_row(#f2c0db);
+  }
+  .bg-violet {
+    @include colored_row(#f0dcff);
+  }
+  .bg-violet-dark {
+    @include colored_row(#d8c0ff);
+  }
+  .bg-grey {
+    @include colored_row(#eaeaea);
+    color: #828282;
+  }
+  .bg-turquoise {
+    @include colored_row(#ddfff3fc);
+  }
+  .success {
+    @include colored_row(#dff0d8);
+  }
+  .error {
+    @include colored_row(#f2dede);
+  }
+  .warning {
+    @include colored_row(#fcf8e3);
+  }
+  .info {
+    @include colored_row(#d9edf7);
+  }
+  .bg-lemon {
+    @include colored_row(#d7ff76);
+  }
+}
+.muted {
+  & > td, &:hover > td {
+    background-color: #ededed !important;
+  }
+}
+
 #batch_action_form {
   margin-bottom: 10px;
 }

data/app/assets/stylesheets/ab_admin/components/_tooltip.scss

@@ -9,6 +9,7 @@
   color: white;
   opacity: 0;
   z-index: -100;
+  pointer-events: none;
 }
 
 //.tool::before,

data/app/assets/stylesheets/ab_admin/main.scss

@@ -1,5 +1,5 @@
 //= require bootstrap-wysihtml5
-//= require select2
+//= require select2_3_5_2/select2
 //= require ab_admin/bootstrap_and_overrides
 //= require ab_admin/bootstrap-editable
 //= require ab_admin/bootstrap-datetimepicker

data/app/controllers/admin/assets_controller.rb

@@ -53,7 +53,7 @@ class Admin::AssetsController < ApplicationController
   protected
 
   def permitted_params
-    params[:asset].try!(:permit, :data, :is_main, :original_name, :base_filename, *Asset.all_translated_attribute_names)
+    params[:asset].try!(:permit, :data, :is_main, :original_name, :human_filename, *Asset.all_translated_attribute_names)
   end
 
   def find_asset