Compare commits
1 Commits
master
...
fix-flash-
| Author | SHA1 | Date |
|---|---|---|
alexdbondoc17
|
c168e5c99f | 4 years ago |
31 changed files with 138 additions and 191 deletions
@ -1,45 +1,43 @@ |
|||||||
<div class="row-flex m-3 mt-0 doctrine-content-body clickable-link" data-controller="application" |
<div class="row-flex m-3 mt-0 doctrine-content-body clickable-link" href="<%= jurisprudence.present? ? document_doctrine_path(jurisprudence.id, id) : doctrine_path(id)%>"> |
||||||
data-href="<%= jurisprudence.present? ? document_doctrine_path(jurisprudence.id, id) : doctrine_path(id)%>" |
<div class="container-sm <%= opts[:is_subjects_index].present? ? 'm-0 ps-0' : '' %>"> |
||||||
data-action="click->application#openLink"> |
<span> <b> <i> <%= headnote %> </i> </b> </span> |
||||||
<div class="container-sm <%= opts[:is_subjects_index].present? ? 'm-0 ps-0' : '' %>"> |
<p class="mb-0"> <%= raw content.html_safe %> </p> |
||||||
<span> <b> <i> <%= headnote %> </i> </b> </span> |
|
||||||
<p class="mb-0"> <%= raw content.html_safe %> </p> |
<div class="container-fluid p-0"> |
||||||
|
<% if opts[:is_doctrines_index].present? %> |
||||||
<div class="container-fluid p-0"> |
<% document_title = jurisprudence.short_title || jurisprudence.title %> |
||||||
<% if opts[:is_doctrines_index].present? %> |
<% date_or_year = jurisprudence.docdate.present? ? jurisprudence.docdate.to_date.strftime("%B %d, %Y") : jurisprudence.year %> |
||||||
<% document_title = jurisprudence.short_title || jurisprudence.title %> |
<h5 style="color: darkred;"> <%= [document_title, jurisprudence.clean_reference_number, date_or_year].join(", ") %> </h5> |
||||||
<% date_or_year = jurisprudence.docdate.present? ? jurisprudence.docdate.to_date.strftime("%B %d, %Y") : jurisprudence.year %> |
<% end %> |
||||||
<h5 style="color: darkred;"> <%= [document_title, jurisprudence.clean_reference_number, date_or_year].join(", ") %> </h5> |
|
||||||
<% end %> |
|
||||||
|
|
||||||
<% annotations.each do |annotation| %> |
<% annotations.each do |annotation| %> |
||||||
<% annotated_documents_title = [] %> |
<% annotated_documents_title = [] %> |
||||||
<% annotation.documents.each do |annotated_document| %> |
<% annotation.documents.each do |annotated_document| %> |
||||||
<% ad_title = annotated_document.short_title || annotated_document.title %> |
<% ad_title = annotated_document.short_title || annotated_document.title %> |
||||||
<% ad_date_or_year = annotated_document.docdate.present? ? annotated_document.docdate.strftime("%B %d, %Y") : annotated_document.year %> |
<% ad_date_or_year = annotated_document.docdate.present? ? annotated_document.docdate.strftime("%B %d, %Y") : annotated_document.year %> |
||||||
<% annotated_documents_title << [" citing #{ad_title}", annotated_document.clean_reference_number, ad_date_or_year].join(", ") %> |
<% annotated_documents_title << [" citing #{ad_title}", annotated_document.clean_reference_number, ad_date_or_year].join(", ") %> |
||||||
<% end %> |
<% end %> |
||||||
<% citing_document_title = [document_title, annotation.document.clean_reference_number, date_or_year, clean_phil_rep(annotation), annotated_documents_title].reject(&:blank?).join(', ').html_safe %> |
<% citing_document_title = [document_title, annotation.document.clean_reference_number, date_or_year, clean_phil_rep(annotation), annotated_documents_title].reject(&:blank?).join(', ').html_safe %> |
||||||
|
|
||||||
<div class="row mb-2 pb-0 ms-3"> |
<div class="row mb-2 pb-0 ms-3"> |
||||||
<div class="col-sm-1 p-0 me-1" style="width: auto;"> <strong> <%= "#{annotation.annomarks.map { |annomark| "(#{annomark.code})" }.join(" ")}" %> </strong> </div> |
<div class="col-sm-1 p-0 me-1" style="width: auto;"> <strong> <%= "#{annotation.annomarks.map { |annomark| "(#{annomark.code})" }.join(" ")}" %> </strong> </div> |
||||||
<div class="col-sm-9 p-0 ms-1"> <%= raw annotation.content.present? ? content_diplay_text(annotation) : citing_document_title %> </div> |
<div class="col-sm-9 p-0 ms-1"> <%= raw annotation.content.present? ? content_diplay_text(annotation) : citing_document_title %> </div> |
||||||
</div> |
</div> |
||||||
|
|
||||||
<% if annotation.editor_notes.present? %> |
<% if annotation.editor_notes.present? %> |
||||||
<div class="row ms-5 mb-2"> |
<div class="row ms-5 mb-2"> |
||||||
<div class="col-sm-2 p-0" style="width: 105px;"> |
<div class="col-sm-2 p-0" style="width: 105px;"> |
||||||
<span> Editor's Note: </span> |
<span> Editors Note: </span> |
||||||
</div> |
</div> |
||||||
|
|
||||||
<div class="col-sm-10 ps-0"> |
<div class="col-sm-10 ps-0"> |
||||||
<%= raw annotation.editor_notes %> |
<%= raw annotation.editor_notes %> |
||||||
</div> |
</div> |
||||||
</div> |
|
||||||
<% end %> |
|
||||||
<% end %> |
|
||||||
</div> |
</div> |
||||||
</div> |
<% end %> |
||||||
|
<% end %> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
|
||||||
<hr/> |
<hr/> |
||||||
</div> |
</div> |
||||||
|
|||||||
@ -1,42 +1,40 @@ |
|||||||
<div class="row-flex m-3 mt-0 doctrine-content-body clickable-link" data-controller="application" |
<div class="row-flex m-3 mt-0 doctrine-content-body clickable-link" href="<%= jurisprudence.present? ? document_doctrine_path(jurisprudence.id, id) : doctrine_path(id)%>"> |
||||||
data-href="<%= jurisprudence.present? ? document_doctrine_path(jurisprudence.id, id) : doctrine_path(id)%>" |
<div class="container-sm <%= opts[:is_subjects_index].present? ? 'm-0 ps-0' : '' %>"> |
||||||
data-action="click->application#openLink"> |
<p class="mb-0"> <%= raw content.html_safe %> </p> |
||||||
<div class="container-sm <%= opts[:is_subjects_index].present? ? 'm-0 ps-0' : '' %>"> |
|
||||||
<p class="mb-0"> <%= raw content.html_safe %> </p> |
|
||||||
|
<div class="container-fluid p-0"> |
||||||
|
<% document_title = jurisprudence.short_title || jurisprudence.title %> |
||||||
<div class="container-fluid p-0"> |
<% date_or_year = jurisprudence.docdate.present? ? jurisprudence.docdate.strftime : jurisprudence.year %> |
||||||
<% document_title = jurisprudence.short_title || jurisprudence.title %> |
<h5 style="color: darkred;"> <%= [document_title, jurisprudence.reference_number, date_or_year].join(", ") %> </h5> |
||||||
<% date_or_year = jurisprudence.docdate.present? ? jurisprudence.docdate.strftime : jurisprudence.year %> |
|
||||||
<h5 style="color: darkred;"> <%= [document_title, jurisprudence.reference_number, date_or_year].join(", ") %> </h5> |
|
||||||
|
|
||||||
<% annotations.each do |annotation| %> |
<% annotations.each do |annotation| %> |
||||||
<p class="mb-0 ms-5"> |
<p class="mb-0 ms-5"> |
||||||
<% annotated_documents_title = [] %> |
<% annotated_documents_title = [] %> |
||||||
<% annotation.documents.each do |annotated_document| %> |
<% annotation.documents.each do |annotated_document| %> |
||||||
<% ad_title = annotated_document.short_title || annotated_document.title %> |
<% ad_title = annotated_document.short_title || annotated_document.title %> |
||||||
<% ad_date_or_year = annotated_document.docdate.present? ? annotated_document.docdate.strftime("%B %d, %Y") : annotated_document.year %> |
<% ad_date_or_year = annotated_document.docdate.present? ? annotated_document.docdate.strftime("%B %d, %Y") : annotated_document.year %> |
||||||
<% annotated_documents_title << [" citing #{ad_title}", annotated_document.reference_number, ad_date_or_year].join(", ") %> |
<% annotated_documents_title << [" citing #{ad_title}", annotated_document.reference_number, ad_date_or_year].join(", ") %> |
||||||
<% end %> |
<% end %> |
||||||
|
|
||||||
<strong> <%= "#{annotation.annomarks.map { |annomark| "(#{annomark.code})" }.join(" ")}" %> </strong> |
<strong> <%= "#{annotation.annomarks.map { |annomark| "(#{annomark.code})" }.join(" ")}" %> </strong> |
||||||
<%= raw [document_title(annotation), annotation.document.reference_number, date_or_year(annotation), annotation.phil_rep, annotated_documents_title].reject(&:blank?).join(', ') %> |
<%= raw [document_title(annotation), annotation.document.reference_number, date_or_year(annotation), annotation.phil_rep, annotated_documents_title].reject(&:blank?).join(', ') %> |
||||||
</p> |
</p> |
||||||
|
|
||||||
<% if annotation.editor_notes.present? %> |
<% if annotation.editor_notes.present? %> |
||||||
<div class="row ms-5"> |
<div class="row ms-5"> |
||||||
<div class="col-sm-2 p-0" style="width: 105px;"> |
<div class="col-sm-2 p-0" style="width: 105px;"> |
||||||
<span> Editor's Note: </span> |
<span> Editors Note: </span> |
||||||
</div> |
</div> |
||||||
|
|
||||||
<div class="col-sm-10 ps-0"> |
<div class="col-sm-10 ps-0"> |
||||||
<%= raw annotation.editor_notes %> |
<%= raw annotation.editor_notes %> |
||||||
</div> |
</div> |
||||||
</div> |
|
||||||
<% end %> |
|
||||||
<% end %> |
|
||||||
</div> |
</div> |
||||||
</div> |
<% end %> |
||||||
|
<% end %> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
|
||||||
<hr/> |
<hr/> |
||||||
</div> |
</div> |
||||||
|
|||||||
Loading…
Reference in new issue