Commit 608ff8bf authored by joriot221's avatar joriot221
Browse files

Commit travail en cour bs5

parent 0cf6e837
......@@ -9,7 +9,7 @@
],
"require" : {
"php" : ">=8.0",
"unicaen/app" : "dev-ll-php8",
"unicaen/app" : "dev-ll-php8-bs5",
"unicaen/auth" : "dev-ll-php8",
"laminas/laminas-file" : "^2.8",
"unicaen/code" : "dev-ll-php8",
......
{
"_readme": [
"_readme" : [
"This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "743a85fcaf19a8c5531f12b2a963ba4d",
"packages": [
"content-hash" : "78d8bc979bc3ad3ce7c7a3bbf901f8e4",
"packages" : [
{
"name": "beberlei/assert",
"name" : "beberlei/assert",
"version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/beberlei/assert.git",
"source" : {
"type" : "git",
"url" : "https://github.com/beberlei/assert.git",
"reference": "cb70015c04be1baee6f5f5c953703347c0ac1655"
},
"dist": {
"dist" : {
"type": "zip",
"url": "https://api.github.com/repos/beberlei/assert/zipball/cb70015c04be1baee6f5f5c953703347c0ac1655",
"reference": "cb70015c04be1baee6f5f5c953703347c0ac1655",
......@@ -6778,18 +6778,18 @@
"time": "2016-11-16T10:37:54+00:00"
},
{
"name": "unicaen/app",
"version": "dev-ll-php8",
"source": {
"type": "git",
"url": "https://git.unicaen.fr/lib/unicaen/app.git",
"reference": "8e620328723c25a1b7f6a8f4cc910d410e217c42"
"name" : "unicaen/app",
"version": "dev-ll-php8-bs5",
"source" : {
"type" : "git",
"url" : "https://git.unicaen.fr/lib/unicaen/app.git",
"reference": "de80ad6d5615fdd38ed87d8cf3f6472a75b31a5a"
},
"require": {
"beberlei/assert": "^3.3",
"doctrine/dbal": "^3.2",
"beberlei/assert" : "^3.3",
"doctrine/dbal" : "^3.2",
"doctrine/doctrine-laminas-hydrator": "^3.0",
"doctrine/doctrine-orm-module": "^5.0",
"doctrine/doctrine-orm-module" : "^5.0",
"ext-bcmath": "*",
"ext-intl": "*",
"ext-ldap": "*",
......@@ -6840,7 +6840,7 @@
]
},
"description": "Module de base des applications unicaen",
"time": "2022-01-31T09:45:35+00:00"
"time" : "2022-02-14T08:55:50+00:00"
},
{
"name": "unicaen/auth",
......@@ -6851,9 +6851,9 @@
"reference": "e0cc60d78c307f72287ab572d304f96b4cc10700"
},
"require": {
"jasig/phpcas": "^1.4",
"ramsey/uuid": "^4.2",
"unicaen/app": "^4.0 || dev-ll-php8",
"jasig/phpcas" : "^1.4",
"ramsey/uuid" : "^4.2",
"unicaen/app" : "^4.0 || dev-ll-php8-bs5",
"unicaen/bjy-authorize": "^4.0 || dev-ll-php8"
},
"require-dev": {
......@@ -6948,7 +6948,7 @@
"easybook/geshi": ">=1.0",
"laminas/laminas-developer-tools": "^2.3",
"laminas/laminas-file": "^2.10",
"unicaen/app": "^4.0 || dev-ll-php8"
"unicaen/app": "^4.0 || dev-ll-php8-bs5"
},
"type": "library",
"autoload": {
......@@ -7098,7 +7098,7 @@
"reference": "dfa4393442ce8fc7c9a7f0968fc8af283870b01b"
},
"require": {
"unicaen/app": "^4.0 || dev-ll-php8"
"unicaen/app": "^4.0 || dev-ll-php8-bs5"
},
"type": "library",
"autoload": {
......@@ -8136,5 +8136,5 @@
"php": ">=8.0"
},
"platform-dev": [],
"plugin-api-version": "2.1.0"
"plugin-api-version": "2.2.0"
}
......@@ -234,15 +234,15 @@ $config = [
//'050_bootstrap-theme' => 'vendor/bootstrap-5.0.2/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',
// '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',
],
],
];
......
......@@ -47,13 +47,21 @@ echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
<td style="text-align: center" title="Écart de mois avec le début de l'année universitaire choisie"><?= $periode->getEcartMois(); ?></td>
<?php if ($canEdit): ?>
<td style="text-align: center">
<a class="ajax-modal" data-event="periodes-edition"
href="<?= $this->url('periodes/saisie', ['periode' => $periode->getId()], ['query' => ['tab' => 'edition']]) ?>"
title="Modifier la période"><span class="glyphicon glyphicon-edit"></span></a>
<i class="bi-alarm"><a class="ajax-modal" data-event="periodes-edition"
href="<?= $this->url('periodes/saisie', ['periode' => $periode->getId()], ['query' => ['tab' => 'edition']]) ?>"
title="Modifier la période">
test
</a>
</i>
<span class="span">||</span>
<i class="bi bi-pen-square"></i>
<span class="span">||</span>
<i class="fa fa-camera-retro"></i>
<a class="pop-ajax" data-title="Suppression de période" data-content="Etes vous sur de supprimer" data-confirm="true"
data-submit-reload="true"
href="<?= $this->url('periodes/supprimer', ['periode' => $periode->getId()]) ?>"
title="Supprimer la periode"><span class="glyphicon glyphicon-remove"></span></a>
title="Supprimer la periode">delete<span class="glyphicon glyphicon-remove"></span></a>
<span class="glyphicon glyphicon-move"
title="Vous pouvez trier les champs en déplaçant les lignes du tableau"></span>&nbsp;
</td>
......
......@@ -8,6 +8,13 @@ $navigationHelper = $this->navigation('navigation');
echo $this->doctype(); ?>
<html lang="fr">
<head>
<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-5.0.2/css/bootstrap.min.css" media="all" rel="stylesheet" type="text/css">
<link href="/css/app.css" media="all" rel="stylesheet" type="text/css">
<link href="/vendor/font-awesome-4.5.0/css/font-awesome.css" media="all" rel="stylesheet" type="text/css">
<!-- Meta -->
<meta charset="utf-8">
<?php
......@@ -33,26 +40,13 @@ echo $this->doctype(); ?>
?>
<!-- Scripts -->
<?= $this->headScript(); ?>
<script src="/vendor/jquery-1.11.3.min.js"></script>
<script src="/vendor/jquery-ui-1.11.4/jquery-ui.min.js"></script>
<script src="/vendor/bootstrap-5.0.2/js/bootstrap.bundle.js"></script>
</head>
<body class="<?= getenv('APPLICATION_ENV') ?: 'dev' ?> p-0" data-base-url="<?= $this->url('home') ?>">
<!--<div id="navbar" class="navbar navbar-inverse navbar-fixed-top" role="navigation">-->
<!-- <div class="container">-->
<!-- <div class="navbar-header">-->
<!-- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".bs-navbar-collapse">-->
<!-- <span class="sr-only">Toggle navigation</span>-->
<!-- <span class="icon-bar"></span>-->
<!-- <span class="icon-bar"></span>-->
<!-- <span class="icon-bar"></span>-->
<!-- </button>-->
<!-- </div>-->
<!-- <div class="navbar-collapse bs-navbar-collapse collapse">-->
<!-- <p class="navbar-text navbar-right">-->
<!-- </p>-->
<!-- </div>/.nav-collapse -->
<!-- </div>-->
<!--</div>-->
<nav class="navbar sticky-top navbar-expand-lg navbar-dark" style="background-color: #002768">
<div class="container-fluid center">
......@@ -62,11 +56,11 @@ echo $this->doctype(); ?>
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto px-2">
<li class="nav-item">
<?= $navigationHelper->menuPrincipal(); ?>
</li>
</ul>
<?= $navigationHelper
->menu('navigation')
->setUlClass('navbar-nav me-auto')
->setPartial('layout/menu-principal.phtml'); ?>
<!-- A remplacer par $navigationHelper->menuPrincipal() suite au merge de unicaenApp mis à jour avec l'utilisation de la vue partiel -->
<form class="d-flex">
<button class="btn btn-outline-success" type="submit">
<?= $this->appConnection(); ?>
......
<?php
use Laminas\Navigation\AbstractContainer;
use Laminas\Navigation\Page\AbstractPage;
// Pointeur sur la première page du conteneur
$this->container->rewind();
// On récupère le conteneur en-dessous du 'home'
/** @var AbstractContainer $container */
$container = $this->container->getChildren();
// tri des pages de niveau 1 par 'order'
$sorterByOrder = function (AbstractPage $p1, AbstractPage $p2) {
return ($p1->getOrder() ?: 0) <=> ($p2->getOrder() ?: 0);
};
$pagesNiv1 = iterator_to_array($container);
uasort($pagesNiv1, $sorterByOrder);
?>
<ul class="<?php echo $this->navigation()->menu()->getUlClass(); ?>">
<?php foreach ($pagesNiv1 as $page): ?>
<?php if (!$this->navigation()->accept($page)) continue; ?>
<?php /* @var $page Laminas\Navigation\Page\Mvc */ ?>
<?php $hasChildren = $page->hasPages() ?>
<?php if (!$hasChildren): ?>
<li class="nav-item <?php if ($page->isActive()) echo 'active' ?>">
<a class="nav-link" href="<?php echo $page->getHref() ?>"
<?php if ($page->getTarget() != ""): ?>
target="<?php echo $page->getTarget(); ?>"
<?php endif; ?>>
<?php if ($page->get("icon") !== ""): ?>
<span class="<?php echo $page->get("icon"); ?>"></span>
<?php elseif (in_array('divider', explode(' ', $page->getClass()))): ?>
<div class="dropdown-divider <?php echo $page->getClass() ?>"></div>
<?php endif; ?>
<?php echo $this->escapeHtml($this->translate($page->getLabel(), $this->navigation($container)->getTranslatorTextDomain())); ?>
</a>
</li>
<?php else: ?>
<?php
//check if access is allowed at least one item
$access = false;
foreach ($page->getPages() as $child) {
if ($this->navigation()->accept($child) && $child->get("separator") !== true) {
$access = true;
}
}
if ($access) :
?>
<li class="nav-item dropdown <?php if ($page->isActive(true)) echo ' nav-item active' ?>">
<a class="nav-link dropdown-toggle" id="navbarDropdownMenuLink" data-bs-toggle="dropdown" href="<?php echo $page->getHref() ?>"
aria-expanded="false">
<?php if ($page->get("icon") != ""): ?>
<span class="icon">
<i class="<?php echo $page->get("icon"); ?>"></i>
</span>
<?php endif; ?>
<?php echo $this->escapeHtml($this->translate($page->getLabel(), $this->navigation($container)->getTranslatorTextDomain())); ?>
<!-- <b class="caret"></b>-->
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<?php
// tri des pages de niveau 2 par 'order'
$pagesNiv2 = $page->getPages();
uasort($pagesNiv2, $sorterByOrder);
?>
<?php foreach ($pagesNiv2 as $child): ?>
<?php if (!$this->navigation()->accept($child)) continue; ?>
<?php if ($child->get("dropdown-header") === true): ?>
<li class="dropdown-item">
<?php if ($child->get("icon") != ""): ?>
<span class="icon">
<i class="<?php echo $child->get("icon"); ?>"></i>
</span>
<?php elseif (in_array('divider', explode(' ', $child->getClass()))): ?>
<div class="dropdown-divider <?php echo $child->getClass() ?>"></div>
<?php endif; ?>
<?php echo $this->escapeHtml($this->translate($child->getLabel(), $this->navigation($container)->getTranslatorTextDomain())); ?>
</li>
<?php
continue;
endif;
?>
<?php if ($child->get("separator") === true): ?>
<li class="dropdown-divider"></li>
<?php
continue;
endif;
?>
<li>
<a class="dropdown-item <?php if ($child->isActive()) echo 'active' ?>"
href="<?php echo $child->getHref() ?>"
<?php if ($child->getTarget() != ""): ?>
target="<?php echo $child->getTarget(); ?>"
<?php endif; ?>>
<?php if ($child->get("icon") != ""): ?>
<span class="icon">
<i class="<?php echo $child->get("icon"); ?>"></i>
</span>
<?php endif; ?>
<?php echo $this->escapeHtml($this->translate($child->getLabel(), $this->navigation($container)->getTranslatorTextDomain())); ?>
</a>
</li>
<?php endforeach ?>
</ul>
</li>
<?php endif; ?>
<?php endif ?>
<?php endforeach ?>
</ul>
body {
font-family: ubuntu, arial, sans-serif;
padding-top: 60px;
}
......@@ -309,7 +308,6 @@ div#contenu-principal {
}
body {
padding-top: 50px;
background-color: #f8f8fa;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment