1. biolab
  2. Untitled project
  3. orange-homepagex

Commits

root  committed 2485cc9

Blog bugs.

  • Participants
  • Parent commits 60bda16
  • Branches master

Comments (0)

Files changed (11)

File main/templates/main/main.html

View file
 
             <div class="span4">
                 <div class="blog-headlines">
-                    <h1><a href="#">What are we up to?</a></h1>
+                    <h1><a href="/blog/">What are we up to?</a></h1>
                     {% placeholder main_latest %}
                 </div>
             </div>

File orange_website/templates/cmsplugin_blog/cmsplugin_blog_base.html

View file
 {% extends "base.html" %}
 
+{% block title %}Blog {{ block.super }}{% endblock %}
+
 {% block content %}
     <div class="row">
         <div class="span8">

File orange_website/templates/cmsplugin_blog/entry_archive.html

View file
+{% extends "cmsplugin_blog/cmsplugin_blog_base.html" %}
+{% load i18n cmsplugin_blog_tags simple_translation_tags placeholder_tags %}
+
+{% block title %}{% trans "Latest entries" %}{{ block.super }}{% endblock %}
+
+{% block left-col %}
+<div class="latest-list">
+{% for object in latest|annotate_with_translations %}
+    {% with object|get_preferred_translation_from_request:request as title %}
+        <div class="blog-entry">
+        <h2 id="{{ title.slug }}"><a href="{{ title.get_absolute_url }}">{{ title }}</a> {{ object|render_language_choices:request|safe }}</h2>
+        <div class="entry-content">
+        {% with object.placeholders|choose_placeholder:"on_index_page" as on_index_page %}{% with "3" as max_images_number %}
+            {% render_placeholder on_index_page %}
+        {% endwith %}{% endwith %}
+        </div>
+        </div>
+    {% endwith %}
+{% empty %}
+    <p>{% trans "No entries." %}</p>
+{% endfor %}
+</div>
+{% endblock %}
+
+{% block right-col %}
+{% render_author_links %}
+{% render_month_links %}
+{% render_tag_links %}
+{% endblock %}
+
+{% block bodyend %}
+{% endblock %}

File orange_website/templates/cmsplugin_blog/entry_archive_day.html

View file
+{% extends "cmsplugin_blog/cmsplugin_blog_base.html" %}
+{% load i18n cmsplugin_blog_tags simple_translation_tags %}
+
+{% block title %}{% trans "Entries for" %} {{ day|date:"d F Y" }}{{ block.super }}{% endblock %}
+
+{% block left-col %}
+<div class="entry-list">
+    <h2 id="entries-for">{% trans "Entries for" %} {{ day|date:"d F Y" }}</h2>
+    {% include "cmsplugin_blog/entry_list_include.html" %}
+</div>
+{% endblock %}
+
+{% block right-col %}
+{% render_author_links %}
+{% render_month_links %}
+{% render_tag_links %}
+{% endblock %}
+
+{% block bodyend %}
+{% endblock %}

File orange_website/templates/cmsplugin_blog/entry_archive_month.html

View file
+{% extends "cmsplugin_blog/cmsplugin_blog_base.html" %}
+{% load i18n cmsplugin_blog_tags simple_translation_tags %}
+
+{% block title %}{% trans "Entries for" %} {{ month|date:"F Y" }}{{ block.super }}{% endblock %}
+
+{% block left-col %}
+<div class="entry-list">
+    <h2 id="entries-for">{% trans "Entries for" %} {{ month|date:"F Y" }}</h2>
+    {% include "cmsplugin_blog/entry_list_include.html" %}
+</div>
+{% endblock %}
+
+{% block right-col %}
+{% render_author_links %}
+{% render_month_links %}
+{% render_tag_links %}
+{% endblock %}
+
+{% block bodyend %}
+{% endblock %}

File orange_website/templates/cmsplugin_blog/entry_archive_year.html

View file
+{% extends "cmsplugin_blog/cmsplugin_blog_base.html" %}
+{% load i18n cmsplugin_blog_tags simple_translation_tags %}
+
+{% block title %}{% trans "Entries for" %} {{ year }}{{ block.super }}{% endblock %}
+
+{% block left-col %}
+<div class="entry-list">
+    <h2 id="entries-for">{% trans "Entries for" %} {{ year }}</h2>
+    {% include "cmsplugin_blog/entry_list_include.html" %}
+{% endblock %}
+
+{% block right-col %}
+{% render_author_links %}
+{% render_month_links %}
+{% render_tag_links %}
+{% endblock %}
+
+{% block bodyend %}
+{% endblock %}

File orange_website/templates/cmsplugin_blog/entry_author_list.html

View file
+{% extends "cmsplugin_blog/cmsplugin_blog_base.html" %}
+{% load i18n cmsplugin_blog_tags simple_translation_tags %}
+
+{% block extrahead %}
+{{ block.super }}
+<link rel="alternate" type="application/rss+xml" title="RSS feed for author {{ author|escape }}" href="{% if request.LANGUAGE_CODE %}/{{ request.LANGUAGE_CODE }}{% endif %}{% url 'blog_rss_author' author %}" />
+<link rel="alternate" type="application/rss+xml" title="RSS feed for author {{ author|escape }} (any language)" href="{% if request.LANGUAGE_CODE %}/{{ request.LANGUAGE_CODE }}{% endif %}{% url 'blog_rss_any_author' author %}" />
+{% endblock extrahead %}
+
+{% block title %}{% trans "Entries by" %} {{ author }}{{ block.super }}{% endblock %}
+
+{% block left-col %}
+<div class="entry-list">
+<h2 id="entries-by">{% trans "Entries by" %} {{ author }}</h2>
+{% if object_list %}
+    {% include "cmsplugin_blog/entry_list_include.html" %}
+{% else %}
+    <p>{% trans "No entries by" %} {{ author }}.</p>
+{% endif %}
+</div>
+{% endblock %}
+
+{% block right-col %}
+{% render_author_links %}
+{% render_month_links %}
+{% render_tag_links %}
+{% endblock %}
+
+{% block bodyend %}
+{% endblock %}

