biovision-base 0.11.180127 → 0.14.180326

data/app/views/admin/users/tokens.html.erb

@@ -9,7 +9,7 @@
   <h1><%= t('admin.tokens.index.heading') %></h1>
 
   <ul class="actions">
-    <li><%= back_icon(admin_user_path(@entity.id)) %></li>
+    <li><%= back_icon(admin_user_path(id: @entity.id)) %></li>
   </ul>
 
   <%= paginate @collection %>

data/app/views/agents/_agent.jbuilder

@@ -14,7 +14,7 @@ json.agent do
       json.value agent.active
     end
   end
-  json.url api_agent_path(agent)
+  json.url api_agent_path(id: agent.id)
   json.browser agent.browser.nil? ? nil : agent.browser.name
   json.html render(partial: 'admin/agents/entity/in_list', locals: { agent: agent }, formats: [:html] )
 end

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

@@ -9,7 +9,7 @@
   <h1><%= t('.title') %></h1>
 
   <ul class="actions">
-    <li><%= return_icon(admin_agent_path(@entity.id)) %></li>
+    <li><%= return_icon(admin_agent_path(id: @entity.id)) %></li>
     <li class="danger"><%= destroy_icon @entity %></li>
   </ul>
 

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

@@ -10,7 +10,7 @@
       </div>
     </div>
     <div class="actions">
-      <%= button_tag t('.log_in'), type: 'submit' %>
+      <%= button_tag t('.log_in'), type: 'submit', class: 'button-action' %>
       <%= link_to t('my.profiles.new.title'), new_my_profile_path, class: 'button-nav' %>
     </div>
 <% end %>

data/app/views/authentication/create.jbuilder

@@ -0,0 +1,10 @@
+json.data do
+  json.id @user.id
+  json.type @user.class.table_name
+  json.attributes do
+    json.(@user, :screen_name, :email)
+  end
+end
+json.links do
+  json.return_path @return_path
+end

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

@@ -9,7 +9,7 @@
   <h1><%= t('.title') %></h1>
 
   <ul class="actions">
-    <li><%= back_icon(admin_browser_path(@entity.id)) %></li>
+    <li><%= back_icon(admin_browser_path(id: @entity.id)) %></li>
     <li class="danger"><%= destroy_icon(@entity) %></li>
   </ul>
 

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

@@ -9,7 +9,7 @@
   <h1><%= t('.title') %></h1>
 
   <ul class="actions">
-    <li><%= return_icon(admin_code_path(@entity.id)) %></li>
+    <li><%= return_icon(admin_code_path(id: @entity.id)) %></li>
     <li class="danger"><%= destroy_icon(@entity) %></li>
   </ul>
 

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

