Skip to content

Commit 1a01a97

Browse files
committed
refactors views, shares table documents components
1 parent 927a980 commit 1a01a97

File tree

4 files changed

+56
-70
lines changed

4 files changed

+56
-70
lines changed

app/views/document_types/show.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</div>
5050
<div class="panel-body">
5151
<br>
52-
<%= render "table_documents", documents: @documents %>
52+
<%= render "shared/table_documents", documents: @documents %>
5353
<br>
5454
</div>
5555
</div>

app/views/documents/_table_documents.html.erb

Lines changed: 0 additions & 24 deletions
This file was deleted.

app/views/documents/index.html.erb

Lines changed: 54 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,59 @@
1-
<% content_for :document do %>
2-
<document>Documents (ToS;DR Edit Tool)</document>
1+
<% content_for :title do %>
2+
<title>Documents</title>
33
<% end %>
4-
<div class="card-inline">
5-
<div class="card-inline-item card-inline-service">
6-
<div class="row">
7-
<div class="col-lg-6">
8-
<h1>Documents</h1>
4+
5+
<div class="container">
6+
<div class="panel panel-default">
7+
<div class="panel-heading">
8+
<small><mark>Documents</mark> are the <mark>legal texts</mark> associated with a service.</small>
9+
</div>
10+
<div class="panel-body">
11+
<span class="lighter">
12+
<h3>Documents
13+
<% if current_user&.admin || current_user&.curator %>
14+
<small>
15+
Can't find what you're looking for?
16+
<%= link_to 'Create', new_document_path %>
17+
a new document
18+
</small>
19+
<% end %>
20+
</h3>
21+
</span>
22+
</div>
23+
</div>
24+
<div class="panel panel-default">
25+
<div class="panel-body">
26+
<br>
27+
<div class="row">
28+
<form class="navbar-form navbar-left" role="search">
29+
<%= search_form_for @q do |f| %>
30+
<div>
31+
<%= f.label :name_cont, class: "small lighter" %>
32+
</div>
33+
<div class="form-group">
34+
<%= f.search_field :name_cont, class: "form-control" %>
35+
</div>
36+
<%= f.submit class: "btn btn-default small" %>
37+
<% end %>
38+
</form>
39+
<form class="navbar-form navbar-left" role="search">
40+
<%= search_form_for @q do |f| %>
41+
<div>
42+
<%= f.label :service_name_cont, class: "small lighter" %>
43+
</div>
44+
<div class="form-group">
45+
<%= f.search_field :service_name_cont, class: "form-control" %>
46+
</div>
47+
<%= f.submit class: "btn btn-default small" %>
48+
<% end %>
49+
</form>
950
</div>
10-
<% if (!current_user.nil? && current_user.curator?) || (!current_user.nil? && current_user.admin?) %>
11-
<div class="col-lg-6 text-right justify-content-end">
12-
<%= link_to 'Add Document', new_document_path, class: 'btn btn-primary mb15' %>
13-
</div>
51+
<% if @documents.empty? %>
52+
<p>No documents to display at this time</p>
53+
<% else %>
54+
<%= render "shared/table_documents", documents: @documents %>
1455
<% end %>
56+
<%= paginate @documents %>
1557
</div>
16-
<br>
17-
<br>
18-
<div class="row">
19-
<div class="col-lg-4 text-left">
20-
<div class="">
21-
<%= search_form_for @q do |f| %>
22-
<%= f.label :name_cont %>
23-
<%= f.search_field :name_cont %>
24-
25-
<%= f.submit %>
26-
<% end %>
27-
</div>
28-
</div>
29-
<div class="col-lg-6 text-left">
30-
<div class="">
31-
<%= search_form_for @q do |f| %>
32-
33-
<%= f.label :service_name_cont %>
34-
<%= f.search_field :service_name_cont %>
35-
36-
<%= f.submit %>
37-
<% end %>
38-
</div>
39-
</div>
40-
</div>
41-
<br>
42-
<% if @documents.empty? %>
43-
<p>There are no documents to display at this time!</p>
44-
<% else %>
45-
<%= render "table_documents", documents: @documents %>
46-
<% end %>
4758
</div>
48-
</div>
49-
<%= paginate @documents %>
59+
</div>

app/views/document_types/_table_documents.html.erb renamed to app/views/shared/_table_documents.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<th scope="col" class="lighter">Service</th>
77
<th scope="col" class="lighter">Inspect</th>
88
<th scope="col" class="lighter">Web location</th>
9-
<th scope="col" class="lighter"></th>
9+
<th scope="col" class="lighter text-right">Annotate</th>
1010
</tr>
1111
</thead>
1212
<tbody>

0 commit comments

Comments
 (0)