]> Raphaël G. Git Repositories - airbundle/commitdiff
Rapsys Git / airbundle / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7a56f5f)
Makes base template clean
authorRaphaël Gertz <git@rapsys.eu>
Tue, 26 Nov 2019 23:30:38 +0000 (00:30 +0100)
committerRaphaël Gertz <git@rapsys.eu>
Tue, 26 Nov 2019 23:30:38 +0000 (00:30 +0100)
Move in body template the generic body rules

Resources/views/base.html.twig patch | blob | history
Resources/views/body.html.twig [new file with mode: 0644] patch | blob

diff --git a/Resources/views/base.html.twig b/Resources/views/base.html.twig
index a95e21af33c8426fbb41cf98dee37ca3a70b43c9..6045a6e50c6ddf532154e3f526d93bc8be48a06f 100644 (file)
--- a/Resources/views/base.html.twig
+++ b/Resources/views/base.html.twig
@@ -1,78 +1,12 @@
 <!DOCTYPE html>
 <html>
        <head>
 <!DOCTYPE html>
 <html>
        <head>
-               <meta charset="UTF-8" />
-               <title>{% block title %}{{ title }}{% endblock %}</title>
-               <meta name="viewport" content="width=device-width, initial-scale=1" />
-               {% block stylesheet %}
-                       {% stylesheet '//fonts.googleapis.com/css?family=Irish+Grover' '//fonts.googleapis.com/css?family=La+Belle+Aurore' '@RapsysAirBundle/Resources/public/css/{reset,screen}.css' %}
-                               <link href="{{ asset_url }}" type="text/css" rel="stylesheet" />
-                       {% endstylesheet %}
-               {% endblock %}
-               <!--{% block javascript %}
-                       {% javascript '@RapsysAirBundle/Resources/public/js/*.js' %}
-                               <script src="{{ asset_url }}"></script>
-                       {% endjavascript %}
-               {% endblock %}-->
-               <link rel="icon" type="image/png" href="{{ asset('bundles/rapsysair/png/favicon.png') }}" sizes="192x192" />
-               <link rel="shortcut icon" type="image/x-icon" href="{{ asset('bundles/rapsysair/ico/favicon.ico') }}" />
+               {% block metas %}<meta charset="UTF-8">{% endblock %}
+               <title>{% block title %}Welcome!{% endblock %}</title>
+               {% block stylesheets %}{% endblock %}
        </head>
        </head>
