Commit 436abf1d authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Remplacement des modals de jqueryui par les modales bootstrap pour les charges

parent e2df7a21
Loading
Loading
Loading
Loading
+30 −11
Changes for module/Application/view/application/chargens/controles.phtml: 30 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -67,7 +67,14 @@ $canCopy = $this->isAllowed(Privileges::getResourceId(Privileges::CHARGENS_SCENA
</div>


<div class="form-noeud" style="display:none">
<div class="chargens-formation-edit form-noeud modal fade" tabindex="-1">
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
                <h2 class="modal-title">Titre</h2>
                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
            </div>
            <div class="modal-body">
                <div class="row" id="choix-assiduite">
                    <div class="col-md-12">
                        <div class="form-group">
@@ -128,13 +135,23 @@ $canCopy = $this->isAllowed(Privileges::getResourceId(Privileges::CHARGENS_SCENA
                    <?php endforeach; ?>
                    </tbody>
                </table>

    <div class="text-right">
        <button type="button" class="btn btn-warning" id="btn-cancel"><i class="fas fa-rotate-left"></i> Annuler</button>
            </div>
            <div class="modal-footer">
                <button type="button" class="btn btn-warning" data-bs-dismiss="modal" id="btn-cancel"><i class="fas fa-rotate-left"></i> Annuler</button>
                <button type="button" class="btn btn-primary" id="btn-save"><i class="fas fa-floppy-disk"></i> Enregistrer</button>
            </div>
        </div>
<div class="form-lien" style="display:none">
    </div>
</div>

<div class="chargens-formation-edit form-lien modal fade" tabindex="-1">
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
                <h2 class="modal-title">Modification du lien</h2>
                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
            </div>
            <div class="modal-body">
                <div class="row" id="choix">
                    <div class="col-md-6">
                        <div class="form-group">
@@ -151,9 +168,9 @@ $canCopy = $this->isAllowed(Privileges::getResourceId(Privileges::CHARGENS_SCENA
                </div>
                <div class="row">
                    <div class="col-md-6" id="div-actif">
            <div class="form-group">
                <label for="actif" title="Lien actif">Actif</label>
                <input type="checkbox" class="form-control" placeholder="Actif" id="actif" value="1"/>
                        <div class="form-check">
                            <input type="checkbox" class="form-control form-check-input" id="actif" value="1"/>
                            <label for="actif" title="Lien actif" class="form-check-label">Actif</label>
                        </div>
                    </div>
                    <div class="col-md-6" id="div-poids">
@@ -163,9 +180,11 @@ $canCopy = $this->isAllowed(Privileges::getResourceId(Privileges::CHARGENS_SCENA
                        </div>
                    </div>
                </div>

    <div class="text-right">
        <button type="button" class="btn btn-warning" id="btn-cancel"><i class="fas fa-rotate-left"></i> Annuler</button>
            </div>
            <div class="modal-footer">
                <button type="button" class="btn btn-warning" data-bs-dismiss="modal" id="btn-cancel"><i class="fas fa-rotate-left"></i> Annuler</button>
                <button type="button" class="btn btn-primary" id="btn-save"><i class="fas fa-floppy-disk"></i> Enregistrer</button>
            </div>
        </div>
    </div>
</div>
 No newline at end of file
+1
Changes for module/Application/view/layout/layout.phtml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ echo $this->doctype();
<script type="text/javascript" src="<?= $this->basePath('/js/widget-initializer.js?v=' . $version) ?>"></script>
<script type="text/javascript" src="<?= $this->basePath('/js/intranavigator.js?v=' . $version) ?>"></script>
<script type="text/javascript" src="<?= $this->basePath('/js/pop-ajax.js?v=' . $version) ?>"></script>
<script type="text/javascript" src="<?= $this->basePath('/js/chargens.js?v=' . $version) ?>"></script>
<script type="text/javascript" src="<?= $this->basePath('/js/mod-ajax.js?v=' . $version) ?>"></script>
<script type="text/javascript" src="<?= $this->basePath('/js/tab-ajax.js?v=' . $version) ?>"></script>
<script type="text/javascript" src="<?= $this->basePath('/js/util.js?v=' . $version) ?>"></script>
+6
Changes for public/css/app.css: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -28786,6 +28786,12 @@ form#service div.volume-horaire-saisie-multiple-fin {
  color: darkgrey;
}
.chargens-formation-edit.form-lien #actif {
  line-height: 2rem;
  width: 2rem;
  height: 2rem;
}
ul.privileges-form {
  list-style-type: none;
}
+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

+6
Changes for public/css/chargens.scss: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -75,3 +75,9 @@
.seuils-dedoublement td span.aucun {
    color: darkgrey;
}

.chargens-formation-edit.form-lien #actif {
    line-height: 2rem;
    width: 2rem;
    height:2rem;
}
 No newline at end of file
Loading