biovision-base 0.19.180703.1 → 0.20.180731.0

data/app/views/feedback_mailer/new_feedback_request.html.erb

@@ -1,12 +1,23 @@
 <h1><%= t('.title') %></h1>
 
 <dl>
-  <dt><%= t('activerecord.attributes.feedback_request.name') %></dt>
-  <dd><%= @entity.name %></dd>
+  <% unless @entity.name.blank? %>
+    <dt><%= t('activerecord.attributes.feedback_request.name') %></dt>
+    <dd><%= @entity.name %></dd>
+  <% end %>
 
-  <dt><%= t('activerecord.attributes.feedback_request.email') %></dt>
-  <dd><%= @entity.email %></dd>
+  <% unless @entity.email.blank? %>
+    <dt><%= t('activerecord.attributes.feedback_request.email') %></dt>
+    <dd><%= @entity.email %></dd>
+  <% end %>
 
-  <dt><%= t('activerecord.attributes.feedback_request.phone') %></dt>
-  <dd><%= @entity.phone %></dd>
+  <% unless @entity.phone.blank? %>
+    <dt><%= t('activerecord.attributes.feedback_request.phone') %></dt>
+    <dd><%= @entity.phone %></dd>
+  <% end %>
+
+  <% unless @entity.comment.blank? %>
+    <dt><%= t('activerecord.attributes.feedback_request.comment') %></dt>
+    <dd><%= simple_format(@entity.comment) %></dd>
+  <% end %>
 </dl>

data/app/views/feedback_mailer/new_feedback_request.text.erb

@@ -1,5 +1,21 @@
 <%= t('.title') %>
 
-<%= t('activerecord.attributes.feedback_request.name') %>: <%= @entity.name %>
-<%= t('activerecord.attributes.feedback_request.email') %>: <%= @entity.email %>
-<%= t('activerecord.attributes.feedback_request.phone') %>: <%= @entity.phone %>
+<% unless @entity.name.blank? %>
+<%= t('activerecord.attributes.feedback_request.name') %>:
+  <%= @entity.name %>
+<% end %>
+<% unless @entity.email.blank? %>
+
+<%= t('activerecord.attributes.feedback_request.email') %>:
+  <%= @entity.email %>
+<% end %>
+<% unless @entity.phone.blank? %>
+
+<%= t('activerecord.attributes.feedback_request.phone') %>:
+  <%= @entity.phone %>
+<% end %>
+<% unless @entity.comment.blank? %>
+
+<%= t('activerecord.attributes.feedback_request.comment') %>:
+  <%= @entity.comment %>
+<% end %>

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

@@ -56,7 +56,7 @@
       %>
     <% end %>
     <div>
-      <%= f.check_box :consent, id: :feedback_request_consent %>
+      <%= f.check_box :consent, id: :feedback_request_consent, required: true %>
       <%= f.label :consent %>
     </div>
   </div>

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

@@ -5,6 +5,7 @@
       <ul>
         <li><%= link_to(t('about.index.nav_text'), about_path) %></li>
         <li><%= link_to(t('about.tos.nav_text'), tos_path) %></li>
+        <li><%= link_to(t('about.privacy.nav_text'), privacy_path) %></li>
         <% if UserPrivilege.user_has_any_privilege?(current_user) %>
             <li><%= link_to(t('admin.index.index.heading'), admin_path) %></li>
         <% end %>

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

@@ -31,7 +31,7 @@
             id:        "#{model_name}_slug",
             size:      nil,
             maxlength: LinkBlockItem::SLUG_LIMIT,
-            data: {
+            data:      {
                 check: :slug
             }
         )
