From 7aefbbb23fbb209ccd481246da5ce1eee8fddc6e Mon Sep 17 00:00:00 2001 From: "Alexander D. Bondoc" Date: Wed, 27 Apr 2022 14:54:23 +0800 Subject: [PATCH 1/4] Change `Editors Note` to `Editor's Note` --- .../annotation_form_component.html.erb | 4 ++-- .../annotation_marks_modal_form_component.html.erb | 4 ++-- .../doctrine_index_component.html.erb | 2 +- .../document_doctrine_index_component.html.erb | 2 +- .../document_doctrine_show_component.html.erb | 2 +- .../reports_search_results_component.html.erb | 2 +- app/views/shared/_annotation_form.html.erb | 4 ++-- app/views/shared/_annotations_index_view.html.erb | 2 +- .../shared/_doctrine_form_annotation_modal_form.html.erb | 4 ++-- app/views/shared/_doctrine_form_annotations_view.html.erb | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/components/annotation_form_component/annotation_form_component.html.erb b/app/components/annotation_form_component/annotation_form_component.html.erb index 9520239..98de05d 100644 --- a/app/components/annotation_form_component/annotation_form_component.html.erb +++ b/app/components/annotation_form_component/annotation_form_component.html.erb @@ -45,7 +45,7 @@
- <%= label_tag :editor_notes %> - <%= rich_text_area_tag :editor_notes, annotation.editor_notes, placeholder: "Editor Notes", data: { target: "annotations.editor_notes" } %> + <%= label_tag "Editor's Note" %> + <%= rich_text_area_tag :editor_notes, annotation.editor_notes, placeholder: "Editor's Note", data: { target: "annotations.editor_notes" } %>
diff --git a/app/components/annotation_marks_modal_form_component/annotation_marks_modal_form_component.html.erb b/app/components/annotation_marks_modal_form_component/annotation_marks_modal_form_component.html.erb index 87f6037..ed98077 100644 --- a/app/components/annotation_marks_modal_form_component/annotation_marks_modal_form_component.html.erb +++ b/app/components/annotation_marks_modal_form_component/annotation_marks_modal_form_component.html.erb @@ -59,8 +59,8 @@
- <%= label_tag :editor_notes %> - <%= rich_text_area_tag :editor_notes, nil, placeholder: "Editor Notes", data: { target: "annotations.editor_notes" } %> + <%= label_tag "Editor's Note" %> + <%= rich_text_area_tag :editor_notes, nil, placeholder: "Editor's Note", data: { target: "annotations.editor_notes" } %>
diff --git a/app/components/doctrine_index_component/doctrine_index_component.html.erb b/app/components/doctrine_index_component/doctrine_index_component.html.erb index ac420b9..b5e2508 100644 --- a/app/components/doctrine_index_component/doctrine_index_component.html.erb +++ b/app/components/doctrine_index_component/doctrine_index_component.html.erb @@ -36,7 +36,7 @@ <% if annotation.editor_notes.present? %>
- Editors Note: + Editor's Note:
diff --git a/app/components/document_doctrine_index_component/document_doctrine_index_component.html.erb b/app/components/document_doctrine_index_component/document_doctrine_index_component.html.erb index 4d5d0ec..301adea 100644 --- a/app/components/document_doctrine_index_component/document_doctrine_index_component.html.erb +++ b/app/components/document_doctrine_index_component/document_doctrine_index_component.html.erb @@ -27,7 +27,7 @@ <% if annotation.editor_notes.present? %>
- Editors Note: + Editor's Note:
diff --git a/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb b/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb index 7b5d4b5..760a514 100644 --- a/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb +++ b/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb @@ -111,7 +111,7 @@ <% if annotation.editor_notes.present? %>
- Editors Note: + Editor's Note:
diff --git a/app/components/reports_search_results_component/reports_search_results_component.html.erb b/app/components/reports_search_results_component/reports_search_results_component.html.erb index 6e0bea1..ea41248 100644 --- a/app/components/reports_search_results_component/reports_search_results_component.html.erb +++ b/app/components/reports_search_results_component/reports_search_results_component.html.erb @@ -24,7 +24,7 @@ <% if annotation.editor_notes.present? %>
- Editors Note: + Editor's Note:
diff --git a/app/views/shared/_annotation_form.html.erb b/app/views/shared/_annotation_form.html.erb index e094101..6ff79e6 100644 --- a/app/views/shared/_annotation_form.html.erb +++ b/app/views/shared/_annotation_form.html.erb @@ -52,8 +52,8 @@
- <%= label_tag :editor_notes %> - <%= rich_text_area_tag :editor_notes, nil, placeholder: "Editor Notes" %> + <%= label_tag "Editor's Note" %> + <%= rich_text_area_tag :editor_notes, nil, placeholder: "Editor's Note" %>
diff --git a/app/views/shared/_annotations_index_view.html.erb b/app/views/shared/_annotations_index_view.html.erb index 914824d..ddb8c32 100644 --- a/app/views/shared/_annotations_index_view.html.erb +++ b/app/views/shared/_annotations_index_view.html.erb @@ -30,7 +30,7 @@ <% if annotation.editor_notes.present? %>
- Editors Note: + Editor's Note:
diff --git a/app/views/shared/_doctrine_form_annotation_modal_form.html.erb b/app/views/shared/_doctrine_form_annotation_modal_form.html.erb index a247c7d..110ee96 100644 --- a/app/views/shared/_doctrine_form_annotation_modal_form.html.erb +++ b/app/views/shared/_doctrine_form_annotation_modal_form.html.erb @@ -56,8 +56,8 @@
- <%= label_tag :editor_notes %> - <%= rich_text_area_tag :editor_notes, nil, placeholder: "Editor Notes" %> + <%= label_tag "Editor's Note" %> + <%= rich_text_area_tag :editor_notes, nil, placeholder: "Editor's Note" %>
diff --git a/app/views/shared/_doctrine_form_annotations_view.html.erb b/app/views/shared/_doctrine_form_annotations_view.html.erb index fd76f33..156a64c 100644 --- a/app/views/shared/_doctrine_form_annotations_view.html.erb +++ b/app/views/shared/_doctrine_form_annotations_view.html.erb @@ -26,7 +26,7 @@ <% if annotation[:editor_notes].present? %>
- Editors Note: + Editor's Note:
From 05b0f0f94af5162f42dc10e8f2241f0201bbff22 Mon Sep 17 00:00:00 2001 From: "Alexander D. Bondoc" Date: Wed, 27 Apr 2022 14:55:16 +0800 Subject: [PATCH 2/4] Fix `prompt` message --- app/javascript/controllers/doctrines_controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/controllers/doctrines_controller.js b/app/javascript/controllers/doctrines_controller.js index 65e287c..dc919c0 100644 --- a/app/javascript/controllers/doctrines_controller.js +++ b/app/javascript/controllers/doctrines_controller.js @@ -90,7 +90,7 @@ export default class extends ApplicationController { $.post("/api/doctrines", $.extend({ jurisprudence_ids: [document_id] }, params), function(doctrine, status) { if(status === 'success') { $('.toast').addClass('bg-success').show(); - $( ".toast-body" ).html( "Doctrine was successfully save" ); + $( ".toast-body" ).html( "Doctrine was successfully saved" ); $('.toast').fadeOut(5000); if (annotations_attributes.length > 0) { @@ -98,7 +98,7 @@ export default class extends ApplicationController { $.post("/api/doctrines/" + doctrine.id + "/annotations", annotation, function(result, status) { if(status === 'success') { $('.toast').addClass('bg-success').show(); - $( ".toast-body" ).html( "Case Lists was successfully save" ); + $( ".toast-body" ).html( "Case Lists was successfully saved" ); $('.toast').fadeOut(5000); if (index === annotations_attributes.length - 1) { From 2964d47de167bb1af8e2cec5f35383933b8090f9 Mon Sep 17 00:00:00 2001 From: "Alexander D. Bondoc" Date: Wed, 27 Apr 2022 14:55:36 +0800 Subject: [PATCH 3/4] Fix font size for `doctrines#content` --- .../doctrine_index_component/doctrine_index_component.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/doctrine_index_component/doctrine_index_component.html.erb b/app/components/doctrine_index_component/doctrine_index_component.html.erb index b5e2508..772a6bf 100644 --- a/app/components/doctrine_index_component/doctrine_index_component.html.erb +++ b/app/components/doctrine_index_component/doctrine_index_component.html.erb @@ -6,7 +6,7 @@ <% grouped_by_content_search_params = { subject_ids: opts[:subject_ids], headnote: uniq_by_headnote.headnote, is_grouped_by_content: true } %> <% search_doctrines(grouped_by_content_search_params).group(:content).groups.each do |group_by_content| %> <% group_by_content.results.each do |content_result| %> -
<%= raw content_result.content.html_safe %>
+
<%= raw content_result.content.html_safe %>
<% grouped_by_juris_search_params = { subject_ids: opts[:subject_ids], content: content_result.content, is_grouped_by_juris_id: true } %> <% search_doctrines(grouped_by_juris_search_params).group(:jurisprudence_id).groups.each do |grouped_by_juris| %> From 9bebc0180b38468495539239cd1f3794f5fbc520 Mon Sep 17 00:00:00 2001 From: "Alexander D. Bondoc" Date: Wed, 27 Apr 2022 15:24:14 +0800 Subject: [PATCH 4/4] Fix `css` for `footnotes` --- app/javascript/src/application.scss | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/javascript/src/application.scss b/app/javascript/src/application.scss index ab6be17..6dc65c7 100644 --- a/app/javascript/src/application.scss +++ b/app/javascript/src/application.scss @@ -125,3 +125,29 @@ .not-full input { width: auto !important; } + +// Footnotes +.footnote-x a { + font-size:12px; vertical-align: 20%; + color: red; + font-weight: bold; + text-decoration: none; +} + +.footnote-x a.tip span{ + display: none +} + +.footnote-x a.tip:hover span{ + border: #c0c0c0 1px dotted; + padding: 5px 20px 5px 5px; + display: block; + z-index: 100; + background-color: #87cefa; + left: 0px; + margin: 10px; + width: 250px; + position: absolute; + top: 10px; + text-decoration: none +}