RubyGems - biovision-base - Versions diffs - 0.5.170614 → 0.7.170709 - Mend

biovision-base 0.5.170614 → 0.7.170709

Files changed (136) hide show

checksums.yaml +4 -4
data/README.md +12 -0
data/app/assets/images/biovision/base/placeholders/image.svg +1 -1
data/app/assets/images/biovision/base/placeholders/region_image.svg +1 -0
data/app/assets/stylesheets/biovision/base/admin.scss +226 -31
data/app/assets/stylesheets/biovision/base/biovision.scss +45 -104
data/app/assets/stylesheets/biovision/base/buttons.scss +3 -2
data/app/assets/stylesheets/biovision/base/default.scss +66 -45
data/app/assets/stylesheets/biovision/base/default_admin.scss +10 -0
data/app/assets/stylesheets/biovision/base/default_application.scss +8 -0
data/app/assets/stylesheets/biovision/base/filters.scss +4 -4
data/app/assets/stylesheets/biovision/base/layout.scss +113 -0
data/app/assets/stylesheets/biovision/base/message-box.scss +3 -3
data/app/assets/stylesheets/biovision/base/regions.scss +9 -0
data/app/assets/stylesheets/biovision/base/tootik.scss +6 -6
data/app/assets/stylesheets/biovision/base/track.scss +7 -6
data/app/assets/stylesheets/biovision/base/users.scss +64 -0
data/app/controllers/admin/login_attempts_controller.rb +6 -0
data/app/controllers/admin/privileges_controller.rb +37 -1
data/app/controllers/admin/regions_controller.rb +37 -0
data/app/controllers/admin/users_controller.rb +2 -2
data/app/controllers/authentication_controller.rb +27 -26
data/app/controllers/concerns/authentication.rb +20 -0
data/app/controllers/my/confirmations_controller.rb +8 -3
data/app/controllers/my/login_attempts_controller.rb +9 -0
data/app/controllers/my/profiles_controller.rb +10 -2
data/app/controllers/my/tokens_controller.rb +20 -0
data/app/controllers/regions_controller.rb +73 -0
data/app/helpers/biovision_regions_helper.rb +22 -0
data/app/mailers/application_mailer.rb +5 -0
data/app/mailers/user_mailer.rb +8 -0
data/app/models/central_region.rb +49 -0
data/app/models/concerns/required_unique_name.rb +1 -1
data/app/models/concerns/required_unique_slug.rb +1 -1
data/app/models/login_attempt.rb +24 -0
data/app/models/privilege.rb +176 -1
data/app/models/region.rb +100 -0
data/app/models/user.rb +118 -1
data/app/models/user_privilege.rb +52 -1
data/app/services/code_manager/confirmation.rb +1 -1
data/app/services/user_bouncer.rb +37 -0
data/app/uploaders/header_image_uploader.rb +50 -0
data/app/uploaders/region_image_uploader.rb +53 -0
data/app/views/admin/agents/entity/_preview.jbuilder +8 -0
data/app/views/admin/codes/index.html.erb +1 -1
data/app/views/admin/editable_pages/index.html.erb +1 -1
data/app/views/admin/index/index.html.erb +4 -0
data/app/views/admin/login_attempts/_nav_item.html.erb +6 -0
data/app/views/admin/login_attempts/entity/_in_list.html.erb +16 -0
data/app/views/admin/login_attempts/included/_agents.jbuilder +3 -0
data/app/views/admin/login_attempts/included/_users.jbuilder +3 -0
data/app/views/admin/login_attempts/index.html.erb +16 -0
data/app/views/admin/login_attempts/index.jbuilder +28 -0
data/app/views/admin/privilege_groups/index.html.erb +1 -1
data/app/views/admin/privileges/_toggleable.html.erb +7 -0
data/app/views/admin/privileges/entity/_in_list.html.erb +1 -0
data/app/views/admin/privileges/entity/_region.html.erb +12 -0
data/app/views/admin/privileges/regions.jbuilder +10 -0
data/app/views/admin/privileges/show.html.erb +2 -0
data/app/views/admin/regions/_nav_item.html.erb +2 -0
data/app/views/admin/regions/_toggleable.html.erb +7 -0
data/app/views/admin/regions/entity/_in_list.html.erb +32 -0
data/app/views/admin/regions/index.html.erb +22 -0
data/app/views/admin/regions/show.html.erb +95 -0
data/app/views/admin/tokens/index.html.erb +1 -1
data/app/views/admin/users/_search.html.erb +1 -1
data/app/views/admin/users/entity/_preview.jbuilder +12 -0
data/app/views/admin/users/entity/_privilege.html.erb +23 -7
data/app/views/admin/users/entity/_privilege_tree.html.erb +2 -2
data/app/views/admin/users/privileges.html.erb +47 -12
data/app/views/admin/users/show.html.erb +17 -1
data/app/views/admin/users/tokens.html.erb +1 -1
data/app/views/authentication/new.html.erb +1 -2
data/app/views/layouts/admin/_footer.html.erb +8 -0
data/app/views/layouts/application/_footer.html.erb +5 -0
data/app/views/layouts/application/_header.html.erb +9 -0
data/app/views/layouts/application/header/_authentication.html.erb +7 -0
data/app/views/layouts/application/header/_logo.html.erb +3 -0
data/app/views/layouts/application/header/_navigation.html.erb +0 -0
data/app/views/layouts/application/header/authentication/_links.html.erb +4 -0
data/app/views/layouts/application/header/authentication/_plate.html.erb +4 -0
data/app/views/layouts/mailer.html.erb +13 -0
data/app/views/layouts/mailer.text.erb +1 -0
data/app/views/my/confirmations/show.html.erb +11 -1
data/app/views/my/index/index.html.erb +6 -4
data/app/views/{admin/tokens → my/login_attempts}/_list.html.erb +1 -1
data/app/views/my/login_attempts/_nav_item.html.erb +6 -0
data/app/views/my/login_attempts/entity/_in_list.html.erb +13 -0
data/app/views/my/login_attempts/included/_agents.jbuilder +7 -0
data/app/views/my/login_attempts/index.html.erb +13 -0
data/app/views/my/login_attempts/index.jbuilder +22 -0
data/app/views/my/profiles/_nav_item.html.erb +6 -0
data/app/views/my/profiles/new/_form.html.erb +49 -23
data/app/views/my/profiles/new.html.erb +2 -2
data/app/views/{admin/codes → my/tokens}/_list.html.erb +1 -1
data/app/views/my/tokens/_nav_item.html.erb +6 -0
data/app/views/my/tokens/_toggleable.html.erb +7 -0
data/app/views/my/tokens/entity/_in_list.html.erb +18 -0
data/app/views/my/tokens/index.html.erb +13 -0
data/app/views/privileges/_form.html.erb +7 -0
data/app/views/regions/_form.html.erb +73 -0
data/app/views/regions/edit.html.erb +20 -0
data/app/views/regions/new.html.erb +17 -0
data/app/views/shared/_counters.html.erb +0 -0
data/app/views/shared/_pagination.jbuilder +9 -0
data/app/views/{admin/editable_pages → shared/admin}/_list.html.erb +2 -2
data/app/views/user_mailer/login_attempt.html.erb +7 -0
data/config/locales/common-ru.yml +5 -0
data/config/locales/editable-pages-ru.yml +1 -1
data/config/locales/regions-ru.yml +62 -0
data/config/locales/users-ru.yml +48 -6
data/config/routes.rb +19 -2
data/db/migrate/20170301000201_create_regions.rb +32 -0
data/db/migrate/20170302000001_create_users.rb +1 -0
data/db/migrate/20170302000101_create_privileges.rb +2 -0
data/db/migrate/20170302000102_create_user_privileges.rb +1 -0
data/db/migrate/20170302000103_create_privilege_groups.rb +1 -0
data/db/migrate/20170302000104_create_privilege_group_privileges.rb +4 -0
data/db/migrate/20170629120000_create_login_attempts.rb +19 -0
data/lib/biovision/base/engine.rb +6 -0
data/lib/biovision/base/privilege_methods.rb +21 -3
data/lib/biovision/base/version.rb +1 -1
data/lib/tasks/{biovision/agents.rake → agents.rake} +0 -0
data/lib/tasks/{biovision/browsers.rake → browsers.rake} +0 -0
data/lib/tasks/{biovision/codes.rake → codes.rake} +0 -0
data/lib/tasks/regions.rake +70 -0
data/lib/tasks/{biovision/tokens.rake → tokens.rake} +0 -0
data/lib/tasks/{biovision/users.rake → users.rake} +0 -0
metadata +75 -17
data/app/assets/stylesheets/biovision/base/fonts.scss +0 -9
data/app/controllers/concerns/biovision/admin/privileges.rb +0 -34
data/app/models/concerns/biovision/privilege_base.rb +0 -143
data/app/models/concerns/biovision/user_base.rb +0 -124
data/app/models/concerns/biovision/user_privilege_base.rb +0 -46
data/app/views/admin/privilege_groups/_list.html.erb +0 -11
data/app/views/authentication/_info.html.erb +0 -8

