Update index templates

diff --git a/Resources/views/article/index.html.twig b/Resources/views/article/index.html.twig
index 817a4e078b7c38eb1c8792dc642eaf6a15d786d5..3f0abf6ba69f939022fd6cffb17768e11a25ea84 100644 (file)
--- a/Resources/views/article/index.html.twig
+++ b/Resources/views/article/index.html.twig
@@ -1,29 +1,45 @@
-{% extends 'RapsysBlogBundle::body.html.twig' %}
-{% block blog_title %}<h1><a href="{{ path('homepage') }}">{% trans %}Dev log{% endtrans %}</a></h1>{% endblock %}
+{% extends '@RapsysBlog/_base.html.twig' %}

 {% block content %}
 {% block content %}

-<section id="content">
-       <h2><a href="{{ path('articles') }}">{% trans %}Articles list{% endtrans %}</a></h2>
-       {% for article in articles %}
-       <article>
+       <section id="content">

                <header>
                <header>

-                       <h3><a href="{{ path('articles_article', {'_article': article.slug}) }}">{{article.title}}</a></h3>
-                       <p>
-                               <span>{% trans with {'%date%': article.created|localizeddate('full', 'short')} %}Published the %date%{% endtrans %}{% if article.created != article.updated %}{% trans with {'%date%': article.updated|localizeddate('short', 'short')} %}, edited the %date%{% endtrans %}{% endif %}</span>
-                               {% if article.keywords %}
-                                       <span>
-                                               {% transchoice article.keywords|length %}{1} Keyword:|]1,Inf[ Keywords:{% endtranschoice %}
-                                               {% for slug, keyword in article.keywords %}
-                                                       <a href="{{ path('keywords_keyword', {'_keyword': slug}) }}">{{ keyword }}</a>
-                                               {% endfor %}
-                                       </span>
-                               {% endif %}
-                       </p>
+                       <h1><a href="{{ path('rapsys_blog_article') }}">{{ title }}</a></h1>
+                       <p>{{ description }}</p>

                </header>
                </header>

-               <p>{{article.description}}</p>
-               <nav>
-                       <a href="{{ path('articles_article', {'_article': article.slug}) }}">{% trans %}Read more{% endtrans %}...</a>
-               </nav>
-       </article>
-       {% endfor %}
-</section>
+               <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 articles_prev is defined or articles_next is defined %}
+                       <footer>
+                               <nav class="pager">
+                                       {% if articles_prev is defined %}
+                                               <a href="{{ articles_prev }}" rel="prev">&lt; {% trans %}Previous articles{% endtrans %}</a>
+                                       {% endif %}
+                                       {% if articles_next is defined %}
+                                               <a href="{{ articles_next }}" rel="next">{% trans %}Next articles{% endtrans %} &gt;</a>
+                                       {% endif %}
+                               </nav>
+                       </footer>
+               {% endif %}
+       </section>

 {% endblock %}
 {% endblock %}

diff --git a/Resources/views/index.html.twig b/Resources/views/index.html.twig
index 0036a4e197e17c386caea9da57128720ff200790..04c49e4a27803165908b01abe7fb9143adac1171 100644 (file)
--- a/Resources/views/index.html.twig
+++ b/Resources/views/index.html.twig
@@ -1,28 +1,45 @@
-{% extends 'RapsysBlogBundle::body.html.twig' %}
+{% extends '@RapsysBlog/_base.html.twig' %}

 {% block content %}
 {% block content %}

-<section id="content">
-       <h2><a href="{{ path('articles') }}">{% trans %}Articles list{% endtrans %}</a></h2>
-       {% for article in articles %}
-       <article>
+       <section id="content">

                <header>
                <header>

