aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilly Micieli <micieli@laposte.net>2019-09-23 09:06:59 +0200
committerWilly Micieli <micieli@laposte.net>2019-09-23 09:06:59 +0200
commitfc21a75b1cf9954b1e8cb9f0d5344d85eda3f0c9 (patch)
tree689018d0e28672f6118c92adcabdbd2f5fd34413
parent964a5092403b8afc7498af155f430ba6263c5d32 (diff)
downloadshaolin-fc21a75b1cf9954b1e8cb9f0d5344d85eda3f0c9.zip
shaolin-fc21a75b1cf9954b1e8cb9f0d5344d85eda3f0c9.tar.gz
clean views
-rw-r--r--app/Controllers/WelcomeController.php2
-rw-r--r--app/Views/404.twig102
-rw-r--r--app/Views/Welcome/welcome.twig2
-rw-r--r--app/Views/admin.twig86
-rw-r--r--app/Views/layout.twig28
-rw-r--r--app/Views/maintenance.twig66
6 files changed, 189 insertions, 97 deletions
diff --git a/app/Controllers/WelcomeController.php b/app/Controllers/WelcomeController.php
index 4129052..d682206 100644
--- a/app/Controllers/WelcomeController.php
+++ b/app/Controllers/WelcomeController.php
@@ -54,7 +54,7 @@ namespace App\Controllers {
public function not_found()
{
- return $this->view('404');
+ return $this->view('404',[],404);
}
}
diff --git a/app/Views/404.twig b/app/Views/404.twig
index 83c569e..63f5d9e 100644
--- a/app/Views/404.twig
+++ b/app/Views/404.twig
@@ -1,63 +1,79 @@
-
<!doctype html>
-<html lang="en">
-<head>
- <!-- Required meta tags -->
- <meta charset="utf-8">
+<html lang="fr">
+ <head>
+ <!-- Required meta tags -->
+ <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+ <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+ <link rel="apple-touch-icon" sizes="57x57" href="/img/favicon/apple-icon-57x57.png">
+ <link rel="apple-touch-icon" sizes="60x60" href="/img/favicon/apple-icon-60x60.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="/img/favicon/apple-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="76x76" href="/img/favicon/apple-icon-76x76.png">
+ <link rel="apple-touch-icon" sizes="114x114" href="/img/favicon/apple-icon-114x114.png">
+ <link rel="apple-touch-icon" sizes="120x120" href="/img/favicon/apple-icon-120x120.png">
+ <link rel="apple-touch-icon" sizes="144x144" href="/img/favicon/apple-icon-144x144.png">
+ <link rel="apple-touch-icon" sizes="152x152" href="/img/favicon/apple-icon-152x152.png">
+ <link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-icon-180x180.png">
+ <link rel="icon" type="image/png" sizes="192x192" href="/img/favicon/android-icon-192x192.png">
+ <link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png">
+ <link rel="icon" type="image/png" sizes="96x96" href="/img/favicon/favicon-96x96.png">
+ <link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png">
+ <link rel="manifest" href="/img/favicon/manifest.json">
+ <meta name="msapplication-TileColor" content="#ffffff">
+ <meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png">
+ <meta name="theme-color" content="#ffffff">
- <style>
- html, body {
- background-color: #fff;
- color: #636b6f;
- font-family: 'Nunito', sans-serif;
- font-weight: 100;
- height: 100vh;
- margin: 0;
- }
+ <style>
+ html, body {
+ background-color: #fff;
+ color: #636b6f;
+ font-family: 'Nunito', sans-serif;
+ font-weight: 100;
+ height: 100vh;
+ margin: 0;
+ }
- .full-height {
- height: 100vh;
- }
+ .full-height {
+ height: 100vh;
+ }
- .flex-center {
- align-items: center;
- display: flex;
- justify-content: center;
- }
+ .flex-center {
+ align-items: center;
+ display: flex;
+ justify-content: center;
+ }
- .position-ref {
- position: relative;
- }
+ .position-ref {
+ position: relative;
+ }
- .code {
- border-right: 2px solid;
- font-size: 26px;
- padding: 0 15px 0 15px;
- text-align: center;
- }
+ .code {
+ border-right: 2px solid;
+ font-size: 26px;
+ padding: 0 15px 0 15px;
+ text-align: center;
+ }
- .message {
- font-size: 18px;
- text-align: center;
- }
- </style>
+ .message {
+ font-size: 18px;
+ text-align: center;
+ }
+ </style>
- <title>Service Unavailable</title>
+ <title>Page not found</title>
- <meta name="description" content="Service Unavailable">
+ <meta name="description" content="not found">
-</head>
+ </head>
<body>
+
<main class="container">
<div class="flex-center position-ref full-height">
<div class="code">
- 404
+ 404
</div>
-
<div class="message" style="padding: 10px;">
- Page not found
+ Page not found
</div>
</div>
</main>
diff --git a/app/Views/Welcome/welcome.twig b/app/Views/Welcome/welcome.twig
index 472c83d..83ab5d0 100644
--- a/app/Views/Welcome/welcome.twig
+++ b/app/Views/Welcome/welcome.twig
@@ -13,7 +13,7 @@
<div class="flex-center position-ref full-height">
<div class="content">
<div class="title m-b-md">
- Shaolin
+ Shaolin
</div>
</div>
</div>
diff --git a/app/Views/admin.twig b/app/Views/admin.twig
index 6505a3f..aa1c3cf 100644
--- a/app/Views/admin.twig
+++ b/app/Views/admin.twig
@@ -1,36 +1,56 @@
<!doctype html>
<html lang="{{ lang() }}">
- <head>
- <!-- Required meta tags -->
- <meta charset="utf-8">
-
- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
- {% if development() %}
-
- {% endif %}
-
- {{ css('app') }}
-
- {% block css %} {% endblock %}
-
- <title>{% block title %}{% endblock %}</title>
-
- <meta name="description" content="{% block description %} {% endblock %}">
- </head>
- <body>
- <main class="container">
- {{ display('success') }}
- {{ display('failure') }}
- {% block content %} {% endblock %}
- </main>
-
- <script src="https://code.jquery.com/jquery-3.4.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
-
- <script src="{{ js('admin.js') }}"></script>
-
- {% block js %}
-
- {% endblock %}
- </body>
+<head>
+ <!-- Required meta tags -->
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+ <link rel="apple-touch-icon" sizes="57x57" href="/img/favicon/apple-icon-57x57.png">
+ <link rel="apple-touch-icon" sizes="60x60" href="/img/favicon/apple-icon-60x60.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="/img/favicon/apple-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="76x76" href="/img/favicon/apple-icon-76x76.png">
+ <link rel="apple-touch-icon" sizes="114x114" href="/img/favicon/apple-icon-114x114.png">
+ <link rel="apple-touch-icon" sizes="120x120" href="/img/favicon/apple-icon-120x120.png">
+ <link rel="apple-touch-icon" sizes="144x144" href="/img/favicon/apple-icon-144x144.png">
+ <link rel="apple-touch-icon" sizes="152x152" href="/img/favicon/apple-icon-152x152.png">
+ <link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-icon-180x180.png">
+ <link rel="icon" type="image/png" sizes="192x192" href="/img/favicon/android-icon-192x192.png">
+ <link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png">
+ <link rel="icon" type="image/png" sizes="96x96" href="/img/favicon/favicon-96x96.png">
+ <link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png">
+ <link rel="manifest" href="/img/favicon/manifest.json">
+ <meta name="msapplication-TileColor" content="#ffffff">
+ <meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png">
+ <meta name="theme-color" content="#ffffff">
+
+ {% if development() %}
+
+ {% endif %}
+ {{ css('app') }}
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.carousel.min.css" integrity="sha256-UhQQ4fxEeABh4JrcmAJ1+16id/1dnlOEVCFOxDef9Lw=" crossorigin="anonymous"/>
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+ {% block css %} {% endblock %}
+
+ <title>{% block title %}{% endblock %}</title>
+
+ <meta name="description" content="{% block description %} {% endblock %}">
+
+</head>
+<body>
+
+<main class="container">
+
+ {{ display('success') }}
+ {{ display('failure') }}
+ {% block content %} {% endblock %}
+</main>
+
+<script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/owl.carousel.min.js" integrity="sha256-pTxD+DSzIwmwhOqTFN+DB+nHjO4iAsbgfyFq5K5bcE0=" crossorigin="anonymous"></script>
+{{ js('admin.js') }}
+
+{% block js %}
+
+{% endblock %}
+</body>
</html> \ No newline at end of file
diff --git a/app/Views/layout.twig b/app/Views/layout.twig
index c167b6d..ae5619d 100644
--- a/app/Views/layout.twig
+++ b/app/Views/layout.twig
@@ -5,6 +5,23 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+ <link rel="apple-touch-icon" sizes="57x57" href="/img/favicon/apple-icon-57x57.png">
+ <link rel="apple-touch-icon" sizes="60x60" href="/img/favicon/apple-icon-60x60.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="/img/favicon/apple-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="76x76" href="/img/favicon/apple-icon-76x76.png">
+ <link rel="apple-touch-icon" sizes="114x114" href="/img/favicon/apple-icon-114x114.png">
+ <link rel="apple-touch-icon" sizes="120x120" href="/img/favicon/apple-icon-120x120.png">
+ <link rel="apple-touch-icon" sizes="144x144" href="/img/favicon/apple-icon-144x144.png">
+ <link rel="apple-touch-icon" sizes="152x152" href="/img/favicon/apple-icon-152x152.png">
+ <link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-icon-180x180.png">
+ <link rel="icon" type="image/png" sizes="192x192" href="/img/favicon/android-icon-192x192.png">
+ <link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png">
+ <link rel="icon" type="image/png" sizes="96x96" href="/img/favicon/favicon-96x96.png">
+ <link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png">
+ <link rel="manifest" href="/img/favicon/manifest.json">
+ <meta name="msapplication-TileColor" content="#ffffff">
+ <meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png">
+ <meta name="theme-color" content="#ffffff">
{% if development() %}
@@ -12,22 +29,25 @@
{{ css('app') }}
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.carousel.min.css" integrity="sha256-UhQQ4fxEeABh4JrcmAJ1+16id/1dnlOEVCFOxDef9Lw=" crossorigin="anonymous"/>
+
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+
{% block css %} {% endblock %}
<title>{% block title %}{% endblock %}</title>
<meta name="description" content="{% block description %} {% endblock %}">
-
</head>
<body>
+
<main class="container">
{{ display('success') }}
{{ display('failure') }}
{% block content %} {% endblock %}
</main>
-
- <script src="https://code.jquery.com/jquery-3.4.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
-
+ <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/owl.carousel.min.js" integrity="sha256-pTxD+DSzIwmwhOqTFN+DB+nHjO4iAsbgfyFq5K5bcE0=" crossorigin="anonymous"></script>
{{ js('app.js') }}
{% block js %}
diff --git a/app/Views/maintenance.twig b/app/Views/maintenance.twig
index 70d835d..ecd81cb 100644
--- a/app/Views/maintenance.twig
+++ b/app/Views/maintenance.twig
@@ -1,12 +1,34 @@
<!doctype html>
-<html lang="en">
+<html lang="fr">
<head>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+ <link rel="apple-touch-icon" sizes="57x57" href="/img/favicon/apple-icon-57x57.png">
+ <link rel="apple-touch-icon" sizes="60x60" href="/img/favicon/apple-icon-60x60.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="/img/favicon/apple-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="76x76" href="/img/favicon/apple-icon-76x76.png">
+ <link rel="apple-touch-icon" sizes="114x114" href="/img/favicon/apple-icon-114x114.png">
+ <link rel="apple-touch-icon" sizes="120x120" href="/img/favicon/apple-icon-120x120.png">
+ <link rel="apple-touch-icon" sizes="144x144" href="/img/favicon/apple-icon-144x144.png">
+ <link rel="apple-touch-icon" sizes="152x152" href="/img/favicon/apple-icon-152x152.png">
+ <link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-icon-180x180.png">
+ <link rel="icon" type="image/png" sizes="192x192" href="/img/favicon/android-icon-192x192.png">
+ <link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png">
+ <link rel="icon" type="image/png" sizes="96x96" href="/img/favicon/favicon-96x96.png">
+ <link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png">
+ <link rel="manifest" href="/img/favicon/manifest.json">
+ <meta name="msapplication-TileColor" content="#ffffff">
+ <meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png">
+ <meta name="theme-color" content="#ffffff">
+
+ <link href="http://judo.ji/css/app.css" rel="stylesheet" type="text/css">
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.carousel.min.css"
+ integrity="sha256-UhQQ4fxEeABh4JrcmAJ1+16id/1dnlOEVCFOxDef9Lw=" crossorigin="anonymous"/>
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<style>
html, body {
background-color: #fff;
@@ -46,20 +68,34 @@
<title>Service Unavailable</title>
- <meta name="description" content="Service Unavailable">
+ <meta name="description" content="">
</head>
- <body>
- <main class="container">
- <div class="flex-center position-ref full-height">
- <div class="code">
- 503
- </div>
-
- <div class="message" style="padding: 10px;">
- Service Unavailable
- </div>
- </div>
- </main>
- </body>
+<body>
+
+<main class="container">
+
+
+
+
+ <div class="flex-center position-ref full-height">
+ <div class="code">
+ {{img('logo.jpg','judo club villeneuvois')}}
+ </div>
+
+ <div class="message" style="padding: 10px;">
+ Site en maintenance
+ </div>
+ </div>
+
+
+</main>
+<script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/owl.carousel.min.js" integrity="sha256-pTxD+DSzIwmwhOqTFN+DB+nHjO4iAsbgfyFq5K5bcE0=" crossorigin="anonymous"></script>
+<script src="http://judo.ji/js/app.js" ></script>
+
+
+
+
+</body>
</html> \ No newline at end of file