Commit bc4e8121 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Mise en page / séparation des SCSS

parent cd039221

module/Oscar/view/layout/layout.phtml

+1 −1
Changes for module/Oscar/view/layout/layout.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ echo getenv('APPLICATION_ENV') ?: 'development' ?>"> 
    endif; ?>

</div>



<footer class="bg-secondary">

<footer>

    <div class="container">

        <div class="row row-bordered-light">

            <div class="col-md-4">

module/Oscar/view/oscar/public/index.phtml

+85 −112
Changes for module/Oscar/view/oscar/public/index.phtml: 85 added lines, 112 removed lines.
Original line number Diff line number Diff line 
<?php

// Récupération des informations utilisateur



use Oscar\OscarText;

use function Oscar\_ot; ?>

<div class="banner">

    <div class="container">

use function Oscar\_ot;



?>





<?php

$cols = 1;

// -------------------------------------------------- CHEMIN DECISIONNEL

if ($cheminsDecisionnels) :

    $cols++;

    ob_start() ?>

    <section class="section-home section-chemin-decisionnel">

        <h3><i class="icon-paper-plane"></i>Demande de conventions</h3>

        <ul style="font-size: larger; font-weight: bolder;">

            <?php foreach ($cheminsDecisionnels as $chemin_decisionnel): ?>

                <li>

                    <a href="<?= $this->url('chemins-decisionnels/demarrer', ['id' => $chemin_decisionnel->getId()]) ?>"><?= $chemin_decisionnel->getNom() ?></a>

                </li>

            <?php endforeach; ?>

        </ul>

    </section>

    <?php $sectionCheminsDecisionnels = ob_get_clean(); endif;

?>



<?php

// -------------------------------------------------- ACCUEIL CUSTOM

if (file_exists(__DIR__ . '/../../../../../data/home.html')):

    $cols++;

    ob_start() ?>

    <section class="section-home section-home-custom">

        <?php include __DIR__ . '/../../../../../data/home.html' ?>

    </section>

<?php $sectionHomeCustom = ob_get_clean(); endif; ?>





<?php if ($hasTodos):

    $cols++;

    ob_start() ?>

    <section class="section-home section-home-todo">

        <h3><i class="icon-pin"></i>A FAIRE</h3>

        <div id="genericvue" data-params="<?= $paramsTodo ?>"></div>

        <?= $this->Vite()->addJs('src/PersonTodoList.js'); ?>

    </section>

<?php $sectionTodo = ob_get_clean(); endif; ?>