data/app/views/layouts/application/header/_logo.html.erb ADDED Viewed

@@ -0,0 +1,3 @@
+<div class="logo">
+  <%= link_to(t('shared.meta_texts.site_name'), root_path) %>
+</div>

data/app/views/layouts/application/header/_navigation.html.erb ADDED Viewed

File without changes

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

@@ -0,0 +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>

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

@@ -0,0 +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' %>
+</div>

data/app/views/layouts/mailer.html.erb ADDED Viewed

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/app/views/layouts/mailer.text.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ <%= yield %>

data/app/views/my/confirmations/show.html.erb CHANGED Viewed

@@ -5,7 +5,7 @@
   <% if current_user&.email_confirmed? %>
       <div class="message-box-notice"><%= t('activerecord.attributes.user.email_confirmed') %></div>
   <% else %>
-      <section>
+      <section id="confirmation-container">
         <h2><%= t('.got_code') %></h2>
         <%= form_tag my_confirmation_path, method: :patch do %>
             <div>
@@ -18,6 +18,16 @@
         <% end %>
       </section>
+      <% unless param_from_request(:instant).blank? %>
+          <script>
+              'use strict';
+              $(function () {
+                  $('#confirmation-container').find('form').submit();
+              });
+          </script>
+      <% end %>
       <section>
         <h2><%= t('.no_code') %></h2>
         <%= form_tag my_confirmation_path, method: :post do %>

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

