diff --git a/app/assets/images/forms/promo.svg b/app/assets/images/forms/promo.svg new file mode 100644 index 0000000000..110977de5d --- /dev/null +++ b/app/assets/images/forms/promo.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/controllers/forms_controller.rb b/app/controllers/forms_controller.rb index 0649d2158d..4646ce56a6 100644 --- a/app/controllers/forms_controller.rb +++ b/app/controllers/forms_controller.rb @@ -223,7 +223,7 @@ def form_params end def check_forms_enabled - render_404 unless Form.forms_enabled? + render :promo unless Form.forms_enabled? end def log_activity(form, type_of, message_items = {}) diff --git a/app/helpers/left_menu_bar_helper.rb b/app/helpers/left_menu_bar_helper.rb index 22ce21335d..9116dd2ea9 100644 --- a/app/helpers/left_menu_bar_helper.rb +++ b/app/helpers/left_menu_bar_helper.rb @@ -34,7 +34,22 @@ def left_menu_elements name: t('left_menu_bar.templates'), icon: 'sn-icon-protocols-templates', active: protocols_are_selected? || label_templates_are_selected? || forms_are_selected?, - submenu: template_submenu + submenu: [ + { + url: forms_path, + name: t('left_menu_bar.forms'), + active: forms_are_selected? + }, + { + url: protocols_path, + name: t('left_menu_bar.protocol'), + active: protocols_are_selected? + }, { + url: label_templates_path, + name: t('left_menu_bar.label'), + active: label_templates_are_selected? + } + ] }, { url: reports_path, name: t('left_menu_bar.reports'), @@ -91,27 +106,4 @@ def settings_are_selected? def activities_are_selected? controller_name == 'global_activities' end - - def template_submenu - submenu = [ - { - url: protocols_path, - name: t('left_menu_bar.protocol'), - active: protocols_are_selected? - }, { - url: label_templates_path, - name: t('left_menu_bar.label'), - active: label_templates_are_selected? - } - ] - - if Form.forms_enabled? - submenu.unshift({ - url: forms_path, - name: t('left_menu_bar.forms'), - active: forms_are_selected? - }) - end - submenu - end end diff --git a/app/views/forms/promo.html.erb b/app/views/forms/promo.html.erb new file mode 100644 index 0000000000..e96bc2a7e5 --- /dev/null +++ b/app/views/forms/promo.html.erb @@ -0,0 +1,12 @@ +
+
+
+
+ <%= image_tag 'forms/promo.svg' %> +
+
+

<%= t('forms.promo.promo_title') %>

+
+
+
+
diff --git a/config/locales/en.yml b/config/locales/en.yml index 7519ff472e..aeab557ab2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1153,6 +1153,8 @@ en: submitted_on: 'Submitted on' not_submitted: 'Not submitted yet' by: 'by' + promo: + promo_title: 'This feature is disabled by default in open source SciNote' label_templates: types: fluics_label_template: 'Fluics'