diff --git a/app/assets/images/etapes/complet_2.png b/app/assets/images/etapes/complet_2.png new file mode 100644 index 000000000..90c8241f4 Binary files /dev/null and b/app/assets/images/etapes/complet_2.png differ diff --git a/app/assets/images/etapes/create_1.png b/app/assets/images/etapes/create_1.png new file mode 100644 index 000000000..1a37f8c11 Binary files /dev/null and b/app/assets/images/etapes/create_1.png differ diff --git a/app/assets/images/etapes/message_3.png b/app/assets/images/etapes/message_3.png new file mode 100644 index 000000000..facf08a69 Binary files /dev/null and b/app/assets/images/etapes/message_3.png differ diff --git a/app/assets/images/etapes/shared_4.png b/app/assets/images/etapes/shared_4.png new file mode 100644 index 000000000..90ce51dd3 Binary files /dev/null and b/app/assets/images/etapes/shared_4.png differ diff --git a/app/assets/images/keywords/documentation.png b/app/assets/images/keywords/documentation.png deleted file mode 100644 index cfebd1a93..000000000 Binary files a/app/assets/images/keywords/documentation.png and /dev/null differ diff --git a/app/assets/images/keywords/echanger.png b/app/assets/images/keywords/echanger.png deleted file mode 100644 index cf517db40..000000000 Binary files a/app/assets/images/keywords/echanger.png and /dev/null differ diff --git a/app/assets/images/keywords/faciliter.png b/app/assets/images/keywords/faciliter.png deleted file mode 100644 index 020ba4339..000000000 Binary files a/app/assets/images/keywords/faciliter.png and /dev/null differ diff --git a/app/assets/images/keywords/profiter.png b/app/assets/images/keywords/profiter.png deleted file mode 100644 index 0e1f016ba..000000000 Binary files a/app/assets/images/keywords/profiter.png and /dev/null differ diff --git a/app/assets/images/keywords/securiser.png b/app/assets/images/keywords/securiser.png deleted file mode 100644 index d49f08029..000000000 Binary files a/app/assets/images/keywords/securiser.png and /dev/null differ diff --git a/app/assets/images/keywords/simplifier.png b/app/assets/images/keywords/simplifier.png deleted file mode 100644 index 29ada7ff2..000000000 Binary files a/app/assets/images/keywords/simplifier.png and /dev/null differ diff --git a/app/assets/images/landing_background.png b/app/assets/images/landing_background.png index 1d67e71a1..a043859f7 100644 Binary files a/app/assets/images/landing_background.png and b/app/assets/images/landing_background.png differ diff --git a/app/assets/images/landing_background_old.png b/app/assets/images/landing_background_old.png new file mode 100644 index 000000000..1d67e71a1 Binary files /dev/null and b/app/assets/images/landing_background_old.png differ diff --git a/app/assets/images/logos/logo-tps.png b/app/assets/images/logos/logo-tps.png index af81e35a9..b667980eb 100644 Binary files a/app/assets/images/logos/logo-tps.png and b/app/assets/images/logos/logo-tps.png differ diff --git a/app/assets/images/logos/logo-tps_old.png b/app/assets/images/logos/logo-tps_old.png new file mode 100644 index 000000000..af81e35a9 Binary files /dev/null and b/app/assets/images/logos/logo-tps_old.png differ diff --git a/app/assets/javascripts/gestionnaire_dossier_modal.js b/app/assets/javascripts/gestionnaire_dossier_modal.js index 4727189a6..2632ab407 100644 --- a/app/assets/javascripts/gestionnaire_dossier_modal.js +++ b/app/assets/javascripts/gestionnaire_dossier_modal.js @@ -13,4 +13,4 @@ function modal_action() { modal.find('#PJmodal_title').html(modal_title); $("#PJmodal .modal-body .table #"+modal_index).show(); }) -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/admin_type_de_champ.scss b/app/assets/stylesheets/admin_type_de_champ.scss index 71747f829..e4a9b92e9 100644 --- a/app/assets/stylesheets/admin_type_de_champ.scss +++ b/app/assets/stylesheets/admin_type_de_champ.scss @@ -1,5 +1,5 @@ .header_section{ - background-color: rgb(245,245,245); + background-color: rgb(0, 49, 137); margin-top: 20px; margin-bottom: 10px; margin-left: 0; @@ -7,6 +7,12 @@ text-align:center; padding-bottom: 8px; + color: white; + + .form-control.libelle { + font-weight: bold; + } + .form-group.description { display: none; } diff --git a/app/assets/stylesheets/dossiers.scss b/app/assets/stylesheets/dossiers.scss index 31fe3e57b..c6a493da8 100644 --- a/app/assets/stylesheets/dossiers.scss +++ b/app/assets/stylesheets/dossiers.scss @@ -56,6 +56,9 @@ h5 span { padding: 15px 40px 15px 20px; cursor: pointer; line-height: 1.8em; + .progress-bar-warning { + background-color: #E4594F; + } } .procedure_list_element:hover, .notification:hover { background-color: #668ABD; diff --git a/app/assets/stylesheets/landing.scss b/app/assets/stylesheets/landing.scss index 8adbe7df5..cde9c323e 100644 --- a/app/assets/stylesheets/landing.scss +++ b/app/assets/stylesheets/landing.scss @@ -1,16 +1,26 @@ #landing { - background-image: image-url('landing_background.png'); background-attachment: fixed; + background-size: 130% auto; background-position: top center; background-repeat: no-repeat; - background-color: rgba(11,107,168,0.2); + h5{ + color: grey; + } + + .logos { + width: 150px; + } + + #logo-tps { + width: 200px; + } #title { - h1 { - font-size: 65px; - } + padding-bottom: 2%; + padding-top: 1%; + h2 { font-size: 35px; } @@ -18,104 +28,31 @@ .btn { text-shadow: none; } - color: white; - padding-top: 3%; - padding-bottom: 4%; - text-shadow: 0px 0px 10px rgb(0, 0, 0); - } - .logo img { - width: 70px; + color: white; + text-shadow: 0px 0px 10px rgb(0, 0, 0); } } -#suite { - .row{ - width: 100%; - margin-left: 0; - margin-right: 0; - } - .word { - border-bottom: solid darkgrey 1px; +.background-tps{ + background-color: #668AEA; + color: white; +} - img { - padding-top: 50px; - padding-bottom: 50px; - width: 200px; - margin-left: 25%; - } +#landing_body{ + .split-hr-left { + margin-left: auto; + margin-right: auto; + + margin-top: 40px; + margin-bottom: 20px; + + border-color: grey; + width: 40%; } - .simplifier { - ul { - margin-top: 13%; - } + #etapes, #request_access{ + margin-top: 20px; + margin-bottom: 20px; } - - .securiser { - img { - width: 300px; - } - - ul { - margin-top: 11%; - } - } - - .echanger { - ul { - margin-top: 4%; - } - } - .profiter { - //border-bottom: none; - - ul { - margin-top: 10%; - } - } - .news { - padding-top: 25px; - padding-bottom: 25px; - - .latest_release { - .body { - margin-left: 3%; - } - } - } - - .demo_account { - img { - margin-left: 0; - padding-top: 10px; - padding-bottom: 0; - } - padding-top: 25px; - padding-bottom: 25px; - - .btn { - margin-top: 10%; - } - } - - .documentation { - border-bottom: none; - - padding-top: 15px; - padding-bottom: 15px; - - a { - margin-top: 16%; - } - - ul{ - margin-top: 14%; - } - - img { - margin-left: 0; - width: 22%; - } - } -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/left_pannel.scss b/app/assets/stylesheets/left_pannel.scss index b528b99bb..7c8925c3f 100644 --- a/app/assets/stylesheets/left_pannel.scss +++ b/app/assets/stylesheets/left_pannel.scss @@ -14,26 +14,55 @@ font-family: Arial; font-size: 16px; line-height: 18px; + margin-top: 20px; .infos { font-size: 25px; text-align: center; - margin: 20px 10px 30px 0; + margin: 10px 10px 30px 0; .projet-name { font-size: 25px; line-height: normal; padding: 5px; } } + .count { + display: inline-block; + padding: 3px; + border-radius: 25px; + min-width: 40px; + text-align: center; + line-height: 23px; + } + .text { + display: inline-block; + width: 30px; + margin: 0 0 0 8px; + } .dossiers-en-cours, .en-cours { margin-top: 20px; } - .dossiers-en-cours, .nouveaux-dossiers, .en-cours { - line-height: initial; - text-align: center; - margin-right: 10px; + .dossiers-en-cours { + .count { + border: 1px solid #FFFFFF; + } + } + .nouveaux-dossiers { + .count { + background-color: #5CB85C; + } + } + .nouvelles-notifications { + .count { + background-color: #E4594F; + } + } + .dossiers-en-cours, .nouveaux-dossiers, .nouvelles-notifications, .en-cours { + margin: 5px auto 0 20px; + width: 150px; } } #action-block { + text-align: center; margin: 10px; .action { background-color: #E45B51; @@ -140,13 +169,26 @@ margin: 0 30px 0 30px; } .notification { - padding: 10px 10px 10px 20px; + padding: 10px 2px 10px 15px; .dossier, .updated-at { display: inline-block; color: #CCCCCC; font-size: 12px; text-align: left; } + .dossier-index, .updated-at-index, .count { + display: inline-block; + color: #FFFFFF; + font-size: 14px; + text-align: left; + } + .count { + background-color: #F0AD4E; + border-radius: 25px; + padding: 0 5px 0 5px; + width: 25px; + text-align: center; + } .type-notif { font-size: 16px; } diff --git a/app/decorators/notification_decorator.rb b/app/decorators/notification_decorator.rb index 911471e1a..0763f1dc2 100644 --- a/app/decorators/notification_decorator.rb +++ b/app/decorators/notification_decorator.rb @@ -3,6 +3,6 @@ class NotificationDecorator < Draper::Decorator def index_display ['champs', 'piece_justificative'].include?(type_notif) ? type = liste.join(" ") : type = liste.last - { dossier: "Dossier n°#{dossier.id}", date: updated_at.strftime('%d/%m %H:%M'), type: type } + { dossier: "Dossier n°#{dossier.id}", date: created_at.strftime('%d/%m %H:%M'), type: type } end end diff --git a/app/facades/dossiers_list_facades.rb b/app/facades/dossiers_list_facades.rb index d32cb0eb4..6f0cf3bde 100644 --- a/app/facades/dossiers_list_facades.rb +++ b/app/facades/dossiers_list_facades.rb @@ -31,13 +31,17 @@ class DossiersListFacades end def gestionnaire_procedures_name_and_id_list - @current_devise_profil.procedures.order('libelle ASC').inject([]) { |acc, procedure| acc.push({id: procedure.id, libelle: procedure.libelle, unread_notifications: @current_devise_profil.notifications_for(procedure)}) } + @current_devise_profil.procedures.order('libelle ASC').inject([]) { |acc, procedure| acc.push({id: procedure.id, libelle: procedure.libelle, unread_notifications: @current_devise_profil.dossier_with_notification_for(procedure)}) } end def unread_notifications current_devise_profil.notifications end + def dossiers_with_unread_notifications + (unread_notifications.inject([]) { |acc, notif| acc.push(notif.dossier) }).uniq + end + def procedure_id @procedure.nil? ? nil : @procedure.id end diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb index 5f4303042..f42be257c 100644 --- a/app/mailers/notification_mailer.rb +++ b/app/mailers/notification_mailer.rb @@ -1,6 +1,6 @@ class NotificationMailer < ApplicationMailer def new_answer dossier - send_mail dossier, "Nouveau commentaire pour votre dossier TPS N°#{dossier.id}" + send_mail dossier, "Nouveau message pour votre dossier TPS N°#{dossier.id}" end def dossier_received dossier diff --git a/app/models/dossier.rb b/app/models/dossier.rb index 8680dc64c..e3f719e38 100644 --- a/app/models/dossier.rb +++ b/app/models/dossier.rb @@ -59,6 +59,14 @@ class Dossier < ActiveRecord::Base TERMINE = %w(closed refused without_continuation) ALL_STATE = %w(initiated updated replied validated submitted received closed refused without_continuation) + def unreaded_notifications + @unreaded_notif ||= notifications.where(already_read: false) + end + + def first_unread_notification + unreaded_notifications.order("created_at ASC").first + end + def retrieve_last_piece_justificative_by_type(type) pieces_justificatives.where(type_de_piece_justificative_id: type).last end diff --git a/app/models/gestionnaire.rb b/app/models/gestionnaire.rb index 580dc1b96..c944d93a6 100644 --- a/app/models/gestionnaire.rb +++ b/app/models/gestionnaire.rb @@ -79,6 +79,18 @@ class Gestionnaire < ActiveRecord::Base 0 end + def dossier_with_notification_for procedure + procedure_ids = dossiers_follow.pluck(:procedure_id) + + if procedure_ids.include?(procedure.id) + return dossiers_follow.where(procedure_id: procedure.id) + .inject(0) do |acc, dossier| + acc += ((dossier.notifications.where(already_read: false).count) > 0 ? 1 : 0) + end + end + 0 + end + private def valid_couple_table_attr? table, column diff --git a/app/views/dossiers/_dossier_show.html.haml b/app/views/dossiers/_dossier_show.html.haml index 8e7f6f874..3c1da4f2f 100644 --- a/app/views/dossiers/_dossier_show.html.haml +++ b/app/views/dossiers/_dossier_show.html.haml @@ -4,7 +4,11 @@ %div.col-lg-10.col-md-10.col-sm-10.col-xs-10.title .carret-right .carret-down - MESSAGES + MESSAGERIE avec votre + - if user_signed_in? + Administration + - elsif gestionnaire_signed_in? + Usager %div.col-lg-2.col-md-2.col-sm-2.col-xs-2.count - message_count = @facade.commentaires.count = (message_count == 1) ? "1 message" : "#{message_count} messages" diff --git a/app/views/dossiers/_infos_dossier.html.haml b/app/views/dossiers/_infos_dossier.html.haml index a7f5c8a09..bade9cde2 100644 --- a/app/views/dossiers/_infos_dossier.html.haml +++ b/app/views/dossiers/_infos_dossier.html.haml @@ -95,8 +95,9 @@ %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter %span{style:'margin-left:12px'} \- - = link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => 'cerfa' do - %span.fa.fa-clock-o + - if @facade.dossier.pieces_justificatives.where(type_de_piece_justificative_id: type_de_piece_justificative.id).count > 1 + = link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}" do + %span.fa.fa-clock-o - else = 'Pièce non fournie' diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 1730f61a7..12b60bafb 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -13,9 +13,7 @@ %body = render partial: 'layouts/support_navigator_banner' #beta{class:(Rails.env == 'production' ? '' : 'beta_staging')} - - if Rails.env == 'production' - Beta - - else + - if Rails.env != 'production' Env Test - if Rails.env == 'test' diff --git a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml index 0f4c5afb3..59b380de6 100644 --- a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml +++ b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml @@ -1,10 +1,13 @@ %div#first-block %div.dossiers-en-cours - = @facade_data_view.total_dossier - DOSSIERS EN COURS + .count= @facade_data_view.total_dossier + .text= "SUIVIS" %div.nouveaux-dossiers - = @facade_data_view.total_new_dossier - NOUVEAUX DOSSIERS + .count= @facade_data_view.total_new_dossier + .text= "NOUVEAUX" + %div.nouvelles-notifications + .count= @facade_data_view.dossiers_with_unread_notifications.count + .text= "MODIFIÉS" %div#action-block @@ -29,13 +32,12 @@ .badge.progress-bar-warning{title: 'Notifications'} = procedure[:unread_notifications] #notifications_list.hidden - - if @facade_data_view.unread_notifications.empty? + - if @facade_data_view.dossiers_with_unread_notifications.empty? .no-notification= "Aucune notification pour le moment." - else - - @facade_data_view.unread_notifications.each do |notification| - = link_to backoffice_dossier_path(notification.dossier.id) do + - @facade_data_view.dossiers_with_unread_notifications.each do |dossier| + = link_to backoffice_dossier_path(dossier.id) do .notification - .dossier= notification.decorate.index_display[:dossier] - .updated-at= notification.decorate.index_display[:date] - = render partial: "layouts/left_panels/type_notif_fa", locals: {notification: notification} - .type= notification.decorate.index_display[:type] + .dossier-index= "Dossier n°#{dossier.id}" + .updated-at-index= dossier.first_unread_notification.created_at.strftime('%d/%m %H:%M') + .count= dossier.unreaded_notifications.count diff --git a/app/views/layouts/left_panels/_type_notif_fa.html.haml b/app/views/layouts/left_panels/_type_notif_fa.html.haml index f081b230b..3f7ea27fc 100644 --- a/app/views/layouts/left_panels/_type_notif_fa.html.haml +++ b/app/views/layouts/left_panels/_type_notif_fa.html.haml @@ -1,7 +1,7 @@ - case notification.type_notif - when "commentaire" .type-notif.fa.fa-comments-o -- when "submited" +- when "submitted" .type-notif.fa.fa-thumbs-o-up - when "champs" .type-notif.fa.fa-list-alt diff --git a/app/views/notification_mailer/dossier_closed.text.erb b/app/views/notification_mailer/dossier_closed.text.erb index 57e7c03fa..81d692a64 100644 --- a/app/views/notification_mailer/dossier_closed.text.erb +++ b/app/views/notification_mailer/dossier_closed.text.erb @@ -6,5 +6,9 @@ A tout moment, vous pouvez consulter le contenu de vos dossiers et les éventuel Bonne journée +--- +Merci de ne pas répondre à ce mail. Postez directement vos questions dans votre dossier sur la plateforme. +--- + --- L'équide TPS - tps@apientreprise.fr \ No newline at end of file diff --git a/app/views/notification_mailer/dossier_refused.text.erb b/app/views/notification_mailer/dossier_refused.text.erb index 1c061ad32..2024297be 100644 --- a/app/views/notification_mailer/dossier_refused.text.erb +++ b/app/views/notification_mailer/dossier_refused.text.erb @@ -6,5 +6,9 @@ Pour en savoir plus sur le motif du refus, vous pouvez consulter le contenu de v Bonne journée, +--- +Merci de ne pas répondre à ce mail. Postez directement vos questions dans votre dossier sur la plateforme. +--- + --- L'équide TPS - tps@apientreprise.fr \ No newline at end of file diff --git a/app/views/notification_mailer/dossier_submitted.text.erb b/app/views/notification_mailer/dossier_submitted.text.erb index bc05f0e26..2357b8bbf 100644 --- a/app/views/notification_mailer/dossier_submitted.text.erb +++ b/app/views/notification_mailer/dossier_submitted.text.erb @@ -4,5 +4,9 @@ Nous vous confirmons que votre dossier N°<%=@dossier.id%> a été déposé aupr Bonne journée, +--- +Merci de ne pas répondre à ce mail. Postez directement vos questions dans votre dossier sur la plateforme. +--- + --- L'équide TPS - tps@apientreprise.fr \ No newline at end of file diff --git a/app/views/notification_mailer/dossier_validated.text.erb b/app/views/notification_mailer/dossier_validated.text.erb index bfe057f15..a5b19304b 100644 --- a/app/views/notification_mailer/dossier_validated.text.erb +++ b/app/views/notification_mailer/dossier_validated.text.erb @@ -6,5 +6,9 @@ Afin de finaliser son dépôt, merci de vous rendre sur <%=users_dossier_recapit Bonne journée, +--- +Merci de ne pas répondre à ce mail. Postez directement vos questions dans votre dossier sur la plateforme. +--- + --- L'équide TPS - tps@apientreprise.fr \ No newline at end of file diff --git a/app/views/notification_mailer/dossier_without_continuation.text.erb b/app/views/notification_mailer/dossier_without_continuation.text.erb index 66d0604c2..73fe7d8e2 100644 --- a/app/views/notification_mailer/dossier_without_continuation.text.erb +++ b/app/views/notification_mailer/dossier_without_continuation.text.erb @@ -6,5 +6,9 @@ Pour en savoir plus sur les raisons de ce classement sans suite, vous pouvez con Bonne journée, +--- +Merci de ne pas répondre à ce mail. Postez directement vos questions dans votre dossier sur la plateforme. +--- + --- L'équide TPS - tps@apientreprise.fr \ No newline at end of file diff --git a/app/views/notification_mailer/new_answer.text.erb b/app/views/notification_mailer/new_answer.text.erb index 947d7826d..d6874bd6d 100644 --- a/app/views/notification_mailer/new_answer.text.erb +++ b/app/views/notification_mailer/new_answer.text.erb @@ -1,10 +1,14 @@ Bonjour <%= @user.email %> -Un nouveau commentaire est disponible dans votre espace TPS. +Un nouveau message est disponible dans votre espace TPS. Pour le consulter, merci de vous rendre sur <%=users_dossier_recapitulatif_url(dossier_id: @dossier.id)%> Bonne journée +--- +Merci de ne pas répondre à ce mail. Postez directement vos questions dans votre dossier sur la plateforme. +--- + --- L'équide TPS - tps@apientreprise.fr \ No newline at end of file diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml index 7d5ae2978..472a04034 100644 --- a/app/views/root/landing.html.haml +++ b/app/views/root/landing.html.haml @@ -1,87 +1,102 @@ -- total = 100 - 2 -- interface = 5 -- notification = 10 -- bugs = 10 -- realise = total - interface - notification - bugs #landing.max-size - #title{style:'padding-bottom: 2%; padding-top: 2%'} + #title %h1.center - TPS V2 + %img#logo-tps{src: image_url('logos/logo-tps.png')} %h2.center - Pour une meilleure plateforme + TéléProcédure Simplifiée + + %h3.center + Plateforme publique pour réaliser des démarches administratives 100% en ligne. %br - %h3.center - La plateforme évolue pour une meilleure interface, de meilleures interactions et une meilleure expérience. + %br + .center + %button.background-tps.js-scrollTo.btn.btn-lg{cible: '.demo_account'} + Envie d'essayer ? -#progression{style:'margin-left: 2em; margin-right: 2em; margin-top: 50px'} - %h2.center Où en est la migration vers TPS V2 ? ... +#landing_body.max-size + .row#etapes.center + #create_1.col-lg-3.col-md-3.col-sm-3.col-xs-3 + %img{src:image_url('etapes/create_1.png')} + %br + %h4 Administration + %h3.text-info Je construis ma démarche 100% en ligne + #complet_2.col-lg-3.col-md-3.col-sm-3.col-xs-3 + %img{src:image_url('etapes/complet_2.png')} + %br + %h4 Usager + %h3.text-success Je remplis un dossier de manière simplifiée + #message_3.col-lg-3.col-md-3.col-sm-3.col-xs-3 + %img{src:image_url('etapes/message_3.png')} + %br + %h4 Usager + %h3.text-warning Je dialogue avec mon administration en ligne + #shared_4.col-lg-3.col-md-3.col-sm-3.col-xs-3 + %img{src:image_url('etapes/shared_4.png')} + %br + %h4 Usager et Administrations + %h3.text-danger + J'invite des partenaires à co-construire le dossier - %h2.text-success.center{style:'margin-left: 135px'} - = realise - \% - %i.text-default{style:'font-size: 18px'} - du site migré - %div{style: "width: 60%; margin-left:auto; margin-right:auto"} - .progress{style:'height: 30px; background-color: #ddd'} - .progress-bar.progress-bar-success.progress-bar-striped{:style => "width: #{realise}%;"} - .progress-bar.progress-bar-warning{:style => "width: #{interface}%;"} - %div{style:'margin-top: 0.4em'} - Interface - .progress-bar.progress-bar-purple{:style => "width: #{notification}%;"} - %div{style:'margin-top: 0.4em'} - Notifications - .progress-bar.progress-bar-danger{:style => "width: #{bugs}%;"} - %div{style:'margin-top: 0.4em'} - Fiabilisations et bugs + .split-hr-left + .row.demo_account.center + .col-md-4.col-lg-4 + %h3.text-primary Acteurs publics + %h4 Créez des démarches en ligne simplifiées et sécurisées. + =link_to 'Démonstration', 'https://tps-dev.apientreprise.fr/administrateurs/sign_in/demo', {class: 'btn btn-lg btn-primary'} -#road_map.center{style:'margin-top: 30px; margin-bottom: 50px'} - %h2.text-success - Réalisé + .col-md-4.col-lg-4 + %h3.text-warning Agents et services + %h4 Accompagnez et co-traitez les projets avec les usagers. + =link_to 'Démonstration', 'https://tps-dev.apientreprise.fr/gestionnaires/sign_in/demo', {class: 'btn btn-lg btn-warning'} - #realise{style: 'width: 650px; margin-left: auto; margin-right: auto; text-align:left'} - %ul - %li - Un design général qui permet de mieux s'y retrouver - %li - Utilisateur, Accompagnateur et Administrateur ont maintenant la même page de connexion - %li - Un tout nouveau tableau de bord pour les Accompagnateurs - %li - Une page récapitulative pour un dossier entièrement revue - %li - La possibilité de changer en un clic de compte entre Utilisateur, Accompagnateur et Administrateur - %li - Une recherche globale : tapez et vous trouverez !! + .col-md-4.col-lg-4 + %h3.text-success Usagers + %h4 Profitez de démarches simplifiées et d’échanges continus avec les services traitants. + =link_to 'Démonstration', 'https://tps-dev.apientreprise.fr/users/sign_in/demo', {class: 'btn btn-lg btn-success'} - %br - %h2.text-warning - Reste à faire + .split-hr-left - #reste_a_faire{style: 'width: 650px; margin-left: auto; margin-right: auto; text-align:left'} - %ul - %li - Terminer d'optimiser nos pages avec la nouvelle interface - %b.text-warning - ="(#{interface}%)" - %li - Centre de notification : un seul endroit pour suivre l'activité de l'ensemble de vos dossiers (Accompagnateur) - %b.text-purple - ="(#{notification}%)" - %li - Fiabilisation accrue de la plateforme : un certain nombre de bugs est encore présents ... - %b.text-danger - ="(#{bugs}%)" - %li - %b - Prendre vos retours en compte : - = link_to 'feedback@tps.apientreprise.fr', "mailto:feedback@tps.apientreprise.fr" + #request_access.row.center + .col-xs-12.col-sm-12.col-md-12.col-lg-12 + %h3 Envi de commencer à créer votre démarche ? + = link_to 'Demander un accès administrateur', 'https://tps.apientreprise.fr/users/dossiers/new?procedure_id=31', {class: 'btn btn-lg background-tps', target: '_blank'} -%h3.center - Disponible sur - = link_to "tps.apientreprise.fr", 'https://tps.apientreprise.fr', target: '_blank' - le - %span.text-success - 3 Janvier 2017 \ No newline at end of file + .split-hr-left + + .center + .row + #utilisateurs.col-xs-12.col-sm-12.col-md-12.col-lg-12 + %h4 Ils nous font confiances + + Consel regional Ile de France, + Politique de la ville du Pas de calais, + DRIEA Ile de France + + %br + + Préfecture de la martinique, + DRIEE Ile de France, + Ministère de l'écologie et du développement durable, + MEME, + CCI Normandie + + %br + .row + #partenaires.col-xs-12.col-sm-12.col-md-12.col-lg-12 + %h4 Ils travaillent avec nous + + Insee + Infogreff, + Ministere de la jeunesse et du sport, + IGN, + DGFIP + France Connect, + BAN, + api.gouv.fr + Euroquity, + BPI, + FNTP, + Qualibat \ No newline at end of file diff --git a/app/views/users/sessions/_resume_procedure.html.haml b/app/views/users/sessions/_resume_procedure.html.haml index f99ce8bd8..3fdbfdaa2 100644 --- a/app/views/users/sessions/_resume_procedure.html.haml +++ b/app/views/users/sessions/_resume_procedure.html.haml @@ -14,5 +14,6 @@ = h @dossier.procedure.description.html_safe - else - = image_tag(image_url(LOGO_NAME), {id: 'logo_tps'}) + #logo_procedure.flag + = image_tag(image_url(LOGO_NAME), {id: 'logo_tps'}) %br \ No newline at end of file