diff --git a/app/components/pagination_component/pagination_component.html.erb b/app/components/pagination_component/pagination_component.html.erb index 1625876..eeb56cf 100644 --- a/app/components/pagination_component/pagination_component.html.erb +++ b/app/components/pagination_component/pagination_component.html.erb @@ -1,6 +1,6 @@
-
+
<% if opts[:is_subject_breadcrums].present? && subjects.present? %> <% else %> -

Search Results

+

Search Results

<%= page_entries_info data, entry_name: 'records' if data.present? %> diff --git a/app/javascript/src/application.scss b/app/javascript/src/application.scss index 53ca036..2bd369f 100644 --- a/app/javascript/src/application.scss +++ b/app/javascript/src/application.scss @@ -1,6 +1,8 @@ @import "~bootstrap/scss/bootstrap"; @import "./application/sidenav"; @import "./application/sessions"; +@import "./application/pagination"; +@import "./application/table"; .tableFixHead { overflow: auto; @@ -33,3 +35,8 @@ .accordion-button::after { margin-right: 10px; } + +.main-content-body { + min-height: 100vh !important; + overflow: auto; +} \ No newline at end of file diff --git a/app/javascript/src/application/pagination.scss b/app/javascript/src/application/pagination.scss new file mode 100644 index 0000000..e1915f9 --- /dev/null +++ b/app/javascript/src/application/pagination.scss @@ -0,0 +1,9 @@ +.pagination-body .pagination .page-item a{ + color: darkred; + } + +.pagination-body .pagination span.page-item.page.current.page-link { +border: darkred; +background: darkred !important; +color: #fff !important; +} \ No newline at end of file diff --git a/app/javascript/src/application/table.scss b/app/javascript/src/application/table.scss new file mode 100644 index 0000000..140840b --- /dev/null +++ b/app/javascript/src/application/table.scss @@ -0,0 +1,8 @@ + +.table > :not(:first-child) { + border-top: none !important; +} + +thead tr { + border-bottom: 2px solid #782525 +} diff --git a/app/views/documents/index.html.erb b/app/views/documents/index.html.erb index 18ba62a..962f839 100644 --- a/app/views/documents/index.html.erb +++ b/app/views/documents/index.html.erb @@ -1,23 +1,22 @@ -
-
- <%= form_tag(documents_path, method: :get) do %> -
-
- <%= text_field_tag :q, params[:q], class: "form-control" %> -
-
- <%= submit_tag "Search", class: "btn btn-primary text-dark" %> - +
+ <%= form_tag(documents_path, method: :get) do %> +
+
+ <%= text_field_tag :q, params[:q], placeholder: 'Full text search', class: "form-control" %> +
- - -
- <% if @search_params.present? %> -
<%= render PaginationComponent.new(data: @jurisprudences) %>
- - - - - - + + + <% end %> + + +<% if @search_params.present? %> +
<%= render PaginationComponent.new(data: @jurisprudences) %>
+
+
+
+
+
Reference No. Title Date
+ + + + + - - <%= render(DocumentIndexTableComponent.with_collection(@jurisprudences, current_user: current_user, opts: {})) %> - -
Reference No. Title Date
- <% end %> + + <%= render(DocumentIndexTableComponent.with_collection(@jurisprudences, current_user: current_user, opts: {})) %> + + +
+
-
+<% end %> \ No newline at end of file diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb index 936ff4b..93e9e07 100644 --- a/app/views/kaminari/_first_page.html.erb +++ b/app/views/kaminari/_first_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, remote: remote, class: "page-link" %> + <%= link_to_unless current_page.first?, ''.html_safe, url, remote: remote, class: "page-link" %> diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb index 5e86ca6..c5bfc68 100644 --- a/app/views/kaminari/_last_page.html.erb +++ b/app/views/kaminari/_last_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, remote: remote, class: "page-link" %> + <%= link_to_unless current_page.last?, ''.html_safe, url, remote: remote, class: "page-link" %> diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb index 89fead1..edc2e96 100644 --- a/app/views/kaminari/_next_page.html.erb +++ b/app/views/kaminari/_next_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, rel: 'next', remote: remote, class: "page-link" %> + <%= link_to_unless current_page.last?, ''.html_safe, url, rel: 'next', remote: remote, class: "page-link" %> diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb index 5525f48..4917e0b 100644 --- a/app/views/kaminari/_paginator.html.erb +++ b/app/views/kaminari/_paginator.html.erb @@ -7,7 +7,7 @@ paginator: the paginator that renders the pagination tags inside -%> <%= paginator.render do -%> -
<% end %> -