<div class="container-fluid homepage">

    <div class="row">

            <!-- <div class="col-md-3">



                <svg

                    xmlns:svg="http://www.w3.org/2000/svg"

                    xmlns="http://www.w3.org/2000/svg"

                    width="100%"

                    height="100%"

                    id="svg2"

                    version="1.1"

                    viewBox="0 0 100 100">

                    <defs

                        id="defs4"/>

                    <g

                        id="layer1"

                        transform="translate(-153.96966,-376.65716)">

                        <path

                            style="fill:#0b0b28;fill-opacity:0.03980099;fill-rule:nonzero"

                            clip-path="none"

                            d="m 206.59896,377.89804 -2.07215,21.87042 c 21.98902,5.58418 37.8924,26.99564 38.26032,51.38078 1.85864,-4.69526 3.10587,-9.78049 3.61583,-15.16293 2.61334,-27.58243 -14.98966,-52.83758 -39.804,-58.08827 z"

                            id="path2985-78"

                        <path

                            style="fill:#0b0b28;fill-opacity:0.03980099;fill-rule:nonzero"

                            clip-path="none"

                            d="m 245.06847,457.92753 -16.42866,-13.2969 c -15.01387,17.82509 -39.71348,21.7057 -59.31798,9.40384 2.84771,4.18695 6.29989,8 10.34308,11.27244 20.71941,16.76973 49.29791,13.28116 65.40356,-7.37939 z"

                            id="path2985-7-3"/>

                        <path

                            style="fill:#0b0b28;fill-opacity:0.03980099;fill-rule:nonzero"

                            clip-path="none"

                            d="m 158.19677,456.67923 18.49108,-8.57484 c -6.97739,-23.39778 1.8095,-48.68173 21.03528,-60.76507 -4.70426,0.50933 -9.4014,1.78222 -13.95216,3.89254 -23.32049,10.81436 -34.28495,39.54911 -25.5742,65.44738 z"

                            id="path2985-7-7-0"/>

                        <path

                            style="fill:#685895;fill-opacity:1;fill-rule:nonzero"

                            clip-path="none"

                            d="m 219.40862,377.19287 -5.29381,21.08959 c 21.16642,8.70621 33.91574,31.99819 30.69156,55.90776 2.55029,-4.31909 4.5466,-9.10987 5.84944,-14.30014 6.67642,-26.59766 -7.20631,-53.9005 -31.24719,-62.69721 z"

                            id="path2985"

                            class="logo-primary"/>

                        <path

                            style="fill:#4c5d94;fill-opacity:1;fill-rule:nonzero"

                            clip-path="none"

                            d="m 246.08922,461.15773 -14.46993,-15.4312 c -17.63964,15.22326 -42.91088,15.37638 -60.70324,0.45016 2.23095,4.51602 5.12144,8.75541 8.68258,12.55312 18.2491,19.46145 47.3415,20.26399 66.4906,2.42791 z"

                            class="logo-secondary"

                            id="path2985-7"/>

                        <path

                            style="fill:#9198a1;fill-opacity:1;fill-rule:nonzero"

                            clip-path="none"

                            class="logo-grey"

                            d="m 159.40141,447.12305 19.75421,-5.66111 c -3.53073,-23.91856 8.98067,-47.35709 29.9864,-56.3421 -4.77929,-0.19561 -9.66393,0.3568 -14.52556,1.75003 -24.91352,7.13964 -40.11081,33.63279 -35.21505,60.25319 z"

                            id="path2985-7-7"/>

                    </g>

                </svg>

        <div class="col-md-12">

            <header class="home">

                <h1><?= $this->appInfos()->nom ?></h1>

                <h2><?= $this->appInfos()->desc ?></h2>

            </header>

        </div>

            -->

            <div class="col-md-9">



                <h1 style="font-size: 8em"><?= $this->appInfos()->nom ?></h1>

        <?php if( $sectionHomeCustom ): ?>

            <div class="col-md-<?= 12/$cols ?>">

                <?= $sectionHomeCustom ?>

            </div>

        <?php endif; ?>



                <p><?= $this->appInfos()->desc ?><p>

        <section class="col-md-<?= 12/$cols ?>">

            <?php if (!$this->hasRole('user')): ?>

                        <a href="<?= $this->url('zfcuser/login') ?>" class="btn btn-success btn-large">

                            <i class="glyphicon glyphicon-user"></i>

                <a href="<?= $this->url('zfcuser/login') ?>" class="btn btn-primary btn-large">

                    <i class="icon-login"></i>

                    <?= $this->oscarText('Se connecter') ?>

                </a>

            <?php else: ?>



                        Bienvenue



                <?php if ($user): ?>

                            <strong><?= $user->getDisplayname() ?></strong>,

                        <?php else: ?>

                        <div class="alert alert-warning">

                            <p><?= $this->oscarText("Votre compte n'est associé à aucune personne") ?></p>

                        </div>

                        <?php endif; ?>







                        <div class="row">

                            <div class="col-md-12">

                    <section class="section-home section-home-access">

                        <h3><i class="icon-direction"></i>Vos accès</h3>

                        <a href="<?= $this->url('contract/search-mine') ?>"

                           class="btn btn-primary"><i class="icon-cubes"></i>

                            <?= $this->oscarText('Mes projets') ?></a>



                        <?php if ($this->grant()->isBoss()): ?>

                            <a href="<?= $this->url('contract/search-org') ?>" class="btn btn-primary">

                                <i class="icon-building-filled"></i>

                                <?= $this->oscarText('Activités dans vos structures') ?></a>

                            </a>

                        <?php endif; ?>



                        <?php if ($this->grant()->getCurrentPerson() && $this->grant()->isDeclarer()): ?>

                            <a class="btn btn-primary" href="<?= $this->url('timesheet/declarant') ?>">

                                <i class="icon-pencil"></i>

                                <?= $this->oscarText('Déclarer des heures') ?>

                            </a>

                                    <a class="btn btn-default" href="<?= $this->url('timesheet/resume') ?>">

                            <a class="btn btn-light" href="<?= $this->url('timesheet/resume') ?>">

                                <i class="icon-calendar"></i>

                                <?= $this->oscarText('Historique de mes feuilles de temps') ?>

                            </a>

                        <?php endif; ?>



                        <?php if (count($periodsRejected)): ?>

                                    <hr>

                            <div class="alert alert-danger">

                                <i class="icon-warning-empty"></i> Problème pour la/les déclaration(s) :

                                <?php foreach ($periodsRejected as $validationPeriod): ?>

                                    <article>

                                            Il y'a un conflit dans la déclaration de <strong><?= $this->moment($validationPeriod['firstDay'], 'M Y') ?></strong>

                                        Il y'a un conflit dans la déclaration de

                                        <strong><?= $this->moment($validationPeriod['firstDay'], 'M Y') ?></strong>



                                        <a class="btn btn-default btn-xs"

                                           href="<?= $this->url('timesheet/declarant') ?>?month=<?= $validationPeriod['month'] ?>&year=<?= $validationPeriod['year'] ?>">