@@ -6,10 +6,12 @@
   <div class="dashboard">
     <nav>
       <ul>
-        <li>
-          <div><%= link_to t('my.profiles.show.heading'), my_profile_path %></div>
-          <div class="description"><%= t('my.profiles.show.description') %></div>
-        </li>
+        <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>

data/app/views/{admin/tokens → my/login_attempts}/_list.html.erb RENAMED Viewed

@@ -2,7 +2,7 @@
     <ul class="list-of-entities">
       <% collection.each do |entity| %>
           <li data-id="<%= entity.id %>">
-            <%= render partial: 'admin/tokens/entity/in_list', locals: { entity: entity } %>
+            <%= render partial: 'my/login_attempts/entity/in_list', locals: { entity: entity } %>
           </li>
       <% end %>
     </ul>

data/app/views/my/login_attempts/_nav_item.html.erb ADDED Viewed

@@ -0,0 +1,6 @@
+<div>
+  <%= link_to t('.text'), my_login_attempts_path %>
+</div>
+<div class="description">
+  <%= t('.description') %>
+</div>

data/app/views/my/login_attempts/entity/_in_list.html.erb ADDED Viewed

@@ -0,0 +1,13 @@
+<div class="data">
+  <div><%= time_tag(entity.created_at) %></div>
+  <div class="info">
+    <%= t('activerecord.attributes.login_attempt.password') %>:
+    <%= entity.password %>
+  </div>
+  <div class="secondary info">
+    <div><%= entity.ip %></div>
+    <% unless entity.agent.blank? %>
+        <div class="truncate"><%= entity.agent.name %></div>
+    <% end %>
+  </div>
+</div>

data/app/views/my/login_attempts/included/_agents.jbuilder ADDED Viewed

@@ -0,0 +1,7 @@
+json.(agents) do |agent|
+  json.id agent.id
+  json.type agent.class.table_name
+  json.attributes do
+    json.(agent, :name)
+  end
+end

data/app/views/my/login_attempts/index.html.erb ADDED Viewed

