diff --git a/composer.lock b/composer.lock
index 5a07240..e49e85f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -35,6 +35,7 @@
],
"description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
"homepage": "https://github.com/container-interop/container-interop",
+ "abandoned": "psr/container",
"time": "2017-02-14T19:40:03+00:00"
},
{
@@ -141,16 +142,16 @@
},
{
"name": "monolog/monolog",
- "version": "1.25.1",
+ "version": "1.25.2",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf"
+ "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/70e65a5470a42cfec1a7da00d30edb6e617e8dcf",
- "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d5e2fb341cb44f7e2ab639d12a1e5901091ec287",
+ "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287",
"shasum": ""
},
"require": {
@@ -215,7 +216,7 @@
"logging",
"psr-3"
],
- "time": "2019-09-06T13:49:17+00:00"
+ "time": "2019-11-13T10:00:05+00:00"
},
{
"name": "nikic/fast-route",
@@ -265,16 +266,16 @@
},
{
"name": "phpmailer/phpmailer",
- "version": "v6.1.1",
+ "version": "v6.1.3",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
- "reference": "26bd96350b0b2fcbf0ef4e6f0f9cf3528302a9d8"
+ "reference": "a25ae38e03de4ee4031725498a600012364787c7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/26bd96350b0b2fcbf0ef4e6f0f9cf3528302a9d8",
- "reference": "26bd96350b0b2fcbf0ef4e6f0f9cf3528302a9d8",
+ "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a25ae38e03de4ee4031725498a600012364787c7",
+ "reference": "a25ae38e03de4ee4031725498a600012364787c7",
"shasum": ""
},
"require": {
@@ -283,13 +284,9 @@
"php": ">=5.5.0"
},
"require-dev": {
- "doctrine/annotations": "1.2.*",
+ "doctrine/annotations": "^1.2",
"friendsofphp/php-cs-fixer": "^2.2",
- "phpdocumentor/phpdocumentor": "2.*",
- "phpunit/phpunit": "^4.8 || ^5.7",
- "zendframework/zend-eventmanager": "3.0.*",
- "zendframework/zend-i18n": "2.7.3",
- "zendframework/zend-serializer": "2.7.*"
+ "phpunit/phpunit": "^4.8 || ^5.7"
},
"suggest": {
"ext-mbstring": "Needed to send email in multibyte encoding charset",
@@ -327,7 +324,7 @@
}
],
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
- "time": "2019-09-27T21:33:43+00:00"
+ "time": "2019-11-21T09:37:46+00:00"
},
{
"name": "pimple/pimple",
@@ -638,16 +635,16 @@
},
{
"name": "psr/log",
- "version": "1.1.0",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+ "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
- "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
+ "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
"shasum": ""
},
"require": {
@@ -656,7 +653,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.1.x-dev"
}
},
"autoload": {
@@ -681,7 +678,7 @@
"psr",
"psr-3"
],
- "time": "2018-11-20T15:27:04+00:00"
+ "time": "2019-11-01T11:05:21+00:00"
},
{
"name": "slim/flash",
@@ -1142,16 +1139,16 @@
},
{
"name": "twig/twig",
- "version": "v2.12.1",
+ "version": "v2.12.2",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "ddd4134af9bfc6dba4eff7c8447444ecc45b9ee5"
+ "reference": "d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/ddd4134af9bfc6dba4eff7c8447444ecc45b9ee5",
- "reference": "ddd4134af9bfc6dba4eff7c8447444ecc45b9ee5",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed",
+ "reference": "d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed",
"shasum": ""
},
"require": {
@@ -1205,22 +1202,22 @@
"keywords": [
"templating"
],
- "time": "2019-10-17T07:34:53+00:00"
+ "time": "2019-11-11T16:52:09+00:00"
}
],
"packages-dev": [
{
"name": "doctrine/instantiator",
- "version": "1.2.0",
+ "version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
- "reference": "a2c590166b2133a4633738648b6b064edae0814a"
+ "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
- "reference": "a2c590166b2133a4633738648b6b064edae0814a",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
+ "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
"shasum": ""
},
"require": {
@@ -1263,7 +1260,7 @@
"constructor",
"instantiate"
],
- "time": "2019-03-17T17:37:11+00:00"
+ "time": "2019-10-21T16:45:58+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -1914,6 +1911,7 @@
"mock",
"xunit"
],
+ "abandoned": true,
"time": "2017-06-30T09:13:00+00:00"
},
{
@@ -2431,16 +2429,16 @@
},
{
"name": "symfony/yaml",
- "version": "v4.3.5",
+ "version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178"
+ "reference": "76de473358fe802578a415d5bb43c296cf09d211"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/41e16350a2a1c7383c4735aa2f9fce74cf3d1178",
- "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/76de473358fe802578a415d5bb43c296cf09d211",
+ "reference": "76de473358fe802578a415d5bb43c296cf09d211",
"shasum": ""
},
"require": {
@@ -2451,7 +2449,7 @@
"symfony/console": "<3.4"
},
"require-dev": {
- "symfony/console": "~3.4|~4.0"
+ "symfony/console": "^3.4|^4.0|^5.0"
},
"suggest": {
"symfony/console": "For validating YAML files using the lint command"
@@ -2459,7 +2457,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
@@ -2486,7 +2484,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2019-09-11T15:41:19+00:00"
+ "time": "2019-11-12T14:51:11+00:00"
},
{
"name": "webmozart/assert",
diff --git a/data/noticias.yml b/data/noticias.yml
new file mode 100644
index 0000000..7d369c6
--- /dev/null
+++ b/data/noticias.yml
@@ -0,0 +1,6 @@
+---
+- titulo: Apoyo Económico para participar en el CLAM2020
+ descripcion: Llamado extraoridinario del Programa de Ayuda Económica orientado específicamente a apoyar a los participantes del CLAM2020
+ imagen: img/financial-aid.png
+ link: http://www.umalca.org/2020/01/postulacion-beneficio-umalca-para-clam2020/
+ activa: true
\ No newline at end of file
diff --git a/data/sponsors.yml b/data/sponsors.yml
new file mode 100644
index 0000000..3aad83b
--- /dev/null
+++ b/data/sponsors.yml
@@ -0,0 +1,31 @@
+---
+- nombre: UMALCA
+ img: img/logos/umalca.png
+ web: http://www.umalca.org
+- nombre: IMPA
+ img: https://impa.br/wp-content/themes/impa/src/img/logo-home-horizontal.png
+ web: https://impa.br
+ linkstyle: 'display:block;background:#0c456f;'
+ imgstyle: 'max-width:120px;'
+- nombre: Centro de Matemática
+ img: img/logos/cmat.png
+ web: http://www.cmat.edu.uy
+- nombre: IMERL
+ img: img/logos/imerl.png
+ web: https://www.fing.edu.uy/imerl
+ imgstyle: 'max-width:60px;'
+- nombre: Fcien
+ img: img/logos/f100.png
+ web: https://www.fcien.edu.uy
+- nombre: Fing
+ img: img/logos/fing.png
+ web: https://www.fing.edu.uy
+ imgstyle: "max-width:60px"
+- nombre: CSIC
+ img: img/logos/csic.png
+ web: http://www.csic.edu.uy
+- nombre: UdeLaR
+ img: img/logos/udelar.png
+ web: http://www.universidad.edu.uy
+ imgstyle: "max-width:200px"
+
diff --git a/public/img/financial-aid.png b/public/img/financial-aid.png
new file mode 100644
index 0000000..c0f6fb7
Binary files /dev/null and b/public/img/financial-aid.png differ
diff --git a/src/dependencies.php b/src/dependencies.php
index ab0064e..bce0d45 100644
--- a/src/dependencies.php
+++ b/src/dependencies.php
@@ -1,6 +1,6 @@
getContainer();
$container['flash'] = function($c){
@@ -12,12 +12,18 @@ $container['renderer'] = function ($c) {
$view = new Slim\Views\Twig($settings['template_path'],[
'cache' => $settings['cache_path'],
+
]);
$view->addExtension(new Knlv\Slim\Views\TwigMessages(
$c->get('flash')
));
+ $noticias = Yaml::parseFile(__DIR__."/../data/noticias.yml");
+ $sponsors = Yaml::parseFile(__DIR__."/../data/sponsors.yml");
+ $view->getEnvironment()->addGlobal('noticias',$noticias);
+ $view->getEnvironment()->addGlobal('sponsors',$sponsors);
+
return $view;
};
diff --git a/templates/layout.html b/templates/layout.html
index 3b904c2..6c87392 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -69,69 +69,30 @@
-
+
+