@@ -123,7 +109,6 @@ use function Oscar\_ot; ?> 
                                <?php endforeach; ?>

                            </div>

                        <?php endif; ?>



                        <?php if ($isValidator): ?>

                            <div class="btn-group">

                                <a type="button" href="<?= $this->url('timesheet/validations2') ?>"
@@ -132,18 +117,16 @@ use function Oscar\_ot; ?> 
                                    <?= $this->oscarText("Validation des feuilles de temps") ?></a>



                            </div>



                        <?php endif; ?>



                        <?php if ($documentsWait): ?>

                            <a href="<?= $this->url('unicaen-signature/my-documents') ?>" class="btn btn-primary">

                                Documents à viser

                                <span class="label label-danger"><?= count($documentsWait) ?></span>

                            </a>

                        <?php endif; ?>



                        <?php if ($isRequestValidator): ?>

                                    <a href="<?= $this->url('contract/requestadmin') ?>" class="btn <?= $requestValidations > 0 ? 'btn-primary' : 'btn-default' ?>">

                            <a href="<?= $this->url('contract/requestadmin') ?>"

                               class="btn <?= $requestValidations > 0 ? 'btn-primary' : 'btn-default' ?>">

                                <i class="icon-cube"></i>

                                <?= $this->oscarText("Demande d'activité") ?>

                                <?php if ($requestValidations > 0): ?>
@@ -151,13 +134,12 @@ use function Oscar\_ot; ?> 
                                <?php endif; ?>

                            </a>

                        <?php endif; ?>



                        <span id="sticky"></span>

                        <?php $this->Vite()->addJs('src/Sticky.js') ?>

                            </div>



                            <div class="col-md-12">

                    <?php if ($this->grant()->privilege(\Oscar\Provider\Privileges::ACTIVITY_INDEX)): ?>

                        <section class="section-home section-home-search"></section>

                            <h3><i class="icon-search-outline"></i><?= $this->oscarText("Rechercher dans les activités") ?>

                            </h3>

                            <form action="<?= $this->url('contract/advancedsearch') ?>"

                                  method="get" class="form">

                                <div class="input-group input-group">
@@ -172,35 +154,26 @@ use function Oscar\_ot; ?> 
                                            </span>

                                </div>

                            </form>

                        </section>

                    <?php endif; ?>

                    </section>

                <?php else: ?>

                    <div class="alert alert-warning">

                        <p><?= $this->oscarText("Votre compte n'est associé à aucune personne") ?></p>

                    </div>



                    </div>





                    <div class="row">

                        <div class="col-md-12">

                            <div style="margin-top: 3rem; background: white; padding: 2rem; border-radius: 1rem;">

                                <h3>Conventions</h3>

                                <ul style="font-size: larger; font-weight: bolder;">

                                    <?php foreach($cheminsDecisionnels as $chemin_decisionnel): ?>

                                    <li><a href="<?= $this->url('chemins-decisionnels/demarrer', ['id' => $chemin_decisionnel->getId()]) ?>"><?= $chemin_decisionnel->getNom() ?></a></li>

                                    <?php endforeach; ?>

                                </ul>

                            </div>

                        </div>

                    </div>



                <?php endif; ?>

            </p>

            <?php if($hasTodos): ?>

            <h2><i class="icon-pin"></i>A FAIRE</h2>

            <div id="genericvue" data-params="<?= $paramsTodo ?>"></div>

            <?= $this->Vite()->addJs('src/PersonTodoList.js'); ?>

            <?php endif; ?>

