Browse Source

Merge pull request #135 from lexintegritastech/minor-updates

Minor updates
stable
Alexander D. Bondoc 4 years ago committed by GitHub
parent
commit
0cf7193f13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      app/components/annotation_form_component/annotation_form_component.html.erb
  2. 4
      app/components/annotation_marks_modal_form_component/annotation_marks_modal_form_component.html.erb
  3. 4
      app/components/doctrine_index_component/doctrine_index_component.html.erb
  4. 2
      app/components/document_doctrine_index_component/document_doctrine_index_component.html.erb
  5. 2
      app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb
  6. 2
      app/components/reports_search_results_component/reports_search_results_component.html.erb
  7. 4
      app/javascript/controllers/doctrines_controller.js
  8. 26
      app/javascript/src/application.scss
  9. 4
      app/views/shared/_annotation_form.html.erb
  10. 2
      app/views/shared/_annotations_index_view.html.erb
  11. 4
      app/views/shared/_doctrine_form_annotation_modal_form.html.erb
  12. 2
      app/views/shared/_doctrine_form_annotations_view.html.erb

4
app/components/annotation_form_component/annotation_form_component.html.erb

@ -45,7 +45,7 @@
<div class="row">
<div class="col-sm-12 p-2">
<strong> <%= label_tag :editor_notes %> </strong>
<%= rich_text_area_tag :editor_notes, annotation.editor_notes, placeholder: "Editor Notes", data: { target: "annotations.editor_notes" } %>
<strong> <%= label_tag "Editor's Note" %> </strong>
<%= rich_text_area_tag :editor_notes, annotation.editor_notes, placeholder: "Editor's Note", data: { target: "annotations.editor_notes" } %>
</div>
</div>

4
app/components/annotation_marks_modal_form_component/annotation_marks_modal_form_component.html.erb

@ -59,8 +59,8 @@
<div class="row">
<div class="col-sm-12 p-2">
<strong> <%= label_tag :editor_notes %> </strong>
<%= rich_text_area_tag :editor_notes, nil, placeholder: "Editor Notes", data: { target: "annotations.editor_notes" } %>
<strong> <%= label_tag "Editor's Note" %> </strong>
<%= rich_text_area_tag :editor_notes, nil, placeholder: "Editor's Note", data: { target: "annotations.editor_notes" } %>
</div>
</div>
</div>

4
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| %>
<div class="mb-0"> <%= raw content_result.content.html_safe %> </div>
<div class="mb-0 fs-5"> <%= raw content_result.content.html_safe %> </div>
<% 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| %>
@ -36,7 +36,7 @@
<% if annotation.editor_notes.present? %>
<div class="row ms-5 mb-2">
<div class="col-sm-2 p-0" style="width: 105px;">
<span> Editors Note: </span>
<span> Editor's Note: </span>
</div>
<div class="col-sm-10 ps-0">

2
app/components/document_doctrine_index_component/document_doctrine_index_component.html.erb

@ -27,7 +27,7 @@
<% if annotation.editor_notes.present? %>
<div class="row ms-5 mb-2">
<div class="col-sm-2 p-0" style="width: 105px;">
<span> Editors Note: </span>
<span> Editor's Note: </span>
</div>
<div class="col-sm-10 ps-0">

2
app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb

@ -111,7 +111,7 @@
<% if annotation.editor_notes.present? %>
<div class="row mb-2">
<div class="col-sm-1 ms-5 p-0" style="width: 105px;">
<span> Editors Note: </span>
<span> Editor's Note: </span>
</div>
<div class="col-sm-10 ps-0">

2
app/components/reports_search_results_component/reports_search_results_component.html.erb

@ -24,7 +24,7 @@
<% if annotation.editor_notes.present? %>
<div class="row ms-5">
<div class="col-sm-2 p-0" style="width: 105px;">
<span> Editors Note: </span>
<span> Editor's Note: </span>
</div>
<div class="col-sm-10 ps-0">

4
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( "<span><b>Doctrine was successfully save</b></span>" );
$( ".toast-body" ).html( "<span><b>Doctrine was successfully saved</b></span>" );
$('.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( "<span><b>Case Lists was successfully save</b></span>" );
$( ".toast-body" ).html( "<span><b>Case Lists was successfully saved</b></span>" );
$('.toast').fadeOut(5000);
if (index === annotations_attributes.length - 1) {

26
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
}

4
app/views/shared/_annotation_form.html.erb

@ -52,8 +52,8 @@
<div class="row">
<div class="col-sm-12 p-2">
<strong> <%= label_tag :editor_notes %> </strong>
<%= rich_text_area_tag :editor_notes, nil, placeholder: "Editor Notes" %>
<strong> <%= label_tag "Editor's Note" %> </strong>
<%= rich_text_area_tag :editor_notes, nil, placeholder: "Editor's Note" %>
</div>
</div>
</div>

2
app/views/shared/_annotations_index_view.html.erb

@ -30,7 +30,7 @@
<% if annotation.editor_notes.present? %>
<div class="row">
<div class="col-sm-1 ms-5 p-0" style="width: 105px;">
<span> Editors Note: </span>
<span> Editor's Note: </span>
</div>
<div class="col-sm-10 ps-0">

4
app/views/shared/_doctrine_form_annotation_modal_form.html.erb

@ -56,8 +56,8 @@
<div class="row">
<div class="col-sm-12 p-2">
<strong> <%= label_tag :editor_notes %> </strong>
<%= rich_text_area_tag :editor_notes, nil, placeholder: "Editor Notes" %>
<strong> <%= label_tag "Editor's Note" %> </strong>
<%= rich_text_area_tag :editor_notes, nil, placeholder: "Editor's Note" %>
</div>
</div>
</div>

2
app/views/shared/_doctrine_form_annotations_view.html.erb

@ -26,7 +26,7 @@
<% if annotation[:editor_notes].present? %>
<div class="row mb-2">
<div class="col-sm-1 ms-5 p-0" style="width: 105px;">
<span> Editors Note: </span>
<span> Editor's Note: </span>
</div>
<div class="col-sm-10 ps-0">

Loading…
Cancel
Save