-                       <h3><a href="{{ path('articles_article', {'_article': article.slug}) }}">{{article.title}}</a></h3>
-                       <p>
-                               <span>{% trans with {'%date%': article.created|localizeddate('full', 'short')} %}Published the %date%{% endtrans %}{% if article.created != article.updated %}{% trans with {'%date%': article.updated|localizeddate('short', 'short')} %}, edited the %date%{% endtrans %}{% endif %}</span>
-                               {% if article.keywords %}
-                                       <span>
-                                               {% transchoice article.keywords|length %}{1} Keyword:|]1,Inf[ Keywords:{% endtranschoice %}
-                                               {% for slug, keyword in article.keywords %}
-                                                       <a href="{{ path('keywords_keyword', {'_keyword': slug}) }}">{{ keyword }}</a>
-                                               {% endfor %}
-                                       </span>
-                               {% endif %}
-                       </p>
+                       <h1 id="title"><a href="{{ head.canonical }}">{{ title }}</a></h1>
+                       <p>{{ description }}</p>

                </header>
                </header>

-               <p>{{article.description}}</p>
-               <nav>
-                       <a href="{{ path('articles_article', {'_article': article.slug}) }}">{% trans %}Read more{% endtrans %}...</a>
-               </nav>
-       </article>
-       {% endfor %}
-</section>
+               <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 articles_prev is defined or articles_next is defined %}
+                       <footer>
+                               <nav class="pager">
+                                       {% if articles_prev is defined %}
+                                               <a href="{{ articles_prev }}" rel="prev">&lt; {% trans %}Previous articles{% endtrans %}</a>
+                                       {% endif %}
+                                       {% if articles_next is defined %}
+                                               <a href="{{ articles_next }}" rel="next">{% trans %}Next articles{% endtrans %} &gt;</a>
+                                       {% endif %}
+                               </nav>
+                       </footer>
+               {% endif %}
+       </section>

 {% endblock %}
 {% endblock %}

diff --git a/Resources/views/keyword/index.html.twig b/Resources/views/keyword/index.html.twig
index 9860b9c0eb69a80472fc98612de8ae1608e45ed5..b1a6ce4c6a8b2c6fe25a52019830e48bceeac802 100644 (file)
--- a/Resources/views/keyword/index.html.twig
+++ b/Resources/views/keyword/index.html.twig
@@ -1,28 +1,45 @@
-{% extends 'RapsysBlogBundle::body.html.twig' %}
-{% block blog_title %}<h1><a href="{{ path('homepage') }}">{% trans %}Dev log{% endtrans %}</a></h1>{% endblock %}
+{% extends '@RapsysBlog/_base.html.twig' %}

 {% block content %}
 {% block content %}

-<section id="content">
-       <h2><a href="{{ path('keywords') }}">{% trans %}Keywords list{% endtrans %}</a></h2>
-       {% for keyword in keywords %}
-       <article>
+       <section id="content">

                <header>
                <header>

-                       <h3><a href="{{ path('keywords_keyword', {'_keyword': keyword.slug}) }}">{{keyword.title}}</a></h3>
-                       <p>
-                               <span>{% trans with {'%date%': keyword.created|localizeddate('full', 'short')} %}Published the %date%{% endtrans %}{% if keyword.created != keyword.updated %}{% trans with {'%date%': keyword.updated|localizeddate('short', 'short')} %}, edited the %date%{% endtrans %}{% endif %}</span>
-                       </p>
+                       <h1><a href="{{ path('rapsys_blog_keyword') }}">{{ title }}</a></h1>
+                       <p>{{ description }}</p>

                </header>
                </header>

-               {% if keyword.articles %}
-                       <p style="margin-bottom: 0">{% transchoice keyword.articles|length %}{1} Article:|]1,Inf[ Articles:{% endtranschoice %}</p>
-                       <ul>
-                               {% for slug, article in keyword.articles %}
-                                       <li><a href="{{ path('articles_article', {'_article': slug}) }}">{{ article }}</a></li>
-                               {% endfor %}
-                       </ul>
+               <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 keywords_prev is defined or keywords_next is defined %}
+                       <footer>
+                               <nav class="pager">
+                                       {% if keywords_prev is defined %}
+                                               <a href="{{ keywords_prev }}" rel="prev">&lt; {% trans %}Previous keywords{% endtrans %}</a>
+                                       {% endif %}
+                                       {% if keywords_next is defined %}
+                                               <a href="{{ keywords_next }}" rel="next">{% trans %}Next keywords{% endtrans %} &gt;</a>
+                                       {% endif %}
+                               </nav>
+                       </footer>

                {% endif %}
                {% endif %}

-               <nav>
-                       <a href="{{ path('keywords_keyword', {'_keyword': keyword.slug}) }}">{% trans %}Read more{% endtrans %}...</a>
-               </nav>
-       </article>
-       {% endfor %}
-</section>
+       </section>

 {% endblock %}
 {% endblock %}