Skip to content

Commit 8694685

Browse files
committed
fix: css
1 parent e1f8986 commit 8694685

File tree

6 files changed

+36
-26
lines changed

6 files changed

+36
-26
lines changed

css/digiriskdolibarr.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/scss/modal/_modal.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
@import "photo";
77
@import "evaluator";
88
@import "riskassessment";
9+
@import "riskassessmentdocument-modal";
910

1011
.wpeo-modal .modal-container {
1112
ul, li {
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#generationStatus li {
2+
display: flex;
3+
align-items: center;
4+
margin-left: 15px;
5+
}
6+
7+
#progressbar {
8+
margin: 20px;
9+
}
10+
11+
#progressbar .ui-progressbar-value {
12+
background-color: #966ea2;
13+
width: 0;
14+
}
15+
16+
#generationStatus, .loader, .modal-container h2 {
17+
margin-left: 15px;
18+
}
19+
20+
.loader {
21+
margin-right: 15px;
22+
}
23+
24+
.new-document {
25+
color: green;
26+
}
27+

js/digiriskdolibarr.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/modules/document.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ window.digiriskdolibarr.document.showAdvancementModal = async function () {
122122

123123
setTimeout(() => {
124124
$("#progressbar .ui-progressbar-value").animate({ width: "100%" }, 500);
125+
$('.wpeo-loader').removeClass('wpeo-loader')
125126
$('.loader').html('<i class="fas fa-check" style="color: green"></i>')
126127
}, "1000")
127128

@@ -135,7 +136,7 @@ window.digiriskdolibarr.document.showAdvancementModal = async function () {
135136
$('#builddoc_form').html($(riskassessmentdocumentPage).find('#builddoc_form'))
136137

137138
var elements = $('#builddoc_form').find('.oddeven .minwidth200 a');
138-
const newDocumentDiv = '<span class="new-document" style="color: green">&nbsp;&nbsp;&nbsp;<i class="fas fa-bolt"></i> Nouveau !</span>'
139+
const newDocumentDiv = '<span class="new-document">&nbsp;&nbsp;&nbsp;<i class="fas fa-bolt"></i> Nouveau !</span>'
139140
elements.eq(0).append(newDocumentDiv);
140141
elements.eq(1).append(newDocumentDiv);
141142
}, "2000");
@@ -149,7 +150,7 @@ window.digiriskdolibarr.document.updateModal = function (text) {
149150
var statusList = document.getElementById("generationStatus");
150151
var newStatus = document.createElement("li");
151152

152-
newStatus.innerHTML = '<div class="loader" style="margin-right: 15px"></div>' + text;
153+
newStatus.innerHTML = '<div class="loader"></div>' + text;
153154
statusList.appendChild(newStatus);
154155

155156
window.saturne.loader.display($(newStatus).find('.loader').last());

view/digiriskstandard/digiriskstandard_riskassessmentdocument.php

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -631,32 +631,13 @@
631631
print '<input hidden id="groupmentUrl" value="' . $groupmentUrl . '">';
632632
print '<input hidden id="riskAssessmentDocumentUrl" value="' . $riskAssessmentDocumentUrl . '">';
633633
print '<input hidden id="digiriskElementIds" value="' . $digiriskElementIds . '">';
634-
?>
635-
<style>
636-
#generationStatus li {
637-
display: flex;
638-
align-items: center;
639-
margin-left: 15px; /* Ajoute une marge à gauche */
640-
}
641-
642-
.loader {
643-
margin-left: 10px; /* Ajoute un espace entre le texte et le loader */
644-
}
645634

646-
#progressbar {
647-
margin: 20px;
648-
}
649-
#progressbar .ui-progressbar-value {
650-
background-color: rgb(<?php echo $conf->global->THEME_ELDY_BTNACTION; ?>); /* Couleur verte pour la barre de progression */
651-
width: 0;
652-
}
653-
654-
</style>
635+
?>
655636
<div id="generationModal" class="wpeo-modal">
656637
<div class="modal-container">
657-
<h2 style="margin-left: 15px;"><?php echo $langs->trans('RiskAssessmentDocumentGeneration')?></h2>
638+
<h2><?php echo $langs->trans('RiskAssessmentDocumentGeneration')?></h2>
658639
<div id="progressbar"><div class="ui-progressbar-value"></div></div>
659-
<ul id="generationStatus" style="margin-left: 15px;">
640+
<ul id="generationStatus">
660641
</ul>
661642
</div>
662643
</div>

0 commit comments

Comments
 (0)