From e688de7eb717e7abf8219f9d6e82597151a70acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Sun, 17 Mar 2019 17:13:40 -0500 Subject: [PATCH] remove duplicate main-content --- cl-theme/templates/archives.html | 188 +++++++++++---------- cl-theme/templates/article.html | 200 +++++++++++------------ cl-theme/templates/authors.html | 206 ++++++++++++------------ cl-theme/templates/page.html | 150 +++++++++-------- cl-theme/templates/period_archives.html | 61 ++++--- 5 files changed, 393 insertions(+), 412 deletions(-) diff --git a/cl-theme/templates/archives.html b/cl-theme/templates/archives.html index 6eed5e9..fb390ca 100644 --- a/cl-theme/templates/archives.html +++ b/cl-theme/templates/archives.html @@ -1,130 +1,124 @@ {% extends "base.html" %} {% block extra_head %} - - + + - + .contenedor-arbol ul > li:last-child::after { + height: 8px; + } + {% endblock %} {% block title %}{% trans %}Archivos de {{ SITENAME }}{% endtrans %}{% endblock %} {% block content %} - -
-
- -
- -
-
+
+ +
+ +
+
- -
-

{% trans %}Archivos de {{ SITENAME }}{% endtrans %}

-
- + +
+

{% trans %}Archivos de {{ SITENAME }}{% endtrans %}

+
+ - -
-
-
-
-

{{ ngettext('%(num)d artículo', '%(num)d artículos', dates|length) }}

-
    - {% for article in dates %} - {% set current_year = article.date|strftime('%Y') %} - {% set current_month = article.date|strftime('%m') %} - {% if loop.previtem %} - {% set previous_year = loop.previtem.date|strftime('%Y') %} - {% set previous_month = loop.previtem.date|strftime('%m') %} - {% endif %} - {% if current_year != previous_year %} - {% if loop.previtem %} -