<?php if( $sectionCheminsDecisionnels ): ?>

    <div class="col-md-<?= 12/$cols ?>">

        <?= $sectionCheminsDecisionnels ?>

    </div>

<?php endif; ?>



<?php if( $sectionTodo ): ?>

    <div class="col-md-<?= 12/$cols ?>">

        <?= $sectionTodo ?>

    </div>

<?php endif; ?>

</div>

</div>

</div>
 
 No newline at end of file

ui/src/oscar-css.scss

+19 −114
Changes for ui/src/oscar-css.scss: 19 added lines, 114 removed lines.
Original line number Diff line number Diff line
@@ -30,21 +30,27 @@ $palette: ( 
                "medium": $primary-medium,

                "light": $primary-light,

                "flash": $primary-flash,

                "white": $primary-white

                "white": $primary-white,

                "grey": $primary-grey,

                "black": $primary-black

        ),

        "secondary": (

                "base": $secondary,

                "medium": $secondary-medium,

                "light": $secondary-light,

                "flash": $secondary-flash,

                "white": $secondary-white

                "white": $secondary-white,

                "grey": $secondary-grey,

                "black": $secondary-black

        ),

        "thirdary": (

                "base": $thirdary,

                "medium": $thirdary-medium,

                "light": $thirdary-light,

                "flash": $thirdary-flash,

                "white": $thirdary-white

                "white": $thirdary-white,

                "grey": $thirdary-grey,

                "black": $thirdary-black

        )

);
@@ -80,9 +86,13 @@ $palette: ( 
$mainMenuHeight: 70px;

$footerHeight: 80px;



// Composants

@import "styles/oscar-core";

@import "styles/oscar-layout";

@import "styles/oscar-privatize";

@import "styles/oscar-timesheet";

@import "styles/oscar-cartouche";

@import "styles/oscar-fiche-activity";



.list-simple {

  padding: 0 1em;
@@ -489,114 +499,9 @@ span[class*="status-400"] .icon:before { 






//////////////////////////////////////////////////////////////////////////////

// CARTOUCHE

a.cartouche {

  &:hover {

    background: darken($colorGreyMedium, 10%);

  }

}



.cartouche {

  background: $thirdary-light;

  color: $white;

  padding: 0 .5em 0 .5em;

  margin: .25em;

  text-decoration: none;

  border-radius: $border-radius;

  display: inline-block;

  font-weight: 300;

  margin-right: .3em;

  text-shadow: -1px 1px 0px rgba(0,0,0,.3);



  >a {

    color: $color-white;

    text-decoration: none;

    &:hover {

      text-decoration: underline;

    }

  }



  &:has(.addon){

    padding: 0 0 0 .5em;

  }



  .addon {

    border-radius: 0 $border-radius $border-radius 0;

    background: lighten($colorGreyMedium, 30%);

    color: $colorGreyDark;

    padding: .05em .5em;

    margin-left: .5em;

    display: inline-block;

    text-shadow: 1px -1px 0px rgba(255,255,255,.3);



    >span,em,strong {

      &:after {

        content: ","

      }

      &:last-child:after {

        content: "";

      }

    }



    .principal {

      font-weight: 600;

    }

  }



  &.primary {

    font-weight: 500;

    background: $primary;

    .addon {

      background: lighten($primary, 30%);

      color: $primary;

    }

  }

  &.secondary {

    font-weight: 500;

    background: $secondary;

    .addon {

      background: lighten($secondary, 30%);

      color: $secondary;

    }

  }

  &.warning {

    font-weight: 500;

    background: $warning;

    .addon {

      background: lighten($warning, 30%);

      color: $warning;

    }

  }

  &.success {

    font-weight: 500;

    background: $success;

    .addon {

      background: lighten($success, 30%);

      color: $success;

    }

  }

  &.danger {

    font-weight: 500;

    background: $danger;

    .addon {

      background: lighten($danger, 30%);

      color: $danger;

    }

  }

  &.info {

    background: $info;

    .addon {

      background: lighten($info, 30%);

    }

  }

  &.xs {

    font-size: .8em;

  }

  &.xxs {

    font-size: .7em;

  }

}
@@ -2005,10 +1910,10 @@ time.date-missing { 
}



.chain-values {

  background: $colorGreyUltraLight;

  background: var(--bs-secondary-light);

  border-radius: 0 4px 4px 0;



  color: $colorGreyMedium;

  color: var(--bs-secondary-medium);

  .element {

    display: inline-block;

    padding: .25em .5em;
@@ -2019,8 +1924,8 @@ time.date-missing { 
    &:last-child {

      border-right: none;

      font-weight: bolder;

      background: lighten($info, 20%);

      color: $primary;

      background: var(--bs-secondary-flash);

      color: var(--bs-primary-white);

      &:after {

        content: ""

      }
@@ -2202,7 +2107,7 @@ time.date-missing { 
  &.progress-item-inprogress {

    border-left-color: $info;

    .progress-cartouche {

      @extend .info;

     // @extend .info;

    }

  }

  &.progress-item-cancel {
@@ -2234,7 +2139,7 @@ time.date-missing { 
      content: '\e8a8';

    }

    .progress-cartouche {

      @extend .info;

      //@extend .info;

    }

  }

  &.progress-item-refused {

ui/src/styles/_oscar-cartouche.scss

0 → 100644
+90 −0
Changes for ui/src/styles/_oscar-cartouche.scss: 90 added lines, 0 removed lines.
Original line number Diff line number Diff line 


//////////////////////////////////////////////////////////////////////////////

// CARTOUCHE

a.cartouche {

  &:hover {

    background: darken($colorGreyMedium, 10%);

  }

}



.cartouche {

  background: $thirdary-grey;

  color: $thirdary-white;

  padding: 0 .5em 0 .5em;

  margin: .25em;

  text-decoration: none;

  font-size: 1rem;

  border-radius: $border-radius;

  display: inline-block;

  font-weight: 300;

  margin-right: .3em;

  text-shadow: -1px 1px 0px rgba(0,0,0,.3);



  >a {

    color: $color-white;

    text-decoration: none;

    &:hover {

      text-decoration: underline;

    }

  }



  &:has(.addon){

    padding: 0 0 0 .5em;

  }



  .addon {

    border-radius: 0 $border-radius $border-radius 0;

    background: $thirdary-white;

    color: $thirdary-black;

    padding: .05em .5em;

    margin-left: .5em;

    display: inline-block;

    text-shadow: 1px -1px 0px rgba(255,255,255,.1);



    >span,em,strong {

      &:after {

        content: ","

      }

      &:last-child:after {

        content: "";

      }

    }



    .principal {

      font-weight: 600;

    }

  }



  &.xs {

    font-size: .8em;

  }

  &.xxs {

    font-size: .7em;

  }

}

/*

  &.danger {

    font-weight: 500;

    background: $danger;

    .addon {

      background: lighten($danger, 30%);

      color: $danger;

    }

  }

 */

$bootstrapNames: ("info","danger","waring","success");

@each $name, $color in $theme-colors {

    .cartouche.#{$name} {

      /** Foo **/

      background: var(--bs-#{$name});

      .addon {

        @if index($bootstrapNames, $name) {

          background: color.adjust($color, $lightness: 40%, $saturation: 50%);

          color: color.adjust($color, $lightness: -40%);

        }

        @else {

          background: var(--bs-#{$name}-light);

        }

      }

  }

}
 
 No newline at end of file

ui/src/styles/_oscar-core.scss

+14 −2
Changes for ui/src/styles/_oscar-core.scss: 14 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -22,12 +22,24 @@ h1, h2, h3, label { 
}



h1 {

  //margin-top: 1em;

  margin-top: 2em;

  font-weight: 700

}



h2 {

  margin-top: 1em;

  font-weight: 500

  font-weight: 600;

  color: $secondary-grey;

}



h3 {

  margin-top: 1em;

  font-weight: 600

}



h4 {

  margin-top: 1em;

  font-weight: 400

}



p, ul, li {