biovision-base 0.22.180920.0 → 0.34.190331.1

data/app/views/profiles/_profile.html.erb

@@ -25,7 +25,7 @@
         <dt><%= t('activerecord.attributes.user.last_seen') %></dt>
         <dd><%= time_tag user.last_seen %></dd>
     <% end %>
-    <% unless user.profile_data['name'].blank? %>
+    <% unless user.data.dig('profile', 'name').blank? %>
         <dt><%= t('activerecord.attributes.user_profile.name') %></dt>
         <dd><%= user.full_name %></dd>
     <% end %>
@@ -33,9 +33,9 @@
         <dt><%= t('activerecord.attributes.user.email') %></dt>
         <dd><%= user.email %></dd>
     <% end %>
-    <% unless user.profile_data['gender'].blank? %>
+    <% unless user.data.dig('profile', 'gender').blank? %>
         <dt><%= t('activerecord.attributes.user_profile.gender') %></dt>
-        <dd><%= gender_name(user.profile_data['gender']) %></dd>
+        <dd><%= gender_name(user.data.dig('profile', 'gender')) %></dd>
     <% end %>
   </dl>
 </article>

data/app/views/shared/_pagination.jbuilder

@@ -1,13 +1,15 @@
 if collection.respond_to?(:current_page)
+  qp = request.query_parameters.merge(format: :json)
+
   json.links do
-    json.self url_for(page: collection.current_page, format: :json)
-    json.first url_for(page: 1, format: :json)
+    json.self url_for(qp.merge(page: collection.current_page))
+    json.first url_for(qp.merge(page: 1))
     unless collection.prev_page.nil?
-      json.prev url_for(page: collection.prev_page, format: :json)
+      json.prev url_for(qp.merge(page: collection.prev_page))
     end
     unless collection.next_page.nil?
-      json.next url_for(page: collection.next_page, format: :json)
+      json.next url_for(qp.merge(page: collection.next_page))
     end
-    json.last url_for(page: collection.total_pages, format: :json)
+    json.last url_for(qp.merge(page: collection.total_pages))
   end
 end

data/app/views/shared/admin/_breadcrumbs.html.erb

@@ -1,5 +1,5 @@
 <% if content_for? :breadcrumbs %>
-    <nav class="admin-breadcrumbs">
+    <nav class="breadcrumbs">
       <%= link_to(t('admin.index.index.heading'), admin_path) %>
       <%= yield :breadcrumbs %>
     </nav>

data/app/views/shared/forms/_meta_texts.html.erb

@@ -12,7 +12,7 @@
         }
     )
   %>
-  <div class="check-result-error hidden" data-field="meta_title"></div>
+  <div class="check-result-error" data-field="meta_title"></div>
   <div class="guideline"><%= t('.guidelines.meta_title') %></div>
 </dd>
 
@@ -29,7 +29,7 @@
         }
     )
   %>
-  <div class="check-result-error hidden" data-field="meta_description"></div>
+  <div class="check-result-error" data-field="meta_description"></div>
   <div class="guideline"><%= t('.guidelines.meta_description') %></div>
 </dd>
 
@@ -46,6 +46,6 @@
         }
     )
   %>
-  <div class="check-result-error hidden" data-field="meta_keywords"></div>
+  <div class="check-result-error" data-field="meta_keywords"></div>
   <div class="guideline"><%= t('.guidelines.meta_keywords') %></div>
 </dd>

data/app/views/shared/forms/_priority.html.erb

@@ -0,0 +1,12 @@
+<% model_name = f.object.class.to_s.underscore %>
+<dt><%= f.label :priority %></dt>
+<dd>
+  <%=
+    f.number_field(
+        :priority,
+        id:       "#{model_name}_priority",
+        in:       f.object.class.priority_range,
+        required: true
+    )
+  %>
+</dd>

data/app/views/shared/forms/_state_container.html.erb

@@ -1,6 +1,7 @@
 <div class="loading_message hidden">
   <div><%= t('.saving') %></div>
   <div class="state_container">
+    <div class="percentage">0%</div>
     <progress value="0"></progress>
   </div>
 </div>

data/app/views/simple_blocks/_form.html.erb

