From fb581dadd5b514b58e7f3cd177aa07ad1aee81b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Tue, 28 Mar 2023 09:29:00 +0200 Subject: [PATCH] Wiki toolbar enabled for HTML formatting --- app/views/dmsf/edit.html.erb | 4 +--- app/views/dmsf/edit_root.html.erb | 4 +--- app/views/dmsf_files/_file_new_revision.html.erb | 6 ++---- app/views/dmsf_upload/_upload_file.html.erb | 6 ++---- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/app/views/dmsf/edit.html.erb b/app/views/dmsf/edit.html.erb index 4f93581c..16b859e9 100644 --- a/app/views/dmsf/edit.html.erb +++ b/app/views/dmsf/edit.html.erb @@ -142,6 +142,4 @@ <% end %> -<% if Setting.text_formatting != 'HTML' %> - <%= wikitoolbar_for 'dmsf_folder_description' %> -<% end %> +<%= wikitoolbar_for 'dmsf_folder_description' %> diff --git a/app/views/dmsf/edit_root.html.erb b/app/views/dmsf/edit_root.html.erb index 534f9d2f..60b3a282 100644 --- a/app/views/dmsf/edit_root.html.erb +++ b/app/views/dmsf/edit_root.html.erb @@ -53,6 +53,4 @@ <% end %> -<% if Setting.text_formatting != 'HTML' %> - <%= wikitoolbar_for 'project_dmsf_description' %> -<% end %> +<%= wikitoolbar_for 'project_dmsf_description' %> diff --git a/app/views/dmsf_files/_file_new_revision.html.erb b/app/views/dmsf_files/_file_new_revision.html.erb index fb2f73ac..8b6b8962 100644 --- a/app/views/dmsf_files/_file_new_revision.html.erb +++ b/app/views/dmsf_files/_file_new_revision.html.erb @@ -84,7 +84,5 @@ -<% if Setting.text_formatting != 'HTML' %> - <%= wikitoolbar_for 'dmsf_file_revision_description' %> - <%= wikitoolbar_for 'dmsf_file_revision_comment' %> -<% end %> +<%= wikitoolbar_for 'dmsf_file_revision_description' %> +<%= wikitoolbar_for 'dmsf_file_revision_comment' %> diff --git a/app/views/dmsf_upload/_upload_file.html.erb b/app/views/dmsf_upload/_upload_file.html.erb index ec094685..ebd906b4 100644 --- a/app/views/dmsf_upload/_upload_file.html.erb +++ b/app/views/dmsf_upload/_upload_file.html.erb @@ -82,7 +82,5 @@

-<% if Setting.text_formatting != 'HTML' %> - <%= wikitoolbar_for "commited_files_#{i}_description" %> - <%= wikitoolbar_for "commited_files_#{i}_comment" %> -<% end %> +<%= wikitoolbar_for "commited_files_#{i}_description" %> +<%= wikitoolbar_for "commited_files_#{i}_comment" %>