From 7495ca89efb4cc39a61d160c184f93939e8ec8b8 Mon Sep 17 00:00:00 2001 From: Stella Rouzi Date: Sun, 12 Jan 2020 21:25:54 +0200 Subject: [PATCH 1/2] Change font for registration item in user menu --- app/views/layouts/_user_menu.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_user_menu.html.haml b/app/views/layouts/_user_menu.html.haml index 5465a66a..b839f913 100644 --- a/app/views/layouts/_user_menu.html.haml +++ b/app/views/layouts/_user_menu.html.haml @@ -23,8 +23,8 @@ %li = link_to(conference_conference_registration_path(@conference)) do %span.fa.fa-id-badge - = @conference.short_title - registration + = @conference.short_title + registration -if @conference && @conference.program %li = link_to(conference_program_proposals_path(@conference.short_title)) do From 780d37eb4167b1aeb90cfce4a260cff05cdb0eb0 Mon Sep 17 00:00:00 2001 From: Stella Rouzi Date: Sun, 12 Jan 2020 23:04:11 +0200 Subject: [PATCH 2/2] Enable datepicker for readonly fields Remove minDate definition, so that value appears in readonly input --- app/assets/javascripts/osem-datepickers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/osem-datepickers.js b/app/assets/javascripts/osem-datepickers.js index c11c61a9..0a4c89bb 100644 --- a/app/assets/javascripts/osem-datepickers.js +++ b/app/assets/javascripts/osem-datepickers.js @@ -15,13 +15,13 @@ $(function () { $("#conference-start-datepicker").datetimepicker({ useCurrent: false, + ignoreReadonly: true, format: "YYYY-MM-DD", - // conference-start-day >= Current_date - minDate : today }); $("#conference-end-datepicker").datetimepicker({ useCurrent: false, + ignoreReadonly: true, format: "YYYY-MM-DD" });