biovision-base 0.11.180127 → 0.14.180326

data/app/views/my/tokens/_toggleable.html.erb

@@ -1,4 +1,4 @@
-<div class="toggleable" data-url="<%= toggle_my_token_path(entity.id) %>">
+<div class="toggleable" data-url="<%= toggle_my_token_path(id: entity.id) %>">
   <% Token.toggleable_attributes.each do |flag| %>
   <span class="<%= entity.attributes[flag.to_s] ? 'active' : 'inactive' %>" data-flag="<%= flag %>">
     <%= t("activerecord.attributes.token.#{flag}") %>

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

@@ -1,6 +1,6 @@
 <% content_for :meta_title, t('.title', page: current_page) %>
 <% content_for :breadcrumbs do %>
-    <%= link_to(t('my.profiles.nav_item.text'), my_profile_path) %>
+    <%= link_to(t('my.profiles.nav_item.text'), my_path) %>
     <span><%= t('my.tokens.nav_item.text') %></span>
 <% end %>
 

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

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

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

@@ -11,7 +11,7 @@
 <article>
   <h1><%= t('.title') %></h1>
   <ul class="actions">
-    <li><%= back_icon(admin_privilege_path(@entity.id)) %></li>
+    <li><%= back_icon(admin_privilege_path(id: @entity.id)) %></li>
     <% if @entity.can_be_deleted? %>
         <li class="danger"><%= destroy_icon(@entity) %></li>
     <% end %>

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

@@ -3,13 +3,13 @@
 
   <% if current_user_has_privilege?(:administrator) %>
       <ul class="actions">
-        <li><%= gear_icon(admin_user_path(user)) %></li>
+        <li><%= gear_icon(admin_user_path(id: user.id)) %></li>
       </ul>
   <% end %>
 
   <% if current_user == user %>
       <nav>
-        <%= link_to t(:edit), edit_my_profile_path %>
+        <%= link_to t(:edit), edit_my_profile_path, class: 'button-action' %>
       </nav>
   <% end %>
 
@@ -25,7 +25,7 @@
         <dt><%= t('activerecord.attributes.user.last_seen') %></dt>
         <dd><%= time_tag user.last_seen %></dd>
     <% end %>
-    <% unless user.profile&.name.blank? %>
+    <% unless user.profile_data['name'].blank? %>
         <dt><%= t('activerecord.attributes.user_profile.name') %></dt>
         <dd><%= user.full_name %></dd>
     <% end %>
@@ -33,10 +33,9 @@
         <dt><%= t('activerecord.attributes.user.email') %></dt>
         <dd><%= user.email %></dd>
     <% end %>
-    <% unless user.profile&.gender.blank? %>
+    <% unless user.profile_data['gender'].blank? %>
         <dt><%= t('activerecord.attributes.user_profile.gender') %></dt>
-        <dd><%= t("activerecord.attributes.user_profile.genders.#{user.user_profile.gender}") %></dd>
+        <dd><%= gender_name(user.profile_data['gender']) %></dd>
     <% end %>
   </dl>
-
 </article>

data/app/views/shared/_pagination.jbuilder

@@ -1,6 +1,10 @@
 if collection.respond_to?(:current_page)
   json.links do
     json.self url_for(page: collection.current_page, format: :json)
+    json.first url_for(page: 1, format: :json)
+    unless collection.prev_page.nil?
+      json.prev url_for(page: collection.prev_page, format: :json)
+    end
     unless collection.next_page.nil?
       json.next url_for(page: collection.next_page, format: :json)
     end

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

@@ -2,7 +2,12 @@
     <ol class="list-of-entities">
       <% collection.each do |entity| %>
           <li data-id="<%= entity.id %>" data-number="<%= entity.priority %>">
-            <%= render partial: "admin/#{entity.class.table_name}/entity/in_list", locals: { entity: entity } %>
+            <%=
+              render(
+                  partial: "admin/#{entity.class.table_name}/entity/in_list",
+                  locals: { entity: entity }
+              )
+            %>
           </li>
       <% end %>
     </ol>

data/app/views/shared/forms/_list_of_errors.js.erb

@@ -16,4 +16,6 @@
     errors.innerHTML = data;
 
     form.prepend(errors);
+
+    errors.scrollIntoView();
 }

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

@@ -0,0 +1,11 @@
+<script src="//cdn.ckeditor.com/4.8.0/full/ckeditor.js"></script>
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+        document.querySelectorAll('form [data-wysiwyg]').forEach(function(editor) {
+            CKEDITOR.replace(editor, {
+                filebrowserUploadUrl: '/media_files/ckeditor',
+                removePlugins: 'forms,save,preview,flash,bidi,language,print,templates,newpage,iframe,about,scayt,wsc',
+            });
+        });
+    });
+</script>

data/app/views/shared/forms/errors.js.erb

