biovision-base 0.15.180415 → 0.15.180502

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b32ca23796647159d2a821d53b9b83ece30a748e846c666b55aa8d24579c8fc7
-  data.tar.gz: f00de9e1ea2772e8863b66f96f1fea59c0d5675f0062dd87ce015eba7b3bfa0f
+  metadata.gz: 2a1498261b5c92964dc68ed231731b1edbe106d0b41e1cae16c10527ec1891d4
+  data.tar.gz: e4968f3a7396a9d54d95840ea4435a6198c85a12db44519b06738e7261c12016
 SHA512:
-  metadata.gz: 5ebdb6a0c58f56706b1b93fdaa2fe23e17f801c53aca06bd018e5e1b2fcff96eafd8aa3e0a99dfc4c16f00d522c44e2ff6432df42843278becff5920ce3adf84
-  data.tar.gz: 7af837c64015a5694ed8b917b7b1ee9e8579c1943318ffdae4d3f73a797d7ca61bcb653f27181b07c1359adbfea1a374da1f18a4165a067e17018c879dd2f75d
+  metadata.gz: 1b96d1c6787eea0003c5e8d0c5341385761a75348944d9d7212ef31e7b03b9575ff43b8feb88b648d1e492abde88549bb12a41724714ca456be99b0020edc1be
+  data.tar.gz: f35baf097a33a05fa6c1deaf62823a92657942f40f7e0bdd41dfd832869cad03b17a57d7af2bf2fa9c0d2643ab4ea28d19b1a9e90609b90af6c02a6cee1d2751

data/app/assets/javascripts/biovision/base/biovision.js

