biovision-base 0.22.180920.0 → 0.34.190331.1

data/app/views/admin/editable_pages/show.html.erb

@@ -39,25 +39,29 @@
       <dd><%= @entity.url %></dd>
     <% end %>
 
-    <dt><%= t(:created_at) %></dt>
-    <dd><%= time_tag(@entity.created_at) %></dd>
+    <% unless @entity.nav_group.blank? %>
+      <dt><%= t('activerecord.attributes.editable_page.nav_group') %></dt>
+      <dd><%= @entity.nav_group %></dd>
+    <% end %>
 
-    <dt><%= t(:updated_at) %></dt>
-    <dd><%= time_tag(@entity.updated_at) %></dd>
+    <dt><%= t('activerecord.attributes.editable_page.body') %></dt>
+    <dd>
+      <div class="text">
+        <%= raw(@entity.body) %>
+      </div>
+    </dd>
 
-    <% unless @entity.title.blank? %>
-      <dt><%= t('activerecord.attributes.editable_page.title') %></dt>
-      <dd><%= @entity.title %></dd>
-    <% end %>
-    <% unless @entity.keywords.blank? %>
-      <dt><%= t('activerecord.attributes.editable_page.keywords') %></dt>
-      <dd><%= @entity.keywords %></dd>
-    <% end %>
-    <% unless @entity.description.blank? %>
-      <dt><%= t('activerecord.attributes.editable_page.description') %></dt>
-      <dd><%= @entity.description %></dd>
-    <% end %>
+    <%= render partial: 'shared/entity/meta_texts', locals: { entity: @entity } %>
+    <%= render partial: 'shared/entity/timestamps', locals: { entity: @entity } %>
   </dl>
 
-  <section><%= raw(@entity.body) %></section>
+  <%=
+    render(
+        partial: 'shared/admin/toggleable',
+        locals:  {
+            entity: @entity,
+            url:    toggle_admin_editable_page_path(id: @entity.id)
+        }
+    )
+  %>
 </article>

data/app/views/admin/feedback_requests/entity/_in_list.html.erb

@@ -1,7 +1,7 @@
 <div class="data">
   <div><%= entity.name %></div>
   <div class="info">
-    <%= entity.phone %>
+    <%= entity.phone %><br/>
     <%= entity.email %>
   </div>
   <div class="secondary info">
@@ -13,6 +13,14 @@
       <%= simple_format entity.comment %>
     </div>
   <% end %>
+  <% unless entity.data.empty? %>
+    <div class="secondary info">
+      <%= t('activerecord.attributes.feedback_request.data') %>:
+      <% entity.data.each do |k, v| %>
+        <div><dfn><%= k %></dfn>: <%= v %></div>
+      <% end %>
+    </div>
+  <% end %>
 
   <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_feedback_request_path(id: entity.id) } %>
 </div>

data/app/views/admin/index/_biovision_base.html.erb

@@ -1,11 +1,9 @@
-<%= render 'admin/index/dashboard/settings' %>
+<%#= render 'admin/index/dashboard/settings' %>
 <%#= render 'admin/index/dashboard/biovision_track' %>
-<%= render 'admin/index/dashboard/biovision_regions' if Gem.loaded_specs.key?('biovision-regions') %>
 <%= render 'admin/index/dashboard/biovision_user' %>
 <%= render 'admin/index/dashboard/editorial' %>
-<%= render 'admin/index/dashboard/biovision_links' %>
-<%= render 'admin/index/dashboard/biovision_post' if Gem.loaded_specs.key?('biovision-post') %>
-<%= render 'admin/index/dashboard/biovision_vote' if Gem.loaded_specs.key?('biovision-vote') %>
-<%= render 'admin/index/dashboard/biovision_poll' if Gem.loaded_specs.key?('biovision-poll') %>
-<%= render 'admin/index/dashboard/biovision_courses' if Gem.loaded_specs.key?('biovision-courses') %>
+<%= render 'admin/index/dashboard/biovision_links' if LinkBlock.any? %>
 <%= render 'admin/index/dashboard/biovision_feedback' %>
+<% %w[regions post vote poll comment].each do |part| %>
+  <%= render "admin/index/dashboard/biovision_#{part}" if Gem.loaded_specs.key?("biovision-#{part}") %>
+<% end %>

data/app/views/admin/index/_components.html.erb