@@ -0,0 +1,120 @@
+<% model_name = entity.class.to_s.underscore %>
+<%=
+  form_with(
+      model: entity,
+      html: {
+          id: "#{model_name}-form",
+          data: { check_url: check_simple_blocks_path }
+      }
+  ) do |f|
+%>
+  <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+
+  <dl>
+    <dt><%= f.label :slug %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :slug,
+            id: "#{model_name}_slug",
+            size: nil,
+            maxlength: SimpleBlock::SLUG_LIMIT,
+            pattern: SimpleBlock::SLUG_PATTERN_HTML,
+            title: t('.guidelines.slug'),
+            required: true,
+            data: {
+                check: :slug
+            }
+        )
+      %>
+      <div class="check-result-error" data-field="slug"></div>
+      <div class="guideline"><%= t('.guidelines.slug') %></div>
+    </dd>
+
+    <dt><%= f.label :name %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :name,
+            id: "#{model_name}_name",
+            size: nil,
+            maxlength: SimpleBlock::NAME_LIMIT,
+            required: true,
+            data: {
+                check: :name
+            }
+        )
+      %>
+      <div class="check-result-error" data-field="name"></div>
+      <div class="guideline"><%= t('.guidelines.name') %></div>
+    </dd>
+
+    <dt><%= f.label :body %></dt>
+    <dd>
+      <%=
+        f.text_area(
+            :body,
+            id: "#{model_name}_body",
+            cols: 80,
+            rows: 3,
+            class: 'auto-expand',
+            data: {
+                check: :body,
+                min_rows: 3,
+                max_rows: 40
+            }
+        )
+      %>
+      <div class="check-result-error" data-field="body"></div>
+      <div class="guideline"><%= t('.guidelines.body') %></div>
+    </dd>
+
+    <dt><%= f.label :image %></dt>
+    <dd>
+      <figure class="preview" role="group" id="<%= model_name %>-image">
+        <% if entity.image.blank? %>
+          <%= f.label :image, image_tag('biovision/base/placeholders/16x9.svg', alt: '') %>
+        <% else %>
+          <%= f.label :image, image_tag(entity.image.medium_url, alt: '') %>
+        <% end %>
+        <figcaption>
+          <%=
+            f.file_field(
+                :image,
+                id: "#{model_name}_image",
+                accept: 'image/jpeg,image/png,image/svg+xml',
+                data: { image: "#{model_name}-image" }
+            )
+          %>
+        </figcaption>
+      </figure>
+      <div class="guideline"><%= t('.guidelines.image') %></div>
+    </dd>
+
+    <dt><%= f.label :image_alt_text %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :image_alt_text,
+            id: "#{model_name}_image_alt_text",
+            size: nil,
+            maxlength: SimpleBlock::META_LIMIT,
+            data: {
+                check: :image_alt_text
+            }
+        )
+      %>
+      <div class="check-result-error" data-field="image_alt_text"></div>
+      <div class="guideline"><%= t('.guidelines.image_alt_text') %></div>
+    </dd>
+
+    <%= render partial: 'shared/forms/entity_flags', locals: { f: f } %>
+  </dl>
+
+  <%= render 'shared/forms/state_container' %>
+
+  <div class="buttons">
+    <%= hidden_field_tag :entity_id, entity.id %>
+    <%= f.button t(:save), type: :submit, class: 'button-save' %>
+  </div>
+<% end %>

data/app/views/simple_blocks/_simple_block.html.erb

@@ -0,0 +1,26 @@
+<%
+  style = ''
+  if simple_block.background_image? && !simple_block.image.blank?
+    style = %(background-image: url('#{simple_block.image.hd_url}'))
+  end
+%>
+<section class="simple-block simple-block__<%= simple_block.slug %>" style="<%= style %>">
+  <div class="wrapper">
+    <% unless simple_block.image.blank? || simple_block.background_image? %>
+      <figure>
+        <%= simple_image_hd(simple_block) %>
+      </figure>
+    <% end %>
+
+    <div class="text">
+      <%= raw(simple_block.body) %>
+    </div>
+  </div>
+
+  <% if current_user_has_privilege?(:content_manager) %>
+    <ul class="actions">
+      <li><%= gear_icon(admin_simple_block_path(id: simple_block.id)) %></li>
+      <li><%= edit_icon(edit_simple_block_path(id: simple_block.id)) %></li>
+    </ul>
+  <% end %>
+</section>

data/app/views/simple_blocks/edit.html.erb

@@ -0,0 +1,17 @@
+<% content_for :meta_title, t('.title') %>
+<% content_for :breadcrumbs do %>
+  <%= link_to(t('admin.simple_blocks.nav_item.text'), admin_simple_blocks_path) %>
+  <%= admin_simple_block_link(@entity) %>
+  <span><%= t('.nav_text') %></span>
+<% end %>
+
+<article>
+  <h1><%= t('.heading') %></h1>
+
+  <ul class="actions">
+    <li><%= return_icon(admin_simple_block_path(id: @entity.id)) %></li>
+    <li class="danger"><%= destroy_icon(@entity) %></li>
+  </ul>
+
+  <%= render partial: 'form', locals: { entity: @entity } %>
+</article>

data/app/views/simple_blocks/new.html.erb

@@ -0,0 +1,15 @@
+<% content_for :meta_title, t('.title') %>
+<% content_for :breadcrumbs do %>
+    <%= link_to(t('admin.simple_blocks.nav_item.text'), admin_simple_blocks_path) %>
+    <span><%= t('.nav_text') %></span>
+<% end %>
+
+<article>
+  <h1><%= t('.heading') %></h1>
+
+  <ul class="actions">
+    <li><%= back_icon(admin_simple_blocks_path) %></li>
+  </ul>
+
+  <%= render partial: 'form', locals: { entity: @entity } %>
+</article>

data/app/views/stored_values/_form.html.erb

