administrate-field-jsonb 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7434f7a732965280d6da5120b27bbdb159387f6
-  data.tar.gz: 75a9f459a5f3f84c115986436ca8b8b84a14dc3a
+  metadata.gz: 5eb4e29421277cef5cd5f24b45aacd7ea4b3af22
+  data.tar.gz: 7defd9d8f0a0a0fad1568a05343104e9128574d7
 SHA512:
-  metadata.gz: ae8a41eac399b3d9a60c4e852688ac481c8a78a79b7117e35e339dcc687f9aaca05a9c2ec9e514838a970b169d7397bc026442ea865c1127ebc6bc7d5a5d73b0
-  data.tar.gz: 94e48d3d6dcf04e7b409cfe8381500f45c8525af0f37aa703df4567011d0916697a30c3ff27284b59e3dbd0459ae8180b48051e5180f86489f3f5cc671a14152
+  metadata.gz: d4ebb23aaa1923b04e24649566ff77c3430eaa6d48e43dd403db0f006f36c5f1b431479af7be2dcaf99ec9b6296364570b77c45c6513eb8f80d67c126053e9cd
+  data.tar.gz: 73e0b6efceb262ba60df6c7150ce24760577c9ce5e5016f66afc87d972209b68cd8cee0a286245607b223bdefbaf3aa4845f8bfcc49b54655ed9eb139b355655

data/README.md

@@ -137,6 +137,6 @@ Copyright © 2015-2019 Codica. It is released under the [MIT License](https://op
 
 [![Codica logo](https://www.codica.com/assets/images/logo/logo.svg)](https://www.codica.com)
 
-Timebot is maintained and funded by Codica. The names and logos for Codica are trademarks of Codica.
+Administrate::Field::Jsonb is maintained by Codica. The names and logos for Codica are trademarks of Codica.
 
 We love open source software! See [our other projects](https://github.com/codica2) or [hire us](https://www.codica.com/) to design, develop, and grow your product.

data/administrate-field-jsonb.gemspec

@@ -2,7 +2,7 @@ $LOAD_PATH.push File.expand_path('lib', __dir__)
 
 Gem::Specification.new do |gem|
   gem.name = 'administrate-field-jsonb'
-  gem.version = '0.2.0'
+  gem.version = '0.3.0'
   gem.authors = ['Sergey Volkov', 'Codica']
   gem.email = ['sergvolkov.codica@gmail.com']
   gem.homepage = 'https://github.com/codica2/administrate-field-jsonb'

data/app/assets/stylesheets/administrate-field-jsonb/accordion.css

@@ -1,15 +1,32 @@
+.administrate-field-jsonb-wrapper {
+  float: left;
+  width: 100%;
+  margin-top: 0;
+  border: 1px solid #ccc;
+  padding: 10px;
+}
+
+.administrate-field-jsonb-box {
+  margin-bottom: 0;
+  float: left;
+  width: 100%;
+}
+
 .administrate-field-jsonb-accordion {
-  --margin: calc(15% - .5rem);
+  width: 100%;
+  text-align: left;
+  padding: 5px 15px;
   background-color: #eee;
   color: #444;
   cursor: pointer;
-  padding: 18px;
-  width: calc(100% - var(--margin));
-  text-align: left;
-  border: none;
   outline: none;
   transition: 0.4s;
-  margin-left: calc(var(--margin));
+  margin-bottom: 0;
+  margin-top: 15px;
+}
+
+.administrate-field-jsonb-accordion:first-child {
+  margin-top: 0;
 }
 
 .administrate-field-jsonb-active, .administrate-field-jsonb-accordion:hover {
@@ -17,10 +34,11 @@
 }
 
 .administrate-field-jsonb-panel {
-  padding: 0 18px;
+  padding: 0 18px 15px;
   background-color: white;
   display: none;
   overflow: hidden;
+  border: 1px solid #ccc;
 }
 
 .administrate-field-jsonb-accordion:after {

data/app/views/fields/jsonb/_array.html.erb

@@ -1,7 +1,9 @@
+<% label ||= nil %>
+
 <% data.each.with_index(1) do |d, index| %>
-  <dt class='attribute-label administrate-field-jsonb-accordion'><%= "#{field.attribute.to_s.singularize.titleize} - #{index}" %></dt>
+  <dt class='attribute-label administrate-field-jsonb-accordion'><%= "#{label || field.attribute.to_s.singularize.titleize} - #{index}" %></dt>
   <dd class='administrate-field-jsonb-panel'>
-    <dl>
+    <dl class='administrate-field-jsonb-box'>
       <%= render field.to_partial_path('hash'), field: field, structure: structure, data: d %>
     <dl>
   </dd>

data/app/views/fields/jsonb/_hash.html.erb

@@ -2,8 +2,13 @@
   <% if sv.is_a?(Hash) %>
     <dt class='attribute-label administrate-field-jsonb-accordion'><%= sk.to_s.titleize %></dt>
     <dd class='administrate-field-jsonb-panel'>
-      <dl>
-        <%= render field.to_partial_path('hash'), field: field, structure: structure[sk], data: data[sk] %>
+      <dl class='administrate-field-jsonb-box'>
+        <% if data[sk].is_a?(Array) %>
+          <%= render field.to_partial_path('array'),
+            field: field, structure: structure[sk], data: data[sk], label: sk.to_s.singularize.titleize %>
+        <% else %>
+          <%= render field.to_partial_path('hash'), field: field, structure: structure[sk], data: data[sk] %>
+        <% end %>
       <dl>
     </dd>
   <% else %>

data/app/views/fields/jsonb/_show.html.erb

@@ -1,14 +1,11 @@
 <% if field.advanced_view? %>
-  <% if field.array? %>
-    <%= render field.to_partial_path('array'), field: field, structure: field.advanced_view, data: field.transform %>
-  <% else %>
-    <dt class='attribute-label administrate-field-jsonb-accordion'><%= field.attribute.to_s.titleize %></dt>
-    <dd class='administrate-field-jsonb-panel'>
-      <dl>
-         <%= render field.to_partial_path('hash'), field: field, structure: field.advanced_view, data: field.transform %>
-      <dl>
-    </dd>
-  <% end %>
+  <dl class='administrate-field-jsonb-wrapper'>
+    <% if field.array? %>
+      <%= render field.to_partial_path('array'), field: field, structure: field.advanced_view, data: field.transform %>
+    <% else %>
+      <%= render field.to_partial_path('hash'), field: field, structure: field.advanced_view, data: field.transform %>
+    <% end %>
+  </dl>
 <% else %>
   <div class='administrate-jsoneditor-viewer'>
     <p><%= text_area_tag field.attribute, field.transform.to_json.html_safe.squish %></p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-jsonb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sergey Volkov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate