Merge branch 'develop' into staging

2017-01-12 17:02:39 +01:00 · 2017-01-12 17:02:39 +01:00 · eeb5c89b13
commit eeb5c89b13
parent 2ebd1aec2f f5f5ef1a0d
6 changed files with 4 additions and 0 deletions
--- 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
--- 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
--- a/app/lib/tasks/.keep
+++ b/app/lib/tasks/.keep
--- a/app/lib/tasks/cloud_storage.rake
+++ b/app/lib/tasks/cloud_storage.rake
--- a/app/lib/tasks/dev.rake
+++ b/app/lib/tasks/dev.rake
--- a/app/lib/tasks/opensimplif_import.rake
+++ b/app/lib/tasks/opensimplif_import.rake