biovision-base 0.8.170916 → 0.8.171029

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

@@ -17,22 +17,28 @@
   <canvas id="metric-chart" width="640" height="480" data-source="<%= data_admin_metric_path(@entity.id) %>"></canvas>
 </article>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.bundle.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.0/Chart.bundle.min.js"></script>
 <script>
     'use strict';
-    $(function () {
-        let $canvas = $('#metric-chart');
-        $.get($canvas.data('source'), function (response) {
+
+    document.addEventListener('DOMContentLoaded', function () {
+        const canvas = document.getElementById('metric-chart');
+        const url = canvas.getAttribute('data-source');
+        const request = Biovision.new_ajax_request('GET', url, function () {
+            const response = JSON.parse(this.responseText);
+
             if (response.hasOwnProperty('data')) {
-                let metric = response['data'];
-                let labels = Object.keys(metric['graph_data']);
-                let myChart = new Chart($canvas[0], {
+                const metric = response.data;
+                const labels = Object.keys(metric.graph_data);
+                const myChart = new Chart(canvas, {
                     type: 'line',
                     data: {
                         labels: labels,
                         datasets: [{
-                            label: metric['name'],
-                            data: labels.map(function(k) { return metric['graph_data'][k]; } ),
+                            label: metric.name,
+                            data: labels.map(function (k) {
+                                return metric.graph_data.k;
+                            }),
                             borderWidth: 1
                         }]
                     },
@@ -40,13 +46,15 @@
                         scales: {
                             yAxes: [{
                                 ticks: {
-                                    beginAtZero: metric['start_with_zero']
+                                    beginAtZero: metric.start_with_zero
                                 }
                             }]
                         }
                     }
                 });
             }
-        }).fail(handle_ajax_failure);
+        });
+
+        request.send();
     });
-</script>
+</script>

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

@@ -14,17 +14,19 @@
 
       <script>
           'use strict';
-          $(function () {
-              $('ul.privilege-groups input[type=checkbox]').on('click', function () {
-                  var url = $(this).closest('li').data('url');
-                  var method = $(this).is(':checked') ? 'put' : 'delete';
 
-                  $.ajax(url, {
-                      method: method,
-                      success: function (response) {
-                          console.log(response);
-                      }
-                  }).fail(handle_ajax_failure);
+          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.new_ajax_request(method, url, function() {
+                          console.log(JSON.parse(this.responseText));
+                      });
+
+                      request.send();
+                  });
+
               });
           });
       </script>

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

@@ -24,7 +24,7 @@
   <%= render partial: 'admin/regions/toggleable', locals: { entity: entity } %>
 
   <ul class="actions">
-    <li class="lockable <%= entity.editable_by?(current_user) ? '' : 'hidden' %>">
+    <li class="lockable <%= (entity.editable_by?(current_user) && !entity.locked?) ? '' : 'hidden' %>">
       <%= edit_icon edit_region_path(entity) %>
     </li>
     <%= render partial: 'shared/actions/locks', locals: { entity: entity, path: lock_admin_region_path(entity) } %>

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

@@ -12,7 +12,7 @@
 
   <ul class="actions">
     <li><%= back_icon(admin_regions_path) %></li>
-    <% if @entity.editable_by?(current_user) %>
+    <% if @entity.editable_by?(current_user) && !@entity.locked? %>
         <li><%= edit_icon edit_region_path(@entity.id) %></li>
     <% end %>
   </ul>

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

@@ -3,20 +3,8 @@
       <legend><%= t(:filter) %></legend>
 
       <div>
-        <div><%= label_tag 'filter_screen_name', t('activerecord.attributes.user.screen_name') %></div>
-        <div><%= search_field_tag 'filter[screen_name]', filter[:screen_name], size: 30, results: 5, autosave: 'screen_name' %></div>
-      </div>
-
-<!--
-      <div>
-        <div><%= label_tag 'filter_name', t('activerecord.attributes.user.name') %></div>
-        <div><%= search_field_tag 'filter[name]', filter[:name], size: 30, results: 5, autosave: 'name' %></div>
-      </div>
--->
-
-      <div>
-        <div><%= label_tag 'filter_email', t('activerecord.attributes.user.email') %></div>
-        <div><%= search_field_tag 'filter[email]', filter[:email], size: 30, results: 5, autosave: 'email' %></div>
+        <div><%= label_tag 'q', t('.search') %></div>
+        <div><%= search_field_tag 'q', param_from_request(:q), size: 30, results: 5, autosave: 'user_search' %></div>
       </div>
 
       <div class="button"><%= button_tag t(:submit), type: :submit, name: '' %></div>

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

@@ -11,7 +11,7 @@
     <li><%= create_icon(new_user_path) %></li>
   </ul>
 
-  <%= render partial: 'filter', locals: { filter: @filter } %>
+  <%= render partial: 'filter' %>
 
   <%= paginate @collection %>
   <%= render partial: 'list', locals: { collection: @collection } %>

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

@@ -22,49 +22,64 @@
 <script>
     'use strict';
 
-    $(function () {
-        $('ul.privileges input[type=checkbox]').on('click', function () {
-            if ($(this).is(':visible')) {
-                let url = $(this).closest('div.entity').data('url');
-                let method = $(this).is(':checked') ? 'put' : 'delete';
-                let region_id = $(this).data('region-id');
-                let data = region_id > 0 ? { region_id: region_id } : {};
-
-                $.ajax(url, {
-                    method: method,
-                    data: data,
-                }).fail(handle_ajax_failure);
-            }
-        });
+    document.addEventListener('DOMContentLoaded', function () {
+        document.querySelectorAll('ul.privileges input[type=checkbox]').forEach(function (element) {
+            element.addEventListener('click', function () {
+                if (this.offsetParent !== null) {
+                    const url = this.closest('div.entity').getAttribute('data-url');
+                    const method = this.checked ? 'put' : 'delete';
+                    const region_id = this.getAttribute('data-region-id');
+                    const data = region_id > 0 ? {region_id: region_id} : {};
+                    const request = Biovision.new_ajax_request(method, url);
 
-        $(document).on('click', 'button.add_regions', function () {
-            let $button = $(this);
-            let $container = $(this).closest('ul');
-
-            $.get($container.data('url'), function (response) {
-                if (response.hasOwnProperty('data')) {
-                    $(response['data']).each(function(i, data) {
-                        if (data.hasOwnProperty('meta')) {
-                            $container.append('<li>' + data['meta']['html_chunk'] + '</li>');
-                        }
-                    });
+                    request.setRequestHeader("Content-Type", "application/json");
+                    request.send(JSON.stringify(data));
                 }
-                $button.closest('li').remove();
-            }).fail(handle_ajax_failure);
+            });
         });
 
-        $(document).on('click', 'input[type=checkbox].privilege-adder', function () {
-            let url = $(this).closest('div.entity').data('url');
-            let $li = $(this).closest('li');
-            let data = {region_id: $(this).val()};
+        document.addEventListener('click', function (event) {
+            const element = event.target;
 
-            $.ajax(url, {
-                method: 'put',
-                data: data,
-                success: function(response) {
-                    $li.find('ul.regions').remove();
-                }
-            }).fail(handle_ajax_failure);
+            if (element.matches('button.add_regions')) {
+                const container = element.closest('ul');
+                const url = container.getAttribute('data-url');
+                const request = Biovision.new_ajax_request('GET', url, function () {
+                    const response = JSON.parse(this.responseText);
+                    const li = element.closest('li');
+
+                    if (response.hasOwnProperty('data')) {
+                        response.data.forEach(function (data) {
+                            if (data.hasOwnProperty('meta')) {
+                                const item = document.createElement('li');
+
+                                item.innerHTML = data.meta.html_chunk;
+
+                                container.appendChild(item);
+                            }
+                        });
+                    }
+                    li.parentNode.removeChild(li);
+                });
+
+                request.send();
+            }
+
+            if (element.matches('input[type=checkbox].privilege-adder')) {
+                const url = element.closest('div.entity').getAttribute('data-url');
+                const li = element.closest('li');
+                const data = {region_id: element.value};
+                const list = li.querySelector('ul.regions');
+
+                const request = Biovision.new_ajax_request('put', url, function() {
+                    if (list) {
+                        list.parentNode.removeChild(list);
+                    }
+                });
+
+                request.setRequestHeader("Content-Type", "application/json");
+                request.send(JSON.stringify(data));
+            }
         });
     });
 </script>

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

@@ -23,31 +23,31 @@
     </fieldset>
 <% end %>
 
-<script>/*<![CDATA[*/
-"use strict";
-
-$(function() {
-  var $pagination = $('#agents-filter').find('div.pages');
-
-  function change_page(delta) {
-    var $field = $('#agent-filter-page');
-    var value = parseInt($field.val());
-
-    value += delta;
-    if (value < 1) {
-      value = 1;
-    }
-
-    $field.val(value);
-    $field.closest('form').submit();
-  }
-
-  $pagination.find('.previous-page').on('click', function() {
-    change_page(-1);
-  });
-
-  $pagination.find('.next-page').on('click', function () {
-    change_page(1);
-  });
-});
-/*]]>*/</script>
+<script>
+    "use strict";
+
+    document.addEventListener('DOMContentLoaded', function () {
+        const pagination = document.querySelector('#agents-filter div.pages');
+        const field = document.getElementById('agent-filter-page');
+
+        function change_page(delta) {
+            let value = parseInt(field.value);
+
+            value += delta;
+            if (value < 1) {
+                value = 1;
+            }
+
+            field.value = value;
+            field.closest('form').submit();
+        }
+
+        pagination.querySelector('.previous-page').addEventListener('click', function () {
+            change_page(-1);
+        });
+
+        pagination.querySelector('.next-page').addEventListener('click', function () {
+            change_page(1);
+        });
+    });
+</script>

data/app/views/authentication/new.jbuilder

@@ -0,0 +1,6 @@
+json.meta do
+  json.fields do
+    json.login t('activerecord.attributes.user.screen_name')
+    json.password t('activerecord.attributes.user.password')
+  end
+end

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

@@ -6,3 +6,9 @@
     <meta name="twitter:card" content="summary_large_image" />
     <meta name="twitter:description" content="<%= entity.description %>" />
 <% end %>
+
+<article>
+  <h1><%= entity.title %></h1>
+
+  <%= raw entity.body %>
+</article>

data/app/views/editable_pages/form/_ckeditor.html.erb

@@ -1,7 +1,7 @@
-<script src="//cdn.ckeditor.com/4.7.0/standard/ckeditor.js"></script>
+<script src="//cdn.ckeditor.com/4.7.3/standard/ckeditor.js"></script>
 <script>
-    $(function () {
-        var editor = document.getElementById('editable_page_body');
+    document.addEventListener('DOMContentLoaded', function () {
+        const editor = document.getElementById('editable_page_body');
 
         CKEDITOR.replace(editor, {
 //            filebrowserUploadUrl: '/illustrations',

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

@@ -11,7 +11,7 @@
 <body>
 <%= render 'layouts/admin/header' %>
 
-<main id="main" role="main">
+<main id="main">
   <%= render 'shared/flash_messages' %>
   <%= render 'shared/admin/breadcrumbs' %>
 

data/app/views/my/recoveries/show.html.erb

@@ -43,7 +43,7 @@
           <dd><%= email_field_tag :email, param_from_request(:email), required: true %></dd>
         </dl>
         <div>
-          <%= button_tag t('.send_code'), type: :submit %>
+          <%= button_tag t('.receive_code'), type: :submit %>
         </div>
     <% end %>
   </section>

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

@@ -0,0 +1,6 @@
+<% if content_for? :breadcrumbs %>
+    <nav class="breadcrumbs">
+      <%= link_to(t(:home), root_path) %>
+      <%= yield :breadcrumbs %>
+    </nav>
+<% end %>

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

@@ -1,11 +1,7 @@
 <% if entity.errors.any? %>
-    <section class="errors">
-      <h2><%= t(:error_count, count: entity.errors.count) %></h2>
-
-      <ol>
-        <% entity.errors.full_messages.each do |message| %>
-            <li><%= message %></li>
-        <% end %>
-      </ol>
-    </section>
+    <ol class="errors">
+      <% entity.errors.full_messages.each do |message| %>
+          <li><%= message %></li>
+      <% end %>
+    </ol>
 <% end %>

data/config/locales/common-ru.yml

@@ -25,36 +25,37 @@ ru:
       - "декабрь"
   archive_year: " за %{year} год"
   archive_month: " за %{month} %{year} года"
-  nothing_found: "Ничего не нашлось"
+  are_you_sure: "Вы уверены?"
+  back: "Назад"
+  copyright: "2017"
   create: "Создать"
-  view: "В просмотр"
-  list: "К списку"
-  edit: "Редактировать"
-  update: "Обновить"
+  created_at: "Время создания"
+  current_image: "Текущая картинка"
   delete: "Удалить"
-  submit: "Отправить"
-  save: "Сохранить"
-  back: "Назад"
+  deleted_entity: "Удалённый объект"
+  edit: "Редактировать"
+  filter: "Фильтр"
   find: "Найти"
-  are_you_sure: "Вы уверены?"
-  created_at: "Время создания"
-  updated_at: "Время обновления"
+  flags: "Флаги"
+  hide: "Скрыть"
+  home: "Главная"
+  list: "К списку"
+  locked: "Редактирование зарещено"
+  "no": "Нет"
   not_selected: "Не выбрано"
   not_set: "Не задано"
-  filter: "Фильтр"
-  "yes": "Да"
-  "no": "Нет"
+  nothing_found: "Ничего не нашлось"
   page: "Страница"
-  current_image: "Текущая картинка"
-  deleted_entity: "Удалённый объект"
-  locked: "Редактирование зарещено"
+  save: "Сохранить"
+  submit: "Отправить"
   unlocked: "Редактирование разрешено"
-  home: "Главная"
   untitled: "Без названия"
-  hide: "Скрыть"
-  copyright: "2017"
-  view_as_visitor: "Посмотреть на странице"
+  update: "Обновить"
+  updated_at: "Время обновления"
+  view: "В просмотр"
   view_as_administrator: "Посмотреть в админке"
+  view_as_visitor: "Посмотреть на странице"
+  "yes": "Да"
   views:
     pagination:
       first: "⇤"
@@ -108,4 +109,3 @@ ru:
       title: "Раздел в разработке"
       heading: "Раздел наполняется"
       message: "Информация ещё не готова, зайдите позже"
-  flags: "Флаги"