summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorIgor Scheller <igor.scheller@igorshp.de>2018-09-08 12:48:08 +0200
committerIgor Scheller <igor.scheller@igorshp.de>2018-09-09 12:11:12 +0200
commit222c9fed7d4ca2b3b44c05907fbb7080c1efd342 (patch)
tree62b1bfa9233000985331b9dea703d51dc24515a2 /templates
parent2d6bca1357faff28bc1f86a56b432cc463ff7574 (diff)
parent8257864829ffdfb410f05e0dd0a9c781f48b741a (diff)
Merge remote-tracking branch 'MyIgel/templating'
Diffstat (limited to 'templates')
-rw-r--r--templates/errors/default.twig7
-rw-r--r--templates/layout.html46
-rw-r--r--templates/layouts/app.twig87
-rw-r--r--templates/layouts/maintenance.html (renamed from templates/maintenance.html)0
-rw-r--r--templates/pages/credits.html (renamed from templates/guest_credits.html)18
-rw-r--r--templates/pages/user-shifts.html (renamed from templates/user_shifts.html)0
6 files changed, 103 insertions, 55 deletions
diff --git a/templates/errors/default.twig b/templates/errors/default.twig
new file mode 100644
index 00000000..5fb8bcbd
--- /dev/null
+++ b/templates/errors/default.twig
@@ -0,0 +1,7 @@
+{% extends "layouts/app.twig" %}
+
+{% block title %}{% if status == 404 %}{{ __("Page not found") }}{% else %}Error {{ status }}{% endif %}{% endblock %}
+
+{% block content %}
+ <div class="alert alert-info">{{ content }}</div>
+{% endblock %}
diff --git a/templates/layout.html b/templates/layout.html
deleted file mode 100644
index 832bdcf3..00000000
--- a/templates/layout.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html lang="%locale%">
-<head>
- <title>%title% - Engelsystem</title>
- <meta charset="UTF-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="stylesheet" type="text/css" href="%start_page_url%assets/theme%theme%.css"/>
- <script type="text/javascript" src="%start_page_url%assets/vendor.js"></script>
- %atom_link%
-</head>
-<body>
-<div class="navbar navbar-default navbar-fixed-top">
- <div class="container-fluid">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle collapsed"
- data-toggle="collapse" data-target="#navbar-collapse-1">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="%start_page_url%">
- <span class="icon-icon_angel"></span> <strong class="visible-lg-inline">ENGELSYSTEM</strong>
- </a>
- </div>
- <div class="collapse navbar-collapse" id="navbar-collapse-1">%menu% %header_toolbar%</div>
- </div>
-</div>
-<div class="container-fluid">
- <div class="row">%content%</div>
- <div class="row" id="footer">
- <div class="col-md-12">
- <hr/>
- <div class="text-center footer" style="margin-bottom: 10px;">
- %event_info%
- <a href="%faq_url%">FAQ</a>
- · <a href="%contact_email%"><span class="glyphicon glyphicon-envelope"></span> Contact</a>
- · <a href="https://github.com/engelsystem/engelsystem/issues">Bugs / Features</a>
- · <a href="https://github.com/engelsystem/engelsystem/">Development Platform</a>
- · <a href="%credits_url%">Credits</a>
- </div>
- </div>
- </div>
-</div>
-</body>
-</html>
diff --git a/templates/layouts/app.twig b/templates/layouts/app.twig
new file mode 100644
index 00000000..42d5610c
--- /dev/null
+++ b/templates/layouts/app.twig
@@ -0,0 +1,87 @@
+{% set theme = user.color|default(config('theme')) %}
+<!DOCTYPE html>
+<html>
+<head>
+ {% block head %}
+ <title>{% block title %}{{ title }}{% endblock %} - Engelsystem</title>
+ <meta charset="UTF-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="stylesheet" type="text/css" href="css/theme{{ theme }}.css"/>
+ <link rel="stylesheet" type="text/css" href="vendor/icomoon/style.css"/>
+ <link rel="stylesheet" type="text/css" href="vendor/bootstrap-datepicker-1.7.1/css/bootstrap-datepicker3.min.css"/>
+ <script type="text/javascript" src="vendor/jquery-2.1.1.min.js"></script>
+ <script type="text/javascript" src="vendor/jquery-ui.min.js"></script>
+ {% if atom_feed -%}
+ <link href="{{ url('atom', atom_feed) }}" type="application/atom+xml" rel="alternate" title="Atom Feed">
+ {% endif %}
+ {% endblock %}
+</head>
+<body>
+
+{% block body %}
+ <div class="navbar navbar-default navbar-fixed-top">
+ {% block header %}
+ <div class="container-fluid">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed"
+ data-toggle="collapse" data-target="#navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="{{ url('/') }}">
+ <span class="icon-icon_angel"></span> <strong class="visible-lg-inline">ENGELSYSTEM</strong>
+ </a>
+ </div>
+
+ {% block navbar %}
+ <div class="collapse navbar-collapse" id="navbar-collapse-1">
+ {{ menu|raw }}
+ {{ header_toolbar|raw }}
+ </div>
+ {% endblock %}
+ </div>
+ {% endblock %}
+ </div>
+
+ <div class="container-fluid">
+ <div class="row">{% block content %}{{ content|raw }}{% endblock %}</div>
+ <div class="row" id="footer">
+ {% block footer %}
+ <div class="col-md-12">
+ <hr/>
+ <div class="text-center footer" style="margin-bottom: 10px;">
+ {% block eventinfo %}
+ {{ event_info|raw }}
+ {% endblock %}
+ <a href="{{ config('faq_url') }}">FAQ</a>
+ · <a href="{{ config('contact_email') }}">
+ <span class="glyphicon glyphicon-envelope"></span>Contact
+ </a>
+ · <a href="https://github.com/engelsystem/engelsystem/issues">Bugs / Features</a>
+ · <a href="https://github.com/engelsystem/engelsystem/">Development Platform</a>
+ · <a href="{{ url('credits') }}">Credits</a>
+ </div>
+ </div>
+ {% endblock %}
+ </div>
+ </div>
+
+ <script type="text/javascript" src="vendor/bootstrap/js/bootstrap.min.js"></script>
+ <script type="text/javascript" src="vendor/bootstrap-datepicker-1.7.1/js/bootstrap-datepicker.min.js"></script>
+ <script type="text/javascript" src="vendor/bootstrap-datepicker-1.7.1/locales/bootstrap-datepicker.de.min.js"></script>
+ <script type="text/javascript" src="vendor/Chart.min.js"></script>
+ <script type="text/javascript" src="js/forms.js"></script>
+ <script type="text/javascript" src="vendor/moment-with-locales.min.js"></script>
+ <script type="text/javascript">
+ $(function () {
+ moment.locale("{{ session_get('locale')|escape('js') }}");
+ });
+ </script>
+ <script type="text/javascript" src="js/moment-countdown.js"></script>
+ <script type="text/javascript" src="js/sticky-headers.js"></script>
+{% endblock %}
+
+</body>
+</html>
diff --git a/templates/maintenance.html b/templates/layouts/maintenance.html
index f7ab5772..f7ab5772 100644
--- a/templates/maintenance.html
+++ b/templates/layouts/maintenance.html
diff --git a/templates/guest_credits.html b/templates/pages/credits.html
index db7fac57..4e247113 100644
--- a/templates/guest_credits.html
+++ b/templates/pages/credits.html
@@ -6,15 +6,15 @@
<p>
The original system was written by <a href="https://github.com/cookieBerlin/engelsystem">cookie</a>.
It was then completely rewritten and enhanced by
- <a href="http://notrademark.de/">msquare</a> (maintainer),
- <a href="http://myigel.name/">MyIgel</a>,
- <a href="http://mortzu.de/">mortzu</a>,
- <a href="http://jplitza.de/">jplitza</a> and
- gnomus.
+ <a href="https://notrademark.de">msquare</a> (maintainer),
+ <a href="https://myigel.name">MyIgel</a>,
+ <a href="https://mortzu.de">mortzu</a>,
+ <a href="https://jplitza.de">jplitza</a> and
+ <a href="https://github.com/gnomus">gnomus</a>.
</p>
<p>
- Please look at the <a href="https://github.com/engelsystem/engelsystem/graphs/contributors">contributor
- list on github</a> for a more complete version.
+ Please look at the <a href="https://github.com/engelsystem/engelsystem/graphs/contributors">
+ contributor list on github</a> for a more complete version.
</p>
</div>
<div class="col-md-4">
@@ -22,8 +22,8 @@
<p>
Webspace, development platform and domain on <a href="https://engelsystem.de">engelsystem.de</a>
is currently provided by <a href="https://www.wybt.net/">would you buy this?</a> (ichdasich)
- and adminstrated by <a href="http://mortzu.de/">mortzu</a>,
- <a href="http://derf.homelinux.org/">derf</a> and ichdasich.
+ and adminstrated by <a href="https://mortzu.de">mortzu</a>,
+ <a href="http://derf.homelinux.org">derf</a> and ichdasich.
</p>
</div>
<div class="col-md-4">
diff --git a/templates/user_shifts.html b/templates/pages/user-shifts.html
index 2fdade29..2fdade29 100644
--- a/templates/user_shifts.html
+++ b/templates/pages/user-shifts.html
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-05-18 06:18:43 +0000