- - - - {% endif %} -
  • {{ current_year }} -
      + +
      +
      +
      +
      +

      {{ ngettext('%(num)d artículo', '%(num)d artículos', dates|length) }}

      +
        + {% for article in dates %} + {% set current_year = article.date|strftime('%Y') %} + {% set current_month = article.date|strftime('%m') %} + {% if loop.previtem %} + {% set previous_year = loop.previtem.date|strftime('%Y') %} + {% set previous_month = loop.previtem.date|strftime('%m') %} + {% endif %} + {% if current_year != previous_year %} + {% if loop.previtem %} +
      + +
    +
    • + {% endif %} +
  • {{ current_year }} + -
    • - {% endif %} - {% endfor %} - -
    -
    + + + {% endif %} + {% endfor %} +
    - -
    - -
    - +
    +
    - + +
    {% endblock %} diff --git a/cl-theme/templates/article.html b/cl-theme/templates/article.html index 136fd5c..d641148 100644 --- a/cl-theme/templates/article.html +++ b/cl-theme/templates/article.html @@ -58,116 +58,112 @@ {% block title %}{{ article.title|striptags }}{% endblock %} {% block content %} - -
    -
    - -
    - -
    -
    +
    + +
    + +
    +
    - -
    -

    {{ article.title }}

    -
    - + +
    +

    {{ article.title }}

    +
    + - -
    -
    -
    - -
    - {{ article.content }} -
    - - - -
    -
    - - - - - GNUSocial - - - - - - - - Diaspora - - - - - - - - Mastodom - - - -
    - -
    -
    - {{ _('Regresar al Inicio') }} -
    -
    - - - - - - {% set año = article.date|strftime('%Y') %} - {% set mes = article.date|strftime('%m') %} - {% set nombre_mes = article.date|strftime('%B') %} - - - {% if not HIDE_AUTHORS and article.authors %} - - - - - - {% for author in article.authors %} - - {{ author }}{% if not loop.last %}, {% endif %} - - {% endfor %} - {% endif %} - -
    -
    - -
    - + +
    +
    +
    + +
    + {{ article.content }}
    + + + +
    +
    + + + + + GNUSocial + + + + + + + + Diaspora + + + + + + + + Mastodom + + + +
    + +
    +
    + {{ _('Regresar al Inicio') }} +
    +
    + + + + + + {% set año = article.date|strftime('%Y') %} + {% set mes = article.date|strftime('%m') %} + {% set nombre_mes = article.date|strftime('%B') %} + + + {% if not HIDE_AUTHORS and article.authors %} + + + + + + {% for author in article.authors %} + + {{ author }}{% if not loop.last %}, {% endif %} + + {% endfor %} + {% endif %} + +
    +
    + +
    +
    - -
    - + +
    - +
    +
    - {% endblock %} diff --git a/cl-theme/templates/authors.html b/cl-theme/templates/authors.html index afc4007..1054070 100644 --- a/cl-theme/templates/authors.html +++ b/cl-theme/templates/authors.html @@ -8,121 +8,119 @@ {% block title %}{% trans %}Autores de {{ SITENAME }}{% endtrans %}{% endblock %} {% block content %} -
    -
    - -
    - -
    -
    - -
    -

    {{ _('Créditos') }}

    -
    - - -
    -
    -
    - -
    +
    + +
    + +
    +
    + +
    +

    {{ _('Créditos') }}

    +
    + + +
    +
    +
    + +
    -

    {{ _('Artículos') }}

    -
      - {%- for author, articles in authors|sort %} -
    • - {{ author }} - ({{ articles|count }}) -
      • - {% endfor %} -
    +

    {{ _('Artículos') }}

    +
      + {%- for author, articles in authors|sort %} +
    • + {{ author }} + ({{ articles|count }}) +
      • + {% endfor %} +
    -

    {{ _('Programación') }}

    - +

    {{ _('Programación') }}

    + -

    {{ _('Traducción') }}

    - +

    {{ _('Traducción') }}

    + -

    {{ _('Software que usa la página') }}

    - {% set software = (('https://nginx.org/', 'Nginx'), - ('http://babel.pocoo.org/', 'Babel'), - ('https://pypi.org/project/beautifulsoup4/', 'BeautifulSoup4'), - ('https://nodejs.org/', 'nodejs'), - ('https://www.python.org/', 'Python'), - ('https://blog.getpelican.com/', 'Pelican'), - ('https://pypi.org/project/Markdown/', 'Markdown'), - ('https://nodejs.org/', 'nodejs'), - ('https://www.npmjs.com/', 'npm'), - ('https://github.com/fmarcia/UglifyCSS', 'uglifycss'), - ('https://github.com/mishoo/UglifyJS', 'uglifyjs'), - ('https://conocimientoslibres.tuxfamily.org/pages/librejs.html', _('Algunos programas de JavaScript'),)) %} -
      - {% for program in software %} -
    • {{ program[1] }}
      • - {% endfor %} -
    -

    {{ _('Miscelánea') }}

    -
      -
    • CitoplasmaC
      • -
    +

    {{ _('Software que usa la página') }}

    + {% set software = (('https://nginx.org/', 'Nginx'), + ('http://babel.pocoo.org/', 'Babel'), + ('https://pypi.org/project/beautifulsoup4/', 'BeautifulSoup4'), + ('https://nodejs.org/', 'nodejs'), + ('https://www.python.org/', 'Python'), + ('https://blog.getpelican.com/', 'Pelican'), + ('https://pypi.org/project/Markdown/', 'Markdown'), + ('https://nodejs.org/', 'nodejs'), + ('https://www.npmjs.com/', 'npm'), + ('https://github.com/fmarcia/UglifyCSS', 'uglifycss'), + ('https://github.com/mishoo/UglifyJS', 'uglifyjs'), + ('https://conocimientoslibres.tuxfamily.org/pages/librejs.html', _('Algunos programas de JavaScript'),)) %} +
      + {% for program in software %} +
    • {{ program[1] }}
      • + {% endfor %} +
    +

    {{ _('Miscelánea') }}

    +
      +
    • CitoplasmaC
      • +
    -
    - - - -
    -
    - - - - - GNUSocial - - - - - - - - Diaspora - - - - - - - - Mastodom - - - -
    - -
    -
    - {{ _('Regresar al Inicio') }} -
    -
    - - -
    -
    + + + +
    +
    + + + + + GNUSocial + + + + + + + + Diaspora + + + + + + + + Mastodom + + + +
    + +
    +
    + {{ _('Regresar al Inicio') }} +
    +
    + + +
    +
    -
    +
    -
    - +
    +
    {% endblock %} diff --git a/cl-theme/templates/page.html b/cl-theme/templates/page.html index 9d5a232..31288e4 100644 --- a/cl-theme/templates/page.html +++ b/cl-theme/templates/page.html @@ -29,89 +29,85 @@ {% endblock %} {% block content %} - -
    -
    - -
    - -
    -
    - -
    -

    {{ page.title }}

    -
    - - -
    -
    -
    - -
    - {{ page.content }} -
    - - - -
    -
    - - - - - GNUSocial - - - - - - - - Diaspora - - - - - - - - Mastodom - - - -
    - -
    -
    - {{ _('Regresar al Inicio') }} -
    -
    - - - - - - {% import 'translations.html' as translations with context %} - {% if translations.translations_for(page) %} - - {{ translations.translations_for(page) }} - - {% endif %} -
    -
    - -
    - +
    + +
    + +
    +
    + +
    +

    {{ page.title }}

    +
    + + +
    +
    +
    + +
    + {{ page.content }}
    + + + +
    +
    + + + + + GNUSocial + + + + + + + + Diaspora + + + + + + + + Mastodom + + + +
    + +
    +
    + {{ _('Regresar al Inicio') }} +
    +
    + + + + + + {% import 'translations.html' as translations with context %} + {% if translations.translations_for(page) %} + + {{ translations.translations_for(page) }} + + {% endif %} +
    +
    + +
    +
    -
    +
    -
    - +
    +
    - {% endblock %} diff --git a/cl-theme/templates/period_archives.html b/cl-theme/templates/period_archives.html index b1510b8..d1efa0f 100644 --- a/cl-theme/templates/period_archives.html +++ b/cl-theme/templates/period_archives.html @@ -1,47 +1,44 @@ {% extends "base.html" %} {% block content %} -
    -
    - -
    - -
    -
    +
    + +
    + +
    +
    -
    -

    - {% set len_period = period|length %} - {%- if len_period == 1 -%} - {{ _('Archivos de %(año)d', año=period[0]) }} - {%- elif len_period == 2 -%} - {{ _('Archivos de %(mes)s de %(año)d', año=period[0], mes=period[1]) }} - {%- elif len_period == 3 -%} - {{ _('Archivos del %(dia)d de %(mes)s de %(año)d', año=period[0], mes=period[1], dia=period[2]) }} - {%- endif -%} -

    -
    +
    +

    + {% set len_period = period|length %} + {%- if len_period == 1 -%} + {{ _('Archivos de %(año)d', año=period[0]) }} + {%- elif len_period == 2 -%} + {{ _('Archivos de %(mes)s de %(año)d', año=period[0], mes=period[1]) }} + {%- elif len_period == 3 -%} + {{ _('Archivos del %(dia)d de %(mes)s de %(año)d', año=period[0], mes=period[1], dia=period[2]) }} + {%- endif -%} +

    +
    -
    -
    -
    +
    +
    +
    -
    -
    - {% for article in dates %} -
    {{ article.date|strftime('%A %-d de %B de %Y a las %H:%M %z') }}
    -
    {{ article.title }}
    - {% endfor %} -
    -
    +
    +
    + {% for article in dates %} +
    {{ article.date|strftime('%A %-d de %B de %Y a las %H:%M %z') }}
    +
    {{ article.title }}
    + {% endfor %} +
    -
    +
    - {% endblock %}