Commit 7579db48 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Correction des vues des actualites et des soutenances (bs5)

parent 594a8bdc

module/Application/src/Application/View/Helper/Actualite/partial/actualites.phtml

+11 −7
Original line number Diff line number Diff line
@@ -12,7 +12,10 @@ use Laminas\Feed\Reader\Reader; 


<?php if ($enabled): ?>



    <ul class="menu-actualites nav nav-pills nav-stacked">

    <div id="menu-actualites" class="card">

        <div class="card-header">

            Actualités

        </div>

        <?php

        try {

            $channel = Reader::import($url);
@@ -24,20 +27,21 @@ use Laminas\Feed\Reader\Reader; 
            error_log($error);

        }

        ?>

        <ul class="card-body nav flex-column">

        <?php foreach ($items as $item): /** @var Rss $item */ ?>

            <li>

            <li class="nav-item">

                <h2>

                    <span class="label label-info">Actualité</span>

                    <a target="_blank" title="Cliquez pour ouvrir dans un nouvel onglet"

                    <a class="nav-link" target="_blank" title="Cliquez pour ouvrir dans un nouvel onglet"

                       href="<?php echo $item->getLink() ?>"><?php echo $item->getTitle() ?> <i

                                class="fa fa-external-link-alt"></i></a>

                                class="fa fa-external-link-alt"></i>

                        <p class="date"><?php echo $item->getDateCreated()->format('d/m/Y H:i') ?></p></a>

                </h2>

                <p class="date"><?php echo $item->getDateCreated()->format('d/m/Y H:i') ?></p>

            </li>

        <?php endforeach ?>

        <?php if ($error !== null): ?>

            <li class="text-danger"><?php echo $error ?></li>

        <?php endif; ?>

        </ul>

    </div>



<?php endif; ?>
 
 No newline at end of file

module/Application/view/application/index/partial/soutenances.phtml

+11 −8
Original line number Diff line number Diff line
@@ -6,16 +6,19 @@ 


use Application\Entity\Db\EcoleDoctorale;





?>



<br/>

<ul class="nav nav-pills nav-stacked menu-secondaire" style="padding: 1rem;">

    <strong>Soutenances à venir</strong>



<div id="menu-soutenances-a-venir" class="card">

    <div class="card-header">

        Soutenances à venir

    </div>

    <ul class="card-body nav flex-column">

        <?php foreach ($ecoles as $ecole) : ?>

            <li>

                <a href="<?php echo $this->url('soutenances-par-ecole-doctorale', ['ecole' => $ecole->getId()], [], true); ?>"><?php echo $ecole->getSigle(); ?></a>

            <li class="nav-item">

                <a class="nav-link"

                   href="<?php echo $this->url('soutenances-par-ecole-doctorale', ['ecole' => $ecole->getId()], [], true); ?>"

                ><?php echo $ecole->getSigle(); ?></a>

            </li>

        <?php endforeach; ?>

    </ul>

</div>
 
 No newline at end of file

public/css/app.css

+23 −37
Original line number Diff line number Diff line
@@ -501,50 +501,40 @@ ul.roadmap.pagination { 


#menu-informations,

#menu-actualites,

#menu-offretheses {

#menu-offretheses,

#menu-soutenances-a-venir {

  margin-bottom: 1rem; }

  #menu-informations .card-header,

  #menu-actualites .card-header,

  #menu-offretheses .card-header {

  #menu-offretheses .card-header,

  #menu-soutenances-a-venir .card-header {

    padding: .5rem 1rem; }

    #menu-informations .card-header p,

    #menu-actualites .card-header p,

    #menu-offretheses .card-header p {

    #menu-offretheses .card-header p,

    #menu-soutenances-a-venir .card-header p {

      margin-bottom: 0; }

  #menu-informations .card-body,

  #menu-actualites .card-body,

  #menu-offretheses .card-body {

  #menu-offretheses .card-body,

  #menu-soutenances-a-venir .card-body {

    background: white; }

  #menu-informations .nav,

  #menu-actualites .nav,

  #menu-offretheses .nav {

  #menu-offretheses .nav,

  #menu-soutenances-a-venir .nav {

    padding: 0.5rem; }

  #menu-informations .nav-item,

  #menu-actualites .nav-item,

  #menu-offretheses .nav-item {

  #menu-offretheses .nav-item,

  #menu-soutenances-a-venir .nav-item {

    margin-top: 0; }

    #menu-informations .nav-item .nav-link,

    #menu-actualites .nav-item .nav-link,

    #menu-offretheses .nav-item .nav-link {

    #menu-offretheses .nav-item .nav-link,

    #menu-soutenances-a-venir .nav-item .nav-link {

      padding: 0.3rem 0.3rem; }



