diff --git a/app/controllers/admin/communication/unsplash_controller.rb b/app/controllers/admin/communication/unsplash_controller.rb index f3ecdc1479e1f2199f3108480e867f856889bf9d..964023c35472cc05eea1139e46bc0552738addd9 100644 --- a/app/controllers/admin/communication/unsplash_controller.rb +++ b/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 diff --git a/app/views/admin/education/diplomas/_list.html.erb b/app/views/admin/education/diplomas/_list.html.erb index e7adc544efca6f34d7256ee8b0c5d22695b5a1f2..dd55353b3b6bced66b141dc9a6c66ef18832130f 100644 --- a/app/views/admin/education/diplomas/_list.html.erb +++ b/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"> diff --git a/app/views/admin/education/diplomas/static.html.erb b/app/views/admin/education/diplomas/static.html.erb index e0ca041da5dc6b06ef4292e9778105906b056ee6..5f0dadeff9a8fbf326b53c4bd6b6f738bb067ce5 100644 --- a/app/views/admin/education/diplomas/static.html.erb +++ b/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 %> --- diff --git a/app/views/admin/education/programs/static.html.erb b/app/views/admin/education/programs/static.html.erb index 1d9160ea01fad1755da2fb72171f06bad4ebdf10..caa4fcc189268ab0a8ff1d1fd086b08b980ce05d 100644 --- a/app/views/admin/education/programs/static.html.erb +++ b/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,