From 8cccc7fd2694b9d5faaa97452826af95ee9af4c1 Mon Sep 17 00:00:00 2001
From: lecluse <lecluse@d57fa8bc-6af1-4de9-8b7d-78e900e231e7>
Date: Mon, 1 Feb 2016 16:36:22 +0000
Subject: [PATCH] Refonte des messages d'erreur pour les rendre + propres, un
peu de deseign, correction de bugs divers
---
code/NewOseForm.php | 2 +-
code/template/{Form.php => OseForm.php} | 0
composer.lock | 122 +++++++-------
config/autoload/README.md | 8 -
config/autoload/local.php.dist | 7 -
data/Sql/init_premier_recrutement.sql | 7 +-
module/Application/config/module.config.php | 15 +-
module/Application/language/fr_FR.mo | Bin 732 -> 1588 bytes
module/Application/language/fr_FR.po | 154 +++---------------
.../view/application/menu-callout.phtml | 6 +-
module/Application/view/error/exception.phtml | 73 +++++++++
module/Application/view/error/index.phtml | 65 ++++++++
module/Application/view/layout/layout.phtml | 81 +++++++++
public/css/app.css | 66 ++------
public/css/callout.css | 50 ++++++
15 files changed, 387 insertions(+), 269 deletions(-)
rename code/template/{Form.php => OseForm.php} (100%)
delete mode 100755 config/autoload/README.md
delete mode 100755 config/autoload/local.php.dist
create mode 100644 module/Application/view/error/exception.phtml
create mode 100644 module/Application/view/error/index.phtml
create mode 100644 module/Application/view/layout/layout.phtml
create mode 100644 public/css/callout.css
diff --git a/code/NewOseForm.php b/code/NewOseForm.php
index cbf770ba8c..18a5ef637b 100644
--- a/code/NewOseForm.php
+++ b/code/NewOseForm.php
@@ -50,7 +50,7 @@ if ($controller->getRequest()->isPost() && $form->isValid()) {
<h3>Etape 2 : Création des fichiers sources du formulaire</h3>
<?php
- $sCodeGenerator->setTemplate('Form')->setParams($params)->generateToHtml($params['fileName'])->generateToFile($params['fileName']);
+ $sCodeGenerator->setTemplate('OseForm')->setParams($params)->generateToHtml($params['fileName'])->generateToFile($params['fileName']);
$p = $sCodeGenerator->generateFormTraitParams($targetFullClass, $name, $module . '\Form');
$sCodeGenerator->setTemplate('FormAwareTrait')->setParams($p)->generateToHtml($p['fileName'])->generateToFile($p['fileName']);
diff --git a/code/template/Form.php b/code/template/OseForm.php
similarity index 100%
rename from code/template/Form.php
rename to code/template/OseForm.php
diff --git a/composer.lock b/composer.lock
index 68cab89807..8165781c9c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -147,33 +147,33 @@
},
{
"name": "doctrine/cache",
- "version": "v1.5.2",
+ "version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "47c7128262da274f590ae6f86eb137a7a64e82af"
+ "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/47c7128262da274f590ae6f86eb137a7a64e82af",
- "reference": "47c7128262da274f590ae6f86eb137a7a64e82af",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6",
+ "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "php": "~5.5|~7.0"
},
"conflict": {
"doctrine/common": ">2.2,<2.4"
},
"require-dev": {
- "phpunit/phpunit": ">=3.7",
+ "phpunit/phpunit": "~4.8|~5.0",
"predis/predis": "~1.0",
"satooshi/php-coveralls": "~0.6"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.5.x-dev"
+ "dev-master": "1.6.x-dev"
}
},
"autoload": {
@@ -213,7 +213,7 @@
"cache",
"caching"
],
- "time": "2015-12-03 10:50:37"
+ "time": "2015-12-31 16:37:02"
},
{
"name": "doctrine/collections",
@@ -283,16 +283,16 @@
},
{
"name": "doctrine/common",
- "version": "v2.5.2",
+ "version": "v2.5.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common.git",
- "reference": "311001fd9865a4d0d59efff4eac6d7dcb3f5270c"
+ "reference": "10f1f19651343f87573129ca970aef1a47a6f29e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/common/zipball/311001fd9865a4d0d59efff4eac6d7dcb3f5270c",
- "reference": "311001fd9865a4d0d59efff4eac6d7dcb3f5270c",
+ "url": "https://api.github.com/repos/doctrine/common/zipball/10f1f19651343f87573129ca970aef1a47a6f29e",
+ "reference": "10f1f19651343f87573129ca970aef1a47a6f29e",
"shasum": ""
},
"require": {
@@ -352,24 +352,24 @@
"persistence",
"spl"
],
- "time": "2015-12-04 12:49:42"
+ "time": "2015-12-25 13:10:16"
},
{
"name": "doctrine/dbal",
- "version": "v2.5.2",
+ "version": "v2.5.4",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c"
+ "reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/01dbcbc5cd0a913d751418e635434a18a2f2a75c",
- "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/abbdfd1cff43a7b99d027af3be709bc8fc7d4769",
+ "reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769",
"shasum": ""
},
"require": {
- "doctrine/common": ">=2.4,<2.6-dev",
+ "doctrine/common": ">=2.4,<2.7-dev",
"php": ">=5.3.2"
},
"require-dev": {
@@ -423,7 +423,7 @@
"persistence",
"queryobject"
],
- "time": "2015-09-16 16:29:33"
+ "time": "2016-01-05 22:11:12"
},
{
"name": "doctrine/doctrine-module",
@@ -758,22 +758,22 @@
},
{
"name": "doctrine/orm",
- "version": "v2.5.2",
+ "version": "v2.5.4",
"source": {
"type": "git",
"url": "https://github.com/doctrine/doctrine2.git",
- "reference": "464b5fdbfbbeb4a65465ac173c4c5d90960f41ff"
+ "reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/464b5fdbfbbeb4a65465ac173c4c5d90960f41ff",
- "reference": "464b5fdbfbbeb4a65465ac173c4c5d90960f41ff",
+ "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/bc4ddbfb0114cb33438cc811c9a740d8aa304aab",
+ "reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab",
"shasum": ""
},
"require": {
"doctrine/cache": "~1.4",
"doctrine/collections": "~1.2",
- "doctrine/common": ">=2.5-dev,<2.6-dev",
+ "doctrine/common": ">=2.5-dev,<2.7-dev",
"doctrine/dbal": ">=2.5-dev,<2.6-dev",
"doctrine/instantiator": "~1.0.1",
"ext-pdo": "*",
@@ -782,7 +782,6 @@
},
"require-dev": {
"phpunit/phpunit": "~4.0",
- "satooshi/php-coveralls": "dev-master",
"symfony/yaml": "~2.3|~3.0"
},
"suggest": {
@@ -831,7 +830,7 @@
"database",
"orm"
],
- "time": "2015-11-23 12:44:25"
+ "time": "2016-01-05 21:34:58"
},
{
"name": "jasig/phpcas",
@@ -1006,16 +1005,16 @@
},
{
"name": "rwoverdijk/assetmanager",
- "version": "1.4.4",
+ "version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/RWOverdijk/AssetManager.git",
- "reference": "fed0e5cc6799a595627c79c41da4492f6e857cc0"
+ "reference": "ced629631ff612b8b3dd3a2e83ac8e77ac946fcd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/RWOverdijk/AssetManager/zipball/fed0e5cc6799a595627c79c41da4492f6e857cc0",
- "reference": "fed0e5cc6799a595627c79c41da4492f6e857cc0",
+ "url": "https://api.github.com/repos/RWOverdijk/AssetManager/zipball/ced629631ff612b8b3dd3a2e83ac8e77ac946fcd",
+ "reference": "ced629631ff612b8b3dd3a2e83ac8e77ac946fcd",
"shasum": ""
},
"require": {
@@ -1063,20 +1062,20 @@
"zend framework 2",
"zf2"
],
- "time": "2015-03-12 07:10:33"
+ "time": "2016-01-21 09:21:54"
},
{
"name": "symfony/console",
- "version": "v3.0.0",
+ "version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "175871ca8d1ef16ff8d8cac395a1c73afa8d0e63"
+ "reference": "ebcdc507829df915f4ca23067bd59ee4ef61f6c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/175871ca8d1ef16ff8d8cac395a1c73afa8d0e63",
- "reference": "175871ca8d1ef16ff8d8cac395a1c73afa8d0e63",
+ "url": "https://api.github.com/repos/symfony/console/zipball/ebcdc507829df915f4ca23067bd59ee4ef61f6c3",
+ "reference": "ebcdc507829df915f4ca23067bd59ee4ef61f6c3",
"shasum": ""
},
"require": {
@@ -1123,29 +1122,32 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2015-11-30 12:36:17"
+ "time": "2015-12-22 10:39:06"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.0.0",
+ "version": "v1.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "0b6a8940385311a24e060ec1fe35680e17c74497"
+ "reference": "1289d16209491b584839022f29257ad859b8532d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497",
- "reference": "0b6a8940385311a24e060ec1fe35680e17c74497",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
+ "reference": "1289d16209491b584839022f29257ad859b8532d",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
+ "suggest": {
+ "ext-mbstring": "For best performance"
+ },
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0-dev"
+ "dev-master": "1.1-dev"
}
},
"autoload": {
@@ -1179,20 +1181,20 @@
"portable",
"shim"
],
- "time": "2015-11-04 20:28:58"
+ "time": "2016-01-20 09:13:37"
},
{
"name": "symfony/process",
- "version": "v2.8.0",
+ "version": "v2.8.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "1b988a88e3551102f3c2d9e1d47a18c3a78d6312"
+ "reference": "6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/1b988a88e3551102f3c2d9e1d47a18c3a78d6312",
- "reference": "1b988a88e3551102f3c2d9e1d47a18c3a78d6312",
+ "url": "https://api.github.com/repos/symfony/process/zipball/6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac",
+ "reference": "6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac",
"shasum": ""
},
"require": {
@@ -1228,7 +1230,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2015-11-30 12:35:10"
+ "time": "2016-01-06 09:59:23"
},
{
"name": "unicaen/unicaen-app",
@@ -1236,7 +1238,7 @@
"source": {
"type": "svn",
"url": "https://svn.unicaen.fr/svn/UnicaenApp",
- "reference": "/trunk/@664"
+ "reference": "/trunk/@676"
},
"require": {
"doctrine/doctrine-orm-module": ">=0.7",
@@ -1286,7 +1288,7 @@
"source": {
"type": "svn",
"url": "https://svn.unicaen.fr/svn/UnicaenAuth",
- "reference": "/trunk/@257"
+ "reference": "/trunk/@263"
},
"require": {
"bjyoungblood/bjy-authorize": ">=1.4",
@@ -3765,16 +3767,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "4.8.19",
+ "version": "4.8.21",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "b2caaf8947aba5e002d42126723e9d69795f32b4"
+ "reference": "ea76b17bced0500a28098626b84eda12dbcf119c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b2caaf8947aba5e002d42126723e9d69795f32b4",
- "reference": "b2caaf8947aba5e002d42126723e9d69795f32b4",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ea76b17bced0500a28098626b84eda12dbcf119c",
+ "reference": "ea76b17bced0500a28098626b84eda12dbcf119c",
"shasum": ""
},
"require": {
@@ -3833,7 +3835,7 @@
"testing",
"xunit"
],
- "time": "2015-11-30 08:18:59"
+ "time": "2015-12-12 07:45:58"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -4264,16 +4266,16 @@
},
{
"name": "symfony/yaml",
- "version": "v3.0.0",
+ "version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002"
+ "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002",
- "reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/3df409958a646dad2bc5046c3fb671ee24a1a691",
+ "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691",
"shasum": ""
},
"require": {
@@ -4309,7 +4311,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2015-11-30 12:36:17"
+ "time": "2015-12-26 13:39:53"
},
{
"name": "unicaen/unicaen-code",
@@ -4317,7 +4319,7 @@
"source": {
"type": "svn",
"url": "https://svn.unicaen.fr/svn/UnicaenCode",
- "reference": "/trunk/@14"
+ "reference": "/trunk/@28"
},
"require-dev": {
"phpunit/phpunit": ">=3.7",
diff --git a/config/autoload/README.md b/config/autoload/README.md
deleted file mode 100755
index 4e504db024..0000000000
--- a/config/autoload/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-About this directory:
-=====================
-
-By default, this application is configured to load all configs in
-`./config/autoload/{,*.}{global,local}.php`. Doing this provides a
-location for a developer to drop in configuration override files provided by
-modules, as well as cleanly provide individual, application-wide config files
-for things like database connections, etc.
diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist
deleted file mode 100755
index 594b84551d..0000000000
--- a/config/autoload/local.php.dist
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return [
- 'view_manager' => [
- 'display_not_found_reason' => false,
- 'display_exceptions' => false,
- ],
-];
diff --git a/data/Sql/init_premier_recrutement.sql b/data/Sql/init_premier_recrutement.sql
index fb8b28fc84..ded1aca03f 100644
--- a/data/Sql/init_premier_recrutement.sql
+++ b/data/Sql/init_premier_recrutement.sql
@@ -5,11 +5,11 @@ from
intervenant i
JOIN formule_resultat fr ON fr.intervenant_id = i.id
where
- source_code IN (select source_code from intervenant where id = 8334)
+ source_code IN (select source_code from intervenant where id = 6860)
AND i.annee_id = 2014
AND fr.total > 0)
WHERE
- id = 8334
+ id = 6860
AND premier_recrutement IS NULL
;
@@ -25,6 +25,3 @@ where
select source_code from intervenant where id = 5249;
-
-
-8329 8334
\ No newline at end of file
diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index 896d2fcd46..307e8d3882 100755
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -11,12 +11,12 @@ const R_INTERVENANT_EXTERIEUR = Acl\IntervenantExterieurRole::ROLE_ID;
$main = [
'doctrine' => [
- 'connection' => [
+ 'connection' => [
'orm_default' => [
'driverClass' => \Doctrine\DBAL\Driver\OCI8\Driver::class,
],
],
- 'driver' => [
+ 'driver' => [
'orm_default_driver' => [
'class' => \Doctrine\ORM\Mapping\Driver\XmlDriver::class,
'paths' => [
@@ -46,7 +46,7 @@ $main = [
],
],
],
- 'eventmanager' => [
+ 'eventmanager' => [
'orm_default' => [
'subscribers' => [
\Doctrine\DBAL\Event\Listeners\OracleSessionInit::class,
@@ -54,7 +54,7 @@ $main = [
],
],
],
- 'cache' => [
+ 'cache' => [
'apc' => [
'namespace' => 'OSE__' . __NAMESPACE__,
],
@@ -216,6 +216,12 @@ $main = [
'template_path_stack' => [
__DIR__ . '/../view',
],
+ 'template_map' => [
+ 'layout/layout' => __DIR__ . '/../view/layout/layout.phtml',
+ //'error/404' => __DIR__ . '/../view/error/404.phtml',
+ 'error/index' => __DIR__ . '/../view/error/index.phtml',
+ ],
+ 'layout' => 'layout/layout', // e.g., 'layout/layout'
],
'public_files' => [
'inline_scripts' => [
@@ -238,6 +244,7 @@ $main = [
17 => 'css/service.css',
18 => 'css/acceuil.css',
19 => 'css/droits.css',
+ 20 => 'css/callout.css',
],
],
];
diff --git a/module/Application/language/fr_FR.mo b/module/Application/language/fr_FR.mo
index fb929afe2e595af2258b2087a6eb8b19bc3083e3..2e9cf92a95ecac3624e84ed156f5419beb11eb3a 100755
GIT binary patch
delta 1162
zcmcb^x`n6yo)F7a1_lNOeg*~x83qQ1DGUq@;tUK7Jd7Yw28Ikq1_luZ28K*V1_m((
z28KFD1_nU}28OAO3=Gx`3=GSm{Kt$83@i)`3||=;7<d^N7=AG_Ft9T)FmNzI^a(IA
zFbFd+FsL&zFmN+4FjzzAdIonU1_mPr28LiJ1_m1j28K2!28L^l3=D^v7#O4(7#L=;
zFfhn6FfeRmfjI063j>1>0|Ubw7KlSESs@mAvqCHmW@TXDU|?WKWQFL@Vr5{E0GZ1Q
zv3Nc!MBi#wkO%4+81}L<Fjz4#F#Kd?U;ufV6XJ0O9tH*mHYgk9Vki?#fkF%9TM!52
zTUHQ*fq{V;<YNW~1||ju20jJ`1}>;LC?psh6-*3F6jF<d@{1Jmlaot}ic(YR85~nm
zGD|Y^^Ad9uGV{{%i*ge|JO;-+G?kbl3Mr*UnR)37sTHZor65h#3I#c-iN&c3B}J7A
ziRp=%c?vm+C8<Sv49@v^d8x@Isa3jV`K85rdU^~V`MIeKo_X~psYPX}d5L)?3RVoh
zsl~;K>8T8U`3kNT$*Bb(GZhlc5;JoWlX6lS0*X@0GV@D|6;ff6#SB5I$r-6d$r-5%
zRt&)<iOJatB}IwJsSF_*sR~7@g{7&*C8;S2p+P<h$@!%@DGGV{B??KY3b~0T$r-6B
z3Q6&m3Pt&)C7F5YdT4r*^YcoI@^f-hixkQeixo=qKyFYd$yZ3pEG__PS13W)p~nzV
zl%JKFT%zllq8pZ4RGgWgXQkjD>^kvj-{wk2BgXpByi`ztrj`~#VxhQ1p|}*}^-@qU
zz{9;*Avr&{Am{MP+|<01#LS}9Vg@9gsmQu;h$|GN=B0qbGe<qO;_ymn%+xFRrWPe<
zDx{<;6dhg(3g^nyB87sS(qe^@#G({zG31z>T$-Ah!{C{R5=VzuLL$krG`SSyCs<s7
z!zDj26BJYM*eg~jC_20{`S8m6l+?VERMhwi$jnJqNI`NXgO55WrczRK6Z29IuS`|Q
zQ%_VVNGw(;C{-va$}cTTEdqNWzqBM(AvwROD7CmCAMDvwJq90;P+m#V;Vn6!K!zCt
ZHA5C`2rTMSixhGa!Rh1hs*+Sa1_05^KhOXG
delta 300
zcmdnObBDG5o)F7a1_lNORt5$J83qOh7X}6fb_NE99FQOb149P`1A`y~14AbR0|PGu
z1H)_v1_o{h28NXk3=Av`3=CTt7#Kb<GBE6ds$0zjQMZ=~qV6;kMBQ~J1_nl`Js^F|
z5cAU*m>>)W2Iu^|ywv29)GFPw{L*4QJv|1`ypq(Svedl9yb=W~hM?5sjMSp!j8p|H
zhLF_a5{7`H{H)aE5?#*}-LTZ6;>`R!D}|`kyp-VV)ST3k{5;2kf}G6c#FEVXyveti
U`dFP3i;Gh?r!yNf8j@@m0LBMIA^-pY
diff --git a/module/Application/language/fr_FR.po b/module/Application/language/fr_FR.po
index d43cf19961..b75dfcee74 100755
--- a/module/Application/language/fr_FR.po
+++ b/module/Application/language/fr_FR.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"Project-Id-Version: ZendSkeletonApplication\n"
+"Project-Id-Version: OSE\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-28 09:32+0100\n"
"PO-Revision-Date: 2014-02-28 09:32+0100\n"
@@ -17,154 +17,46 @@ msgstr ""
"X-Poedit-SearchPath-0: ..\n"
#: ../src/Application/Controller/IntervenantController.php:46
-#: ../src/Application/Controller/DemoController.php:36
msgid "Intervenant :"
msgstr "Intervenant :"
#: ../src/Application/Controller/RechercheController.php:24
-#: ../src/Application/Controller/DemoController.php:79
msgid "Recherche :"
msgstr "Recherche :"
-#: ../src/Application/Controller/DemoController.php:118
-msgid "Test"
-msgstr "Test"
-
#: ../view/application/index/index.phtml:5
msgid "Connectez-vous..."
msgstr "Connectez-vous..."
-#~ msgid "Skeleton Application"
-#~ msgstr "Skeleton Application"
-
-#~ msgid "Home"
-#~ msgstr "Accueil"
-
-#~ msgid "All rights reserved."
-#~ msgstr "Tous droits réservés."
-
-#~ msgid "Welcome to %sZend Framework 2%s"
-#~ msgstr "Bienvenue dans le %sZend Framework 2%s"
-
-#~ msgid ""
-#~ "Congratulations! You have successfully installed the %sZF2 Skeleton "
-#~ "Application%s. You are currently running Zend Framework version %s. This "
-#~ "skeleton can serve as a simple starting point for you to begin building "
-#~ "your application on ZF2."
-#~ msgstr ""
-#~ "Félicitations ! Vous avez installé avec succès le %sZF2 Skeleton "
-#~ "Application%s. Vous utilisez actuellement Zend Framework version %s. "
-#~ "Cette structure peut vous servir comme un point de départ simple pour "
-#~ "démarrer la construction de votre application avec ZF2."
-
-#~ msgid "Fork Zend Framework 2 on GitHub"
-#~ msgstr "Faites un Fork de Zend Framework 2 sur GitHub"
-
-#~ msgid "Follow Development"
-#~ msgstr "Suivre le développement"
-
-#~ msgid ""
-#~ "Zend Framework 2 is under active development. If you are interested in "
-#~ "following the development of ZF2, there is a special ZF2 portal on the "
-#~ "official Zend Framework website which provides links to the ZF2 %swiki%s, "
-#~ "%sdev blog%s, %sissue tracker%s, and much more. This is a great resource "
-#~ "for staying up to date with the latest developments!"
-#~ msgstr ""
-#~ "Zend Framework 2 est en cours de développement. Si vous êtes intéressé "
-#~ "pour suivre l'évolution de ZF2, il existe un portail dédié à ZF2 sur le "
-#~ "site officiel Zend Framework qui propose des liens vers le %swiki%s ZF2, "
-#~ "%sdev blog%s, %ssuivi des problèmes%s, et bien plus encore. Il s'agit "
-#~ "d'une excellente ressource pour rester à jour sur les dernières "
-#~ "évolutions !"
-
-#~ msgid "ZF2 Development Portal"
-#~ msgstr "Portail sur le développement de ZF2"
-
-#~ msgid "Discover Modules"
-#~ msgstr "Découvrez les modules"
-
-#~ msgid ""
-#~ "The community is working on developing a community site to serve as a "
-#~ "repository and gallery for ZF2 modules. The project is available %son "
-#~ "GitHub%s. The site is currently live and currently contains a list of "
-#~ "some of the modules already available for ZF2."
-#~ msgstr ""
-#~ "La communauté travaille sur le développement d'un site communautaire avec "
-#~ "l'objectif de servir de dépôt et de galerie pour les modules ZF2. Le "
-#~ "projet est disponible %ssur GitHub%s. Le site est déjà en ligne, et "
-#~ "contient une liste non exhaustive des modules déjà disponibles pour ZF2."
-
-#~ msgid "Explore ZF2 Modules"
-#~ msgstr "Explorer les modules ZF2"
-
-#~ msgid "Help & Support"
-#~ msgstr "Aide & support"
-
-#~ msgid ""
-#~ "If you need any help or support while developing with ZF2, you may reach "
-#~ "us via IRC: %s#zftalk on Freenode%s. We'd love to hear any questions or "
-#~ "feedback you may have regarding the beta releases. Alternatively, you may "
-#~ "subscribe and post questions to the %smailing lists%s."
-#~ msgstr ""
-#~ "Si vous avez besoin d'aide ou de support en développant avec ZF2, vous "
-#~ "pouvez nous joindre sur IRC : %s#zftalk sur Freenode%s. Nous aimerions "
-#~ "avoir vos questions ou vos commentaires que vous pourriez avoir au sujet "
-#~ "des versions bêta. Sinon, vous pouvez vous abonner, et poser des "
-#~ "questions sur la %sliste de diffusion%s."
-
-#~ msgid "Ping us on IRC"
-#~ msgstr "Rejoignez-nous sur IRC"
-
-#~ msgid "An error occurred"
-#~ msgstr "Une erreur est survenue"
-
-#~ msgid "Additional information"
-#~ msgstr "Informations complémentaires"
-
-#~ msgid "File"
-#~ msgstr "Fichier"
-
-#~ msgid "Message"
-#~ msgstr "Message"
-
-#~ msgid "Stack trace"
-#~ msgstr "Pile d'exécution"
-
-#~ msgid "Previous exceptions"
-#~ msgstr "Exceptions précédentes"
+msgid "Home"
+msgstr "Accueil"
-#~ msgid "No Exception available"
-#~ msgstr "Aucune exception disponible"
+msgid "An error occurred"
+msgstr "Une erreur est survenue"
-#~ msgid "A 404 error occurred"
-#~ msgstr "Une erreur 404 est survenue"
+msgid "Additional information"
+msgstr "Informations complémentaires"
-#~ msgid "The requested controller was unable to dispatch the request."
-#~ msgstr "Le contrôleur demandé n'a pas pu dispatcher la requête."
+msgid "Message"
+msgstr "Méssage"
-#~ msgid ""
-#~ "The requested controller could not be mapped to an existing controller "
-#~ "class."
-#~ msgstr ""
-#~ "Le contrôleur demandé ne correspond pas à une classe existante de "
-#~ "contrôleur."
+msgid "Stack trace"
+msgstr "Pile d'exécution"
-#~ msgid "The requested controller was not dispatchable."
-#~ msgstr "Le contrôleur demandé n'est pas dispatchable."
+msgid "Previous exceptions"
+msgstr "Exceptions précédentes"
-#~ msgid "The requested URL could not be matched by routing."
-#~ msgstr "L'URL demandée n'a pas pu trouver de route correspondante."
+msgid "No Exception available"
+msgstr "Aucune exception disponible"
-#~ msgid "We cannot determine at this time why a 404 was generated."
-#~ msgstr ""
-#~ "Nous ne pouvons pas déterminer pour le moment pourquoi une 404 a été "
-#~ "générée."
+msgid "A 404 error occurred"
+msgstr "Une erreur 404 est survenue"
-#~ msgid "Controller"
-#~ msgstr "Contrôleur"
+msgid "The requested controller was unable to dispatch the request."
+msgstr "Le contrôleur demandé n'a pas pu dispatcher la requête."
-#~ msgid "resolves to %s"
-#~ msgstr "résout en %s"
+msgid "The requested URL could not be matched by routing."
+msgstr "L'URL demandée n'a pas pu trouver de route correspondante."
-#~ msgid "Exception"
-#~ msgstr "Exception"
+msgid "An error occurred during execution; please try again later."
+msgstr "Une erreur est survenue pendant l'exécution; Merci de réessayer plus tard."
\ No newline at end of file
diff --git a/module/Application/view/application/menu-callout.phtml b/module/Application/view/application/menu-callout.phtml
index 0308bccdb0..31055d98d0 100644
--- a/module/Application/view/application/menu-callout.phtml
+++ b/module/Application/view/application/menu-callout.phtml
@@ -7,6 +7,7 @@ use UnicaenApp\View\Helper\TagViewHelper;
* @var $this \Application\View\Renderer\PhpRenderer
*/
+echo $this->tag('div', ['class'=>'callout-menu']);
foreach ($container as $page) {
if ($this->navigation()->accept($page)) {
$attrs = [
@@ -19,6 +20,7 @@ foreach ($container as $page) {
$attrs['title'] = $description;
}
+ echo $this->tag('div', ['class'=>'callout-container']);
echo $this->tag('div', $attrs);
if ($icon = $page->get('icon')) {
echo $this->tag('span', ['class' => $icon])->open(TagViewHelper::AUTOCLOSE_FULL);
@@ -36,5 +38,7 @@ foreach ($container as $page) {
echo '</ul>';
}
echo '</div>';
+ echo '</div>';
}
-}
\ No newline at end of file
+}
+echo '</div>';
\ No newline at end of file
diff --git a/module/Application/view/error/exception.phtml b/module/Application/view/error/exception.phtml
new file mode 100644
index 0000000000..52104480c8
--- /dev/null
+++ b/module/Application/view/error/exception.phtml
@@ -0,0 +1,73 @@
+<?php $this->headTitle()->append($title = $this->translate("Opération impossible")) ?>
+
+<h1 class="text-danger has-error"><?php echo $title ?></h1>
+<h2><?php echo $this->message ?></h2>
+
+<?php if (isset($this->exception) && ($previous = $this->exception->getPrevious())): ?>
+ <h3><?php echo $previous->getMessage() ?></h3>
+<?php endif ?>
+
+
+<?php if (isset($this->display_exceptions) && $this->display_exceptions): ?>
+
+<?php if (isset($this->exception) && $this->exception instanceof \Exception): ?>
+
+<?php if (!$this->exception instanceof \UnicaenApp\Exception\MessageException): ?>
+<hr/>
+<h3><?php echo $this->translate('Additional information') ?>:</h3>
+<h4><?php echo get_class($this->exception); ?></h4>
+<dl>
+ <dt><?php echo $this->translate('File') ?>:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo $this->exception->getFile() ?>:<?php echo $this->exception->getLine() ?></pre>
+ </dd>
+ <dt><?php echo $this->translate('Message') ?>:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo $this->exception->getMessage() ?></pre>
+ </dd>
+ <dt><?php echo $this->translate('Stack trace') ?>:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo \UnicaenApp\Util::formatTraceString($this->exception->getTraceAsString()) ?></pre>
+ </dd>
+</dl>
+<?php
+ $e = $this->exception->getPrevious();
+ if ($e) :
+?>
+<hr/>
+<h3><?php echo $this->translate('Previous exceptions') ?>:</h3>
+<ul class="unstyled">
+ <?php while($e) : ?>
+ <li>
+ <h4><?php echo get_class($e); ?></h4>
+ <dl>
+ <dt><?php echo $this->translate('File') ?>:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo $e->getFile() ?>:<?php echo $e->getLine() ?></pre>
+ </dd>
+ <dt><?php echo $this->translate('Message') ?>:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo $e->getMessage() ?></pre>
+ </dd>
+ <dt><?php echo $this->translate('Stack trace') ?>:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo \UnicaenApp\Util::formatTraceString($e->getTraceAsString()) ?></pre>
+ </dd>
+ </dl>
+ </li>
+ <?php
+ $e = $e->getPrevious();
+ endwhile;
+ ?>
+</ul>
+<?php endif; ?>
+
+<?php endif ?>
+
+<?php else: ?>
+
+<h4><?php echo $this->translate('No Exception available') ?></h4>
+
+<?php endif ?>
+
+<?php endif ?>
\ No newline at end of file
diff --git a/module/Application/view/error/index.phtml b/module/Application/view/error/index.phtml
new file mode 100644
index 0000000000..c435c6ce1d
--- /dev/null
+++ b/module/Application/view/error/index.phtml
@@ -0,0 +1,65 @@
+<?php
+
+$this->headTitle()->append($title = 'An error occurred');
+$details = isset($this->display_exceptions) && $this->display_exceptions && isset($this->exception) && ($this->exception instanceof Exception);
+
+?>
+<div class="alert alert-danger exception" role="alert">
+ <span class="glyphicon glyphicon-alert"></span>
+ <h1><?php echo $this->translate($title) ?> :</h1>
+ <?php echo $this->exception->getMessage() ?>
+ <?php if ($details): ?>
+ <hr/>
+ <h2><?php echo $this->translate('Additional information') ?>:</h2>
+ <h3><?php echo get_class($this->exception); ?></h3>
+ <dl>
+ <dt><?php echo $this->translate('File') ?>:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo $this->exception->getFile() ?>
+ :<?php echo $this->exception->getLine() ?></pre>
+ </dd>
+ <dt><?php echo $this->translate('Stack trace') ?>:</dt>
+ <dd>
+ <pre
+ class="prettyprint linenums"><?php echo \UnicaenApp\Util::formatTraceString($this->exception->getTraceAsString()) ?></pre>
+ </dd>
+ </dl>
+ <?php
+ $e = $this->exception->getPrevious();
+ if ($e) :
+ ?>
+ <hr/>
+ <h2><?php echo $this->translate('Previous exceptions') ?>:</h2>
+ <ul class="unstyled">
+ <?php while ($e) : $id = uniqid('bloc_code_'); ?>
+ <a role="button" data-toggle="collapse" href="#<?php echo $id ?>" aria-expanded="false"
+ aria-controls="collapseExample">
+ <?php echo get_class($e) ?>
+ </a><br/>
+ <div class="collapse" id="<?php echo $id ?>">
+
+ <dl>
+ <dt><?php echo $this->translate('File') ?>:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo $e->getFile() ?>
+ :<?php echo $e->getLine() ?></pre>
+ </dd>
+ <dt><?php echo $this->translate('Message') ?>:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo $e->getMessage() ?></pre>
+ </dd>
+ <dt><?php echo $this->translate('Stack trace') ?>:</dt>
+ <dd>
+ <pre
+ class="prettyprint linenums"><?php echo \UnicaenApp\Util::formatTraceString($e->getTraceAsString()) ?></pre>
+ </dd>
+ </dl>
+ </div>
+ <?php
+ $e = $e->getPrevious();
+ endwhile;
+ ?>
+ </ul>
+ <?php endif; ?>
+ <?php endif ?>
+</div>
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
new file mode 100644
index 0000000000..2dfd14aef0
--- /dev/null
+++ b/module/Application/view/layout/layout.phtml
@@ -0,0 +1,81 @@
+<?php 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") ?>
+
+ <!-- Title -->
+ <?php echo $this->headTitle($this->appInfos()->nom)->setSeparator(' - ')->setAutoEscape(false) ?>
+
+ <!-- Links -->
+ <?php echo $this->headLink(array(
+ 'rel' => 'shortcut icon',
+ 'type' => 'image/vnd.microsoft.icon',
+ 'href' => '//www.unicaen.fr/images/favicon.ico')) ?>
+
+ <!-- Scripts -->
+ <?php echo $this->headScript(); ?>
+
+ <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+ <![endif]-->
+</head>
+
+<body class="<?php echo getenv('APPLICATION_ENV') ?: 'development' ?>">
+<!--[if lt IE 7]>
+<p class="chromeframe">Vous utilisez un navigateur internet hors d'âge. Veuillez le mettre à jour, svp.</p>
+<![endif]-->
+<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>
+ <?php echo $this->appLink($this->appInfos()->nom) ?>
+ </div>
+ <div class="navbar-collapse bs-navbar-collapse collapse">
+ <?php echo $this->navigation()->menuPrincipal('navigation'); ?>
+ <p class="navbar-text navbar-right">
+ <?php echo $this->appConnection(); ?>
+ </p>
+ </div><!--/.nav-collapse -->
+ </div>
+</div>
+
+<div id="contenu-principal" class="container">
+ <?php if (($menuSecondaire = $this->navigation()->menuSecondaire('navigation')->render())): ?>
+ <div class="row">
+ <div id="sidebar" class="col-xs-6 col-md-2" role="navigation">
+ <?php echo $menuSecondaire; ?>
+ </div>
+ <div id="content" class="col-xs-12 col-md-10">
+ <?php echo $this->content; ?>
+ </div>
+ </div>
+ <?php else: ?>
+ <?php echo $this->content; ?>
+ <?php endif; ?>
+</div>
+
+<div id="footer" class="container">
+ <?php echo $this->navigation()->menuPiedDePage('navigation'); ?>
+</div>
+
+<a href="#" class="scrollup" title="Remonter en haut de cette page">
+ <img alt="Remonter" src="data:image/png;base64,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"/>
+</a>
+
+<!-- Scripts -->
+<?php echo $this->inlineScript(); ?>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/public/css/app.css b/public/css/app.css
index e6301b8bd9..8156b2630d 100755
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -47,14 +47,6 @@ body {
background-color: #f8f8fa;
}
-body > hr {
- display: none;
-}
-
-ul.breadcrumb {
- display: none;
-}
-
div#footer {
margin-top:2em;
}
@@ -294,66 +286,36 @@ form#dossier .form-control[disabled], form#dossier .form-control[readonly], form
-
.intervenant-recherche .critere{
padding-bottom: 1em;
}
-.callout {
- border-radius: 5px;
- border: 1px #ddd solid;
- border-left: 6px #9E9E9E solid;
- padding:1em;
- margin: .5em;
- float: left;
- width: 48%;
- min-height:8.5em;
- min-width: 30em;
- box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.075);
- transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
-
-}
-
-.callout:hover {
- border-color: #ddd;
- outline: 0px none;
- box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset, 0px 0px 8px #bbb;
-}
-
-.callout h1 {
- margin-top: 0px;
+td .alert {
margin-bottom: 0px;
- font-size: 18pt;
}
-.callout ul {
- margin-bottom: 0px;
-}
-.callout .glyphicon {
- float:right;
- font-size: 40pt;
- color: #ddd;
+.progressbar {
+ box-shadow: 1px 0px 2px gray;
}
-.callout .fa {
- float:right;
- font-size: 40pt;
- color: #ddd;
+.progressbar.active {
+ animation: 2s linear 0s normal none infinite running progress-bar-stripes;
}
-td .alert {
- margin-bottom: 0px;
+.alert.exception {
+ padding-left: 100px;
}
-
-.progressbar {
- box-shadow: 1px 0px 2px gray;
+.alert.exception .glyphicon {
+ float: left;
+ margin-left: -80px;
+ font-size: 60px;
}
-.progressbar.active {
- animation: 2s linear 0s normal none infinite running progress-bar-stripes;
-}
+.alert.exception h1 {
+ margin-top: 0px;
+}
\ No newline at end of file
diff --git a/public/css/callout.css b/public/css/callout.css
new file mode 100644
index 0000000000..19f9688606
--- /dev/null
+++ b/public/css/callout.css
@@ -0,0 +1,50 @@
+.callout-menu {
+
+}
+
+.callout-menu .callout-container {
+ margin: auto;
+ width: 50%;
+ min-width:25em;
+ float: left;
+ padding:.5em;
+}
+
+.callout-menu .callout {
+ border-radius: 5px;
+ border: 1px #ddd solid;
+ border-left: 6px #9E9E9E solid;
+ padding:1em;
+ min-height:8.5em;
+ box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.075);
+ transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
+
+}
+
+.callout-menu .callout:hover {
+ border-color: #ddd;
+ outline: 0px none;
+ box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset, 0px 0px 8px #bbb;
+}
+
+.callout-menu .callout h1 {
+ margin-top: 0px;
+ margin-bottom: 0px;
+ font-size: 18pt;
+}
+
+.callout-menu .callout ul {
+ margin-bottom: 0px;
+}
+
+.callout-menu .callout .glyphicon {
+ float:right;
+ font-size: 40pt;
+ color: #ddd;
+}
+
+.callout-menu .callout .fa {
+ float:right;
+ font-size: 40pt;
+ color: #ddd;
+}
\ No newline at end of file
--
GitLab