From 42359eff15938fae0dafc7bd9464c8bf4494de7d Mon Sep 17 00:00:00 2001 From: Xavier J Date: Wed, 11 Jan 2017 17:36:28 +0100 Subject: [PATCH 1/2] Fix rake tasks --- {app/lib => lib}/tasks/.keep | 0 {app/lib => lib}/tasks/cloud_storage.rake | 0 {app/lib => lib}/tasks/dev.rake | 0 {app/lib => lib}/tasks/opensimplif_import.rake | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {app/lib => lib}/tasks/.keep (100%) rename {app/lib => lib}/tasks/cloud_storage.rake (100%) rename {app/lib => lib}/tasks/dev.rake (100%) rename {app/lib => lib}/tasks/opensimplif_import.rake (100%) diff --git a/app/lib/tasks/.keep b/lib/tasks/.keep similarity index 100% rename from app/lib/tasks/.keep rename to lib/tasks/.keep diff --git a/app/lib/tasks/cloud_storage.rake b/lib/tasks/cloud_storage.rake similarity index 100% rename from app/lib/tasks/cloud_storage.rake rename to lib/tasks/cloud_storage.rake diff --git a/app/lib/tasks/dev.rake b/lib/tasks/dev.rake similarity index 100% rename from app/lib/tasks/dev.rake rename to lib/tasks/dev.rake diff --git a/app/lib/tasks/opensimplif_import.rake b/lib/tasks/opensimplif_import.rake similarity index 100% rename from app/lib/tasks/opensimplif_import.rake rename to lib/tasks/opensimplif_import.rake From f5f5ef1a0d9e94d5ab7965ae4d3fa5fb4c7d0a7b Mon Sep 17 00:00:00 2001 From: Xavier J Date: Thu, 12 Jan 2017 17:02:30 +0100 Subject: [PATCH 2/2] Badge count invites by dossiers --- .../_navbar_backoffice_dossierscontroller_show.html.haml | 2 ++ .../_navbar_users_recapitulatifcontroller_show.html.haml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml b/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml index 744d4e583..9e0a297d8 100644 --- a/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml +++ b/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml @@ -17,6 +17,8 @@ %div#invitations.dropdown-toggle{ 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false } %i.fa.fa-user = t('utils.involved') + .badge.progress-bar-info + = @facade.dossier.invites.count %div.dropdown-menu.dropdown-menu-right.dropdown-pannel %h4= t('dynamics.dossiers.followers.title') %ul diff --git a/app/views/layouts/navbars/_navbar_users_recapitulatifcontroller_show.html.haml b/app/views/layouts/navbars/_navbar_users_recapitulatifcontroller_show.html.haml index ba834c09f..b82f836ad 100644 --- a/app/views/layouts/navbars/_navbar_users_recapitulatifcontroller_show.html.haml +++ b/app/views/layouts/navbars/_navbar_users_recapitulatifcontroller_show.html.haml @@ -7,6 +7,8 @@ %div#invitations.dropdown-toggle{ 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false } %i.fa.fa-user = t('utils.involved') + .badge.progress-bar-info + = @facade.dossier.invites.count %div.dropdown-menu.dropdown-menu-right.dropdown-pannel %h4= t('dynamics.dossiers.followers.title') %ul