@@ -0,0 +1,9 @@
+<section>
+  <ul class="biovision-components">
+    <% if current_user_has_privilege?(:administrator) %>
+      <li class="settings-general">
+        <%= link_to(t('admin.settings.index.nav_text'), admin_settings_path) %>
+      </li>
+    <% end %>
+  </ul>
+</section>

data/app/views/admin/index/dashboard/_editorial.html.erb

@@ -1,9 +1,9 @@
 <% if current_user_has_privilege?(:content_manager) %>
   <nav>
-    <div class="heading"><%= t('.heading') %></div>
+    <h3><%= t('.heading') %></h3>
     <ul>
       <li><%= render 'admin/editable_pages/nav_item' %></li>
-      <li><%= render 'admin/editable_blocks/nav_item' %></li>
+      <li><%= render 'admin/simple_blocks/nav_item' %></li>
 <!--      <li><%#= render 'admin/media_folders/nav_item' %></li>-->
 <!--      <li><%#= render 'admin/media_files/nav_item' %></li>-->
     </ul>

data/app/views/admin/index/dashboard/_settings.html.erb

@@ -3,7 +3,7 @@
     <div class="heading"><%= t('.heading') %></div>
 
     <ul>
-      <li><%= render 'admin/stored_values/nav_item' %></li>
+<!--      <li><%#= render 'admin/stored_values/nav_item' %></li>-->
     </ul>
   </nav>
-<% end %>
+<% end %>

data/app/views/admin/index/index.html.erb

@@ -3,6 +3,8 @@
 <article>
   <h1><%= t('.heading') %></h1>
 
+  <%= render 'admin/index/components' %>
+
   <div class="dashboard">
     <%= render 'admin/index/biovision_base' %>
     <%= render 'admin/index/custom_dashboard' %>

data/app/views/admin/privileges/entity/_groups.html.erb

@@ -2,35 +2,35 @@
   <h2><%= t('.heading') %></h2>
 
   <% if PrivilegeGroup.count > 0 %>
-      <ul class="list-of-entities privilege-groups">
-        <% PrivilegeGroup.page_for_administration.each do |privilege_group| %>
-            <li data-url="<%= privilege_admin_privilege_group_path(id: privilege_group.id, privilege_id: privilege.id) %>">
-              <% element_id = "privilege_group_#{privilege_group.id}" %>
-              <%= check_box_tag element_id, 1, privilege_group.has_privilege?(privilege) %>
-              <%= label_tag element_id, privilege_group.name %>
-            </li>
-        <% end %>
-      </ul>
+    <ul class="list-of-entities privilege-groups">
+      <% PrivilegeGroup.list_for_administration.each do |privilege_group| %>
+        <li data-url="<%= privilege_admin_privilege_group_path(id: privilege_group.id, privilege_id: privilege.id) %>">
+          <% element_id = "privilege_group_#{privilege_group.id}" %>
+          <%= check_box_tag element_id, 1, privilege_group.has_privilege?(privilege) %>
+          <%= label_tag element_id, privilege_group.name %>
+        </li>
+      <% end %>
+    </ul>
 
-      <script>
-          'use strict';
+    <script>
+        'use strict';
 
-          document.addEventListener('DOMContentLoaded', function () {
-              document.querySelectorAll('ul.privilege-groups input[type=checkbox]').forEach(function(element) {
-                  element.addEventListener('click', function () {
-                      const url = this.closest('li').getAttribute('data-url');
-                      const method = this.checked ? 'put' : 'delete';
-                      const request = Biovision.newAjaxRequest(method, url, function() {
-                          console.log(JSON.parse(this.responseText));
-                      });
+        document.addEventListener('DOMContentLoaded', function () {
+            document.querySelectorAll('ul.privilege-groups input[type=checkbox]').forEach(function (element) {
+                element.addEventListener('click', function () {
+                    const url = this.closest('li').getAttribute('data-url');
+                    const method = this.checked ? 'put' : 'delete';
+                    const request = Biovision.newAjaxRequest(method, url, function () {
+                        console.log(JSON.parse(this.responseText));
+                    });
 
-                      request.send();
-                  });
+                    request.send();
+                });
 
-              });
-          });
-      </script>
+            });
+        });
+    </script>
   <% else %>
-      <%= render 'shared/nothing_found' %>
+    <%= render 'shared/nothing_found' %>
   <% end %>
 </section>

data/app/views/admin/privileges/entity/_in_list.html.erb

@@ -6,28 +6,49 @@
   <div class="info">
     <div><%= entity.slug %></div>
     <div><%= entity.privilege_groups.map(&:name).join(', ') %></div>
