diff options
| author | Steffen van Bergerem <svbergerem@online.de> | 2016-08-12 23:10:57 +0300 |
|---|---|---|
| committer | Steffen van Bergerem <svbergerem@online.de> | 2016-08-18 02:54:43 +0300 |
| commit | 993f3d5ab0f45baaf301e3587c1dd7acc780eb4c (patch) | |
| tree | 6f02e85a224e7c72a428731dda2729a60e823a78 /app/views | |
| parent | d022e51a0c68bece91503eeef29b0e73091c49c5 (diff) | |
Refactor contacts page using pagination
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/contacts/_header.html.haml | 13 | ||||
| -rw-r--r-- | app/views/contacts/index.html.haml | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/app/views/contacts/_header.html.haml b/app/views/contacts/_header.html.haml index e6059e005..d8d323fb1 100644 --- a/app/views/contacts/_header.html.haml +++ b/app/views/contacts/_header.html.haml @@ -20,7 +20,11 @@ = link_to @aspect, method: "delete", data: { confirm: t("aspects.edit.confirm_remove_aspect") }, class: "delete contacts_button", id: "delete_aspect" do %i.entypo-trash.contacts-header-icon{title: t("delete")} .pull-right.contact-list-search - = search_field_tag :contact_search, "", id: "contact_list_search", class: "search-query form-control", placeholder: t("contacts.index.user_search") + %form#contact-search-form{role: "search", method: "get", action: "/search"} + = search_field_tag :q, "", + id: "contact_list_search", + class: "search-query form-control", + placeholder: t("contacts.index.user_search") %h3 %span#aspect_name = @aspect.name @@ -32,6 +36,13 @@ = aspect.submit t('aspects.edit.update'), 'data-disable-with' => t('aspects.edit.updating'), class: "btn btn-default" - else + .pull-right.contact-list-search + %form#contact-search-form{role: "search", method: "get", action: "/search"} + = search_field_tag :q, "", + id: "contact_list_search", + class: "search-query form-control", + placeholder: t("contacts.index.user_search") + %h3 - case params["set"] - when "only_sharing" diff --git a/app/views/contacts/index.html.haml b/app/views/contacts/index.html.haml index ebc6d2e43..2a8de4f32 100644 --- a/app/views/contacts/index.html.haml +++ b/app/views/contacts/index.html.haml @@ -29,6 +29,10 @@ .btn.btn-link{ 'data-toggle' => 'modal' } = t('invitations.new.invite_someone_to_join') + #paginate + %span.loader.hidden + .spinner + -if @aspect #new_conversation_pane = render 'shared/modal', |