@@ -0,0 +1,5 @@
+<%
+entity_name = @entity.class.to_s.underscore
+list = @entity.errors.full_messages.map { |m| "'#{j(m)}'" }
+%>
+Biovision.show_list_of_errors('<%= entity_name %>', [<%= raw(list.join(',')) %>]);

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

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

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

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

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

@@ -1,89 +1,147 @@
-<%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
-
-<%= form_for entity do |f| %>
-
-
-    <dl>
-      <dt><%= f.label :image %></dt>
-      <dd>
-        <figure id="user-image">
-          <%= f.label(:image, image_tag(entity.image.profile.url, alt: t(:current_image))) %>
-          <figcaption>
-            <%= f.file_field :image, accept: 'image/jpeg,image/png', data: { image: 'user-image' } %>
-          </figcaption>
-        </figure>
-      </dd>
-
-      <dt><%= f.label :screen_name %></dt>
-      <dd>
-        <%= f.text_field :screen_name, size: 30, maxlength: User::SLUG_LIMIT %>
-      </dd>
-
-      <dt><%= f.label :email %></dt>
-      <dd>
-        <%= f.email_field :email, size: 30, maxlength: User::EMAIL_LIMIT %>
-      </dd>
-
-      <dt><%= f.label :phone %></dt>
-      <dd>
-        <%= f.phone_field :phone, size: 15, maxlength: User::PHONE_LIMIT %>
-      </dd>
-
-      <% if entity.id.blank? %>
-          <dt><%= f.label :password %></dt>
-          <dd>
-            <%= f.text_field :password, size: nil, maxlength: 70 %>
-          </dd>
-
-          <dt><%= f.label :password_confirmation %></dt>
-          <dd>
-            <%= f.text_field :password_confirmation, size: nil, maxlength: 70 %>
-          </dd>
-      <% end %>
-
-      <dt><%= label_tag :user_profile_name, t('activerecord.attributes.user_profile.name') %></dt>
+<% entity_type = entity.class.to_s.underscore %>
+<%= form_with(model: entity, html: { id: "#{entity_type}-form" }) do |f| %>
+  <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+
+  <dl>
+    <dt><%= f.label :image %></dt>
+    <dd>
+      <figure id="<%= entity_type %>-image" role="group" class="preview">
+        <%= f.label(:image, image_tag(entity.image.profile.url)) %>
+        <figcaption>
+          <%=
+            f.file_field(
+                :image,
+                id:     :user_image,
+                accept: 'image/jpeg,image/png',
+                data:   { image: "#{entity_type}-image" }
+            )
+          %>
+        </figcaption>
+      </figure>
+    </dd>
+
+    <dt><%= f.label :screen_name %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :screen_name,
+            maxlength: User::SCREEN_NAME_LIMIT,
+            pattern:   User::SCREEN_NAME_PATTERN_HTML,
+            title:     t('.guidelines.screen_name'),
+            required:  true
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.screen_name') %></div>
+    </dd>
+
+    <dt><%= f.label :email %></dt>
+    <dd>
+      <%=
+        f.email_field(
+            :email,
+            id:        :user_email,
+            size:      nil,
+            maxlength: User::EMAIL_LIMIT,
+            readonly: entity.super_user?
+        )
+      %>
+    </dd>
+
+    <dt><%= f.label :phone %></dt>
+    <dd>
+      <%=
+        f.phone_field(
+            :phone,
+            id:        :user_phone,
+            size:      15,
+            maxlength: User::PHONE_LIMIT,
+            readonly: entity.super_user?
+        )
+      %>
+    </dd>
+
+    <dt><%= f.label :birthday %></dt>
+    <dd>
+      <%=
+        f.date_field(
+            :birthday,
+            id:   :user_birthday,
+            size: 10
+        )
+      %>
+    </dd>
+
+    <% if entity.id.blank? || !entity.super_user? %>
+      <dt><%= f.label :password %></dt>
       <dd>
-        <%= text_field_tag 'user_profile[name]', entity.user_profile&.name, size: 30, maxlength: UserProfile::NAME_LIMIT %>
+        <%=
+          f.text_field(
+              :password,
+              id:        :user_password,
+              size:      nil,
+              maxlength: 70,
+              required:  entity.id.nil?
+          )
+        %>
       </dd>
 
-      <dt><%= label_tag :user_profile_patronymic, t('activerecord.attributes.user_profile.patronymic') %></dt>
+      <dt><%= f.label :password_confirmation %></dt>
       <dd>
-        <%= text_field_tag 'user_profile[patronymic]', entity.user_profile&.patronymic, size: 30, maxlength: UserProfile::NAME_LIMIT %>
+        <%=
+          f.text_field(
+              :password_confirmation,
+              id:        :user_password_confirmation,
+              size:      nil,
+              maxlength: 70,
+              required:  entity.id.nil?
+          )
+        %>
       </dd>
