Loading module/Formation/view/formation/index/index-doctorant.phtml +2 −1 Changes for module/Formation/view/formation/index/index-doctorant.phtml: 2 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -71,7 +71,8 @@ $now = new DateTime(); <?php if ($canCatalogueAfficher) : ?> <?php /** @see \Formation\Controller\ModuleController::catalogueAction() */?> <a href="<?php echo $this->url('formation/catalogue',[],[], true); ?>" class="btn btn-primary" target="_blank"> <span class="icon icon-voir"> Accéder au catalogue des formations</span> <span class="icon icon-voir"></span> Accéder au catalogue des formations </a> <?php endif; ?> </div> Loading module/These/view/these/these/identite.phtml +31 −41 Changes for module/These/view/these/these/identite.phtml: 31 added lines, 41 removed lines. Original line number Diff line number Diff line Loading @@ -66,6 +66,28 @@ $modifierEncadrementEvent = 'event-modifier-encadrement'; $isImportable = $these->getSource()->getImportable(); $etatTheseTextTooltip = "État de la thèse"; switch ($these->getEtatThese()){ case "E" : $etatTheseClass = "en-cours"; $iconEtatThese = "hourglass"; break; case "A" : $etatTheseClass = "abandonnee"; $iconEtatThese = "ko"; break; case "U" : $etatTheseClass = "transferee"; $iconEtatThese = "export"; break; case "S" : $etatTheseClass = $these->getResultat() === 1 ? "admis" : "non-admis"; $iconEtatThese = $these->getResultat() === 1 ? "ok" : "ko"; $etatTheseTextTooltip = $these->getResultatToString(); break; default: $etatTheseClass = ""; } ?> <?php $this->headTitle($this->translate("Thèse"))->prepend($these->getDoctorant()->getIndividu()->getNomUsuel()) ?> Loading @@ -75,31 +97,7 @@ $isImportable = $these->getSource()->getImportable(); ->addAlertesFromFlashMessenger() ->renderAsBootstrapToasts() ?> <!--<div class="row titre-these-div">--> <!-- <div class="col-md-4">--> <!-- <h1 class="page-header">--> <!-- --><?php //echo $this->translate("Thèse"); ?> <!-- <small>--><?php //echo $this->partial('these/these/partial/titre') ?><!--</small>--> <!-- </h1>--> <!-- </div>--> <!-- --><?php //if ($canEditThese): ?> <!-- <div class="col-md-7">--> <!-- --><?php ///** @see \These\Controller\TheseSaisieController::modifierAction() */ ?> <!-- <a href="--><?php //echo $this->url('these/modifier', ['these' => $these->getId()], [], true) ?><!--"--> <!-- data-event="--><?php //echo $modifierStructuresEvent ?><!--"--> <!-- class="btn btn-primary">--> <!-- <span class="icon icon-edit"></span>--> <!-- --><?php //echo $this->translate("Modifier la thèse"); ?> <!-- </a>--> <!-- </div>--> <!-- --><?php //endif ?> <!--</div>--> <!--<div class="row these-saisie-title-section">--> <!-- <h2>--> <!-- Titre : --><?php //echo $these->getTitre(); ?> <!-- </h2>--> <!--</div>--> <div class="row informations-these-header"> <div class="row informations-principales-these-header"> <div class="col-md-4"> <h1 class="page-header"> <?php echo $this->translate("Thèse"); ?> Loading @@ -117,11 +115,15 @@ $isImportable = $these->getSource()->getImportable(); </a> </div> <?php endif ?> </div> <div class="row these-titre-div"> <div class="col-md-12"> <h2 class="thesis-title" data-bs-toggle="tooltip" data-bs-original-title="Titre de la thèse"><?= $these->getTitre(); ?></h2> <div class="row informations-compl-these-div"> <div class="col-md-6 informations-compl-these-card"> <h2 class="informations-titre-these-card" data-bs-toggle="tooltip" data-bs-original-title="Titre de la thèse"><?= $these->getTitre(); ?></h2> </div> <div class="col-md-6 informations-compl-these-card information-etat-these-card <?=$etatTheseClass?>-etat-these-card" data-bs-toggle="tooltip" data-bs-original-title="<?=$etatTheseTextTooltip?>"> <span class="icon icon-<?=$iconEtatThese?>"></span> <h2><?= $these->getEtatTheseToString(); ?></h2> </div> </div> Loading Loading @@ -210,13 +212,6 @@ $isImportable = $these->getSource()->getImportable(); </div> <div class="card-body these-identite-body"> <div id="photo-div" class="float-end"> <!-- <div class="photo-placeholder loading"--> <!-- data-src="--> <?php //echo $this->url('leocarte/photo', ['id' => $these->getDoctorant()->getSourceCodeSansPrefix()]) ?><!--"></div>--> </div> <dl class="row these"> <dt class="col-md-3"> <?php echo $this->translate("Titre d'accès à l'inscr. en thèse") ?> Loading Loading @@ -287,11 +282,6 @@ $isImportable = $these->getSource()->getImportable(); <dd class="col-md-9">Non confidentielle</dd> <?php endif ?> <dt class="col-md-3">État</dt> <dd class="col-md-9"> <span class="badge bg-secondary"><?php echo $these->getEtatTheseToString() ?></span> </dd> <?php if ($resultat = $these->getResultatToString()): ?> <dt class="col-md-3">Résultat</dt> <dd class="col-md-9"> Loading public/css/app.css +37 −6 Changes for public/css/app.css: 37 added lines, 6 removed lines. Original line number Diff line number Diff line @charset "UTF-8"; :root { --primary-color:#337ab7; --secondary-color:#004980; } h1, h2, h3 { font-weight: bold; } h1 small { color: #7f8c8d; } color: #7f8c8d; } h2 { margin-top: 35px; } Loading @@ -12,6 +15,11 @@ h2 { h2:nth-of-type(1) { margin-top: 20px; } h3 { margin-bottom: 10px; border-left: 4px solid var(--primary-color); padding-left: 10px; } a.anchor { display: block; position: relative; Loading Loading @@ -47,7 +55,7 @@ h2.modal-title { padding-bottom: 5px; } .modal-header { background-color: #337ab7; } background-color: var(--primary-color); } .modal-header .modal-title { color: white; background-color: transparent; } Loading Loading @@ -217,6 +225,19 @@ li.uploaded-file { margin-right: auto; width: 100px; } button.nav-link { color: var(--primary-color); } button.nav-link:hover { color: var(--secondary-color); } .page-item.active .page-link { background-color: var(--secondary-color); border-color: var(--secondary-color); } .page-link { color: var(--primary-color); } ul.pagination li a { padding: 3px 6px; font-size: 80%; } Loading @@ -237,6 +258,13 @@ a.toggle-details:hover, a.toggle-details:focus { vertical-align: text-top; margin-left: 2px; } .form-check-input:checked { background-color: var(--secondary-color); border-color: var(--secondary-color); } .dropdown-item.active { background-color: var(--secondary-color); } /** Tabs **/ ul.nav-tabs h2 { font-weight: bold; Loading Loading @@ -326,7 +354,7 @@ input[type="checkbox"] { padding: 0 3px 0 3px; margin-right: 4px; margin-bottom: 5px; background-color: #004980; background-color: var(--secondary-color); border-radius: inherit; } .text-structure.etablissement:before { Loading Loading @@ -544,6 +572,9 @@ form [type='submit'] { transform: scale(1.2); /* Zoom à 120% */ } a.btn > span.icon { color: white; } .btn-info { background-color: #009ce4; border-color: #009ce4; Loading @@ -562,10 +593,10 @@ form [type='submit'] { border-color: #f1732d; } .btn-primary { background-color: #337ab7; } background-color: var(--secondary-color); } .btn-primary:hover { background-color: #004980; } background-color: var(--primary-color); } .box .btn.btn-primary { margin-bottom: 10px; Loading public/css/app.css.map +1 −1 File changed.Preview size limit exceeded, changes collapsed. Show changes public/css/app.scss +46 −4 Changes for public/css/app.scss: 46 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -8,7 +8,14 @@ $dangerColor: #d23544; $historiseColor: #d22828; $navbarBackgroundColor: #004980; $navbarBackgroundColor: var(--primary-color); :root{ //--primary-color:#004980; //--secondary-color:#337ab7; --primary-color:#337ab7; --secondary-color:#004980; } h1, h2, h3 { font-weight: bold; Loading @@ -26,6 +33,12 @@ h2:nth-of-type(1) { margin-top: 20px; } h3 { margin-bottom: 10px; border-left: 4px solid var(--primary-color); padding-left: 10px; } a.anchor { display: block; position: relative; Loading Loading @@ -70,7 +83,7 @@ h2.modal-title { } } .modal-header { background-color: rgb(51, 122, 183); background-color: var(--primary-color); .modal-title { color: white; background-color: transparent; Loading Loading @@ -354,6 +367,22 @@ li.uploaded-file { width: 100px; } button.nav-link { color: var(--primary-color); } button.nav-link:hover { color: var(--secondary-color); } .page-item.active .page-link{ background-color: var(--secondary-color); border-color: var(--secondary-color); } .page-link{ color: var(--primary-color); } ul.pagination { li a { padding: 3px 6px; Loading Loading @@ -383,6 +412,14 @@ a.toggle-details:hover, a.toggle-details:focus { margin-left: 2px; } .form-check-input:checked{ background-color: var(--secondary-color); border-color: var(--secondary-color); } .dropdown-item.active{ background-color: var(--secondary-color) } /** Tabs **/ Loading Loading @@ -524,7 +561,7 @@ input[type="checkbox"] { padding: 0 3px 0 3px; margin-right: 4px; margin-bottom: 5px; background-color: #004980; background-color: var(--secondary-color); border-radius: inherit; } .text-structure.etablissement:before { Loading Loading @@ -633,6 +670,7 @@ div.filters { padding: 3px 7px; } } button.dropdown-toggle { padding: 3px 4px 3px 4px; height: 20px; Loading Loading @@ -857,6 +895,10 @@ form { transform: scale(1.2); /* Zoom à 120% */ } a.btn > span.icon { color:white; } .btn-info { background-color: $infoColor; border-color: $infoColor; Loading @@ -875,7 +917,7 @@ form { border-color: $warningColor; } .btn-primary { background-color: #337ab7; background-color: var(--secondary-color); } .btn-primary:hover { Loading Loading
module/Formation/view/formation/index/index-doctorant.phtml +2 −1 Changes for module/Formation/view/formation/index/index-doctorant.phtml: 2 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -71,7 +71,8 @@ $now = new DateTime(); <?php if ($canCatalogueAfficher) : ?> <?php /** @see \Formation\Controller\ModuleController::catalogueAction() */?> <a href="<?php echo $this->url('formation/catalogue',[],[], true); ?>" class="btn btn-primary" target="_blank"> <span class="icon icon-voir"> Accéder au catalogue des formations</span> <span class="icon icon-voir"></span> Accéder au catalogue des formations </a> <?php endif; ?> </div> Loading
module/These/view/these/these/identite.phtml +31 −41 Changes for module/These/view/these/these/identite.phtml: 31 added lines, 41 removed lines. Original line number Diff line number Diff line Loading @@ -66,6 +66,28 @@ $modifierEncadrementEvent = 'event-modifier-encadrement'; $isImportable = $these->getSource()->getImportable(); $etatTheseTextTooltip = "État de la thèse"; switch ($these->getEtatThese()){ case "E" : $etatTheseClass = "en-cours"; $iconEtatThese = "hourglass"; break; case "A" : $etatTheseClass = "abandonnee"; $iconEtatThese = "ko"; break; case "U" : $etatTheseClass = "transferee"; $iconEtatThese = "export"; break; case "S" : $etatTheseClass = $these->getResultat() === 1 ? "admis" : "non-admis"; $iconEtatThese = $these->getResultat() === 1 ? "ok" : "ko"; $etatTheseTextTooltip = $these->getResultatToString(); break; default: $etatTheseClass = ""; } ?> <?php $this->headTitle($this->translate("Thèse"))->prepend($these->getDoctorant()->getIndividu()->getNomUsuel()) ?> Loading @@ -75,31 +97,7 @@ $isImportable = $these->getSource()->getImportable(); ->addAlertesFromFlashMessenger() ->renderAsBootstrapToasts() ?> <!--<div class="row titre-these-div">--> <!-- <div class="col-md-4">--> <!-- <h1 class="page-header">--> <!-- --><?php //echo $this->translate("Thèse"); ?> <!-- <small>--><?php //echo $this->partial('these/these/partial/titre') ?><!--</small>--> <!-- </h1>--> <!-- </div>--> <!-- --><?php //if ($canEditThese): ?> <!-- <div class="col-md-7">--> <!-- --><?php ///** @see \These\Controller\TheseSaisieController::modifierAction() */ ?> <!-- <a href="--><?php //echo $this->url('these/modifier', ['these' => $these->getId()], [], true) ?><!--"--> <!-- data-event="--><?php //echo $modifierStructuresEvent ?><!--"--> <!-- class="btn btn-primary">--> <!-- <span class="icon icon-edit"></span>--> <!-- --><?php //echo $this->translate("Modifier la thèse"); ?> <!-- </a>--> <!-- </div>--> <!-- --><?php //endif ?> <!--</div>--> <!--<div class="row these-saisie-title-section">--> <!-- <h2>--> <!-- Titre : --><?php //echo $these->getTitre(); ?> <!-- </h2>--> <!--</div>--> <div class="row informations-these-header"> <div class="row informations-principales-these-header"> <div class="col-md-4"> <h1 class="page-header"> <?php echo $this->translate("Thèse"); ?> Loading @@ -117,11 +115,15 @@ $isImportable = $these->getSource()->getImportable(); </a> </div> <?php endif ?> </div> <div class="row these-titre-div"> <div class="col-md-12"> <h2 class="thesis-title" data-bs-toggle="tooltip" data-bs-original-title="Titre de la thèse"><?= $these->getTitre(); ?></h2> <div class="row informations-compl-these-div"> <div class="col-md-6 informations-compl-these-card"> <h2 class="informations-titre-these-card" data-bs-toggle="tooltip" data-bs-original-title="Titre de la thèse"><?= $these->getTitre(); ?></h2> </div> <div class="col-md-6 informations-compl-these-card information-etat-these-card <?=$etatTheseClass?>-etat-these-card" data-bs-toggle="tooltip" data-bs-original-title="<?=$etatTheseTextTooltip?>"> <span class="icon icon-<?=$iconEtatThese?>"></span> <h2><?= $these->getEtatTheseToString(); ?></h2> </div> </div> Loading Loading @@ -210,13 +212,6 @@ $isImportable = $these->getSource()->getImportable(); </div> <div class="card-body these-identite-body"> <div id="photo-div" class="float-end"> <!-- <div class="photo-placeholder loading"--> <!-- data-src="--> <?php //echo $this->url('leocarte/photo', ['id' => $these->getDoctorant()->getSourceCodeSansPrefix()]) ?><!--"></div>--> </div> <dl class="row these"> <dt class="col-md-3"> <?php echo $this->translate("Titre d'accès à l'inscr. en thèse") ?> Loading Loading @@ -287,11 +282,6 @@ $isImportable = $these->getSource()->getImportable(); <dd class="col-md-9">Non confidentielle</dd> <?php endif ?> <dt class="col-md-3">État</dt> <dd class="col-md-9"> <span class="badge bg-secondary"><?php echo $these->getEtatTheseToString() ?></span> </dd> <?php if ($resultat = $these->getResultatToString()): ?> <dt class="col-md-3">Résultat</dt> <dd class="col-md-9"> Loading
public/css/app.css +37 −6 Changes for public/css/app.css: 37 added lines, 6 removed lines. Original line number Diff line number Diff line @charset "UTF-8"; :root { --primary-color:#337ab7; --secondary-color:#004980; } h1, h2, h3 { font-weight: bold; } h1 small { color: #7f8c8d; } color: #7f8c8d; } h2 { margin-top: 35px; } Loading @@ -12,6 +15,11 @@ h2 { h2:nth-of-type(1) { margin-top: 20px; } h3 { margin-bottom: 10px; border-left: 4px solid var(--primary-color); padding-left: 10px; } a.anchor { display: block; position: relative; Loading Loading @@ -47,7 +55,7 @@ h2.modal-title { padding-bottom: 5px; } .modal-header { background-color: #337ab7; } background-color: var(--primary-color); } .modal-header .modal-title { color: white; background-color: transparent; } Loading Loading @@ -217,6 +225,19 @@ li.uploaded-file { margin-right: auto; width: 100px; } button.nav-link { color: var(--primary-color); } button.nav-link:hover { color: var(--secondary-color); } .page-item.active .page-link { background-color: var(--secondary-color); border-color: var(--secondary-color); } .page-link { color: var(--primary-color); } ul.pagination li a { padding: 3px 6px; font-size: 80%; } Loading @@ -237,6 +258,13 @@ a.toggle-details:hover, a.toggle-details:focus { vertical-align: text-top; margin-left: 2px; } .form-check-input:checked { background-color: var(--secondary-color); border-color: var(--secondary-color); } .dropdown-item.active { background-color: var(--secondary-color); } /** Tabs **/ ul.nav-tabs h2 { font-weight: bold; Loading Loading @@ -326,7 +354,7 @@ input[type="checkbox"] { padding: 0 3px 0 3px; margin-right: 4px; margin-bottom: 5px; background-color: #004980; background-color: var(--secondary-color); border-radius: inherit; } .text-structure.etablissement:before { Loading Loading @@ -544,6 +572,9 @@ form [type='submit'] { transform: scale(1.2); /* Zoom à 120% */ } a.btn > span.icon { color: white; } .btn-info { background-color: #009ce4; border-color: #009ce4; Loading @@ -562,10 +593,10 @@ form [type='submit'] { border-color: #f1732d; } .btn-primary { background-color: #337ab7; } background-color: var(--secondary-color); } .btn-primary:hover { background-color: #004980; } background-color: var(--primary-color); } .box .btn.btn-primary { margin-bottom: 10px; Loading
public/css/app.css.map +1 −1 File changed.Preview size limit exceeded, changes collapsed. Show changes
public/css/app.scss +46 −4 Changes for public/css/app.scss: 46 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -8,7 +8,14 @@ $dangerColor: #d23544; $historiseColor: #d22828; $navbarBackgroundColor: #004980; $navbarBackgroundColor: var(--primary-color); :root{ //--primary-color:#004980; //--secondary-color:#337ab7; --primary-color:#337ab7; --secondary-color:#004980; } h1, h2, h3 { font-weight: bold; Loading @@ -26,6 +33,12 @@ h2:nth-of-type(1) { margin-top: 20px; } h3 { margin-bottom: 10px; border-left: 4px solid var(--primary-color); padding-left: 10px; } a.anchor { display: block; position: relative; Loading Loading @@ -70,7 +83,7 @@ h2.modal-title { } } .modal-header { background-color: rgb(51, 122, 183); background-color: var(--primary-color); .modal-title { color: white; background-color: transparent; Loading Loading @@ -354,6 +367,22 @@ li.uploaded-file { width: 100px; } button.nav-link { color: var(--primary-color); } button.nav-link:hover { color: var(--secondary-color); } .page-item.active .page-link{ background-color: var(--secondary-color); border-color: var(--secondary-color); } .page-link{ color: var(--primary-color); } ul.pagination { li a { padding: 3px 6px; Loading Loading @@ -383,6 +412,14 @@ a.toggle-details:hover, a.toggle-details:focus { margin-left: 2px; } .form-check-input:checked{ background-color: var(--secondary-color); border-color: var(--secondary-color); } .dropdown-item.active{ background-color: var(--secondary-color) } /** Tabs **/ Loading Loading @@ -524,7 +561,7 @@ input[type="checkbox"] { padding: 0 3px 0 3px; margin-right: 4px; margin-bottom: 5px; background-color: #004980; background-color: var(--secondary-color); border-radius: inherit; } .text-structure.etablissement:before { Loading Loading @@ -633,6 +670,7 @@ div.filters { padding: 3px 7px; } } button.dropdown-toggle { padding: 3px 4px 3px 4px; height: 20px; Loading Loading @@ -857,6 +895,10 @@ form { transform: scale(1.2); /* Zoom à 120% */ } a.btn > span.icon { color:white; } .btn-info { background-color: $infoColor; border-color: $infoColor; Loading @@ -875,7 +917,7 @@ form { border-color: $warningColor; } .btn-primary { background-color: #337ab7; background-color: var(--secondary-color); } .btn-primary:hover { Loading