-       {% block body %}
-               <body>
-                       {% block header %}
-                               <header id="header">
-                                       {% block header_title %}
-                                               {% block blog_title %}<h1><a href="{{ path('rapsys_air_homepage') }}"><img src="{{ asset('bundles/rapsysair/png/logo.png') }}" alt="{% trans %}Open Air{% endtrans %}" /></a></h1>{% endblock %}
-                                               {% block header_nav %}
-                                                       <nav>
-                                                               <h2>{% trans %}Navigation{% endtrans %}</h2>
-                                                               <a href="{{ path('rapsys_air_admin') }}">{% trans %}Admin{% endtrans %}</a>
-                                                               <a href="{{ path('rapsys_air_contact') }}">{% trans %}Contact{% endtrans %}</a>
-                                                               {% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
-                                                                       <a href="{{ path('rapsys_user_logout') }}">{% trans %}Logout{% endtrans %}</a>
-                                                               {% else %}
-                                                                       <a href="{{ path('rapsys_user_register') }}">{% trans %}Register{% endtrans %}</a>
-                                                               {% endif %}
-                                                       </nav>
-                                               {% endblock %}
-                                               {% block blog_subtitle %}{% endblock %}
-                                               {% block blog_tagline %}
-                                                       {% if tags is defined and tags %}
-                                                               <ul>
-                                                                       {% for id, tag in tags %}
-                                                                               <li><h2><a href="#">Tag</a></h2></li>
-                                                                       {% endfor %}
-                                                               </ul>
-                                                       {% endif %}
-                                               {% endblock %}
-                                       {% endblock %}
-                               </header>
-                       {% endblock %}
-
-                       {# pass an array argument to get the messages of those types (['warning', 'error']) #}
-                       {% for label, messages in app.flashes %}
-                               {% if messages %}
-                                       <div class="flash {{label}}">
-                                               <ul>
-                                                       {% for message in messages %}
-                                                               <li>{{ message }}</li>
-                                                       {% endfor %}
-                                               </ul>
-                                       </div>
-                               {% endif %}
-                       {% endfor %}
-
-                       {% block sidebar %}<aside id="sidebar"></aside>{% endblock %}
-
-                       {% block content %}<section id="content"></section>{% endblock %}
-
-                       {% block footer %}
-                               <footer id="footer">
-                                       <span>&nbsp;</span>
-                                       <details><summary>{% trans %}Raphaël Gertz all rights reserved{% endtrans %}</summary><span>{% trans %}Copyright 2018{% endtrans %}.</span></details>
-                                       <span>&nbsp;</span>
-                               </footer>
-                       {% endblock %}
-               </body>
-       {% endblock %}
+       <body>
+               {% block body %}{% endblock %}
+               {% block javascripts %}{% endblock %}
+       </body>
 </html>
 </html>
diff --git a/Resources/views/body.html.twig b/Resources/views/body.html.twig
new file mode 100644 (file)
index 0000000..452f70c
--- /dev/null
+++ b/Resources/views/body.html.twig
@@ -0,0 +1,98 @@
+{% extends '@RapsysAir/base.html.twig' %}
+{% block metas %}
+       <meta charset="UTF-8" />
+{% endblock %}
+{% block stylesheets %}
+       <meta name="viewport" content="width=device-width, initial-scale=1" />
+       <link rel="shortcut icon" type="image/x-icon" href="{{ asset(site_ico) }}" />
+       <link ref="icon" type="image/svg+xml" href="{{ asset(site_svg) }}" />
+       {% for size, icon in site_png %}
+               {# Apple #}
+               {% if size in [152, 167, 180] %}
+                       {% if size == 180 %}
+                               <link rel="apple-touch-icon" href="{{ asset(icon) }}" />
+                       {% endif %}
+                       <link rel="apple-touch-icon" sizes="{{ size }}x{{ size }}" href="{{ asset(icon) }}" />
+               {# Windows #}
+               {% elseif size in [70, 150, 310] %}
+                       <meta name="msapplication-square{{ size }}x{{ size }}logo" content="{{ asset(icon) }}" />
+               {# Others #}
+               {% else %}
+                       <link rel="icon" type="image/png" size="{{ size }}x{{ size }}" href="{{ asset(icon) }}" />
+               {% endif %}
+       {% endfor %}
+       {# stylesheet '//fonts.googleapis.com/css?family=Irish+Grover' '//fonts.googleapis.com/css?family=La+Belle+Aurore' '@RapsysAirBundle/Resources/public/css/{reset,screen}.css' #}
+       {% stylesheet '@rapsys_air_bundle/css/{reset,irishgrover,labelleaurore,screen}.css' %}
+               <link rel="stylesheet" type="text/css" href="{{ asset_url }}" />
+       {% endstylesheet %}
+{% endblock %}
+{% block javascripts %}
+       {#{% javascript '@RapsysAir/js/*.js' %}
+               <script type="text/javascript" src="{{ asset_url }}"></script>
+       {% endjavascript %}#}
+{% endblock %}
+{% block title %}{{ title }}{% endblock %}
+{% block body %}
+       {% block header %}
+               <header id="header">
+                       {% block header_title %}<h1><a href="{{ site_url }}"><img src="{{ asset(site_logo) }}" alt="{{ site_title }}" /></a></h1>{% endblock %}
+                       {% block header_nav %}
+                               <nav>
+                                       <h2>{% trans %}Navigation{% endtrans %}</h2>
+                                       <a href="{{ path('rapsys_air_location') }}">{% trans %}Locations{% endtrans %}</a>
+                                       <a href="{{ path('rapsys_air_user') }}">{% trans %}Users{% endtrans %}</a>
+                                       <a href="{{ path('rapsys_air_contact') }}">{% trans %}Contact{% endtrans %}</a>
+                                       <a href="{{ path('rapsys_air_policy') }}">{% trans %}Policy{% endtrans %}</a>
+                                       {% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
+                                               <a href="{{ path('rapsys_user_logout') }}">{% trans %}Logout{% endtrans %}</a>
+                                       {% else %}
+                                               <a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a>
+                                               <a href="{{ path('rapsys_user_register') }}">{% trans %}Register{% endtrans %}</a>
+                                       {% endif %}
+                               </nav>
+                       {% endblock %}
+{#
+                       {% block site_subtitle %}{% endblock %}
+                       {% block site_tagline %}
+                               {% if tags is defined and tags %}
+                                       <ul>
+                                               {% for id, tag in tags %}
+                                                       <li><h2><a href="#{{id}}">{{tag}}</a></h2></li>
+                                               {% endfor %}
+                                       </ul>
+                               {% endif %}
+                       {% endblock %}
+#}
+               </header>
+       {% endblock %}
+       {% block message %}
+               {# pass an array argument to get the messages of those types (['warning', 'error']) #}
+               {% for label, messages in app.flashes %}
+                       {% if messages %}
+                               <div class="flash {{label}}">
+                                       <ul>
+                                               {% for message in messages %}
+                                                       <li>{{ message }}</li>
+                                               {% endfor %}
+                                       </ul>
+                               </div>
+                       {% endif %}
+               {% endfor %}
+       {% endblock %}
+{#
+       {% block sidebar %}<aside id="sidebar"></aside>{% endblock %}
+#}
+       {% block content %}
+               <section id="content">
+                       <h2><a href="{{ path('rapsys_air_homepage') }}">{{ section }}</a></h2>
+                       <p>{% trans %}Outdoor space reservation system{% endtrans %}</p>
+               </section>
+       {% endblock %}
+       {% block footer %}
+               <footer id="footer">
+                       <span>&nbsp;</span>
+                       <details><summary>{{ copy_long }}</summary><span>{{ copy_short }}</span></details>
+                       <span>&nbsp;</span>
+               </footer>
+       {% endblock %}
+{% endblock %}
Symfony bundle rapsys/airbundle used to handle libre air features