#menu-actualites .nav-item .badge {

  font-size: 70%;

  vertical-align: bottom;

  margin-right: 3px; }

#menu-actualites .nav-item h2 {

  font-weight: 300;

  font-size: 90%;

  margin: 0;

  line-height: 120%; }

#menu-actualites .nav-item .nav-link {

  padding-left: 0; }

#menu-actualites .nav-item .date-actualites {

  font-size: 70%; }

#menu-actualites .nav-item .fa {

  font-size: 60%;

  vertical-align: super; }



ul.menu-secondaire li a.roadmap {

  font-weight: bold; }

ul.menu-secondaire li a.version-initiale.correction-attendue- {
@@ -558,26 +548,22 @@ ul.menu-secondaire li a.version-initiale.correction-attendue-obligatoire, 
ul.menu-secondaire li a.version-initiale.correction-effectuee-O {

  opacity: 0.5; }



ul.menu-actualites {

#menu-actualites {

  margin-top: 2em; }

  ul.menu-actualites li:first-child {

  #menu-actualites li:first-child {

    padding-top: 7px; }

  ul.menu-actualites li {

  #menu-actualites .nav-item {

    padding: 0 0 10px; }

    ul.menu-actualites li span.label {

      padding: 1px 2px;

      font-size: 70%;

      vertical-align: middle;

      margin-right: 3px; }

    ul.menu-actualites li h2 {

      font-weight: lighter;

    #menu-actualites .nav-item h2 {

      font-weight: 400;

      font-size: 90%;

      margin: 0;

      line-height: 120%; }

    ul.menu-actualites li p.date {

    #menu-actualites .nav-item p.date {

      margin: 0;

      font-size: 70%; }

    ul.menu-actualites li .fa {

      font-size: 75%;

      color: initial; }

    #menu-actualites .nav-item .fa {

      font-size: 55%;

      vertical-align: super; }

public/css/app.css.map

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

public/css/app.scss

+11 −38
Original line number Diff line number Diff line
@@ -807,7 +807,8 @@ ul.roadmap.pagination { 


#menu-informations,

#menu-actualites,

#menu-offretheses {

#menu-offretheses,

#menu-soutenances-a-venir {

  margin-bottom: 1rem;



  .card-header {
@@ -841,33 +842,6 @@ ul.roadmap.pagination { 
  }

}



#menu-actualites {

  .nav-item {

    .badge {

      font-size: 70%;

      vertical-align: bottom;

      margin-right: 3px;

    }

    h2 {

      font-weight: 300;

      font-size: 90%;

      margin: 0;

      line-height: 120%;

    }

    .nav-link {

      padding-left: 0;

    }

    .date-actualites {

      font-size: 70%;

    }

    .fa {

      font-size: 60%;

      vertical-align: super;

    }

  }

}







ul.menu-secondaire {

  li {
@@ -893,28 +867,27 @@ ul.menu-secondaire { 
    }

  }

}

ul.menu-actualites {



#menu-actualites {

  margin-top: 2em;

  li:first-child {

    padding-top: 7px;

  }

  li {

  .nav-item {

    padding: 0 0 10px;

    span.label {

      padding: 1px 2px;

      font-size: 70%;

      vertical-align: middle;

      margin-right: 3px;

    }

    h2 {

      font-weight: lighter;

      font-weight: 400;

      font-size: 90%;

      margin: 0;

      line-height: 120%;

    }

    //.nav-link {

    //  padding: 0;

    //}

    p.date {

      margin: 0;

      font-size: 70%;

      font-size: 75%;

      color: initial;

    }

    .fa {

      font-size: 55%;