alexdbondoc17
/
cdao-pjet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #109 from lexintegritastech/feature-enhance-ui 

Fix width for citation finder search field
pull/110/head
Alexander D. Bondoc 4 years ago committed by GitHub
parent
2894706a8a 3a8e1ce27a
commit
792d7f32c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb
  2. 10
      app/views/shared/_case_lists_no_results.html.erb
  3. 12
      app/views/shared/_case_lists_search_results.html.erb

4
app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb
Unescape View File

@ -62,9 +62,9 @@
</div> </div>
<div class="col-sm-2 p-2"> <div class="col-sm-2 p-2">
<%= button_tag "Search", class: "btn btn-success btn-sm me-2", data: { action: "click->document#search" } %> <%= button_tag "Search", class: "btn btn-success btn-sm me-2", data: { action: "click->document#search" } %>
<%= button_tag "Citation finder", class: "btn btn-warning btn-sm text-white ms-3", data-bs-toggle="collapse" href="#citation_finder_collapse" role="button" aria-expanded="false" aria-controls="collapseExample" %> <button class="btn btn-warning btn-sm text-white ms-3" data-bs-toggle="collapse" href="#citation_finder_collapse" role="button" aria-expanded="false" aria-controls="collapseExample" > Citation finder</button>
</div> </div>
<div class="collapse col-sm-11 p-2" id="citation_finder_collapse"> <div class="collapse col-sm-10 p-2" id="citation_finder_collapse">
<%= text_field_tag :citation_finder, nil, class: "form-control", placeholder: "Citation Finder", data: { target: "document.citation_finder" } %> <%= text_field_tag :citation_finder, nil, class: "form-control", placeholder: "Citation Finder", data: { target: "document.citation_finder" } %>
</div> </div>
</div> </div>

10
app/views/shared/_case_lists_no_results.html.erb
Unescape View File

@ -1,14 +1,12 @@
<div class="row" data-controller="document" data-doctrine-id="<%= doctrine_id %>"> <div class="row" data-controller="document" data-doctrine-id="<%= doctrine_id %>">
<div class="col-sm-11 p-2"> <div class="col-sm-10 p-2">
<%= text_field_tag :q, nil, class: "form-control", placeholder: "Search GR Number, Title or Short Title", data: { target: "document.input" } %> <%= text_field_tag :q, nil, class: "form-control", placeholder: "Search GR Number, Title or Short Title", data: { target: "document.input" } %>
</div> </div>
<div class="col-sm-1 p-2"> <div class="col-sm-2 p-2">
<%= button_tag "Search", class: "btn btn-success", data: { action: "click->document#search" } %> <%= button_tag "Search", class: "btn btn-success", data: { action: "click->document#search" } %>
<a class="show-citer-finder" style="cursor: pointer;" data-bs-toggle="collapse" href="#citation_finder_collapse" role="button" aria-expanded="false" aria-controls="collapseExample"> <button class="btn btn-warning btn-sm text-white ms-3" data-bs-toggle="collapse" href="#citation_finder_collapse" role="button" aria-expanded="false" aria-controls="collapseExample" > Citation finder</button>
<i class="fas fa-angle-double-down" style="font-size: 20px;color: darkred;" data-bs-toggle="tooltip" data-bs-placement="right" title="Open Citation Finder"></i>
</a>
</div> </div>
<div class="collapse col-sm-11 p-2" id="citation_finder_collapse"> <div class="collapse col-sm-10 p-2" id="citation_finder_collapse">
<%= text_field_tag :citation_finder, nil, class: "form-control", placeholder: "Citation Finder", data: { target: "document.citation_finder" } %> <%= text_field_tag :citation_finder, nil, class: "form-control", placeholder: "Citation Finder", data: { target: "document.citation_finder" } %>
</div> </div>
</div> </div>

12
app/views/shared/_case_lists_search_results.html.erb
Unescape View File

@ -1,15 +1,13 @@
<div class="row" data-controller="document" data-current-document-id="<%= opts[:current_document_id] %>" data-doctrine-id="<%= opts[:doctrine_id] %>"> <div class="row" data-controller="document" data-current-document-id="<%= opts[:current_document_id] %>" data-doctrine-id="<%= opts[:doctrine_id] %>">
<div class="col-sm-11 p-2"> <div class="col-sm-10 p-2">
<%= text_field_tag :q, opts[:q], class: "form-control", placeholder: "Search GR Number, Title or Short Title", <%= text_field_tag :q, opts[:q], class: "form-control", placeholder: "Search GR Number, Title or Short Title",
data: { target: "document.input" } %> data: { target: "document.input" } %>
</div> </div>
<div class="col-sm-1 p-2"> <div class="col-sm-2 p-2">
<%= button_tag "Search", class: "btn btn-success", data: { action: "click->document#search" } %> <%= button_tag "Search", class: "btn btn-success btn-sm", data: { action: "click->document#search" } %>
<a class="show-citer-finder" style="cursor: pointer;" data-bs-toggle="collapse" href="#citation_finder_collapse" role="button" aria-expanded="false" aria-controls="collapseExample"> <button class="btn btn-warning btn-sm text-white ms-3" data-bs-toggle="collapse" href="#citation_finder_collapse" role="button" aria-expanded="false" aria-controls="collapseExample" > Citation finder</button>
<i class="fas fa-angle-double-down" style="font-size: 20px;color: darkred;" data-bs-toggle="tooltip" data-bs-placement="right" title="Open Citation Finder"></i>
</a>
</div> </div>
<div class="collapse col-sm-11 p-2" id="citation_finder_collapse"> <div class="collapse col-sm-10 p-2" id="citation_finder_collapse">
<%= text_field_tag :citation_finder, opts[:citation_finder], class: "form-control", placeholder: "Citation Finder", data: { target: "document.citation_finder" } %> <%= text_field_tag :citation_finder, opts[:citation_finder], class: "form-control", placeholder: "Citation Finder", data: { target: "document.citation_finder" } %>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save