sysadm/clam2020
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes en db, menu, header image, etc

Browse Source
This commit is contained in:
German Correa 2018-11-28 14:55:32 -03:00
parent 1f166835a0
commit 84876df7e1
7 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
composer.lock generated
View File

@ -1,7 +1,7 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "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#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "39b38af13b004d514b8fa19e295ad0d9", "content-hash": "39b38af13b004d514b8fa19e295ad0d9",
@ -141,16 +141,16 @@
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
"version": "1.23.0", "version": "1.24.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Seldaek/monolog.git", "url": "https://github.com/Seldaek/monolog.git",
"reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4" "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4", "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
"reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4", "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -215,7 +215,7 @@
"logging", "logging",
"psr-3" "psr-3"
], ],
"time": "2017-06-19T01:22:40+00:00" "time": "2018-11-05T09:00:11+00:00"
}, },
{ {
"name": "nikic/fast-route", "name": "nikic/fast-route",
@ -265,16 +265,16 @@
}, },
{ {
"name": "phpmailer/phpmailer", "name": "phpmailer/phpmailer",
"version": "v6.0.5", "version": "v6.0.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git", "url": "https://github.com/PHPMailer/PHPMailer.git",
"reference": "cb3ea134d4d3729e7857737d5f320cce9caf4d32" "reference": "8190d73eb5def11a43cfb020b7f36db65330698c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/cb3ea134d4d3729e7857737d5f320cce9caf4d32", "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/8190d73eb5def11a43cfb020b7f36db65330698c",
"reference": "cb3ea134d4d3729e7857737d5f320cce9caf4d32", "reference": "8190d73eb5def11a43cfb020b7f36db65330698c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -327,7 +327,7 @@
} }
], ],
"description": "PHPMailer is a full-featured email creation and transfer class for PHP", "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
"time": "2018-03-27T13:49:45+00:00" "time": "2018-11-16T00:41:32+00:00"
}, },
{ {
"name": "pimple/pimple", "name": "pimple/pimple",
@ -532,16 +532,16 @@
}, },
{ {
"name": "psr/http-server-handler", "name": "psr/http-server-handler",
"version": "1.0.0", "version": "1.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/http-server-handler.git", "url": "https://github.com/php-fig/http-server-handler.git",
"reference": "439d92054dc06097f2406ec074a2627839955a02" "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/439d92054dc06097f2406ec074a2627839955a02", "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/aff2f80e33b7f026ec96bb42f63242dc50ffcae7",
"reference": "439d92054dc06097f2406ec074a2627839955a02", "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -581,7 +581,7 @@
"response", "response",
"server" "server"
], ],
"time": "2018-01-22T17:04:15+00:00" "time": "2018-10-30T16:46:14+00:00"
}, },
{ {
"name": "psr/http-server-middleware", "name": "psr/http-server-middleware",
@ -638,16 +638,16 @@
}, },
{ {
"name": "psr/log", "name": "psr/log",
"version": "1.0.2", "version": "1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/log.git", "url": "https://github.com/php-fig/log.git",
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -681,7 +681,7 @@
"psr", "psr",
"psr-3" "psr-3"
], ],
"time": "2016-10-10T12:19:37+00:00" "time": "2018-11-20T15:27:04+00:00"
}, },
{ {
"name": "slim/flash", "name": "slim/flash",
@ -855,7 +855,7 @@
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
"version": "v1.9.0", "version": "v1.10.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git", "url": "https://github.com/symfony/polyfill-ctype.git",
@ -913,16 +913,16 @@
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.9.0", "version": "v1.10.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8" "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
"reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8", "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -968,7 +968,7 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2018-08-06T14:22:27+00:00" "time": "2018-09-21T13:07:52+00:00"
}, },
{ {
"name": "tuupola/callable-handler", "name": "tuupola/callable-handler",
@ -2425,16 +2425,16 @@
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v4.1.6", "version": "v4.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "367e689b2fdc19965be435337b50bc8adf2746c9" "reference": "fe87e3b24d15ec8948f0280ee867a65ca44fdbaa"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/367e689b2fdc19965be435337b50bc8adf2746c9", "url": "https://api.github.com/repos/symfony/yaml/zipball/fe87e3b24d15ec8948f0280ee867a65ca44fdbaa",
"reference": "367e689b2fdc19965be435337b50bc8adf2746c9", "reference": "fe87e3b24d15ec8948f0280ee867a65ca44fdbaa",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2480,7 +2480,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-10-02T16:36:10+00:00" "time": "2018-11-11T19:51:29+00:00"
}, },
{ {
"name": "webmozart/assert", "name": "webmozart/assert",

BIN
db/surfaces2018.db → db/clam2020.db
View File

Binary file not shown.

BIN
public/img/headerpic2.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 456 KiB

After

Width:  |  Height:  |  Size: 199 KiB

6
src/routes.php
View File

@ -50,8 +50,8 @@ $app->get('/practicalinfo', function (Request $request, Response $response, arra
return $this->renderer->render($response, 'practicalinfo.html', $args); return $this->renderer->render($response, 'practicalinfo.html', $args);
}); });
$app->get('/invitedspeakers', function (Request $request, Response $response, array $args) { $app->get('/plenaryspeakers', function (Request $request, Response $response, array $args) {
$this->logger->info("GDDWorkshop '/invitedspeakers' route"); $this->logger->info("GDDWorkshop '/plenaryspeakers' route");
try { try {
$speakers = $this->db->getSpeakers(); $speakers = $this->db->getSpeakers();
} catch (Exception $e) { } catch (Exception $e) {
@ -59,7 +59,7 @@ $app->get('/invitedspeakers', function (Request $request, Response $response, ar
$this->flash->addMessageNow("Get Speakers", "DB error: ".$e->getMessage()); $this->flash->addMessageNow("Get Speakers", "DB error: ".$e->getMessage());
} }
return $this->renderer->render($response, 'invitedspeakers.html', return $this->renderer->render($response, 'plenaryspeakers.html',
['speakers' => $speakers]); ['speakers' => $speakers]);
}); });

2
src/settings.php
View File

@ -23,7 +23,7 @@ return [
'level' => \Monolog\Logger::DEBUG, 'level' => \Monolog\Logger::DEBUG,
], ],
'db' => [ 'db' => [
'path' => __DIR__."/../db/surfaces2018.db", 'path' => __DIR__."/../db/clam2020.db",
'schema' => __DIR__."/../db/schema.sql", 'schema' => __DIR__."/../db/schema.sql",
'load_schema' => __DIR__."/../db/.schema.lock" 'load_schema' => __DIR__."/../db/.schema.lock"
], ],

8
templates/header.html
View File

@ -35,13 +35,13 @@
<ul class="nav navbar-nav" id="menu"> <ul class="nav navbar-nav" id="menu">
<!--<li id="home" class="selected"><a href="/">Home</a></li>--> <!--<li id="home" class="selected"><a href="/">Home</a></li>-->
<li id="home"><a href="/"><i class="glyphicon glyphicon-home"></i></a></li> <li id="home"><a href="/"><i class="glyphicon glyphicon-home"></i></a></li>
<li id="program"><a href="program">Plenary Speakers</a></li> <li id="speakers"><a href="plenaryspeakers">Plenary Speakers</a></li>
<!-- <li id="plenary"><a href="plenary">Plenary Speakers </a></li>--> <!-- <li id="plenary"><a href="plenary">Plenary Speakers </a></li>-->
<!-- <li id="plenaryspeakers"><a href="plenaryspeakers">Plenary Speakers</a></li> <!-- <li id="plenaryspeakers"><a href="plenaryspeakers">Plenary Speakers</a></li>-->
<!-- <li id="registration"><a href="registration">Registration</a></li>--> <!-- <li id="registration"><a href="registration">Registration</a></li>-->
<!-- <li id="participants"><a href="participants">Participants</a></li>--> <!-- <li id="participants"><a href="participants">Participants</a></li>-->
<!-- <li id="practicalinfo"><a href="practicalinfo">Practical Information</a></li> <!-- <li id="practicalinfo"><a href="practicalinfo">Practical Information</a></li>-->
<!--<li id="contacto" class="selected"><a href="contact">Contact</a></li>-->--> <!--<li id="contacto" class="selected"><a href="contact">Contact</a></li>-->
</ul> </ul>
</div> </div>
</div> </div>

2
templates/invitedspeakers.html → templates/plenaryspeakers.html
View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<div class="row"> <div class="row">
<h1><strong>Invited Speakers</strong></h1> <h1><strong>Plenary Speakers</strong></h1>
<!--<h2>Scientific Committee</h2>--> <!--<h2>Scientific Committee</h2>-->
<ul class="comite"> <ul class="comite">
{% for speaker in speakers %} {% for speaker in speakers %}