Changeset 155:d66540ebce8f

Timestamp:

08/08/10 19:56:02 (3 years ago)

Author:

nicoechaniz <nico@…>

Branch:

default

Message:

fixed collection categories_hierarchy view

Files:

• cyclope/core/collections/frontend_views.py (modified) (1 diff)
• cyclope/core/collections/templates/collections/collection_categories_hierarchy.html (modified) (1 diff)
• cyclope/default_settings.py (modified) (3 diffs)
• cyclope/templates/admin/change_form.html (modified) (1 diff)
• demo/cyclope_project/db/site.db (modified) (previous)
• demo/cyclope_project/local_settings.py (modified) (1 diff)
• demo/cyclope_project/media/uploads/archivito (added)
• demo/cyclope_project/media/uploads/edificios.swf (added)
• demo/cyclope_project/media/uploads/output.ogv (added)
• demo/cyclope_project/media/uploads/punch.mp3 (added)
• demo/cyclope_project/media/uploads/thumb.png (added)
• demo/cyclope_project/media/uploads/thumb_fb_thumb.png (added)
• demo/cyclope_project/media/uploads/thumb_thumbnail.png (added)
• demo/cyclope_project/media/uploads/undocumento.txt (added)

cyclope/core/collections/frontend_views.py

@@ -156 +156 @@
         for category in categories:
             category_list.extend(self._get_categories_nested_list(category))
-        c = RequestContext(request, {'categories': category_list})
+        c = RequestContext(request, {'categories': category_list,
+                                     'collection_slug': collection.slug})
         t = loader.get_template("collections/collection_categories_hierarchy.html")
         c['host_template'] = 'cyclope/inline_view.html'

cyclope/core/collections/templates/collections/collection_categories_hierarchy.html

@@ -5 +5 @@
 <script type="text/javascript">
 jQuery(document).ready(function(){
-  $('.collection.categories_hierarchy ul').css('display', 'none');
-  $(".collection.categories_hierarchy ul").first().css('display', 'block');
-  $('.expand_collapse').click(function() {
+  $('#{{ collection_slug }}_collection ul').css('display', 'none');
+  $("#{{ collection_slug }}_collection ul").first().css('display', 'block');
+  $('#{{ collection_slug }}_collection .expand_collapse').click(function() {
     if ($(this).text() == '+') $(this).text('-');
     else $(this).text('+');

cyclope/default_settings.py

@@ -1 +1 @@
 #!/usr/bin/env python
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2010 Código Sur - Nuestra América Asoc. Civil / Fundación Pacificar.
@@ -127 +127 @@
     'Folder': [''],
     'Image': ['.jpg','.jpeg','.gif','.png','.tif','.tiff'],
-    'Video': ['.ogg', '.mov','.wmv','.mpeg','.mpg','.avi','.rm',],
+    'Video': ['.ogv', '.ogg', '.mov','.wmv','.mpeg','.mpg','.avi','.rm',],
     'Document': ['.odt', 'docx', '.pdf','.doc','.rtf','.txt',
                  '.ods', '.xls','.csv'],
@@ -188 +188 @@
 HAYSTACK_SITECONF = 'cyclope_project.search_sites'
 HAYSTACK_SEARCH_ENGINE = 'whoosh'
-

cyclope/templates/admin/change_form.html

@@ -20 +20 @@
 <div class="breadcrumbs">
      <a href="../../../">{% trans "Home" %}</a> &rsaquo;
-     <a href="../../">{{ app_label|capfirst|escape }}</a> &rsaquo;
      {% if has_change_permission %}<a href="../">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} &rsaquo;
      {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %}

demo/cyclope_project/local_settings.py

@@ -8 +8 @@
 #SERVER_EMAIL = ""
 EMAIL_USE_TLS = True  # we set this to True for the sample email config
+
+CYCLOPE_PAGINATION = { 'TEASER' : 3, 'LABELED_ICON' : 5,}