@@ -0,0 +1,13 @@
+<% content_for :meta_title, t('.title', page: current_page) %>
+<% content_for :breadcrumbs do %>
+    <%= link_to(t('my.profiles.nav_item.text'), my_profile_path) %>
+    <span><%= t('my.login_attempts.nav_item.text') %></span>
+<% end %>
+<article class="entity-page">
+  <h1><%= t('.heading') %></h1>
+  <%= paginate @collection %>
+  <%= render partial: 'list', locals: { collection: @collection } %>
+  <%= paginate @collection %>
+</article>

data/app/views/my/login_attempts/index.jbuilder ADDED Viewed

@@ -0,0 +1,22 @@
+json.data @collection do |entity|
+  json.id entity.id
+  json.type entity.class.table_name
+  json.attributes do
+    json.(entity, :created_at, :password)
+    json.ip entity.ip.to_s
+  end
+  unless entity.agent.nil?
+    json.relationships do
+      json.agent do
+        json.data do
+          json.id entity.agent_id
+          json.type entity.agent.class.table_name
+        end
+      end
+    end
+  end
+end
+json.included do
+  json.partial! 'my/login_attempts/included/agents', locals: { agents: Agent.where(id: @collection.pluck(:agent_id).uniq) }
+end
+json.partial! 'shared/pagination', locals: { collection: @collection }

data/app/views/my/profiles/_nav_item.html.erb ADDED Viewed

@@ -0,0 +1,6 @@
+<div>
+  <%= link_to t('.text'), my_profile_path %>
+</div>
+<div class="description">
+  <%= t('.description') %>
+</div>

data/app/views/my/profiles/new/_form.html.erb CHANGED Viewed

@@ -1,34 +1,60 @@
-<section class="form">
-  <h2><%= t('.registration_form') %></h2>
+<section>
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
   <%= form_tag my_profile_path do %>
-      <div>
-        <div><%= label_tag :user_screen_name, t('activerecord.attributes.user.screen_name') %></div>
-        <%= text_field_tag 'user[screen_name]', entity.screen_name, required: true, size: 30, maxlength: 30 %>
-      </div>
-      <div>
-        <div><%= label_tag :user_password, t('activerecord.attributes.user.password') %></div>
-        <%= password_field_tag 'user[password]', '', required: true, size: 30, maxlength: 70 %>
-      </div>
-      <div>
-        <div><%= label_tag :user_password_confirmation, t('activerecord.attributes.user.password_confirmation') %></div>
-        <%= password_field_tag 'user[password_confirmation]', '', required: true, size: 30, maxlength: 70 %>
-      </div>
-      <div>
-        <div><%= label_tag :user_email, t('activerecord.attributes.user.email') %></div>
-        <%= email_field_tag 'user[email]', entity.email, size: 50, maxlength: User::EMAIL_LIMIT %>
-      </div>
-      <div>
+      <dl>
+        <dt>
+          <%= label_tag :user_screen_name, t('activerecord.attributes.user.screen_name') %>
+        </dt>
+        <dd>
+          <%= text_field_tag 'user[screen_name]', entity.screen_name, required: true, size: 30, maxlength: 30 %>
+          <div class="guideline"><%= t('.guidelines.screen_name') %></div>
+        </dd>
+        <dt>
+          <%= label_tag :user_password, t('activerecord.attributes.user.password') %>
+        </dt>
+        <dd>
+          <%= password_field_tag 'user[password]', '', required: true, size: nil, maxlength: 70 %>
+          <div class="guideline"><%= t('.guidelines.password') %></div>
+        </dd>
+        <dt>
+          <%= label_tag :user_password_confirmation, t('activerecord.attributes.user.password_confirmation') %>
+        </dt>
+        <dd>
+          <%= password_field_tag 'user[password_confirmation]', '', required: true, size: nil, maxlength: 70 %>
+          <div class="guideline"><%= t('.guidelines.password_confirmation') %></div>
+        </dd>
+        <dt>
+          <%= label_tag :user_email, t('activerecord.attributes.user.email') %>
+        </dt>
+        <dd>
+          <%= email_field_tag 'user[email]', entity.email, size: nil, maxlength: User::EMAIL_LIMIT, required: true %>
+          <div class="guideline"><%= t('.guidelines.email') %></div>
+        </dd>
+      </dl>
+      <ul class="flags">
+        <li>
+          <%= check_box_tag 'user[consent]', '1', false, required: true %>
+          <%= label_tag :user_consent, t('.consent') %>
+        </li>
+        <li>
+          <%= check_box_tag 'user[allow_mail]', '1', entity.allow_mail %>
+          <%= label_tag :user_allow_mail, t('activerecord.attributes.user.allow_mail') %>
+        </li>
+      </ul>
+      <div class="trap">
         <%= check_box_tag :agree %>
         <%= label_tag :agree, t('.i_am_bot') %>
       </div>