@@ -1,35 +1,64 @@
-<%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+<% model_name = entity.class.to_s.underscore %>
+<%= form_with(model: entity, html: { id: "#{model_name}-form" }) do |f| %>
+  <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+  <dl>
+    <dt><%= f.label :slug %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :slug,
+            id: "#{model_name}_slug",
+            required: true,
+            size: nil,
+            maxlength: StoredValue::SLUG_LIMIT
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.slug') %></div>
+    </dd>
 
-<%= form_for entity do |f| %>
-    <dl>
-      <dt><%= f.label :slug %></dt>
-      <dd>
-        <%= f.text_field :slug, required: true, size: nil, maxlength: StoredValue::SLUG_LIMIT %>
-        <div class="guideline"><%= t('.guidelines.slug') %></div>
-      </dd>
+    <dt><%= f.label :value %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :value,
+            id: "#{model_name}_value",
+            size: nil,
+            maxlength: StoredValue::VALUE_LIMIT
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.value') %></div>
+    </dd>
 
-      <dt><%= f.label :value %></dt>
-      <dd>
-        <%= f.text_field :value, size: nil, maxlength: StoredValue::VALUE_LIMIT %>
-        <div class="guideline"><%= t('.guidelines.value') %></div>
-      </dd>
+    <dt><%= f.label :name %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :name,
+            id: "#{model_name}_name",
+            size: nil,
+            maxlength: StoredValue::NAME_LIMIT
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.name') %></div>
+    </dd>
 
-      <dt><%= f.label :name %></dt>
-      <dd>
-        <%= f.text_field :name, size: nil, maxlength: StoredValue::NAME_LIMIT %>
-        <div class="guideline"><%= t('.guidelines.name') %></div>
-      </dd>
-
-      <dt><%= f.label :description %></dt>
-      <dd>
-        <%= f.text_field :description, size: nil, maxlength: StoredValue::DESCRIPTION_LIMIT %>
-        <div class="guideline"><%= t('.guidelines.description') %></div>
-      </dd>
-    </dl>
+    <dt><%= f.label :description %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :description,
+            id: "#{model_name}_description",
+            size: nil,
+            maxlength: StoredValue::DESCRIPTION_LIMIT
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.description') %></div>
+    </dd>
+  </dl>
 
   <%= render 'shared/forms/state_container' %>
 
-    <div class="buttons">
-      <%= f.button t(:save), type: :submit %>
-    </div>
+  <div class="buttons">
+    <%= f.button t(:save), type: :submit %>
+  </div>
 <% end %>

data/app/views/tokens/_form.html.erb

@@ -1,32 +1,37 @@
-<%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+<% model_name = entity.class.to_s.underscore %>
+<%= form_with(model: entity, html: { id: "#{model_name}-form" }) do |f| %>
+  <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+  <dl>
+    <% if entity.id.blank? %>
+      <dt><%= f.label :user_id %></dt>
+      <dd>
+        <%=
+          f.number_field(
+              :user_id,
+              id: "#{model_name}_user_id",
+              in: User.ids_range
+          )
+        %>
+        <%= render partial: 'admin/users/search', locals: { target_id: 'token_user_id' } %>
+      </dd>
+    <% else %>
+      <dt><%= t('activerecord.attributes.token.user') %></dt>
+      <dd>
+        <%= admin_user_link entity.user %>
+      </dd>
 
-<%= form_for entity do |f| %>
-    <dl>
-      <% if entity.id.blank? %>
-          <dt><%= f.label :user_id %></dt>
-          <dd>
-            <%= f.number_field :user_id, in: User.ids_range %>
-            <%= render partial: 'admin/users/search', locals: { target_id: 'token_user_id' } %>
-          </dd>
-      <% else %>
-          <dt><%= t('activerecord.attributes.token.user') %></dt>
-          <dd>
-            <%= admin_user_link entity.user %>
-          </dd>
+      <dt><%= t('activerecord.attributes.token.token') %></dt>
+      <dd>
+        <%= entity.token %>
+      </dd>
+    <% end %>
 
-          <dt><%= t('activerecord.attributes.token.token') %></dt>
-          <dd>
-            <%= entity.token %>
-          </dd>
-      <% end %>
-    </dl>
-    <ul class="flags">
-      <li><%= f.check_box :active %><%= f.label :active %></li>
-    </ul>
+    <%= render partial: 'shared/forms/entity_flags', locals: { f: f } %>
+  </dl>
 
   <%= render 'shared/forms/state_container' %>
 
-    <div class="buttons">
-      <%= f.button t(:save), type: :submit %>
-    </div>
+  <div class="buttons">
+    <%= f.button t(:save), type: :submit %>
+  </div>
 <% end %>

data/app/views/users/_form.html.erb

@@ -111,7 +111,7 @@
       </dd>
     <% end %>
 
-    <%= render partial: 'users/form/profile_data', locals: { data: entity.profile_data } %>
+    <%= render partial: 'users/form/profile_data', locals: { data: entity.data['profile'] || {} } %>
 
     <dt><%= f.label :notice %></dt>
     <dd>