Skip to content
GitLab
Commit 3dc70780 authored by Laurent Lécluse's avatar Laurent Lécluse
Browse files

Modifs de customisation de logo et de lien "Vie privée" 

Intégration dans l'app de la CSS Unicaen
parent f85033de
Expand all Hide whitespace changes
Inline Side-by-side
CHANGELOG.md
View file @ 3dc70780
......@@ -12,9 +12,22 @@ author: Laurent Lécluse - DSI - Unicaen
* Composante d'affectation
* Pays de naissance
* Nom patronymique
* Les coordonnées bancaires peuvent être saisies même si elles sont hors zone SEPA (une case à cocher limite le contrôle)
## Nouveautés
* Le logo Unicaen n'est plus fourni par défaut dans l'interface de OSE en pied de page
* Le lien "Informatique et libertés" est remplacé par un nouveau lien "Vie privée"
## Notes de mise à jour
* CSS personnalisée : Si vous avez remplacé le logo Unicaen par votre propre logo en pied de page,
la classe CSS pour cela est maintenant "lien-univ" au lien de "ucbn".
* Dans le fichier de configuration, remplacer l'item "informatiqueEtLibertes" par "viePrivee"
# OSE 8.1.4
## Correction de bug
......
composer.json
View file @ 3dc70780
......@@ -9,7 +9,7 @@
],
"require" : {
"php" : "^7.0",
"unicaen/app" : "1.3.26",
"unicaen/app" : "1.3.27",
"unicaen/auth" : "1.3.6",
"zendframework/zend-code" : "^2.4",
"zendframework/zend-text" : "^2.4",
......
composer.lock
View file @ 3dc70780
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "70ac177092bbd3d4faa7b3aac80da001",
"content-hash": "d457b05fcec673d652d6a6a4151b06b6",
"packages": [
{
"name": "bjyoungblood/bjy-authorize",
......@@ -705,21 +705,24 @@
},
{
"name": "doctrine/lexer",
"version": "v1.0.1",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
"reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
"reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
"reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
"reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
},
"require-dev": {
"phpunit/phpunit": "^4.5"
},
"type": "library",
"extra": {
"branch-alias": {
......@@ -727,8 +730,8 @@
}
},
"autoload": {
"psr-0": {
"Doctrine\\Common\\Lexer\\": "lib/"
"psr-4": {
"Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
}
},
"notification-url": "https://packagist.org/downloads/",
......@@ -749,13 +752,16 @@
"email": "schmittjoh@gmail.com"
}
],
"description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
"homepage": "http://www.doctrine-project.org",
"description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
"homepage": "https://www.doctrine-project.org/projects/lexer.html",
"keywords": [
"annotations",
"docblock",
"lexer",
"parser"
"parser",
"php"
],
"time": "2014-09-09T13:34:57+00:00"
"time": "2019-06-08T11:03:04+00:00"
},
{
"name": "doctrine/orm",
......@@ -1413,16 +1419,16 @@
},
{
"name": "symfony/debug",
"version": "v3.4.28",
"version": "v3.4.29",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "671fc55bd14800668b1d0a3708c3714940e30a8c"
"reference": "1172dc1abe44dfadd162239153818b074e6e53bf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/671fc55bd14800668b1d0a3708c3714940e30a8c",
"reference": "671fc55bd14800668b1d0a3708c3714940e30a8c",
"url": "https://api.github.com/repos/symfony/debug/zipball/1172dc1abe44dfadd162239153818b074e6e53bf",
"reference": "1172dc1abe44dfadd162239153818b074e6e53bf",
"shasum": ""
},
"require": {
......@@ -1465,7 +1471,7 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2019-05-18T13:32:47+00:00"
"time": "2019-06-18T21:26:03+00:00"
},
{
"name": "symfony/polyfill-ctype",
......@@ -1635,11 +1641,11 @@
},
{
"name": "unicaen/app",
"version": "1.3.26",
"version": "1.3.27",
"source": {
"type": "git",
"url": "https://git.unicaen.fr/lib/unicaen/app.git",
"reference": "79aef7a75e26ff4219d82046005a297d6f1e5e6f"
"reference": "d4bb3996d9dc5da67d25395f938b9617c3aa8837"
},
"require": {
"doctrine/doctrine-orm-module": ">=0.7",
......@@ -1682,7 +1688,7 @@
]
},
"description": "Module de base des applications unicaen",
"time": "2019-05-07T13:37:50+00:00"
"time": "2019-06-28T14:34:22+00:00"
},
{
"name": "unicaen/auth",
......@@ -1791,11 +1797,11 @@
},
{
"name": "unicaen/oracle",
"version": "1.2.11",
"version": "1.2.14",
"source": {
"type": "git",
"url": "https://git.unicaen.fr/lib/unicaen/oracle.git",
"reference": "432835499c6de82258d510e8a4856a6e225b38b6"
"reference": "5f0d06c1a67dc2d89310e256d2fbf1f56ebef293"
},
"require": {
"doctrine/dbal": "^2.5",
......@@ -1815,7 +1821,7 @@
]
},
"description": "Bibliothèque utile lorsqu'on utilise un base de données Oracle",
"time": "2019-04-05T15:04:45+00:00"
"time": "2019-07-04T11:58:15+00:00"
},
{
"name": "unicaen/tbl",
......@@ -3425,16 +3431,16 @@
},
{
"name": "zendframework/zend-permissions-acl",
"version": "2.7.0",
"version": "2.7.1",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-permissions-acl.git",
"reference": "c9568f4aee2887e43bf07769973f9686e8f61707"
"reference": "1323e30a9357e6f6956f63d97faf7e8c8db1f4f8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zendframework/zend-permissions-acl/zipball/c9568f4aee2887e43bf07769973f9686e8f61707",
"reference": "c9568f4aee2887e43bf07769973f9686e8f61707",
"url": "https://api.github.com/repos/zendframework/zend-permissions-acl/zipball/1323e30a9357e6f6956f63d97faf7e8c8db1f4f8",
"reference": "1323e30a9357e6f6956f63d97faf7e8c8db1f4f8",
"shasum": ""
},
"require": {
......@@ -3470,7 +3476,7 @@
"acl",
"zf"
],
"time": "2018-05-01T21:53:20+00:00"
"time": "2019-06-25T08:09:22+00:00"
},
{
"name": "zendframework/zend-serializer",
......
config.local.php.default
View file @ 3dc70780
......@@ -51,10 +51,10 @@ return [
'messageBienvenue' => 'Bienvenue dans l\'application de saisie des enseignements de l\'université de Caen Normandie.',
/* Page web des mentions légales de votre établissement */
'mentionsLegales' => "http://gest.unicaen.fr/acces-direct/mentions-legales/",
'mentionsLegales' => "http://www.unicaen.fr/acces-direct/mentions-legales/",
/* Page web mentionnant vos règles "informatique et liberté" */
'informatiqueEtLibertes' => "http://gest.unicaen.fr/acces-direct/informatique-et-libertes/",
/* Page web mentionnant vos règles "vie privée" */
'viePrivee' => "http://www.unicaen.fr/vie-privee/",
/* URL de votre propre feuille de style pour personnaliser OSE */
'css' => null,
......
config/autoload/unicaen-app.global.php
View file @ 3dc70780
......@@ -88,12 +88,13 @@ return [
'label' => AppConfig::get('etablissement', 'nom'),
'title' => AppConfig::get('etablissement', 'logoDescription'),
'uri' => AppConfig::get('etablissement', 'logoUri'),
'class' => 'lien-univ',
],
'mentions-legales' => [
'uri' => AppConfig::get('etablissement', 'mentionsLegales'),
],
'informatique-et-libertes' => [
'uri' => AppConfig::get('etablissement', 'informatiqueEtLibertes'),
'uri' => AppConfig::get('etablissement', 'viePrivee'),
],
],
],
......
module/Application/config/aaa_module.config.php
View file @ 3dc70780
......@@ -224,8 +224,7 @@ $config = [
'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' => 'vendor/unicaen/app/css/unicaen.css',
//'060_unicaen' => 'vendor/unicaen/app/css/unicaen.css',
'111_' => 'css/cartridge.css',
'112_' => 'vendor/font-awesome-4.5.0/css/font-awesome.min.css',
......
public/css/app.css
View file @ 3dc70780
This diff is collapsed.
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