-      <div>
-        <p><%= t('.you_accept_terms_of_service') %></p>
-      </div>
       <div>
         <%= button_tag t('my.profiles.new.title'), type: :submit, name: 'button' %>
+        <%= link_to t('authentication.nav_item.log_in'), login_path, class: 'nav-button' %>
       </div>
   <% end %>
 </section>

data/app/views/my/profiles/new.html.erb CHANGED Viewed

@@ -1,7 +1,7 @@
 <% content_for :meta_title, t('.title') %>
-<article class="new-profile">
-  <h1><%= t('.title') %></h1>
+<article class="my-profile-new">
+  <h1><%= t('.heading') %></h1>
   <%= render partial: 'my/profiles/new/form', locals: { entity: @user } %>
 </article>

data/app/views/{admin/codes → my/tokens}/_list.html.erb RENAMED Viewed

@@ -2,7 +2,7 @@
     <ul class="list-of-entities">
       <% collection.each do |entity| %>
           <li data-id="<%= entity.id %>">
-            <%= render partial: 'admin/codes/entity/in_list', locals: { entity: entity } %>
+            <%= render partial: 'my/tokens/entity/in_list', locals: { entity: entity } %>
           </li>
       <% end %>
     </ul>

data/app/views/my/tokens/_nav_item.html.erb ADDED Viewed

@@ -0,0 +1,6 @@
+<div>
+  <%= link_to t('.text'), my_tokens_path %>
+</div>
+<div class="description">
+  <%= t('.description') %>
+</div>

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

@@ -0,0 +1,7 @@
+<div class="toggleable" data-url="<%= toggle_my_token_path(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}") %>
+  </span>
+  <% end %>
+</div>

data/app/views/my/tokens/entity/_in_list.html.erb ADDED Viewed

@@ -0,0 +1,18 @@
+<div class="data">
+  <div><%= "#{entity.ip}/#{entity.token}" %></div>
+  <div class="info">
+    <% unless entity.last_used.nil? %>
+        <div>
+          <%= t('activerecord.attributes.token.last_used') %>
+          <%= time_tag entity.last_used %>
+        </div>
+    <% end %>
+  </div>
+  <div class="secondary info">
+    <div><%= t(:created_at) %>: <%= time_tag(entity.created_at) %></div>
+    <% unless entity.agent.blank? %>
+        <div class="truncate"><%= entity.agent.name %></div>
+    <% end %>
+  </div>
+  <%= render partial: 'my/tokens/toggleable', locals: { entity: entity } %>
+</div>

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

@@ -0,0 +1,13 @@
+<% content_for :meta_title, t('.title', page: current_page) %>
+<% content_for :breadcrumbs do %>
+    <%= link_to(t('my.profiles.nav_item.text'), my_profile_path) %>
+    <span><%= t('my.tokens.nav_item.text') %></span>
+<% end %>
+<article class="entity-page">
+  <h1><%= t('.heading') %></h1>
+  <%= paginate @collection %>
+  <%= render partial: 'list', locals: { collection: @collection } %>
+  <%= paginate @collection %>
+</article>

data/app/views/privileges/_form.html.erb CHANGED Viewed

@@ -35,6 +35,13 @@
       </dd>
     </dl>
+    <ul class="flags">
+      <li>
+        <%= f.check_box :regional %>
+        <%= f.label :regional %>
+      </li>
+    </ul>
     <div class="buttons">
       <%= f.hidden_field :parent_id if entity.id.nil? %>
       <%= f.button t(:save), type: :submit %>

data/app/views/regions/_form.html.erb ADDED Viewed

@@ -0,0 +1,73 @@
+<%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+<%= form_for entity do |f| %>
+    <dl>
+      <dt><%= f.label :image %></dt>
+      <dd>
+        <figure class="preview" id="region-image">
+          <% if entity.image.blank? %>
+              <% image = image_tag('biovision/base/placeholders/region_image.svg') %>
+          <% else %>
+              <% image = image_tag(entity.image.url) %>
+          <% end %>
+          <%= label_tag('region_image', image) %>
+          <figcaption>
+            <%= f.file_field :image, accept: 'image/jpeg,image/png', data: { image: 'region-image' } %>
+          </figcaption>
+        </figure>
+      </dd>
+      <dt><%= f.label :header_image %></dt>
+      <dd>
+        <figure class="preview" id="region-header-image">
+          <% if entity.header_image.blank? %>
+              <% header_image = image_tag('biovision/base/placeholders/image.svg') %>
+          <% else %>
+              <% header_image = image_tag(entity.header_image.medium.url) %>
+          <% end %>
+          <%= label_tag('region_header_image', header_image) %>
+          <figcaption>
+            <%= f.file_field :header_image, accept: 'image/jpeg,image/png', data: { image: 'region-header-image' } %>
+            <div class="guideline"><%= t('.guidelines.header_image') %></div>
+          </figcaption>
+        </figure>
+      </dd>
+      <dt><%= f.label :name %></dt>
+      <dd>
+        <%= f.text_field :name, required: true, size: nil, maxlength: Region::NAME_LIMIT %>
+      </dd>
+      <dt><%= f.label :short_name %></dt>
+      <dd>
+        <%= f.text_field :short_name, required: true, size: nil, maxlength: Region::NAME_LIMIT %>
+        <div class="guideline">
+          <%= t('.guidelines.short_name') %>
+        </div>
+      </dd>
+      <dt><%= f.label :locative %></dt>
+      <dd>
+        <%= f.text_field :locative, required: true, size: nil, maxlength: Region::NAME_LIMIT, placeholder: t('.placeholders.locative') %>
+        <div class="guideline">
+          <%= t('.guidelines.locative') %>
+        </div>
+      </dd>
+      <dt><%= f.label :slug %></dt>
+      <dd>
+        <%= f.text_field :slug, required: true, size: nil, maxlength: Region::SLUG_LIMIT %>
+        <div class="guideline">
+          <%= t('.guidelines.slug') %>
+        </div>
+      </dd>
+    </dl>
+    <ul class="flags">
+      <li><%= f.check_box :visible %><%= f.label :visible %></li>
+    </ul>
+    <div class="buttons">
+      <%= f.hidden_field :parent_id if entity.id.nil? %>
+      <%= f.button t(:save), type: :submit %>
+    </div>
+<% end %>

data/app/views/regions/edit.html.erb ADDED Viewed

@@ -0,0 +1,20 @@
+<% content_for :meta_title, t('.title') %>
+<% content_for :breadcrumbs do %>
+    <%= link_to(t('admin.regions.nav_item.text'), admin_regions_path) %>
+    <% @entity.parents.each do |parent| %>
+        <%= admin_region_link(parent) %>
+    <% end %>
+    <%= admin_region_link(@entity) %>
+    <span><%= t(:edit) %></span>
+<% end %>
+<article class="entity-page">
+  <h1><%= t('.title') %></h1>
+  <ul class="actions">
+    <li><%= return_icon(admin_region_path(@entity.id)) %></li>
+    <li class="danger"><%= destroy_icon(@entity) %></li>
+  </ul>
+  <%= render partial: 'form', locals: { entity: @entity } %>
+</article>

data/app/views/regions/new.html.erb ADDED Viewed

@@ -0,0 +1,17 @@
+<% content_for :meta_title, t('.title') %>
+<% content_for :breadcrumbs do %>
+    <%= link_to(t('admin.regions.nav_item.text'), admin_regions_path) %>
+    <span><%= t(:create) %></span>
+<% end %>
+<article class="entity-page">
+  <h1><%= t('.heading') %></h1>
+  <% unless @entity.parent.nil? %>
+      <ul class="actions">
+        <li><%= return_icon(admin_region_path(@entity.parent_id)) %></li>
+      </ul>
+  <% end %>
+  <%= render partial: 'form', locals: { entity: @entity } %>
+</article>

data/app/views/shared/_counters.html.erb ADDED Viewed

File without changes

data/app/views/shared/_pagination.jbuilder ADDED Viewed