@@ -442,13 +442,22 @@ document.addEventListener('DOMContentLoaded', function () {
 
     document.querySelectorAll('form[data-remote]').forEach(function (form) {
         const button = form.querySelector('button[type=submit]');
+        const loading_message = form.querySelector('.loading_message');
 
         form.addEventListener('ajax:before', function () {
             button.disabled = true;
+
+            if (loading_message) {
+                loading_message.classList.remove('hidden');
+            }
         });
 
         form.addEventListener('ajax:complete', function () {
             button.disabled = false;
+
+            if (loading_message) {
+                loading_message.classList.add('hidden');
+            }
         });
     });
 

data/app/assets/stylesheets/biovision/base/admin.scss

@@ -1,6 +1,8 @@
 :root {
   --content-width: #{$content-width};
   --content-width-min: #{$content-width-min};
+  --spacer-xs: .5rem;
+  --spacer-s: 1rem;
 }
 
 html {
@@ -135,7 +137,7 @@ article {
       min-width: 1ch;
     }
 
-    input:not([type=checkbox]):not([type=radio]):not([size]):not([type=date]):not([max]),
+    input:not([type=checkbox]):not([type=radio]):not([size]):not([type=date]):not([max]):not([min]),
     textarea {
       width: 100%;
     }
@@ -192,6 +194,21 @@ article {
   }
 }
 
+.list-of-entities {
+  .data {
+    > div:first-of-type {
+      margin-bottom: var(--spacer-xs);
+    }
+
+    nav {
+      margin: var(--spacer-s) 0;
+
+      a:not(:last-of-type) {
+        margin-right: var(--spacer-xs);
+      }
+    }
+  }
+}
 
 nav.admin-breadcrumbs {
   margin-bottom: .8rem;

data/app/controllers/my/index_controller.rb

@@ -1,8 +1,4 @@
-class My::IndexController < ApplicationController
-  before_action :restrict_anonymous_access
-
-  # layout 'profile'
-
+class My::IndexController < ProfileController
   # get /my
   def index
   end

data/app/controllers/my/profiles_controller.rb

@@ -4,6 +4,8 @@ class My::ProfilesController < ApplicationController
   before_action :redirect_authorized_user, only: [:new, :create]
   before_action :restrict_anonymous_access, except: [:new, :create]
 
+  layout 'profile', only: [:show, :edit]
+
   # get /my/profile/new
   def new
     @entity = User.new
@@ -40,7 +42,7 @@ class My::ProfilesController < ApplicationController
   protected
 
   def redirect_authorized_user
-    redirect_to my_profile_path if current_user.is_a? User
+    redirect_to my_path if current_user.is_a? User
   end
 
   def create_user

data/app/controllers/my/tokens_controller.rb

@@ -1,7 +1,6 @@
-class My::TokensController < ApplicationController
+class My::TokensController < ProfileController
   include ToggleableEntity
 
-  before_action :restrict_anonymous_access
   before_action :set_entity, except: [:index]
 
   # get /my

data/app/controllers/profile_controller.rb

@@ -0,0 +1,9 @@
+class ProfileController < ApplicationController
+  before_action :restrict_access
+
+  protected
+
+  def restrict_access
+    restrict_anonymous_access
+  end
+end

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

@@ -0,0 +1,15 @@
+<div class="sidebar">
+  <nav>
+    <ul>
+      <li><%= render 'my/profiles/nav_item' %></li>
+      <li><%= render 'my/tokens/nav_item' %></li>
+      <li><%= render 'my/login_attempts/nav_item' %></li>
+      <%= render 'my/index/sidebar/biovision_courses' if Gem.loaded_specs.key?('biovision-courses') %>
+      <%= render 'my/index/index/custom_sidebar' %>
+      <% 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>

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

@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8"/>
   <title><%= yield :meta_title %></title>
-  <%= stylesheet_link_tag 'admin', media: 'all' %>
+  <%= stylesheet_link_tag 'application', media: 'all' %>
   <%= javascript_include_tag 'application' %>
   <%= csrf_meta_tags %>
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
@@ -13,9 +13,16 @@
 
 <main id="main">
   <%= render 'shared/flash_messages' %>
-  <%= render 'shared/breadcrumbs' %>
+  <%= render 'shared/breadcrumbs_profile' %>
 
-  <%= yield %>
+  <div id="profile-content">
+    <% unless content_for?(:hide_sidebar) || current_user.nil? %>
+      <%= render 'layouts/profile/sidebar' %>
+    <% end %>
+    <div class="content">
+      <%= yield %>
+    </div>
+  </div>
 </main>
 
 <%= render 'layouts/profile/footer' %>

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

@@ -1,13 +1,15 @@
-<nav>
-  <ul>
-    <li><%= render 'my/profiles/nav_item' %></li>
-    <li><%= render 'my/tokens/nav_item' %></li>
-    <li><%= render 'my/login_attempts/nav_item' %></li>
-    <%= render 'my/index/sidebar/biovision_courses' if Gem.loaded_specs.key?('biovision-courses') %>
-    <%= render 'my/index/index/custom_sidebar' %>
-    <% 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="sidebar">
+  <nav>
+    <ul>
+      <li><%= render 'my/profiles/nav_item' %></li>
+      <li><%= render 'my/tokens/nav_item' %></li>
+      <li><%= render 'my/login_attempts/nav_item' %></li>
+      <%= render 'my/index/sidebar/biovision_courses' if Gem.loaded_specs.key?('biovision-courses') %>
+      <%= render 'my/index/index/custom_sidebar' %>
+      <% 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>

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

@@ -1,14 +1,5 @@
 <% content_for :meta_title, t('.title') %>
-<% content_for :breadcrumbs do %>
-  <span><%= t('.heading') %></span>
-<% end %>
 
 <article id="my-index" class="profile-content">
-  <div class="sidebar dashboard">
-    <%= render 'my/index/index/sidebar' %>
-  </div>
-
-  <div class="content">
-    <%= render 'my/index/index/dashboard' %>
-  </div>
+  <%= render 'my/index/index/dashboard' %>
 </article>

data/app/views/shared/_breadcrumbs_profile.html.erb

@@ -0,0 +1,7 @@
+<% if content_for? :breadcrumbs %>
+    <nav class="breadcrumbs">
+      <%# link_to(t(:home), root_path) %>
+      <%= link_to(t('my.index.index.heading'), my_path) %>
+      <%= yield :breadcrumbs %>
+    </nav>
+<% end %>

data/db/migrate/20170302000101_create_privileges.rb

@@ -19,6 +19,8 @@ class CreatePrivileges < ActiveRecord::Migration[5.1]
       add_foreign_key :privileges, :privileges, column: :parent_id, on_update: :cascade, on_delete: :cascade
 
       add_index :privileges, :slug, unique: true
+
+      create_privileges
     end
   end
 

data/lib/biovision/base/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Base
-    VERSION = '0.15.180415'
+    VERSION = '0.15.180502'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-base
 version: !ruby/object:Gem::Version
-  version: 0.15.180415
+  version: 0.15.180502
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -253,6 +253,7 @@ files:
 - app/controllers/my/tokens_controller.rb
 - app/controllers/privilege_groups_controller.rb
 - app/controllers/privileges_controller.rb
+- app/controllers/profile_controller.rb
 - app/controllers/profiles_controller.rb
 - app/controllers/stored_values_controller.rb
 - app/controllers/tokens_controller.rb
@@ -456,6 +457,7 @@ files:
 - app/views/layouts/profile.html.erb
 - app/views/layouts/profile/_footer.html.erb
 - app/views/layouts/profile/_header.html.erb
+- app/views/layouts/profile/_sidebar.html.erb
 - app/views/layouts/profile/header/_navigation.html.erb
 - app/views/media_files/_form.html.erb
 - app/views/media_files/ckeditor.html.erb
@@ -505,6 +507,7 @@ files:
 - app/views/profiles/_profile.html.erb
 - app/views/profiles/show.html.erb
 - app/views/shared/_breadcrumbs.html.erb
+- app/views/shared/_breadcrumbs_profile.html.erb
 - app/views/shared/_counters.html.erb
 - app/views/shared/_flash_messages.html.erb
 - app/views/shared/_list_of_errors.html.erb