Changeset 626:9649b4d658ce
- Timestamp:
- 20/06/12 13:29:06 (11 months ago)
- Branch:
- default
- Location:
- cyclope
- Files:
-
- 5 edited
-
apps/articles/templates/articles/article_inline_detail.html (modified) (2 diffs)
-
core/collections/templates/collections/category_contents_base.html (modified) (3 diffs)
-
core/collections/templates/collections/category_slideshow.html (modified) (1 diff)
-
core/collections/templates/collections/category_teaser_list.html (modified) (1 diff)
-
core/collections/templates/collections/hierarchycal_navigation_block.html (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
cyclope/apps/articles/templates/articles/article_inline_detail.html
r491 r626 2 2 3 3 {% block content %} 4 5 4 <div class="content-view article inline_detail article-inline_detail"> 6 7 5 {% if article.pretitle %} 8 6 <span class="pretitle">{% trans article.pretitle %}</span> … … 36 34 </div> 37 35 </div> 38 39 36 </div> <!--termina article_detail --> 40 41 37 {% endblock content%} -
cyclope/core/collections/templates/collections/category_contents_base.html
r499 r626 4 4 5 5 {% block content %} 6 7 6 {% if view_options.navigation == "TOP" %} 8 7 {% include 'collections/hierarchycal_navigation_block.html' %} … … 28 27 {% endif %} 29 28 30 31 {% block category_content %} 32 {% endblock %} 33 29 {% block category_content %}{% endblock %} 30 {% spaceless %} 34 31 {% if view_options.navigation == "BOTTOM" %} 35 32 {% include 'collections/hierarchycal_navigation_block.html' %} … … 43 40 {% endif %} 44 41 {% endif %} 45 42 {% endspaceless %} 46 43 {% endblock %} -
cyclope/core/collections/templates/collections/category_slideshow.html
r625 r626 42 42 43 43 {% block content %} 44 {% comment %}45 The content of this view is composed by including a template for each content in the category46 The included template may be something different from a teaser47 {% endcomment %}48 44 {% comment %}TODO: review the ID definition{% endcomment %} 49 45 <ul id="slideshow{% if region_name %}-{{region_name}}{% endif %}-{{category_slug}}" class="jcarousel-skin-cyclope"> 50 46 {% for categorization in categorizations %} 47 {% spaceless %} 51 48 {% join categorization.content_type.app_label "/" categorization.content_type.model "_" inline_view_name ".html" as template_path %} 52 49 53 50 {% comment %} 54 we alias the actual object with the model name 55 so the included template is reusable56 and can access the content object using an explicitname51 we alias the actual object with the model name so the included template 52 is reusable and can access the content object using an explicit name 53 we also alias as 'media' because some medialibrary templates expect this name 57 54 {% endcomment %} 58 55 59 56 {% alias categorization.content_object as categorization.content_type.model %} 60 61 {% comment %}62 we also alias as 'media' because some medialibrary templates expect this name63 {% endcomment %}64 65 57 {% alias categorization.content_object as 'media' %} 58 {% endspaceless %} 66 59 <li>{% include template_path %}</li> 67 60 {% endfor %} -
cyclope/core/collections/templates/collections/category_teaser_list.html
r499 r626 3 3 {% load i18n cyclope_utils fb_versions %} 4 4 5 {% comment %} 6 The content of this view is composed by including a template for each content in the category 7 The included template may be something different from a teaser 8 {% endcomment %} 9 5 10 {% block category_content %} 6 7 {% comment %}8 The content of this view is composed by including a template for each content in the category9 The included template may be something different from a teaser10 {% endcomment %}11 12 11 {% for categorization in categorizations %} 12 {% spaceless %} 13 13 {% join categorization.content_type.app_label "/" categorization.content_type.model "_" inline_view_name ".html" as template_path %} 14 15 14 {% comment %} 16 we alias the actual object with the model name 17 so the included template is reusable18 and can access the content object using an explicitname15 we alias the actual object with the model name so the included template 16 is reusable and can access the content object using an explicit name 17 we also alias as 'media' because some medialibrary templates expect this name 19 18 {% endcomment %} 20 19 {% alias categorization.content_object as categorization.content_type.model %} 21 22 {% comment %}23 we also alias as 'media' because some medialibrary templates expect this name24 {% endcomment %}25 20 {% alias categorization.content_object as 'media' %} 26 21 {% endspaceless %} 27 22 {% include template_path %} 28 23 {% endfor %} 29 30 24 {% endblock %} -
cyclope/core/collections/templates/collections/hierarchycal_navigation_block.html
r499 r626 1 2 1 {% if category.collection.visible %} 3 4 2 {% if not region_name %} 5 3 <div id="categories_navigation" class="{{ category.collection.slug }} {{ category.slug }}"> … … 19 17 </div> 20 18 {% endif%} 21 22 19 {% endif %}
Note: See TracChangeset
for help on using the changeset viewer.