@@ -0,0 +1,9 @@
+if collection.respond_to?(:current_page)
+  json.links do
+    json.self url_for(page: collection.current_page)
+    unless collection.next_page.nil?
+      json.next url_for(page: collection.next_page)
+    end
+    json.last url_for(page: collection.total_pages)
+  end
+end

data/app/views/{admin/editable_pages → shared/admin}/_list.html.erb RENAMED Viewed

@@ -1,8 +1,8 @@
 <% if collection.any? %>
     <ul class="list-of-entities">
       <% collection.each do |entity| %>
-          <li>
-            <%= render partial: 'admin/editable_pages/entity/in_list', locals: { entity: entity } %>
+          <li data-id="<%= entity.id %>">
+            <%= render partial: "admin/#{entity.class.table_name}/entity/in_list", locals: { entity: entity } %>
           </li>
       <% end %>
     </ul>

data/app/views/user_mailer/login_attempt.html.erb ADDED Viewed

@@ -0,0 +1,7 @@
+<h1><%= t('.greeting', name: @user.profile_name) %></h1>
+<p><%= t('.message') %></p>
+<p>
+  <%= t('.you_can_recover_password') %>:
+  <%= link_to(my_recovery_url, my_recovery_url) %>
+</p>

data/config/locales/common-ru.yml CHANGED Viewed

@@ -52,6 +52,7 @@ ru:
   home: "Главная"
   untitled: "Без названия"
   hide: "Скрыть"
+  copyright: "2017"
   view_as_visitor: "Посмотреть на странице"
   view_as_administrator: "Посмотреть в админке"
   views:
@@ -94,3 +95,7 @@ ru:
       title: "Сервис недоступен"
       heading: "Сервис недоступен"
       message: "Сервис временно недоступен. Попробуйте повторить попытку позже"
+  layouts:
+    admin:
+      footer:
+        support: "Поддержка"

data/config/locales/editable-pages-ru.yml CHANGED Viewed

@@ -29,7 +29,7 @@ ru:
       title: "Редактирование редактируемой страницы"
       heading: "Редактирование редактируемой страницы"
     update:
-      success: "Редактируемая страница успешно изменера"
+      success: "Редактируемая страница успешно изменена"
     destroy:
       success: "Редактируемая страница успешно удалена"
     form:

data/config/locales/regions-ru.yml ADDED Viewed

@@ -0,0 +1,62 @@
+ru:
+  activerecord:
+    models:
+      region: "Регион"
+    attributes:
+      region:
+        parent_id: "Родительский регион"
+        visible: "Показывать"
+        name: "Название"
+        slug: "Код"
+        long_slug: "Код для пути в URL"
+        image: "Герб"
+        header_image: "Картинка для шапки"
+        parents_cache: "Кеш родителей"
+        children_cache: "Кеш дочек"
+        latitude: "Широта центральной точки"
+        longitude: "Долгота центральной точки"
+        short_name: "Короткое название"
+        locative: "Локатив"
+      central_region:
+        name: "Центр"
+        short_name: "Центр"
+        locative: "в центре"
+  admin:
+    regions:
+      nav_item:
+        text: "Регионы"
+        description: "Управление регионами"
+      index:
+        title: "Регионы"
+        heading: "Регионы"
+      show:
+        title: "Регион «%{name}»"
+        children: "Дочерние регионы"
+    users:
+      entity:
+        privilege:
+          select_regions: "Выбрать регионы…"
+    privileges:
+      entity:
+        region:
+          deeper_level: "Уровни глубже…"
+  regions:
+    new:
+      title: "Новый регион"
+      heading: "Добавление региона"
+    edit:
+      title: "Редактирование региона"
+      heading: "Редактирование региона"
+      forbidden: "Редактирование этого региона запрещено"
+    update:
+      success: "Регион успешно изменён"
+    destroy:
+      success: "Регион успешно удалён"
+    form:
+      placeholders:
+        locative: "в Москве"
+      guidelines:
+        header_image: "Картинка в формате JPG или PNG размером 1000×220 (лишнее будет обрезано автоматически)"
+        slug: "Используется адресной строке. Только латинские буквы, дефис (кроме границ) и цифры, до 63 символов."
+        short_name: "Используется в списках"
+        locative: "Используется в предложениях вида «в таком-то регионе»"