diff --git a/pinax/projects/sample_group_project/apps/tag_app/__init__.py b/pinax/projects/sample_group_project/apps/tag_app/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/pinax/projects/sample_group_project/apps/tag_app/templates/tag_app/tag_list.html b/pinax/projects/sample_group_project/apps/tag_app/templates/tag_app/tag_list.html deleted file mode 100644 index 1780b4d3c..000000000 --- a/pinax/projects/sample_group_project/apps/tag_app/templates/tag_app/tag_list.html +++ /dev/null @@ -1,10 +0,0 @@ -{% load tagging_tags %} -{% load theme_tags %} - -{% tags_for_object obj as tags %} -{% if tags %} - {% silk "tag_blue" %} - {% for tag in tags %} - {{ tag }} - {% endfor %} -{% endif %} \ No newline at end of file diff --git a/pinax/projects/sample_group_project/apps/tag_app/templatetags/__init__.py b/pinax/projects/sample_group_project/apps/tag_app/templatetags/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/pinax/projects/sample_group_project/apps/tag_app/templatetags/extra_tagging_tags.py b/pinax/projects/sample_group_project/apps/tag_app/templatetags/extra_tagging_tags.py deleted file mode 100644 index 1e02b011a..000000000 --- a/pinax/projects/sample_group_project/apps/tag_app/templatetags/extra_tagging_tags.py +++ /dev/null @@ -1,20 +0,0 @@ -from django.conf import settings -from django.template import Library - - - -register = Library() - - - -@register.inclusion_tag("tag_app/tag_list.html") -def show_tags_for(obj): - return { - "obj": obj, - "MEDIA_URL": settings.MEDIA_URL, - "STATIC_URL": settings.STATIC_URL, - } - -@register.inclusion_tag("tag_app/tag_count_list.html") -def show_tag_counts(tag_counts): - return {"tag_counts": tag_counts} \ No newline at end of file diff --git a/pinax/projects/sample_group_project/settings.py b/pinax/projects/sample_group_project/settings.py index 8c61d9729..56815891a 100644 --- a/pinax/projects/sample_group_project/settings.py +++ b/pinax/projects/sample_group_project/settings.py @@ -179,13 +179,13 @@ "django_filters", "staticfiles", "debug_toolbar", - "flag", + "flag", + "tagging_ext", # internal (for now) "basic_profiles", "account", "signup_codes", - "tag_app", "tagging_utils", "threadedcomments_extras", diff --git a/pinax/projects/sample_group_project/urls.py b/pinax/projects/sample_group_project/urls.py index d801d392d..b167bd125 100644 --- a/pinax/projects/sample_group_project/urls.py +++ b/pinax/projects/sample_group_project/urls.py @@ -39,10 +39,47 @@ (r"^groups/", include("basic_groups.urls")), (r"^tribes/", include("tribes.urls")), (r"^projects/", include("projects.urls")), + (r"^flag/", include("flag.urls")), (r"^admin/", include(admin.site.urls)), ) +from tagging.models import TaggedItem + +from projects.models import Project +from tasks.models import Task +from topics.models import Topic +from wiki.models import Article as WikiArticle + +tagged_models = ( + dict(title="Projects", + query=lambda tag: TaggedItem.objects.get_by_model(Project, tag), + ), + dict(title="Topics", + query=lambda tag: TaggedItem.objects.get_by_model(Topic, tag), + ), + dict(title="Project Tasks", + query=lambda tag: TaggedItem.objects.get_by_model(Task, tag), + ), + dict(title="Wiki Articles", + query=lambda tag: TaggedItem.objects.get_by_model(WikiArticle, tag), + ), + + +) +tagging_ext_kwargs = { + 'tagged_models':tagged_models, +} + +urlpatterns += patterns('', + url(r'^tags/(?P.+)/(?P.+)$', 'tagging_ext.views.tag_by_model', + kwargs=tagging_ext_kwargs, name='tagging_ext_tag_by_model'), + url(r'^tags/(?P.+)/$', 'tagging_ext.views.tag', + kwargs=tagging_ext_kwargs, name='tagging_ext_tag'), + url(r'^tags/$', 'tagging_ext.views.index', name='tagging_ext_index'), +) + + if settings.SERVE_MEDIA: urlpatterns += patterns("",