@@ -101,10 +101,11 @@
       <%=
         f.text_area(
             :body,
-            id:   "#{model_name}_body",
-            cols: 80,
-            rows: 5,
-            data: {
+            id:    "#{model_name}_body",
+            cols:  80,
+            rows:  5,
+            class: 'auto-expand',
+            data:  {
                 check: :body
             }
         )

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

@@ -2,8 +2,8 @@
 <%=
   form_with(
       model: entity,
-      html: {
-          id: "#{model_name}-form",
+      html:  {
+          id:   "#{model_name}-form",
           data: { check_url: check_link_blocks_path }
       }
   ) do |f|
@@ -22,10 +22,10 @@
             id:        "#{model_name}_slug",
             size:      nil,
             maxlength: LinkBlock::SLUG_LIMIT,
-            pattern: LinkBlock::SLUG_PATTERN_HTML,
-            title: t('.guidelines.slug'),
+            pattern:   LinkBlock::SLUG_PATTERN_HTML,
+            title:     t('.guidelines.slug'),
             required:  true,
-            data: {
+            data:      {
                 check: :slug
             }
         )
@@ -42,7 +42,7 @@
             id:        "#{model_name}_title",
             size:      nil,
             maxlength: LinkBlock::TITLE_LIMIT,
-            data: {
+            data:      {
                 check: :title
             }
         )
@@ -56,11 +56,12 @@
       <%=
         f.text_area(
             :lead,
-            id:       "#{model_name}_lead",
-            cols:     80,
-            rows:     5,
-            max_length: LinkBlock::TEXT_LIMIT,
-            data: {
+            id:        "#{model_name}_lead",
+            cols:      80,
+            rows:      5,
+            maxlength: LinkBlock::TEXT_LIMIT,
+            class:     'auto-expand',
+            data:      {
                 check: :lead
             }
         )
@@ -74,11 +75,12 @@
       <%=
         f.text_area(
             :footer_text,
-            id:       "#{model_name}_footer_text",
-            cols:     80,
-            rows:     5,
-            max_length: LinkBlock::TEXT_LIMIT,
-            data: {
+            id:        "#{model_name}_footer_text",
+            cols:      80,
+            rows:      5,
+            maxlength: LinkBlock::TEXT_LIMIT,
+            class:     'auto-expand',
+            data:      {
                 check: :footer_text
             }
         )

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

@@ -1,5 +1,5 @@
 <%
-entity_name = @entity.class.to_s.underscore
+model_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(',')) %>]);
+Biovision.showListOfErrors('<%= model_name %>', [<%= raw(list.join(',')) %>]);

data/config/locales/common-en.yml

@@ -74,11 +74,12 @@ en:
   languages:
     english: "English"
     russian: "Russian"
+    swedish: "Swedish"
   list: "List"
   locked: "Editing is forbidden"
   "no": "No"
   not_selected: "Not selected"
-  not_set: "Not send"
+  not_set: "Not set"
   nothing_found: "Nothing was found"
   page: "Page"
   remove_image: "Remove image"
@@ -160,6 +161,8 @@ en:
       message: "Page content is not ready, please come back later."
     index:
       nav_text: "About us"
+    privacy:
+      nav_text: "Privacy policy"
     tos:
       nav_text: "Terms of service"
   total: "Total"

data/config/locales/common-ru.yml

@@ -75,6 +75,7 @@ ru:
   languages:
     english: "Английский"
     russian: "Русский"
+    swedish: "Шведский"
   list: "К списку"
   locked: "Редактирование зарещено"
   "no": "Нет"
@@ -161,6 +162,8 @@ ru:
       message: "Информация ещё не готова, зайдите позже"
     index:
       nav_text: "О проекте"
+    privacy:
+      nav_text: "Политика конфиденциальности"
     tos:
       nav_text: "Пользовательское соглашение"
   total: "Всего"

data/config/locales/common-sv.yml

@@ -0,0 +1,168 @@
+sv:
+  activerecord:
+    models:
+      language: "Språk"
+    attributes:
+      language:
+        slug: "Pollett"
+        code: "Kod"
+  error_count:
+    zero: "inga fel"
+    one: "%{count} fel"
+    few: "%{count} fel"
+    many: "%{count} fel"
+    other: "%{count} fel"
+  errors:
+    messages:
+      extension_blacklist_error: "är svartlistat"
+    error:
+      bad_request:
+        title: "Dålig förfrågan"
+        heading: "Dålig förfrågan"
+        message: "Du har utfört en felaktig förfrågan, kolla och försök igen."
+      unauthorized:
+        title: "Obehörig"
+        heading: "Obehörig"
+        message: "Du har inte behörighet till den här sidan."
+      forbidden:
+        title: "Förbjuden"
+        heading: "Förbjuden"
+        message: "Denna åtgärd är förbjuden."
+      not_found:
+        title: "Hittades inte"
+        heading: "Hittades inte"
+        message: "Sidan hittades inte."
+      unprocessable_entity:
+        title: "Obearbetbar enhet"
+        heading: "Obearbetbar enhet"
+        message: "Din förfrågan kunde inte behandlas."
+      internal_server_error:
+        title: "Internt serverfel"
+        heading: "Internt serverfel"
+        message: "Något gick fel. Vänligen försök igen senare."
+  date:
+    nominative_months:
+      -
+      - "januari"
+      - "februari"
+      - "mars"
+      - "april"
+      - "maj"
+      - "juni"
+      - "juli"
+      - "augusti"
+      - "september"
+      - "oktober"
+      - "november"
+      - "december"
+  archive_year: " i år %{year}"
+  archive_month: " i %{month} av %{year}"
+  are_you_sure: "Är du säker?"
+  back: "Tillbaka"
+  copyright: "2018"
+  create: "Skapa"
+  created_at: "Skapad vid"
+  current_image: "Nuvarande bild"
+  delete: "Radera"
+  deleted_entity: "Delad enhet"
+  edit: "Redigera"
+  filter: "Filtrera"
+  find: "Hitta"
+  flags: "Flaggor"
+  hide: "Dölj"
+  home: "Hem"
+  languages:
+    english: "Engelsk"
+    russian: "Ryska"
+    swedish: "Svenska"
+  list: "Lista"
+  locked: "Redigering är förbjuden"
+  "no": "Nej"
+  not_selected: "Ej valt"
+  not_set: "Inte inställd"
+  nothing_found: "Ingenting hittades"
+  page: "Sida"
+  remove_image: "Ta bort bilden"
+  save: "Spara"
+  submit: "Lämna"
+  unlocked: "Redigering är tillåten"
+  untitled: "Ofrälse"
+  update: "Uppdatering"
+  updated_at: "Uppdaterad på"
+  view: "Se"
+  view_as_administrator: "Visa som administratör"
+  view_as_visitor: "Visa som besökare"
+  "yes": "Ja"
+  views:
+    pagination:
+      first: "⇤"
+      last: "⇥"
+      previous: "←"
+      next: "→"
+      truncate: "…"
+  shared:
+    flash_messages:
+      notice: "Meddelande"
+      warning: "Förmaning"
+      alert: "Varning"
+    meta_texts:
+      site_name: "example.com"
+      twitter_site: ""
+      twitter_creator: ""
+  admin:
+    index:
+      index:
+        title: "Administrering"
+        heading: "Administrering"
+      dashboard:
+        biovision_user:
+          heading: "Användarmodul"
+        biovision_track:
+          heading: "Metrik"
+        editorial:
+          heading: "Redaktionell"
+        settings:
+          heading: "Inställningar"
+  index:
+    navigation:
+      index:
+        index: "Huvudsida"
+    index:
+      title: "Hemsida"
+      description: "Ny webbplats på Biovision CMS"
+      heading: "Välkommen"
+  application:
+    not_found:
+      title: "Sidan hittades inte"
+      heading: "Sidan hittades inte"
+      message: "Sidan finns inte eller raderas"
+    unauthorized:
+      title: "Obehörig"
+      heading: "Obehörig"
+      message: "Du har inte behörighet till den här sidan."
+    service_unavailable:
+      title: "Tjänsten är inte tillgänglig"
+      heading: "Tjänsten är inte tillgänglig"
+      message: "Tjänsten är tillfälligt otillgänglig. Försök igen senare."
+    error:
+      title: "Serverfel"
+      heading: "Något gick fel"
+      message: "Internt serverfel har inträffat. Försök igen senare."
+  layouts:
+    admin:
+      footer:
+        support: "Stöd"
+  about:
+    contact:
+      nav_text: "Kontakta"
+    editable:
+      title: "Pågående"
+      heading: "Innehållet är inte klart"
+      message: "Sidinnehållet är inte klart, kom tillbaka senare."
+    index:
+      nav_text: "Om oss"
+    privacy:
+      nav_text: "Integritetspolicy"
+    tos:
+      nav_text: "Användarvillkor"
+  total: "Total"

data/config/locales/editable-pages-en.yml

@@ -1,9 +1,23 @@
 en:
   activerecord:
     models:
+      editable_block: "Editable block"
       editable_page: "Editable page"
       stored_value: "Stored value"
     attributes:
+      editable_block:
+        body: "Main text"
+        description: "Description"
+        footer: "Footer text"
+        image: "Image"
+        language: "Language"
+        language_id: "Language"
+        lead: "Lead (before main text)"
+        name: "Name"
+        raw_output: "Raw output"
+        slug: "Slug"
+        title: "Title (before lead)"
+        visible: "Visible"
       editable_page:
         body: "Body"
         description: "Description"
@@ -20,6 +34,15 @@ en:
         slug: "Slug"
         value: "Value"
   admin:
+    editable_blocks:
+      show:
+        title: "Editable block '%{slug}'"
+      nav_item:
+        text: "Editable blocks"
+        description: "Manage editable blocks"
+      index:
+        title: "Editable blocks"
+        heading: "Editable blocks"
     editable_pages:
       nav_item:
         description: "Managing editable pages"
@@ -28,7 +51,7 @@ en:
         heading: "Editable pages"
         title: "Editable pages"
       show:
-        title: "Editable page \"%{name}\""
+        title: "Editable page '%{name}'"
     stored_values:
       nav_item:
         description: "Managing stored values"
@@ -37,7 +60,30 @@ en:
         heading: "Stored values"
         title: "Stored values"
       show:
-        title: "Stored value \"%{slug}\""
+        title: "Stored value '%{slug}'"
+  editable_blocks:
+    new:
+      heading: "New editable block"
+      nav_text: "Create"
+      title: "New editable block"
+    edit:
+      heading: "Editing editable block"
+      nav_text: "Edit"
+      title: "Editing editable block"
+    destroy:
+      success: "Editable block has been deleted"
+    form:
+      guidelines:
+        body: "Maximum 5000 characters."
+        description: "For administrative purposes. Maximum 250 characters."
+        footer: "Maximum 5000 characters."
+        image: "Image in JPG or PNG format with dimensions up to 1280×640 for background."
+        lead: "Maximum 5000 characters."
+        name: "Used for more convenient management. Maximum 100 characters."
+        slug: "Only latin letters, numbers, dash or underscore (except start or end). 2 to 50 characters."
+        title: "Maximum 100 characters."
+    update:
+      success: "Editable block has been updated"
   editable_pages:
     new:
       title: "New editable page"