2nd round about css and some adjustements: message/pj empty validation, margins, link_to div inclusion and more

app/assets/stylesheets/dossier_show.scss

@@ -117,7 +117,6 @@
       .depositaire-label {
         font-weight: bold;
         text-align: end;
-        margin-left: -20px;
       }
       .depositaire-info {
       }

app/assets/stylesheets/left_pannel.scss

@@ -23,9 +23,10 @@
         padding: 5px;
       }
     }
-    .en-cours {
+    .dossiers-en-cours, .en-cours {
       margin-top: 20px;
-      font-size: 25px;
+    }
+    .dossiers-en-cours, .nouveaux-dossiers, .en-cours {
       line-height: initial;
       text-align: center;
       margin-right: 10px;

app/assets/stylesheets/navbar.scss

@@ -114,7 +114,7 @@
 #download-menu {
   .btn-sm {
     color: #000000;
-    font-size: 18px;
+    font-size: 14px;
   }
 }
 

app/controllers/commentaires_controller.rb

@@ -36,7 +36,11 @@ class CommentairesController < ApplicationController
 
     @commentaire.body = params['texte_commentaire']
     saved = false
-    saved = @commentaire.save unless flash.alert
+    unless @commentaire.body.blank? && @commentaire.piece_justificative.nil?
+      saved = @commentaire.save unless flash.alert
+    else
+      flash.alert = "Veuillez rédiger un message ou ajouter une pièce jointe."
+    end
 
     if is_gestionnaire?
       unless current_gestionnaire.follow? @commentaire.dossier

app/views/dossiers/_dossier_show.html.haml

@@ -56,8 +56,8 @@
         %div.col-lg-8.col-md-8.title-no-expanse
           %div.carret-right
           INFORMATIONS ENTREPRISE / ASSOCIATION
-        %div.col-lg-4.col-md-4.action
-          %a#add_siret.action{href: users_dossier_add_siret_path(dossier_id: @facade.dossier.id)}
+        %a#add_siret.action{href: users_dossier_add_siret_path(dossier_id: @facade.dossier.id)}
+          %div.col-lg-4.col-md-4.action
             = "Renseigner un SIRET"
 
 - unless @facade.entreprise.nil?

app/views/dossiers/_edit_dossier.html.haml

@@ -1,5 +1,5 @@
 - unless @facade.dossier.read_only?
   - if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email))
-    %div.col-lg-2.col-md-2.action
-      %a#maj_infos.action{href: "/users/dossiers/#{@facade.dossier.id}/description"}
+    %a#maj_infos.action{href: "/users/dossiers/#{@facade.dossier.id}/description"}
+      %div.col-lg-2.col-md-2.action
         = "éditer".upcase

app/views/dossiers/_infos_dossier.html.haml

@@ -102,11 +102,11 @@
         - if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.size > 0
           .row
             .col-lg-4.col-md-4
-            .col-lg-4.col-md-4.action
-              %a#maj_pj.action{"data-target" => "#UploadPJmodal", "data-toggle" => "modal", :type => "button"}
+            %a#maj_pj.action{"data-target" => "#UploadPJmodal", "data-toggle" => "modal", :type => "button"}
+              .col-lg-4.col-md-4.action
                 Modifier les documents
               %br
-              = render partial: 'users/recapitulatif/modal_upload_pj'
+            = render partial: 'users/recapitulatif/modal_upload_pj'
             .col-lg-4.col-md-4
 
     - if gestionnaire_signed_in?

app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml

@@ -1,8 +1,8 @@
 %div#first-block
-  %div
+  %div.dossiers-en-cours
     = @facade_data_view.total_dossier
     DOSSIERS EN COURS
-  %div
+  %div.nouveaux-dossiers
     = @facade_data_view.total_new_dossier
     NOUVEAUX DOSSIERS
 

app/views/users/description/champs/_header_private_section.html.haml

@@ -1,10 +1,4 @@
 .row
-  .col-lg-12.col-md-12
-    .row.title-row
-      .col-md-4.col-lg-4.split-hr
-      .col-md-4.col-lg-4.dossier-title= libelle
-      .col-md-4.col-lg-4.split-hr
-    .row
-      .col-lg-4.col-md-4
-      .col-lg-8.col-md-8
-        =render partial: 'users/description/champs/render_list_champs', locals: {champs: champs, order_place: order_place}
+  .col-lg-2.col-md-2
+  .col-lg-8.col-md-8
+    = render partial: 'users/description/champs/render_list_champs', locals: {champs: champs, order_place: order_place}