DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix 4052 admin contextual help (#4094)

Browse source 
Administrateur : le bouton "Publier" n'est plus masqué par l'aide contextuelle
This commit is contained in:
Pierre de La Morinerie 2019-07-15 12:25:12 +02:00 committed by GitHub
commit 115a123555
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/application_controller.rb
View file

@ -250,7 +250,11 @@ class ApplicationController < ActionController::Base
email: current_administrateur&.email,
DS_SIGN_IN_COUNT: current_administrateur&.sign_in_count,
DS_CREATED_AT: current_administrateur&.created_at,
DS_ID: current_administrateur&.id
DS_ID: current_administrateur&.id,
DS_NB_DEMARCHES_BROUILLONS: current_administrateur&.procedures&.brouillons&.count,
DS_NB_DEMARCHES_ACTIVES: current_administrateur&.procedures&.publiees&.count,
DS_NB_DEMARCHES_ARCHIVES: current_administrateur&.procedures&.archivees&.count
}
}
end

11
app/javascript/shared/track/crisp.js
View file

@ -21,6 +21,12 @@ if (enabled) {
[
['DS_ID', administrateur.email],
['DS_SIGN_IN_COUNT', administrateur.DS_SIGN_IN_COUNT],
[
'DS_NB_DEMARCHES_BROUILLONS',
administrateur.DS_NB_DEMARCHES_BROUILLONS
],
['DS_NB_DEMARCHES_ACTIVES', administrateur.DS_NB_DEMARCHES_ACTIVES],
['DS_NB_DEMARCHES_ARCHIVES', administrateur.DS_NB_DEMARCHES_ARCHIVES],
[
'URL_MANAGER',
'https://www.demarches-simplifiees.fr/manager/administrateurs/' +
@ -29,4 +35,9 @@ if (enabled) {
]
]
]);
window.$crisp.push([
'set',
'session:event',
[[['PAGE_VIEW', { URL: window.location.pathname }]]]
]);
}

4
app/views/admin/procedures/new.html.haml
View file

@ -5,5 +5,5 @@
#procedure_new.section.section-label
= form_for @procedure, url: { controller: 'admin/procedures', action: :create }, multipart: true do |f|
= render partial: 'informations', locals: { f: f }
.text-right
= f.button 'Valider', class: 'btn btn-info', id: 'save-procedure'
.text-center
= f.button 'Valider', class: 'btn btn-info btn-lg btn-block', id: 'save-procedure'

2
app/views/layouts/_navbar.html.haml
View file

@ -10,7 +10,7 @@
#navbar-body
.row
%div{ style: "vertical-align: middle;float:left;position:absolute;line-height: 60px;z-index:2;" }
👉 Besoin d'aide? Contactez-nous par <a style="cursor:hand" onclick="$crisp.push(['do', 'chat:open'])">chat</a>, <a href="#{contact_admin_path}" target="_blank" rel="noopener">email</a> ou <a target="_blank" rel="noopener" href="https://calendly.com/demarches-simplifiees/accompagnement-administrateur-demarches-simplifiees-fr">prenez rendez-vous avec nous</a>.
👉Besoin d'aide? Contactez-nous par <a style="cursor:hand" onclick="$crisp.push(['do', 'chat:open'])">chat</a>, <a href="#{contact_admin_path}" target="_blank" rel="noopener">email</a> ou <a target="_blank" rel="noopener" href="https://calendly.com/demarches-simplifiees/accompagnement-administrateur-demarches-simplifiees-fr">prenez RDV</a>
-# BEST WTF EVER
-# this begin rescue hides potentials bugs by displaying another navbar
- begin