Rename rapsys_blog route to rapsysblog

Rename rapsys_user route to rapsysuser
New context layout

diff --git a/Resources/views/article/index.html.twig b/Resources/views/article/index.html.twig
deleted file mode 100644 (file)
index 512e0fa..0000000
--- a/Resources/views/article/index.html.twig
+++ /dev/null
@@ -1,45 +0,0 @@
-{% extends '@RapsysBlog/_base.html.twig' %}
-{% block content %}
-       <section id="content">
-               <header>
-                       <h1><a href="{{ path('rapsys_blog_article') }}">{{ title }}</a></h1>
-                       <p>{{ description }}</p>
-               </header>
-               <section>
-                       {% for article in articles %}
-                               <article>
-                                       <header>
-                                               <h2><a href="{{ path('rapsys_blog_article_view', {'id': article.id, 'slug': article.slug}) }}">{{ article.title }}</a></h2>
-                                       </header>
-                                       <section>
-                                               <p>{{ article.description }}</p>
-                                               {% if article.keywords is defined and article.keywords %}
-                                                       <nav>
-                                                               {% for keyword in article.keywords %}
-                                                                       <a href="{{ path('rapsys_blog_keyword_view', {'id': keyword.id, 'slug': keyword.slug}) }}">{{ keyword.title }}</a>
-                                                               {% endfor %}
-                                                       </nav>
-                                               {% endif %}
-                                       </section>
-                                       <footer>
-                                               <nav>
-                                                       <a href="{{ path('rapsys_blog_article_view', {'id': article.id, 'slug': article.slug}) }}">{% trans %}Read more{% endtrans %}...</a>
-                                               </nav>
-                                       </footer>
-                               </article>
-                       {% endfor %}
-               </section>
-               {% if head.prev is defined or head.next is defined %}
-                       <footer>
-                               <nav class="pager">
-                                       {% if head.prev is defined %}
-                                               <a href="{{ head.prev }}" rel="prev">&lt; {% trans %}Previous articles{% endtrans %}</a>
-                                       {% endif %}
-                                       {% if head.next is defined %}
-                                               <a href="{{ head.next }}" rel="next">{% trans %}Next articles{% endtrans %} &gt;</a>
-                                       {% endif %}
-                               </nav>
-                       </footer>
-               {% endif %}
-       </section>
-{% endblock %}

diff --git a/Resources/views/index.html.twig b/Resources/views/index.html.twig
deleted file mode 100644 (file)
index 464fd8a..0000000
--- a/Resources/views/index.html.twig
+++ /dev/null
@@ -1,45 +0,0 @@
-{% extends '@RapsysBlog/_base.html.twig' %}
-{% block content %}
-       <section id="content">
-               <header>
-                       <h1 id="title"><a href="{{ head.canonical }}">{{ title }}</a></h1>
-                       <p>{{ description }}</p>
-               </header>
-               <section>
-                       {% for article in articles %}
-                               <article>
-                                       <header>
-                                               <h2><a href="{{ path('rapsys_blog_article_view', {'id': article.id, 'slug': article.slug}) }}">{{ article.title }}</a></h2>
-                                       </header>
-                                       <section>
-                                               <p>{{ article.description }}</p>
-                                               {% if article.keywords is defined and article.keywords %}
-                                                       <nav>
-                                                               {% for keyword in article.keywords %}
-                                                                       <a href="{{ path('rapsys_blog_keyword_view', {'id': keyword.id, 'slug': keyword.slug}) }}">{{ keyword.title }}</a>
-                                                               {% endfor %}
-                                                       </nav>
-                                               {% endif %}
-                                       </section>
-                                       <footer>
-                                               <nav>
-                                                       <a href="{{ path('rapsys_blog_article_view', {'id': article.id, 'slug': article.slug}) }}">{% trans %}Read more{% endtrans %}...</a>
-                                               </nav>
-                                       </footer>
-                               </article>
-                       {% endfor %}
-               </section>
-               {% if head.prev is defined or head.next is defined %}
-                       <footer>
-                               <nav class="pager">
-                                       {% if head.prev is defined %}
-                                               <a href="{{ head.prev }}" rel="prev">&lt; {% trans %}Previous articles{% endtrans %}</a>
-                                       {% endif %}
-                                       {% if head.next is defined %}
-                                               <a href="{{ head.next }}" rel="next">{% trans %}Next articles{% endtrans %} &gt;</a>
-                                       {% endif %}
-                               </nav>
-                       </footer>
-               {% endif %}
-       </section>
-{% endblock %}

