Commit 5db78bd9 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Mise à jour du layout pour faciliter le passage à BS5

parent 4baf4b91

module/Application/config/aaa_module.config.php

+6 −35
Changes for module/Application/config/aaa_module.config.php: 6 added lines, 35 removed lines.
Original line number Diff line number Diff line
@@ -179,6 +179,12 @@ $config = [ 
        ],

    ],

    'view_helpers'       => [

        'aliases'    => [

            // on utilise les objets standards de Laminas, et plus ceux d'Unicaen

            'headLink'     => \Laminas\View\Helper\HeadLink::class,

            'headScript'   => \Laminas\View\Helper\HeadScript::class,

            'inlineScript' => \Laminas\View\Helper\InlineScript::class,

        ],

        'factories'  => [

            \UnicaenAuth\View\Helper\UserProfileSelectRadioItem::class => View\Helper\UserProfileSelectRadioItemFactory::class,

            \UnicaenApp\View\Helper\AppLink::class                     => View\Helper\AppLinkFactory::class,
@@ -210,41 +216,6 @@ $config = [ 
        'template_map'        => include __DIR__ . '/../template_map.php',

        'layout'              => 'layout/layout', // e.g., 'layout/layout'

    ],

    'public_files'       => [

        'head_scripts'   => [

            '010_jquery'   => 'vendor/jquery-1.11.3.min.js',

            '020_jqueryui' => 'vendor/jquery-ui-1.11.4/jquery-ui.min.js',

        ],

        'inline_scripts' => [

            '010_bootstrap'   => 'vendor/bootstrap-3.3.5/js/bootstrap.min.js',

            '030_util'        => 'js/util.js',

            '040_unicaen'     => 'js/unicaen.js',

            '050_jquery_form' => 'vendor/jquery.form-3.51.js', // pour l'uploader Unicaen uniquement!!,



            '001_' => 'js/datepicker-fr.js',

            '113_' => 'js/paiement.js',



            '121_' => 'js/piece-jointe.js',

        ],

        'stylesheets'    => [

            '010_jquery-ui'           => 'vendor/jquery-ui-1.11.4/jquery-ui.min.css',

            '020_jquery-ui-structure' => 'vendor/jquery-ui-1.11.4/jquery-ui.structure.min.css',

            '030_jquery-ui-theme'     => 'vendor/jquery-ui-1.11.4/jquery-ui.theme.min.css',

            '040_bootstrap'           => 'vendor/bootstrap-3.3.5/css/bootstrap.min.css',

            '050_bootstrap-theme'     => 'vendor/bootstrap-3.3.5/css/bootstrap-theme.min.css',

            '060_unicaen'             => null,



            '111_' => 'css/cartridge.css',

            '112_' => 'vendor/font-awesome-4.5.0/css/font-awesome.min.css',

            '113_' => 'vendor/open-sans-gh-pages/open-sans.css',

            '114_' => 'css/budget.css',

            '115_' => 'css/paiement.css',

            '116_' => 'css/agrement.css',

            '118_' => 'css/acceuil.css',

            '120_' => 'css/callout.css',

            '121_' => 'css/piece-jointe.css',

        ],

    ],

];



if ($customCss = \AppConfig::get('etablissement', 'css')) {

module/Application/view/layout/layout.phtml

+56 −11
Changes for module/Application/view/layout/layout.phtml: 56 added lines, 11 removed lines.
Original line number Diff line number Diff line 
<?php



/**

 * @var $this             \Application\View\Renderer\PhpRenderer

 */



use Laminas\View\Helper\Navigation as NavigationHelper;



/** @var NavigationHelper $navigationHelper */

$navigationHelper = $this->navigation('navigation');



echo $this->doctype(); ?>

$version = $this->appInfos()->getConfig()->get('version');



echo $this->doctype();

?>



<html lang="fr">

<head>

    <!-- Meta -->

    <meta charset="utf-8">

    <?php

    echo $this->headMeta()->appendName('viewport', 'width=device-width, initial-scale=1.0')

        ->appendName('description', '')

        ->appendHttpEquiv("X-UA-Compatible", "IE=edge,chrome=1");

    <meta name="viewport" content="width=device-width, initial-scale=1.0">

    <meta name="description" content="Application d'Organisation des services d'enseignement">

    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

    <?= $this->headTitle($this->appInfos()->nom)->setSeparator(' - ')->setAutoEscape(true) . "\n"; ?>



    <!-- Dépendances -->

    <link href="/vendor/jquery-ui-1.11.4/jquery-ui.min.css" media="all" rel="stylesheet" type="text/css">

    <link href="/vendor/jquery-ui-1.11.4/jquery-ui.structure.min.css" media="all" rel="stylesheet" type="text/css">

    <link href="/vendor/jquery-ui-1.11.4/jquery-ui.theme.min.css" media="all" rel="stylesheet" type="text/css">

    <link href="/vendor/bootstrap-3.3.5/css/bootstrap.min.css" media="all" rel="stylesheet" type="text/css">

    <link href="/vendor/bootstrap-3.3.5/css/bootstrap-theme.min.css" media="all" rel="stylesheet" type="text/css">

    <link href="/vendor/font-awesome-4.5.0/css/font-awesome.min.css" media="all" rel="stylesheet" type="text/css">

    <link href="/vendor/open-sans-gh-pages/open-sans.css" media="all" rel="stylesheet" type="text/css">



    echo $this->headTitle($this->appInfos()->nom)->setSeparator(' - ')->setAutoEscape(false);

    <!-- CSS générales à l'application -->

    <link href="/css/app.css?v=<?= $version ?>" media="all" rel="stylesheet" type="text/css">

    <link href="/css/cartridge.css?v=<?= $version ?>" media="all" rel="stylesheet" type="text/css">

    <link href="/css/budget.css?v=<?= $version ?>" media="all" rel="stylesheet" type="text/css">

    <link href="/css/paiement.css?v=<?= $version ?>" media="all" rel="stylesheet" type="text/css">

    <link href="/css/agrement.css?v=<?= $version ?>" media="all" rel="stylesheet" type="text/css">

    <link href="/css/acceuil.css?v=<?= $version ?>" media="all" rel="stylesheet" type="text/css">

    <link href="/css/callout.css?v=<?= $version ?>" media="all" rel="stylesheet" type="text/css">

    <link href="/css/piece-jointe.css?v=<?= $version ?>" media="all" rel="stylesheet" type="text/css">



    echo $this->headLink();

    echo "\n";

    <!-- Autres links ajoutés dynamiquement -->

    <?= $this->headLink(); ?>



    <!-- Eléments de mise en forme (CSS et icônes) chargés depuis la config OSE -->

    <?php if ($customCss = AppConfig::get('etablissement', 'css')) : ?>

        <link href="<?= $customCss ?>" media="all" rel="stylesheet" type="text/css">

    <?php endif; ?>



    <?php

    $icons = AppConfig::get('etablissement', 'icons');

    if (is_array($icons)) {

        foreach ($icons as $icon) {
@@ -32,7 +63,9 @@ echo $this->doctype(); ?> 
    }

    ?>



    <!-- Scripts -->

    <!-- Scripts globaux -->

    <script type="text/javascript" src="/vendor/jquery-1.11.3.min.js?v=?v=17.1"></script>

    <script type="text/javascript" src="/vendor/jquery-ui-1.11.4/jquery-ui.min.js?v=?v=17.1"></script>

    <?= $this->headScript(); ?>

</head>
@@ -101,7 +134,19 @@ echo $this->doctype(); ?> 
         src="data:image/png;base64,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"/>

</a>



<!-- Scripts -->

<!-- Scripts (dépendances) -->

<script type="text/javascript" src="/vendor/bootstrap-3.3.5/js/bootstrap.min.js"></script>

<script type="text/javascript" src="/vendor/jquery.form-3.51.js"></script>



<!-- Scripts de l'application -->

<script type="text/javascript" src="/js/datepicker-fr.js?v=<?= $version ?>"></script>

<script type="text/javascript" src="/js/unicaen.js?v=<?= $version ?>"></script>

<script type="text/javascript" src="/js/util.js?v=<?= $version ?>"></script>

<script type="text/javascript" src="/js/app.js?v=<?= $version ?>"></script>

<script type="text/javascript" src="/js/paiement.js?v=<?= $version ?>"></script>

<script type="text/javascript" src="/js/piece-jointe.js?v=<?= $version ?>"></script>



<!-- Scripts chargés dynamiquement -->

<?= $this->inlineScript(); ?>



</body>