Merge pull request #94 from jedie/tab2spaces

convert tab to spaces
This commit is contained in:
Iacopo Spalletti 2015-02-22 19:56:21 +01:00
commit dcd72cb2ac
9 changed files with 67 additions and 67 deletions

View file

@ -1,13 +1,13 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block meta %} {% block meta %}
{% if meta %} {% if meta %}
{% include "meta_mixin/meta.html" %} {% include "meta_mixin/meta.html" %}
{% endif %} {% endif %}
{% endblock meta %} {% endblock meta %}
{% block content %} {% block content %}
<div class="app app-blog span8"> <div class="app app-blog span8">
{% block content_blog %}{% endblock %} {% block content_blog %}{% endblock %}
</div> </div>
{% endblock content %} {% endblock content %}

View file

@ -4,9 +4,9 @@
<article id="post-{{ post.slug }}" class="post-item"> <article id="post-{{ post.slug }}" class="post-item">
<header> <header>
<h3><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3> <h3><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
{% block blog_meta %} {% block blog_meta %}
{% include "djangocms_blog/includes/blog_meta.html" %} {% include "djangocms_blog/includes/blog_meta.html" %}
{% endblock %} {% endblock %}
</header> </header>
{% if image and post.main_image %} {% if image and post.main_image %}
<div class="blog-visual"> <div class="blog-visual">

View file

@ -2,16 +2,16 @@
{% load url from future %}{% spaceless %} {% load url from future %}{% spaceless %}
<div class="plugin plugin-blog"> <div class="plugin plugin-blog">
<h3>{% trans "Archive" %}</h3> <h3>{% trans "Archive" %}</h3>
{% regroup dates by date.year as years %} {% regroup dates by date.year as years %}
{% with current_year=year current_month=month %} {% with current_year=year current_month=month %}
<ul class="blog-archive"> <ul class="blog-archive">
{% for year in years %} {% for year in years %}
<li{% if year.grouper == current_year %} class="active"{% endif %}> <li{% if year.grouper == current_year %} class="active"{% endif %}>
<a href="{% url 'djangocms_blog:posts-archive' year=year.grouper %}">{{ year.grouper }}</a> <a href="{% url 'djangocms_blog:posts-archive' year=year.grouper %}">{{ year.grouper }}</a>
<ul> <ul>
{% for month in year.list %} {% for month in year.list %}
<li{% if year.grouper == current_year and month.date.month == current_month %} class="active"{% else %} class="month"{% endif %}> <li{% if year.grouper == current_year and month.date.month == current_month %} class="active"{% else %} class="month"{% endif %}>
<a href="{% url 'djangocms_blog:posts-archive' year=year.grouper month=month.date|date:"n" %}"> <a href="{% url 'djangocms_blog:posts-archive' year=year.grouper month=month.date|date:"n" %}">
{{ month.date|date:"F" }} {{ month.date|date:"F" }}
<span>( <span>(
{% if month.count > 0 %} {% if month.count > 0 %}
@ -19,14 +19,14 @@
{% else %}{% trans "0 articles" %}{% endif %} {% else %}{% trans "0 articles" %}{% endif %}
)</span> )</span>
</a> </a>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
</li> </li>
{% empty %} {% empty %}
<li class="blog-empty"><p>{% trans "No article found." %}</p></li> <li class="blog-empty"><p>{% trans "No article found." %}</p></li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endwith %} {% endwith %}
</div> </div>
{% endspaceless %} {% endspaceless %}

View file

@ -1,19 +1,19 @@
{% load i18n thumbnail %}{% spaceless %} {% load i18n thumbnail %}{% spaceless %}
<div class="plugin plugin-blog"> <div class="plugin plugin-blog">
<h3>{% trans "Authors" %}</h3> <h3>{% trans "Authors" %}</h3>
<ul class="blog-authors"> <ul class="blog-authors">
{% for author in authors_list %} {% for author in authors_list %}
<li><a href="{% url 'djangocms_blog:posts-author' author.get_username %}"> <li><a href="{% url 'djangocms_blog:posts-author' author.get_username %}">
{{ author.get_full_name }} {{ author.get_full_name }}
<span>( <span>(
{% if author.count > 0 %} {% if author.count > 0 %}
{% blocktrans count articles=author.count %}1 article{% plural %}{{ articles }} articles{% endblocktrans %} {% blocktrans count articles=author.count %}1 article{% plural %}{{ articles }} articles{% endblocktrans %}
{% else %}{% trans "0 articles" %}{% endif %} {% else %}{% trans "0 articles" %}{% endif %}
)</span> )</span>
</a></li> </a></li>
{% empty %} {% empty %}
<li class="blog-empty"><p>{% trans "No article found." %}</p></li> <li class="blog-empty"><p>{% trans "No article found." %}</p></li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
{% endspaceless %} {% endspaceless %}

View file

@ -2,9 +2,9 @@
{% load url from future %}{% spaceless %} {% load url from future %}{% spaceless %}
<div class="plugin plugin-blog"> <div class="plugin plugin-blog">
<h3>{% trans "Categories" %}</h3> <h3>{% trans "Categories" %}</h3>
<ul class="blog-categories"> <ul class="blog-categories">
{% for category in categories %} {% for category in categories %}
<li><a href="{% url 'djangocms_blog:posts-category' category=category.slug %}" class="blog-categories-{{ category.count }}"> <li><a href="{% url 'djangocms_blog:posts-category' category=category.slug %}" class="blog-categories-{{ category.count }}">
{{ category.name }} {{ category.name }}
<span>( <span>(
{% if category.count > 0 %} {% if category.count > 0 %}
@ -12,9 +12,9 @@
{% else %}{% trans "0 articles" %}{% endif %} {% else %}{% trans "0 articles" %}{% endif %}
)</span> )</span>
</a></li> </a></li>
{% empty %} {% empty %}
<li class="blog-empty"><p>{% trans "No categories found." %}</p></li> <li class="blog-empty"><p>{% trans "No categories found." %}</p></li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
{% endspaceless %} {% endspaceless %}