diff --git a/Resources/views/keyword/index.html.twig b/Resources/views/keyword/index.html.twig
deleted file mode 100644 (file)
index dae4b70..0000000
--- a/Resources/views/keyword/index.html.twig
+++ /dev/null
@@ -1,45 +0,0 @@
-{% extends '@RapsysBlog/_base.html.twig' %}
-{% block content %}
-       <section id="content">
-               <header>
-                       <h1><a href="{{ path('rapsys_blog_keyword') }}">{{ title }}</a></h1>
-                       <p>{{ description }}</p>
-               </header>
-               <section>
-                       {% for keyword in keywords %}
-                               <article>
-                                       <header>
-                                               <h2><a href="{{ path('rapsys_blog_keyword_view', {'id': keyword.id, 'slug': keyword.slug}) }}">{{ keyword.title }}</a></h2>
-                                       </header>
-                                       <section>
-                                               <p>{{ keyword.description }}</p>
-                                               {#{% if article.keywords is defined and article.keywords %}
-                                                       <nav>
-                                                               {% for keyword in article.keywords %}
-                                                                       <a href="{{ path('rapsys_blog_keyword_view', {'id': keyword.id, 'slug': keyword.slug}) }}">{{ keyword.title }}</a>
-                                                               {% endfor %}
-                                                       </nav>
-                                               {% endif %}#}
-                                       </section>
-                                       <footer>
-                                               <nav>
-                                                       <a href="{{ path('rapsys_blog_keyword_view', {'id': keyword.id, 'slug': keyword.slug}) }}">{% trans %}Read more{% endtrans %}...</a>
-                                               </nav>
-                                       </footer>
-                               </article>
-                       {% endfor %}
-               </section>
-               {% if head.prev is defined or head.next is defined %}
-                       <footer>
-                               <nav class="pager">
-                                       {% if head.prev is defined %}
-                                               <a href="{{ head.prev }}" rel="prev">&lt; {% trans %}Previous keywords{% endtrans %}</a>
-                                       {% endif %}
-                                       {% if head.next is defined %}
-                                               <a href="{{ head.next }}" rel="next">{% trans %}Next keywords{% endtrans %} &gt;</a>
-                                       {% endif %}
-                               </nav>
-                       </footer>
-               {% endif %}
-       </section>
-{% endblock %}

diff --git a/Resources/views/about.html.twig b/templates/about.html.twig
similarity index 84%
rename from Resources/views/about.html.twig
rename to templates/about.html.twig
index b5a584020e5c26f5febc40ab110289ff270fb95a..ab7b440c352f5e0b5135210d31a0ba6a4f6993a5 100644 (file)
--- a/Resources/views/about.html.twig
+++ b/templates/about.html.twig
@@ -2,7 +2,7 @@
 {% block content %}
        <article id="content">
                <header>
 {% block content %}
        <article id="content">
                <header>

-                       <h1><a href="{{ head.canonical }}">{{ title }}</a></h1>
+                       <h1><a href="{{ canonical }}">{{ title.page }}</a></h1>

                        <p>{{ description }}</p>
                </header>
                <section>
                        <p>{{ description }}</p>
                </header>
                <section>

diff --git a/templates/article/index.html.twig b/templates/article/index.html.twig
new file mode 100644 (file)
index 0000000..c1a8aab
--- /dev/null
+++ b/templates/article/index.html.twig
@@ -0,0 +1,45 @@
+{% extends '@RapsysBlog/_base.html.twig' %}
+{% block content %}
+       <section id="content">
+               <header>
+                       <h1><a href="{{ path('rapsysblog_article') }}">{{ title.page }}</a></h1>
+                       <p>{{ description }}</p>
+               </header>
+               <section>
+                       {% for article in articles %}
+                               <article>
+                                       <header>
+                                               <h2><a href="{{ path('rapsysblog_article_view', {'id': article.id, 'slug': article.slug}) }}">{{ article.title }}</a></h2>
+                                       </header>
+                                       <section>
+                                               <p>{{ article.description }}</p>
+                                               {% if article.keywords is defined and article.keywords %}
+                                                       <nav>
+                                                               {% for keyword in article.keywords %}
+                                                                       <a href="{{ path('rapsysblog_keyword_view', {'id': keyword.id, 'slug': keyword.slug}) }}">{{ keyword.title }}</a>
+                                                               {% endfor %}
+                                                       </nav>
+                                               {% endif %}
+                                       </section>
+                                       <footer>
+                                               <nav>
+                                                       <a href="{{ path('rapsysblog_article_view', {'id': article.id, 'slug': article.slug}) }}">{% trans %}Read more{% endtrans %}...</a>
+                                               </nav>
+                                       </footer>
+                               </article>
+                       {% endfor %}
+               </section>
+               {% if ( prev is defined and prev ) or ( next is defined and next ) %}
+                       <footer>
+                               <nav class="pager">
+                                       {% if prev is defined and prev %}
+                                               <a href="{{ prev }}" rel="prev">&lt; {% trans %}Previous articles{% endtrans %}</a>
+                                       {% endif %}
+                                       {% if next is defined and next %}
+                                               <a href="{{ next }}" rel="next">{% trans %}Next articles{% endtrans %} &gt;</a>
+                                       {% endif %}
+                               </nav>
+                       </footer>
+               {% endif %}
+       </section>
+{% endblock %}

diff --git a/Resources/views/article/view.html.twig b/templates/article/view.html.twig
similarity index 75%
rename from Resources/views/article/view.html.twig
rename to templates/article/view.html.twig
index 36a87a23e52f6e6aed61c1db3a065ae46cbebc99..565a72929019b55e1429852680cf60bf74d25f02 100644 (file)
--- a/Resources/views/article/view.html.twig
+++ b/templates/article/view.html.twig
@@ -1,9 +1,8 @@
 {% extends '@RapsysBlog/_base.html.twig' %}
 {% extends '@RapsysBlog/_base.html.twig' %}

-{% block title %}{% endblock %}

 {% block content %}
        <article id="content">
                <header>
 {% block content %}
        <article id="content">
                <header>

-                       <h1 id="title"><a href="{{ head.canonical }}">{{ title }}</a></h1>
+                       <h1 id="title"><a href="{{ canonical }}">{{ title.page }}</a></h1>

                        <p>{% trans with {'%date%': article.created|format_datetime('full', 'short')} %}Published the %date%{% endtrans %}{% if article.created != article.updated %}{% trans with {'%date%': article.updated|format_datetime('short', 'short')} %}, edited the %date%{% endtrans %}{% endif %}</p>
                </header>
                <section>
                        <p>{% trans with {'%date%': article.created|format_datetime('full', 'short')} %}Published the %date%{% endtrans %}{% if article.created != article.updated %}{% trans with {'%date%': article.updated|format_datetime('short', 'short')} %}, edited the %date%{% endtrans %}{% endif %}</p>
                </header>
                <section>


@@ -13,7 +12,7 @@
                        {% if article.keywords is defined and article.keywords %}
                                <nav>
                                        {% for keyword in article.keywords %}
                        {% if article.keywords is defined and article.keywords %}
                                <nav>
                                        {% for keyword in article.keywords %}

-                                               <a href="{{ path('rapsys_blog_keyword_view', {'id': keyword.id, 'slug': keyword.slug}) }}">{{ keyword.title }}</a>
+                                               <a href="{{ path('rapsysblog_keyword_view', {'id': keyword.id, 'slug': keyword.slug}) }}">{{ keyword.title }}</a>

                                        {% endfor %}
                                </nav>
                        {% endif %}
                                        {% endfor %}
                                </nav>
                        {% endif %}

diff --git a/Resources/views/form/contact.html.twig b/templates/form/contact.html.twig
similarity index 92%
rename from Resources/views/form/contact.html.twig
rename to templates/form/contact.html.twig
index dbbf191a73c3dee9f54484903964ef5d99e208bd..ba332401674bbceb7c5b3e03bc6765e940e65697 100644 (file)
--- a/Resources/views/form/contact.html.twig
+++ b/templates/form/contact.html.twig
@@ -2,7 +2,7 @@
 {% block content %}
        <section class="form">
                <header>
 {% block content %}
        <section class="form">
                <header>

-                       <h1><a href="{{ head.canonical }}">{{ title }}</a></h1>
+                       <h1><a href="{{ canonical }}">{{ title.page }}</a></h1>

                        <p>{{ description }}</p>
                </header>
                <section>
                        <p>{{ description }}</p>
                </header>
                <section>

diff --git a/Resources/views/form/edit.html.twig b/templates/form/edit.html.twig
similarity index 100%
rename from Resources/views/form/edit.html.twig
rename to templates/form/edit.html.twig

diff --git a/Resources/views/form/form_div_layout.html.twig b/templates/form/form_div_layout.html.twig
similarity index 100%
rename from Resources/views/form/form_div_layout.html.twig
rename to templates/form/form_div_layout.html.twig

diff --git a/Resources/views/form/login.html.twig b/templates/form/login.html.twig
similarity index 82%
rename from Resources/views/form/login.html.twig
rename to templates/form/login.html.twig
index 2d15c51cfdd07a5bb98686324d99b69163379f58..260e4184192ea08a083d1d645339c8d5a126b98b 100644 (file)
--- a/Resources/views/form/login.html.twig
+++ b/templates/form/login.html.twig
@@ -2,7 +2,7 @@
 {% block content %}
        <section class="form">
                <header>
 {% block content %}
        <section class="form">
                <header>

-                       <h2><a href="{{ path('rapsys_user_login') }}">{{ title }}</a></h2>
+                       <h2><a href="{{ path('rapsysuser_login') }}">{{ title.page }}</a></h2>

                </header>
                <section>
                        {{ form_start(login) }}
                </header>
                <section>
                        {{ form_start(login) }}


@@ -20,7 +20,7 @@
        {% if recover is defined %}
                <section class="form">
                        <header>
        {% if recover is defined %}
                <section class="form">
                        <header>

-                               <h2><a href="{{ path('rapsys_user_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
+                               <h2><a href="{{ path('rapsysuser_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>

                        </header>
                        <section>
                                {{ form_start(recover) }}
                        </header>
                        <section>
                                {{ form_start(recover) }}

diff --git a/Resources/views/form/recover.html.twig b/templates/form/recover.html.twig
similarity index 90%
rename from Resources/views/form/recover.html.twig
rename to templates/form/recover.html.twig
index fa484445e603d8f834fd1e979160cd42cb73c3db..2b18e69b71afde701b58ae9d3383d6941d448aa1 100644 (file)
--- a/Resources/views/form/recover.html.twig
+++ b/templates/form/recover.html.twig
@@ -2,7 +2,7 @@
 {% block content %}
        <section class="form">
                <header>
 {% block content %}
        <section class="form">
                <header>

-                       <h2><a href="{{ path('rapsys_user_recover') }}">{{ title }}</a></h2>
+                       <h2><a href="{{ path('rapsysuser_recover') }}">{{ title }}</a></h2>

                </header>
                <section>
                        {% if sent %}
                </header>
                <section>
                        {% if sent %}

diff --git a/Resources/views/form/register.html.twig b/templates/form/register.html.twig
similarity index 95%
rename from Resources/views/form/register.html.twig
rename to templates/form/register.html.twig
index 86080a64e1c83fcd1c3490fe4c56aa36b92fa9ee..ac89ff21dad1f493112c7029c516649b6a176bc0 100644 (file)
--- a/Resources/views/form/register.html.twig
+++ b/templates/form/register.html.twig
@@ -2,7 +2,7 @@
 {% block content %}
        <section class="form">
                <header>
 {% block content %}
        <section class="form">
                <header>

-                       <h2><a href="{{ path('rapsys_user_register') }}">{{ title }}</a></h2>
+                       <h2><a href="{{ path('rapsysuser_register') }}">{{ title }}</a></h2>

                </header>
                <section>
                        {% if disabled is defined and disabled %}
                </header>
                <section>
                        {% if disabled is defined and disabled %}

diff --git a/templates/index.html.twig b/templates/index.html.twig
new file mode 100644 (file)
index 0000000..14b74ff
--- /dev/null
+++ b/templates/index.html.twig
@@ -0,0 +1,45 @@
+{% extends '@RapsysBlog/_base.html.twig' %}
+{% block content %}
+       <section id="content">
+               <header>
+                       <h1 id="title"><a href="{{ canonical }}">{{ title.page }}</a></h1>
+                       <p>{{ description }}</p>
+               </header>
+               <section>
+                       {% for article in articles %}
+                               <article>
+                                       <header>
+                                               <h2><a href="{{ path('rapsysblog_article_view', {'id': article.id, 'slug': article.slug}) }}">{{ article.title }}</a></h2>
+                                       </header>
+                                       <section>
+                                               <p>{{ article.description }}</p>
+                                               {% if article.keywords is defined and article.keywords %}
+                                                       <nav>
+                                                               {% for keyword in article.keywords %}
+                                                                       <a href="{{ path('rapsysblog_keyword_view', {'id': keyword.id, 'slug': keyword.slug}) }}">{{ keyword.title }}</a>
+                                                               {% endfor %}
+                                                       </nav>
+                                               {% endif %}
+                                       </section>
+                                       <footer>
+                                               <nav>
+                                                       <a href="{{ path('rapsysblog_article_view', {'id': article.id, 'slug': article.slug}) }}">{% trans %}Read more{% endtrans %}...</a>
+                                               </nav>
+                                       </footer>
+                               </article>
+                       {% endfor %}
+               </section>
+               {% if ( prev is defined and prev ) or ( next is defined and next ) %}
+                       <footer>
+                               <nav class="pager">
+                                       {% if prev is defined and prev %}
+                                               <a href="{{ prev }}" rel="prev">&lt; {% trans %}Previous articles{% endtrans %}</a>
+                                       {% endif %}
+                                       {% if next is defined and next %}
+                                               <a href="{{ next }}" rel="next">{% trans %}Next articles{% endtrans %} &gt;</a>
+                                       {% endif %}
+                               </nav>
+                       </footer>
+               {% endif %}
+       </section>
+{% endblock %}

diff --git a/templates/keyword/index.html.twig b/templates/keyword/index.html.twig
new file mode 100644 (file)
index 0000000..1bc5904
--- /dev/null
+++ b/templates/keyword/index.html.twig
@@ -0,0 +1,45 @@
+{% extends '@RapsysBlog/_base.html.twig' %}
+{% block content %}
+       <section id="content">
+               <header>
+                       <h1><a href="{{ path('rapsysblog_keyword') }}">{{ title.page }}</a></h1>
+                       <p>{{ description }}</p>
+               </header>
+               <section>
+                       {% for keyword in keywords %}
+                               <article>
+                                       <header>
+                                               <h2><a href="{{ path('rapsysblog_keyword_view', {'id': keyword.id, 'slug': keyword.slug}) }}">{{ keyword.title }}</a></h2>
+                                       </header>
+                                       <section>
+                                               <p>{{ keyword.description }}</p>
+                                               {#{% if article.keywords is defined and article.keywords %}
+                                                       <nav>
+                                                               {% for keyword in article.keywords %}
+                                                                       <a href="{{ path('rapsysblog_keyword_view', {'id': keyword.id, 'slug': keyword.slug}) }}">{{ keyword.title }}</a>
+                                                               {% endfor %}
+                                                       </nav>
+                                               {% endif %}#}
+                                       </section>
+                                       <footer>
+                                               <nav>
+                                                       <a href="{{ path('rapsysblog_keyword_view', {'id': keyword.id, 'slug': keyword.slug}) }}">{% trans %}Read more{% endtrans %}...</a>
+                                               </nav>
+                                       </footer>
+                               </article>
+                       {% endfor %}
+               </section>
+               {% if ( prev is defined and prev ) or ( next is defined and next ) %}
+                       <footer>
+                               <nav class="pager">
+                                       {% if prev is defined and prev %}
+                                               <a href="{{ prev }}" rel="prev">&lt; {% trans %}Previous keywords{% endtrans %}</a>
+                                       {% endif %}
+                                       {% if next is defined and next %}
+                                               <a href="{{ next }}" rel="next">{% trans %}Next keywords{% endtrans %} &gt;</a>
+                                       {% endif %}
+                               </nav>
+                       </footer>
+               {% endif %}
+       </section>
+{% endblock %}

diff --git a/Resources/views/keyword/view.html.twig b/templates/keyword/view.html.twig
similarity index 67%
rename from Resources/views/keyword/view.html.twig
rename to templates/keyword/view.html.twig
index 97c6c940b1e19205755fa12470224011290a0b6d..56a9a28045bead0de426341ba49183299b67384b 100644 (file)
--- a/Resources/views/keyword/view.html.twig
+++ b/templates/keyword/view.html.twig
@@ -1,9 +1,8 @@
 {% extends '@RapsysBlog/_base.html.twig' %}
 {% extends '@RapsysBlog/_base.html.twig' %}

-{% block title %}{% endblock %}

 {% block content %}
        <article id="content">
                <header>
 {% block content %}
        <article id="content">
                <header>

-                       <h1 id="title"><a href="{{ head.canonical }}">{{ title }}</a></h1>
+                       <h1 id="title"><a href="{{ canonical }}">{{ title.page }}</a></h1>

                        <p>{% trans with {'%date%': keyword.created|format_datetime('full', 'short')} %}Published the %date%{% endtrans %}{% if keyword.created != keyword.updated %}{% trans with {'%date%': keyword.updated|format_datetime('short', 'short')} %}, edited the %date%{% endtrans %}{% endif %}</p>
                        <p>{{ keyword.description }}</p>
                </header>
                        <p>{% trans with {'%date%': keyword.created|format_datetime('full', 'short')} %}Published the %date%{% endtrans %}{% if keyword.created != keyword.updated %}{% trans with {'%date%': keyword.updated|format_datetime('short', 'short')} %}, edited the %date%{% endtrans %}{% endif %}</p>
                        <p>{{ keyword.description }}</p>
                </header>


@@ -12,21 +11,21 @@
                                {% for article in keyword.articles %}
                                        <article>
                                                <header>
                                {% for article in keyword.articles %}
                                        <article>
                                                <header>

-                                                       <h2><a href="{{ path('rapsys_blog_article_view', {'id': article.id, 'slug': article.slug}) }}">{{ article.title }}</a></h2>
+                                                       <h2><a href="{{ path('rapsysblog_article_view', {'id': article.id, 'slug': article.slug}) }}">{{ article.title }}</a></h2>

                                                </header>
                                                <section>
                                                        <p>{{ article.description }}</p>
                                                        {% if article.keywords is defined and article.keywords %}
                                                                <nav>
                                                                        {% for keyword in article.keywords %}
                                                </header>
                                                <section>
                                                        <p>{{ article.description }}</p>
                                                        {% if article.keywords is defined and article.keywords %}
                                                                <nav>
                                                                        {% for keyword in article.keywords %}

-                                                                               <a href="{{ path('rapsys_blog_keyword_view', {'id': keyword.id, 'slug': keyword.slug}) }}">{{ keyword.title }}</a>
+                                                                               <a href="{{ path('rapsysblog_keyword_view', {'id': keyword.id, 'slug': keyword.slug}) }}">{{ keyword.title }}</a>

                                                                        {% endfor %}
                                                                </nav>
                                                        {% endif %}
                                                </section>
                                                <footer>
                                                        <nav>
                                                                        {% endfor %}
                                                                </nav>
                                                        {% endif %}
                                                </section>
                                                <footer>
                                                        <nav>

-                                                               <a href="{{ path('rapsys_blog_article_view', {'id': article.id, 'slug': article.slug}) }}">{% trans %}Read more{% endtrans %}...</a>
+                                                               <a href="{{ path('rapsysblog_article_view', {'id': article.id, 'slug': article.slug}) }}">{% trans %}Read more{% endtrans %}...</a>

                                                        </nav>
                                                </footer>
                                        </article>
                                                        </nav>
                                                </footer>
                                        </article>

diff --git a/Resources/views/mail/_base.html.twig b/templates/mail/_base.html.twig
similarity index 100%
rename from Resources/views/mail/_base.html.twig
rename to templates/mail/_base.html.twig

diff --git a/Resources/views/mail/contact.html.twig b/templates/mail/contact.html.twig
similarity index 100%
rename from Resources/views/mail/contact.html.twig
rename to templates/mail/contact.html.twig

diff --git a/Resources/views/mail/contact.text.twig b/templates/mail/contact.text.twig
similarity index 100%
rename from Resources/views/mail/contact.text.twig
rename to templates/mail/contact.text.twig

diff --git a/Resources/views/mail/recover.html.twig b/templates/mail/recover.html.twig
similarity index 100%
rename from Resources/views/mail/recover.html.twig
rename to templates/mail/recover.html.twig

diff --git a/Resources/views/mail/recover.text.twig b/templates/mail/recover.text.twig
similarity index 100%
rename from Resources/views/mail/recover.text.twig
rename to templates/mail/recover.text.twig

diff --git a/Resources/views/mail/register.html.twig b/templates/mail/register.html.twig
similarity index 100%
rename from Resources/views/mail/register.html.twig
rename to templates/mail/register.html.twig

diff --git a/Resources/views/mail/register.text.twig b/templates/mail/register.text.twig
similarity index 100%
rename from Resources/views/mail/register.text.twig
rename to templates/mail/register.text.twig

diff --git a/Resources/views/page/about.html.twig b/templates/page/about.html.twig
similarity index 100%
rename from Resources/views/page/about.html.twig
rename to templates/page/about.html.twig

diff --git a/Resources/views/user/index.html.twig b/templates/user/index.html.twig
similarity index 80%
rename from Resources/views/user/index.html.twig
rename to templates/user/index.html.twig
index e3049b9e86429cfc4d94c1d10266d2e3691461c8..8fc35b454dff407b8a894761e34926d560dfc486 100644 (file)
--- a/Resources/views/user/index.html.twig
+++ b/templates/user/index.html.twig
@@ -2,7 +2,7 @@
 {% block content %}
        <section id="content">
                <header>
 {% block content %}
        <section id="content">
                <header>

-                       <h1><a href="{{ path('rapsys_blog_user') }}">{{ title }}</a></h1>
+                       <h1><a href="{{ path('rapsysblog_user') }}">{{ title.page }}</a></h1>

                </header>
                <section>
                        {% for user in users %}
                </header>
                <section>
                        {% for user in users %}


@@ -47,14 +47,14 @@
                                </article>
                        {% endfor %}
                </section>
                                </article>
                        {% endfor %}
                </section>

-               {% if head.prev is defined or head.next is defined %}
+               {% if ( prev is defined and prev ) or ( next is defined and next ) %}

                        <footer>
                                <nav class="pager">
                        <footer>
                                <nav class="pager">

-                                       {% if head.prev is defined %}
-                                               <a href="{{ head.prev }}" rel="prev">&lt; {% trans %}Previous users{% endtrans %}</a>
+                                       {% if prev is defined and prev %}
+                                               <a href="{{ prev }}" rel="prev">&lt; {% trans %}Previous users{% endtrans %}</a>

                                        {% endif %}
                                        {% endif %}

-                                       {% if head.next is defined %}
-                                               <a href="{{ head.next }}" rel="next">{% trans %}Next users{% endtrans %} &gt;</a>
+                                       {% if next is defined and next %}
+                                               <a href="{{ next }}" rel="next">{% trans %}Next users{% endtrans %} &gt;</a>

                                        {% endif %}
                                </nav>
                        </footer>
                                        {% endif %}
                                </nav>
                        </footer>

diff --git a/Resources/views/user/view.html.twig b/templates/user/view.html.twig
similarity index 100%
rename from Resources/views/user/view.html.twig
rename to templates/user/view.html.twig