Merge branch 'master' of https://github.com/noesya/osuny

app/controllers/admin/communication/unsplash_controller.rb

@@ -11,9 +11,9 @@ class Admin::Communication::UnsplashController < Admin::Communication::Applicati
         query: params[:query],
         page: (params[:page].presence || 1),
         per_page: (params[:per_page].presence || 10),
-        orientation: (params[:orientation].presence || 'squarish'),
         lang: (params[:lang].presence || 'en')
       }
+      p[:orientation] = params[:orientation] if params.has_key? :orientation
       @search = Unsplash::Search.search "/search/photos", Unsplash::Photo, p
       @total = @search.total
       @total_pages = @search.total_pages

app/views/admin/education/diplomas/_list.html.erb

@@ -3,6 +3,7 @@
     <tr>
       <th><%= Education::Diploma.human_attribute_name('name') %></th>
       <th><%= Education::Diploma.human_attribute_name('short_name') %></th>
+      <th><%= Education::Diploma.human_attribute_name('ects') %></th>
       <th><%= Education::Diploma.human_attribute_name('level') %></th>
       <th><%= Education::Diploma.human_attribute_name('programs') %></th>
       <th></th>
@@ -13,6 +14,7 @@
       <tr>
         <td><%= link_to diploma, [:admin, diploma] %></td>
         <td><%= diploma.short_name %></td>
+        <td><%= diploma.ects %></td>
         <td><%= diploma.level_i18n %></td>
         <td><%= diploma.programs.count %></td>
         <td class="text-end">

app/views/admin/education/diplomas/static.html.erb

@@ -3,4 +3,8 @@ title: >
   <%= @about.name %>
 short_name: >
   <%= @about.short_name %>
+level: <%= @about.level_i18n %>
+ects: <%= @about.ects %>
+duration: >
+  <%= prepare_text_for_static @about.duration %>
 ---

app/views/admin/education/programs/static.html.erb

@@ -42,14 +42,11 @@ roles:
 roles: []
 <% end %>
 continuing: <%= @about.continuing %>
-level: <%= @about.diploma&.level %>
-ects: <%= @about.diploma&.ects %>
 <%
 [
   :accessibility,
   :contacts,
   :content,
-  :duration,
   :evaluation,
   :objectives,
   :opportunities,