View file

@ -1,11 +1,11 @@
{% load i18n %}{% spaceless %} {% load i18n %}{% spaceless %}
<div class="plugin plugin-blog"> <div class="plugin plugin-blog">
<div class="blog-latest-entries"> <div class="blog-latest-entries">
{% for post in posts_list %} {% for post in posts_list %}
{% include "djangocms_blog/includes/blog_item.html" with post=post TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %} {% include "djangocms_blog/includes/blog_item.html" with post=post TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
{% empty %} {% empty %}
<p class="blog-empty">{% trans "No article found." %}</p> <p class="blog-empty">{% trans "No article found." %}</p>
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
{% endspaceless %} {% endspaceless %}

View file

@ -2,9 +2,9 @@
{% load url from future %}{% spaceless %} {% load url from future %}{% spaceless %}
<div class="plugin plugin-blog"> <div class="plugin plugin-blog">
<h3>{% trans "Tags" %}</h3> <h3>{% trans "Tags" %}</h3>
<ul class="blog-tags"> <ul class="blog-tags">
{% for tag in tags %} {% for tag in tags %}
<li><a href="{% url 'djangocms_blog:posts-tagged' tag=tag.slug %}" class="blog-tag-{{ tag.count }}"> <li><a href="{% url 'djangocms_blog:posts-tagged' tag=tag.slug %}" class="blog-tag-{{ tag.count }}">
{{ tag.name }} {{ tag.name }}
<span>( <span>(
{% if tag.count > 0 %} {% if tag.count > 0 %}
@ -12,9 +12,9 @@
{% else %}{% trans "0 articles" %}{% endif %} {% else %}{% trans "0 articles" %}{% endif %}
)</span> )</span>
</a></li> </a></li>
{% empty %} {% empty %}
<li class="blog-empty"><p>{% trans "No article found." %}</p></li> <li class="blog-empty"><p>{% trans "No article found." %}</p></li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
{% endspaceless %} {% endspaceless %}

View file

@ -11,9 +11,9 @@
<article id="post-{{ post.slug }}" class="post-item post-detail"> <article id="post-{{ post.slug }}" class="post-item post-detail">
<header> <header>
<h2>{% render_model post "title" %}</h2> <h2>{% render_model post "title" %}</h2>
{% block blog_meta %} {% block blog_meta %}
{% include "djangocms_blog/includes/blog_meta.html" %} {% include "djangocms_blog/includes/blog_meta.html" %}
{% endblock %} {% endblock %}
</header> </header>
{% if post.main_image_id %} {% if post.main_image_id %}
<div class="blog-visual"> <div class="blog-visual">
@ -22,10 +22,10 @@
</div> </div>
{% endif %} {% endif %}
{% endspaceless %} {% endspaceless %}
{% if use_placeholder %} {% if use_placeholder %}
<div class="blog-content">{% render_placeholder post.content %}</div> <div class="blog-content">{% render_placeholder post.content %}</div>
{% else %} {% else %}
<div class="blog-content">{% render_model post "post_text" "post_text" %}</div> <div class="blog-content">{% render_model post "post_text" "post_text" %}</div>
{% endif %} {% endif %}
</article> </article>
{% endblock content_blog %} {% endblock content_blog %}

View file

@ -8,7 +8,7 @@
{% block blog_title %} {% block blog_title %}
<header> <header>
<h2> <h2>
{% if author %}{% trans "Articles by" %} {{ author.get_full_name }} {% if author %}{% trans "Articles by" %} {{ author.get_full_name }}
{% elif archive_date %}{% trans "Archive" %} &ndash; {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }} {% elif archive_date %}{% trans "Archive" %} &ndash; {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }}
{% elif tagged_entries %}{% trans "Tag" %} &ndash; {{ tagged_entries|capfirst }} {% elif tagged_entries %}{% trans "Tag" %} &ndash; {{ tagged_entries|capfirst }}
{% elif category %}{% trans "Category" %} &ndash; {{ category }}{% endif %} {% elif category %}{% trans "Category" %} &ndash; {{ category }}{% endif %}
@ -16,13 +16,13 @@
</header> </header>
{% endblock %} {% endblock %}
{% for post in post_list %} {% for post in post_list %}
{% include "djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %} {% include "djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
{% empty %} {% empty %}
<p class="blog-empty">{% trans "No article found." %}</p> <p class="blog-empty">{% trans "No article found." %}</p>
{% endfor %} {% endfor %}
{% if author or archive_date or tagged_entries %} {% if author or archive_date or tagged_entries %}
<p class="blog-back"><a href="{% url 'djangocms_blog:posts-latest' %}">{% trans "Back" %}</a></p> <p class="blog-back"><a href="{% url 'djangocms_blog:posts-latest' %}">{% trans "Back" %}</a></p>
{% endif %} {% endif %}
{% if is_paginated %} {% if is_paginated %}
<nav class="{% firstof css_grid instance.css_grid %} pagination"> <nav class="{% firstof css_grid instance.css_grid %} pagination">
{% if page_obj.has_previous %} {% if page_obj.has_previous %}