@@ -1,63 +1,118 @@
-<%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
-
-<%= form_for entity do |f| %>
-    <figure class="preview" id="editable_page-image">
-      <% if entity.image.blank? %>
-          <% image_path = 'biovision/base/placeholders/image.svg' %>
-      <% else %>
-          <% image_path = entity.image.url %>
-      <% end %>
-      <%= label_tag(:editable_page_image, image_tag(image_path, alt: t('activerecord.attributes.editable_page.image'))) %>
-      <figcaption>
-        <%= f.label :image %>
-        <%= f.file_field :image, accept: 'image/jpeg,image/png', data: { image: 'editable_page-image' } %>
-        <div class="guideline"><%= t('.guidelines.image') %></div>
-      </figcaption>
-    </figure>
-
-    <dl>
-      <% if entity.id.nil? %>
-          <dt><%= f.label :slug %></dt>
-          <dd>
-            <%= f.text_field :slug, required: true %>
-            <div class="guideline"><%= t('.guidelines.slug') %></div>
-          </dd>
-      <% end %>
-
-      <dt><%= f.label :name %></dt>
-      <dd>
-        <%= f.text_field :name, required: true, size: nil, maxlength: 100 %>
-        <div class="guideline"><%= t('.guidelines.name') %></div>
-      </dd>
-
-      <dt><%= f.label :title %></dt>
-      <dd>
-        <%= f.text_field :title, size: nil, maxlength: 200 %>
-        <div class="guideline"><%= t('.guidelines.title') %></div>
-      </dd>
-
-      <dt><%= f.label :keywords %></dt>
-      <dd>
-        <%= f.text_field :keywords, size: nil, maxlength: 250 %>
-        <div class="guideline"><%= t('.guidelines.keywords') %></div>
-      </dd>
-
-      <dt><%= f.label :description %></dt>
-      <dd>
-        <%= f.text_field :description, size: nil, maxlength: 250 %>
-        <div class="guideline"><%= t('.guidelines.description') %></div>
-      </dd>
-
-      <dt><%= f.label :body %></dt>
-      <dd>
-        <%= f.text_area :body, cols: 80, rows: 25, required: true %>
-        <div class="guideline"><%= t('.guidelines.body') %></div>
-      </dd>
-    </dl>
-
-    <div class="buttons">
-      <%= f.button t(:save), type: :submit %>
-    </div>
+<%= form_with(model: entity, html: { id: "#{entity.class.to_s.underscore}-form" }) do |f| %>
+  <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+
+  <dl>
+    <dt><%= f.label :language_id %></dt>
+    <dd><%= f.select :language_id, languages_for_select %></dd>
+
+    <dt><%= f.label :slug %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :slug,
+            id:        :editable_page_slug,
+            size:      nil,
+            maxlength: EditablePage::SLUG_LIMIT,
+            required:  true
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.slug') %></div>
+    </dd>
+
+    <dt><%= f.label :image %></dt>
+    <dd>
+      <figure class="preview" role="group" id="editable_page-image">
+        <% if entity.image.blank? %>
+          <%= f.label :image, image_tag('biovision/base/placeholders/image.svg') %>
+        <% else %>
+          <%= f.label :image, image_tag(entity.image.medium.url) %>
+        <% end %>
+        <figcaption>
+          <%=
+            f.file_field(
+                :image,
+                id:     :editable_page_image,
+                accept: 'image/jpeg,image/png',
+                data:   { image: 'editable_page-image' }
+            )
+          %>
+        </figcaption>
+      </figure>
+      <div class="guideline"><%= t('.guidelines.image') %></div>
+    </dd>
+
+    <dt><%= f.label :name %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :name,
+            id:        :editable_page_name,
+            size:      nil,
+            maxlength: EditablePage::NAME_LIMIT,
+            required:  true
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.name') %></div>
+    </dd>
+
+    <dt><%= f.label :title %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :title,
+            id:        :editable_page_title,
+            size:      nil,
+            maxlength: EditablePage::META_LIMIT
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.title') %></div>
+    </dd>
+
+    <dt><%= f.label :keywords %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :keywords,
+            id:        :editable_page_keywords,
+            size:      nil,
+            maxlength: EditablePage::META_LIMIT
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.keywords') %></div>
+    </dd>
+
+    <dt><%= f.label :description %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :description,
+            id:        :editable_page_description,
+            size:      nil,
+            maxlength: EditablePage::META_LIMIT
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.description') %></div>
+    </dd>
+
+    <dt><%= f.label :body %></dt>
+    <dd>
+      <%=
+        f.text_area(
+            :body,
+            id:       :editable_page_body,
+            cols:     80,
+            rows:     25,
+            required: true,
+            data:     { wysiwyg: 1 }
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.body') %></div>
+    </dd>
+  </dl>
+
+  <div class="buttons">
+    <%= f.button t(:save), type: :submit, class: 'button-save' %>
+  </div>
 <% end %>
 
-<%= render 'editable_pages/form/ckeditor' %>
+<%= render partial: 'shared/forms/wysiwyg' %>

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

@@ -9,7 +9,7 @@
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">
-    <li><%= return_icon(admin_editable_page_path(@entity.id)) %></li>
+    <li><%= return_icon(admin_editable_page_path(id: @entity.id)) %></li>
     <li class="danger"><%= destroy_icon(@entity) %></li>
   </ul>
 

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

@@ -1,9 +1,11 @@
 <% if @editable_page.nil? %>
-    <% content_for :meta_title, t('.title') %>
-
-    <article>
-
-    </article>
+  <% content_for :meta_title, t('.title') %>
+  <% content_for :meta_title, t('.description') %>
 <% else %>
-    <%= render partial: 'editable_pages/editable_page', locals: { entity: @editable_page } %>
+  <%= render partial: 'editable_pages/entity/metadata', locals: { entity: @editable_page } %>
 <% end %>
+
+<article id="homepage">
+  <%= render partial: 'index/index/editable', locals: { entity: @editable_page } %>
+  <%= render 'index/index/default_dashboard' %>
+</article>

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

@@ -0,0 +1,2 @@
+<%= render 'index/index/custom_dashboard' %>
+<%= render 'index/dashboard/biovision_post' if Gem.loaded_specs.key?('biovision-post') %>

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

@@ -0,0 +1,9 @@
+<% unless entity.nil? %>
+  <% unless entity.title.blank? %>
+    <h1><%= entity.title %></h1>
+  <% end %>
+
+  <div class="index-editable">
+    <%= raw(entity.body) %>
+  </div>
+<% end %>

data/app/views/layouts/admin/_header.html.erb

@@ -4,7 +4,7 @@
     <ul>
       <% unless current_user.nil? %>
         <li><%= current_user.screen_name %></li>
-        <li><%= link_to(t(:logout), logout_path, method: :delete) %></li>
+        <li><%= link_to(t(:logout), logout_path, method: :delete, class: 'button-action') %></li>
       <% end %>
     </ul>
   </nav>

data/app/views/layouts/application/_header.html.erb

@@ -1,4 +1,4 @@
-<header>
+<header id="site-header">
   <div>
     <%= render 'layouts/application/header/logo' %>
     <nav>

data/app/views/layouts/application/header/authentication/_links.html.erb

@@ -1,4 +1,4 @@
 <div class="links">
-  <%= link_to(t('authentication.nav_item.log_in'), login_path) %>
-  <%= link_to(t('authentication.nav_item.join'), new_my_profile_path) %>
-</div>
+  <%= link_to(t('authentication.nav_item.log_in'), login_path, class: 'button-nav') %>
+  <%= link_to(t('authentication.nav_item.join'), new_my_profile_path, class: 'button-nav') %>
+</div>

data/app/views/layouts/application/header/authentication/_plate.html.erb

@@ -1,4 +1,4 @@
 <div class="plate">
   <%= link_to current_user.profile_name, my_path, class: "profile" %>
-  <%= link_to t('authentication.info.logout'), logout_path, method: :delete, class: 'logout' %>
+  <%= link_to t('authentication.info.logout'), logout_path, method: :delete, class: 'button-action' %>
 </div>

data/app/views/layouts/profile.html.erb

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="<%= locale %>">
+<head>
+  <meta charset="UTF-8"/>
+  <title><%= yield :meta_title %></title>
+  <%= stylesheet_link_tag 'admin', media: 'all' %>
+  <%= javascript_include_tag 'application' %>
+  <%= csrf_meta_tags %>
+  <meta name="viewport" content="width=device-width, initial-scale=1"/>
+</head>
+<body>
+<%= render 'layouts/profile/header' %>
+
+<main id="main">
+  <%= render 'shared/flash_messages' %>
+  <%= render 'shared/breadcrumbs' %>
+
+  <%= yield %>
+</main>
+
+<%= render 'layouts/profile/footer' %>
+</body>
+</html>

data/app/views/layouts/profile/_footer.html.erb

@@ -0,0 +1,11 @@
+<footer>
+  <div>
+    <div class="copyright">&copy; <%= t(:copyright) %></div>
+    <nav>
+      <ul>
+        <li><%= link_to(t('about.index.nav_text'), about_path) %></li>
+        <li><%= link_to(t('about.tos.nav_text'), tos_path) %></li>
+      </ul>
+    </nav>
+  </div>
+</footer>

data/app/views/layouts/profile/_header.html.erb

@@ -0,0 +1,9 @@
+<header>
+  <div>
+    <%= render 'layouts/application/header/logo' %>
+    <nav>
+      <%= render 'layouts/profile/header/navigation' %>
+    </nav>
+    <%= render 'layouts/application/header/authentication' %>
+  </div>
+</header>

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

@@ -9,7 +9,7 @@
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">
-    <li><%= return_icon(admin_media_file_path(@entity.id)) %></li>
+    <li><%= return_icon(admin_media_file_path(id: @entity.id)) %></li>
     <% unless @entity.locked? %>
       <li class="danger"><%= destroy_icon(@entity) %></li>
     <% end %>

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

@@ -50,5 +50,3 @@
     <%= f.button t(:save), type: :submit, class: 'button-save' %>
   </div>
 <% end %>
-
-<%= render partial: 'shared/forms/default_ajax_handler', locals: { form_id: 'media-folder-form' } %>

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

@@ -12,7 +12,7 @@
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">
-    <li><%= return_icon(admin_media_folder_path(@entity.id)) %></li>
+    <li><%= return_icon(admin_media_folder_path(id: @entity.id)) %></li>
     <% if @entity.can_be_deleted? %>
       <li class="danger"><%= destroy_icon(@entity) %></li>
     <% end %>

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

@@ -11,7 +11,7 @@
     <% if @entity.parent.nil? %>
       <li><%= return_icon(admin_media_folders_path) %></li>
     <% else %>
-      <li><%= return_icon(admin_media_folder_path(@entity.parent_id)) %></li>
+      <li><%= return_icon(admin_media_folder_path(id: @entity.parent_id)) %></li>
     <% end %>
   </ul>
 

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

@@ -1,7 +1,7 @@
 <% content_for :meta_title, t('.title') %>
 <% content_for :breadcrumbs do %>
     <%= link_to(t('admin.metrics.nav_item.text'), admin_metrics_path) %>
-    <%= link_to(@entity.name, admin_metric_path(@entity.id)) %>
+    <%= link_to(@entity.name, admin_metric_path(id: @entity.id)) %>
     <span><%= t(:edit) %></span>
 <% end %>
 
@@ -10,7 +10,7 @@
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">
-    <li><%= return_icon(admin_metric_path(@entity.id)) %></li>
+    <li><%= return_icon(admin_metric_path(id: @entity.id)) %></li>
   </ul>
 
   <%= render partial: 'form', locals: { entity: @entity } %>

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

@@ -1,19 +1,14 @@
 <% content_for :meta_title, t('.title') %>
+<% content_for :breadcrumbs do %>
+  <span><%= t('.heading') %></span>
+<% end %>
 
-<article class="my-index">
-  <h1><%= t('.title') %></h1>
+<article id="my-index">
+  <div class="sidebar dashboard">
+    <%= render 'my/index/index/sidebar' %>
+  </div>
 
-  <div class="dashboard">
-    <nav>
-      <ul>
-        <li><%= render 'my/profiles/nav_item' %></li>
-        <li><%= render 'my/tokens/nav_item' %></li>
-        <li><%= render 'my/login_attempts/nav_item' %></li>
-        <% if UserPrivilege.user_has_any_privilege?(current_user) %>
-            <li><%= link_to t('admin.index.index.heading'), admin_path %></li>
-        <% end %>
-        <li><%= link_to t(:logout), logout_path, method: :delete %></li>
-      </ul>
-    </nav>
+  <div class="content">
+    <%= render 'my/index/index/dashboard' %>
   </div>
 </article>