-
-      <dt><%= label_tag :user_profile_surname, t('activerecord.attributes.user_profile.surname') %></dt>
-      <dd>
-        <%= text_field_tag 'user_profile[surname]', entity.user_profile&.surname, size: 30, maxlength: UserProfile::NAME_LIMIT %>
-      </dd>
-
-      <dt><%= label_tag :user_profile_gender, t('activerecord.attributes.user_profile.gender') %></dt>
-      <dd>
-        <%= select_tag 'user_profile[gender]', options_for_select(genders_for_select, entity.user_profile&.gender) %>
-      </dd>
-
-      <dt><%= label_tag :user_profile_birthday, t('activerecord.attributes.user_profile.birthday') %></dt>
-      <dd>
-        <%= date_field_tag 'user_profile[birthday]', entity.user_profile&.birthday, size: 10 %>
-      </dd>
-
-      <dt><%= f.label :notice %></dt>
-      <dd>
-        <%= f.text_field :notice, size: nil, maxlength: User::NOTICE_LIMIT %>
-      </dd>
-
-      <dt><%= t(:flags) %></dt>
-      <dd>
-        <ul>
-          <li><%= f.check_box :bot %><%= f.label :bot %></li>
-          <li><%= f.check_box :allow_login %><%= f.label :allow_login %></li>
-          <li><%= f.check_box :email_confirmed %><%= f.label :email_confirmed %></li>
-          <li><%= f.check_box :phone_confirmed %><%= f.label :phone_confirmed %></li>
-          <li><%= f.check_box :allow_mail %><%= f.label :allow_mail %></li>
-        </ul>
-      </dd>
-    </dl>
-
-    <div class="buttons">
-      <%= f.button t(:save), type: :submit %>
-    </div>
+    <% end %>
+
+    <%= render partial: 'users/form/profile_data', locals: { data: entity.profile_data } %>
+
+    <dt><%= f.label :notice %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :notice,
+            id: :user_notice,
+            size: nil,
+            maxlength: User::NOTICE_LIMIT
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.notice') %></div>
+    </dd>
+
+    <dt><%= t(:flags) %></dt>
+    <dd>
+      <ul>
+        <li>
+          <%= f.check_box :bot, id: :user_bot %>
+          <%= f.label :bot %>
+        </li>
+        <li>
+          <%= f.check_box :allow_login, id: :user_allow_login %>
+          <%= f.label :allow_login %>
+        </li>
+        <li>
+          <%= f.check_box :email_confirmed, id: :user_email_confirmed %>
+          <%= f.label :email_confirmed %>
+        </li>
+        <li>
+          <%= f.check_box :phone_confirmed, id: :user_phone_confirmed %>
+          <%= f.label :phone_confirmed %>
+        </li>
+        <li>
+          <%= f.check_box :allow_mail, id: :user_allow_mail %>
+          <%= f.label :allow_mail %>
+        </li>
+      </ul>
+    </dd>
+  </dl>
+
+  <div class="buttons">
+    <%= f.button t(:save), type: :submit, class: 'button-save' %>
+  </div>
 <% end %>

data/app/views/users/check.jbuilder

@@ -0,0 +1,4 @@
+json.meta do
+  json.valid @entity.valid?
+  json.errors @entity.errors
+end

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

@@ -8,7 +8,7 @@
 <article>
   <h1><%= t('.heading') %></h1>
   <ul class="actions">
-    <li><%= back_icon(admin_user_path(@entity.id)) %></li>
+    <li><%= back_icon(admin_user_path(id: @entity.id)) %></li>
     <% unless @entity.deleted? %>
         <li class="danger"><%= destroy_icon @entity %></li>
     <% end %>

data/app/views/users/form/_profile_data.html.erb

@@ -0,0 +1,53 @@
+<dt>
+  <%= label_tag :user_profile_name, t('activerecord.attributes.user_profile.name') %>
+</dt>
+<dd>
+  <%=
+    text_field_tag(
+        'user_profile[name]',
+        data['name'],
+        size: nil,
+        maxlength: 50
+    )
+  %>
+</dd>
+
+<dt>
+  <%= label_tag :user_profile_patronymic, t('activerecord.attributes.user_profile.patronymic') %>
+</dt>
+<dd>
+  <%=
+    text_field_tag(
+        'user_profile[patronymic]',
+        data['patronymic'],
+        size: nil,
+        maxlength: 50
+    )
+  %>
+</dd>
+
+<dt>
+  <%= label_tag :user_profile_surname, t('activerecord.attributes.user_profile.surname') %>
+</dt>
+<dd>
+  <%=
+    text_field_tag(
+        'user_profile[surname]',
+        data['surname'],
+        size: nil,
+        maxlength: 50
+    )
+  %>
+</dd>
+
+<dt>
+  <%= label_tag :user_profile_gender, t('activerecord.attributes.user_profile.gender') %>
+</dt>
+<dd>
+  <%=
+    select_tag(
+        'user_profile[gender]',
+        options_for_select(genders_for_select, data['gender'])
+    )
+  %>
+</dd>