Merge branch 'master' into debian

This commit is contained in:
Victor LABORIE 2019-03-28 14:16:40 +01:00
commit c64eeec615
4 changed files with 30 additions and 5 deletions

1
Vagrantfile vendored
View File

@ -9,6 +9,7 @@ load File.expand_path(vagrantfile) if File.exists?(vagrantfile)
Vagrant.configure('2') do |config|
config.vm.synced_folder "./", "/vagrant", type: "rsync", rsync__exclude: [ '.vagrant', '.git', 'config/config.ini' ]
config.ssh.shell="/bin/sh"
config.vm.network "forwarded_port", guest: 80, host: 8080, auto_correct: true
config.vm.network "forwarded_port", guest: 443, host: 8443, auto_correct: true

View File

@ -1,6 +1,11 @@
<?php
require_once 'Twig/autoload.php';
if (file_exists(stream_resolve_include_path('Twig/autoload.php'))) {
require_once 'Twig/autoload.php';
} elseif (stream_resolve_include_path(file_exists('Twig/Autoloader.php'))) {
require_once 'Twig/Autoloader.php';
Twig_Autoloader::register();
}
class MailNotify {
private static $twig, $adminmail;

View File

@ -1,6 +1,11 @@
<?php
require_once 'Twig/autoload.php';
if (file_exists(stream_resolve_include_path('Twig/autoload.php'))) {
require_once 'Twig/autoload.php';
} elseif (stream_resolve_include_path(file_exists('Twig/Autoloader.php'))) {
require_once 'Twig/Autoloader.php';
Twig_Autoloader::register();
}
class PageController {
public static $alerts=array();

View File

@ -1,6 +1,17 @@
{% extends 'base.html' %}
<!DOCTYPE html>
<html lang="fr">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<meta name="robots" content="noindex,nofollow"/>
<meta name="referrer" content="same-origin"/>
<title>{{ page_name }}</title>
<link rel="stylesheet" href="assets/main.css" type="text/css"/>
<link rel="shortcut icon" href="assets/favicon.ico" type="image/x-icon"/>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous"/>
</head>
<body>
{% block body %}
<div class="page-wrap">
{% include 'notif.html' %}
{% if logout %}
<div class='login-info bg-info'>Déconnecté</div>
@ -26,4 +37,7 @@
</form>
</div>
</div>
{% endblock %}
</div>
</body>
</html>