File orange_website/templates/cmsplugin_blog/entry_list.html

View file
 
 {% block extrahead %}
 {{ block.super }}
-<link rel="alternate" type="application/rss+xml" title="RSS feed for tag &quot;{{ tag|escape }}&quot;" href="{% if request.LANGUAGE_CODE %}/{{ request.LANGUAGE_CODE }}{% endif %}{% url blog_rss_tagged tag %}" />
-<link rel="alternate" type="application/rss+xml" title="RSS feed for tag &quot;{{ tag|escape }}&quot; (any language)" href="{% if request.LANGUAGE_CODE %}/{{ request.LANGUAGE_CODE }}{% endif %}{% url blog_rss_any_tagged tag %}" />
+<link rel="alternate" type="application/rss+xml" title="RSS feed for tag &quot;{{ tag|escape }}&quot;" href="{% if request.LANGUAGE_CODE %}/{{ request.LANGUAGE_CODE }}{% endif %}{% url 'blog_rss_tagged' tag %}" />
+<link rel="alternate" type="application/rss+xml" title="RSS feed for tag &quot;{{ tag|escape }}&quot; (any language)" href="{% if request.LANGUAGE_CODE %}/{{ request.LANGUAGE_CODE }}{% endif %}{% url 'blog_rss_any_tagged' tag %}" />
 {% endblock extrahead %}
 
 {% block left-col %}
 {{ block.super }}
 
 <h1>{% trans "Entries tagged" %} "{{ tag }}"</h1>
+
 {% if object_list %}
    {% include "cmsplugin_blog/entry_list_include.html" %}
 {% else %}
-	<p>{% trans "No entries tagged" %} "{{ tag }}"</p>
+    <p>{% trans "No entries tagged" %} "{{ tag }}"</p>
 {% endif %}
 
 {% endblock %}
 
 {% render_tag_links %}
 
-{% endblock %}
+{% endblock %}

File orange_website/templates/cmsplugin_blog/entry_list_include.html

View file
 {% load i18n placeholder_tags cmsplugin_blog_tags simple_translation_tags %}
 {% for entry in object_list|annotate_with_translations %}
     {% with entry|get_preferred_translation_from_request:request as title %}
-    {% with entry.placeholders|choose_placeholder:"excerpt" as excerpt %}
-    <h2><a href="{{ title.get_absolute_url }}">{{ title }}</a><span style='font-size: 14px;font-weight: normal;'> &bull; {{ entry.pub_date|date:"d M Y" }}</span></h2>
-    {% with entry.placeholders|choose_placeholder:"on_index_page" as on_index_page %}
-        {% render_placeholder on_index_page %}
-    {% endwith %}
-
-    {% render_placeholder excerpt %}
-    {% endwith %}
+        {% with entry.placeholders|choose_placeholder:"excerpt" as excerpt %}
+            <h2><a href="{{ title.get_absolute_url }}">{{ title }}</a></h2>
+            <p>{{ entry.pub_date|date:"d M Y" }} &bull; <a href="{% url 'blog_archive_author' title.author %}">{{ title.author }}</a>{% if entry.tags %} &bull; {{ entry.tags }}{% endif %}</p>
+            {% with entry.placeholders|choose_placeholder:"on_index_page" as on_index_page %}
+                {% render_placeholder on_index_page %}
+            {% endwith %}
+            {% render_placeholder excerpt %}
+        {% endwith %}
     {% endwith %}
 {% endfor %}

File requirements.txt

View file
 Trac==1.0.1
 cmsplugin-markup-tracwiki==0.2.4
 #cmsplugin-blog==1.1.2
-#-e git+https://github.com/fivethreeo/cmsplugin-blog.git@e5b96b7253fbfea5efe09a30ae042c2a653e744c#egg=cmsplugin-blog
--e git+https://github.com/Tyrdall/cmsplugin-blog.git@86e4415c3e2b8186f96c501b95eb82175eec789a#egg=cmsplugin-blog
+#-e git+https://github.com/fivethreeo/cmsplugin-blog.git@028a803acd7722af0390e37505bbb7403e99867f#egg=cmsplugin-blog
+#-e git+https://github.com/Tyrdall/cmsplugin-blog.git@dd83811aee408807969999bd5b2598cfc4d1c157#egg=cmsplugin-blog
+#-e git+https://github.com/daneoshiga/cmsplugin-blog.git@028a803acd7722af0390e37505bbb7403e99867f#egg=cmsplugin-blog
+-e git+https://github.com/gonzalodelgado/cmsplugin-blog.git@655a109c0b7e4b2bf395231179278337bdd4ba48#egg=cmsplugin-blog
 cmsplugin-contact==1.0.0
 recaptcha-client==1.0.6
 pygments==1.6