-    <div><%= link_to t(:user_count, count: entity.users_count), users_admin_privilege_path(id: entity.id) %></div>
+    <div>
+      <%=
+        link_to(
+            t(:user_count, count: entity.users_count),
+            users_admin_privilege_path(id: entity.id)
+        )
+      %>
+    </div>
   </div>
-  <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_privilege_path(id: entity.id) } %>
+  <%=
+    render(
+        partial: 'shared/admin/toggleable',
+        locals:  {
+            entity: entity,
+            url:    toggle_admin_privilege_path(id: entity.id)
+        }
+    )
+  %>
 
   <ul class="actions">
-    <li class="lockable <%= entity.locked? ? 'hidden' : '' %>">
+    <li>
       <%= edit_icon(edit_privilege_path(id: entity.id)) %>
     </li>
     <%=
       render(
           partial: 'shared/actions/priority_changer',
-          locals: {
+          locals:  {
               path: priority_admin_privilege_path(id: entity.id)
           }
       )
     %>
-    <%= render partial: 'shared/actions/locks', locals: { entity: entity, path: lock_admin_privilege_path(id: entity.id) } %>
   </ul>
 
-  <% if entity.children.any? %>
-      <div class="children">
-        <%= render partial: 'admin/privileges/list', locals: { collection: Privilege.for_tree(entity.id) } %>
-      </div>
+  <% if entity.child_privileges.any? %>
+    <div class="children">
+      <%=
+        render(
+            partial: 'shared/admin/list_with_priority',
+            locals:  {
+                collection: Privilege.for_tree(entity.id)
+            }
+        )
+      %>
+    </div>
   <% end %>
 </div>

data/app/views/admin/privileges/index.html.erb

@@ -10,7 +10,12 @@
     <li><%= back_icon(admin_path) %></li>
   </ul>
 
-  <%= render partial: 'list', locals: { collection: @collection } %>
+  <%=
+    render(
+        partial: 'shared/admin/list_with_priority',
+        locals: { collection: @collection }
+    )
+  %>
 
   <section>
     <h2><%= t('privileges.new.title') %></h2>

data/app/views/admin/privileges/show.html.erb

@@ -1,10 +1,10 @@
 <% content_for :meta_title, t('.title', name: @entity.name) %>
 <% content_for :breadcrumbs do %>
-    <%= link_to(t('admin.privileges.nav_item.text'), admin_privileges_path) %>
-    <% @entity.parents.each do |parent| %>
-        <%= admin_privilege_link(parent) %>
-    <% end %>
-    <span><%= @entity.name %></span>
+  <%= link_to(t('admin.privileges.nav_item.text'), admin_privileges_path) %>
+  <% @entity.parents.each do |parent| %>
+    <%= admin_privilege_link(parent) %>
+  <% end %>
+  <span><%= @entity.name %></span>
 <% end %>
 
 <article>
@@ -12,15 +12,13 @@
 
   <ul class="actions">
     <li><%= return_icon(admin_privileges_path) %></li>
-    <% unless @entity.locked? %>
-        <li><%= edit_icon(edit_privilege_path(id: @entity.id)) %></li>
-    <% end %>
+    <li><%= edit_icon(edit_privilege_path(id: @entity.id)) %></li>
   </ul>
 
   <dl>
     <% unless @entity.parent.nil? %>
-        <dt><%= t('activerecord.attributes.privilege.parent_id') %></dt>
-        <dd><%= link_to @entity.parent.name, admin_privilege_path(id: @entity.parent_id) %></dd>
+      <dt><%= t('activerecord.attributes.privilege.parent_id') %></dt>
+      <dd><%= admin_privilege_link(@entity.parent) %></dd>
     <% end %>
     <dt><%= t('activerecord.attributes.privilege.slug') %></dt>
     <dd><%= @entity.slug %></dd>
@@ -29,22 +27,37 @@
     <dd><%= @entity.priority %></dd>
 
     <% unless @entity.description.blank? %>
-        <dt><%= t('activerecord.attributes.privilege.description') %></dt>
-        <dd><%= simple_format(@entity.description) %></dd>
+      <dt><%= t('activerecord.attributes.privilege.description') %></dt>
+      <dd><%= @entity.description %></dd>
     <% end %>
 
     <% unless @entity.parents_cache.blank? %>
-        <dt><%= t('activerecord.attributes.privilege.parents_cache') %></dt>
-        <dd><%= @entity.parents_cache %></dd>
+      <dt><%= t('activerecord.attributes.privilege.parents_cache') %></dt>
+      <dd><%= @entity.parents_cache %></dd>
     <% end %>
 
     <% unless @entity.children_cache.blank? %>
-        <dt><%= t('activerecord.attributes.privilege.children_cache') %></dt>
-        <dd><%= @entity.children_cache.join(', ') %></dd>
+      <dt><%= t('activerecord.attributes.privilege.children_cache') %></dt>
+      <dd><%= @entity.children_cache.join(', ') %></dd>
     <% end %>
+
+    <%=
+      render(
+          partial: 'shared/entity/timestamps',
+          locals: { entity: @entity }
+      )
+    %>
   </dl>
 
-  <%= render partial: 'shared/admin/toggleable', locals: { entity: @entity, url: toggle_admin_privilege_path(id: @entity.id) } %>
+  <%=
+    render(
+        partial: 'shared/admin/toggleable',
+        locals: {
+            entity: @entity,
+            url: toggle_admin_privilege_path(id: @entity.id)
+        }
+    )
+  %>
 
   <nav>
     <ul>
@@ -57,7 +70,7 @@
   <section>
     <h2><%= t('.children') %></h2>
 
-    <%= render partial: 'admin/privileges/list', locals: { collection: Privilege.for_tree(@entity.id) } %>
+    <%= render partial: 'shared/admin/list_with_priority', locals: { collection: Privilege.for_tree(@entity.id) } %>
   </section>
 
   <section>

data/app/views/admin/settings/component/_new_parameter.html.erb

@@ -0,0 +1,62 @@
+<section>
+  <h2><%= t('.heading') %></h2>
+
+  <%=
+    form_with(
+        scope:  :key,
+        url:    admin_set_parameter_path(slug: handler.slug),
+        method: :put,
+        local:  true,
+        id:     'new-biovision-parameter-form'
+    ) do |f|
+  %>
+    <dl>
+      <dt>
+        <%=
+          f.label(:slug, t('activerecord.attributes.biovision_parameter.slug'))
+        %>
+      </dt>
+      <dd>
+        <%=
+          f.text_field(
+              :slug,
+              value:     '',
+              required:  true,
+              pattern:   BiovisionParameter::SLUG_PATTERN_HTML,
+              title:     t('.guidelines.slug'),
+              size:      nil,
+              maxlength: BiovisionParameter::SLUG_LIMIT,
+              data: {
+                  field: :slug
+              }
+          )
+        %>
+        <div class="guideline"><%= t('.guidelines.slug') %></div>
+      </dd>
+
+      <dt>
+        <%=
+          f.label(:value, t('activerecord.attributes.biovision_parameter.value'))
+        %>
+      </dt>
+      <dd>
+        <%=
+          f.text_field(
+              :value,
+              value:     '',
+              required:  true,
+              size:      nil,
+              maxlength: BiovisionParameter::VALUE_LIMIT,
+              data: {
+                  field: :value
+              }
+          )
+        %>
+        <div class="guideline"><%= t('.guidelines.value') %></div>
+      </dd>
+    </dl>
+    <div class="buttons">
+      <%= button_tag(t(:save), type: :submit, class: 'button-save') %>
+    </div>
+  <% end %>
+</section>

data/app/views/admin/settings/component/_parameters.html.erb

@@ -0,0 +1,37 @@
+<section>
+  <h2><%= t('.heading') %></h2>
+
+  <ul id="biovision-component-parameters" data-url="<%= admin_set_parameter_path(slug: handler.slug) %>">
+    <% parameters.each do |parameter| %>
+      <%
+        element_id = "parameter-#{parameter.id}"
+        description = t("biovision.components.#{parameter.biovision_component.slug}.parameters.#{parameter.slug}.description", default: '')
+      %>
+      <li>
+        <div class="name">
+          <%= label_tag(element_id, parameter.slug) %>
+        </div>
+        <div class="value">
+          <%= text_field_tag(:value, parameter.value, id: element_id) %>
+          <%=
+            button_tag(
+                '',
+                title: t(:save),
+                type: :button,
+                class: 'apply',
+                disabled: true,
+                data: {
+                    slug: parameter.slug
+                }
+            )
+          %>
+        </div>
+        <% unless description.blank? %>
+          <div class="description">
+            <%= description %>
+          </div>
+        <% end %>
+      </li>
+    <% end %>
+  </ul>
+</section>