moving url template tag to superarchives file

Sergio Oliveira
1 parent 06acd010
Showing 5 changed files with 23 additions and 30 deletions Show diff stats
src/super_archives/templates/message-list.html
src/super_archives/templates/message-thread.html
src/super_archives/templatetags/superarchives.py
src/super_archives/templatetags/urlutils.py
src/templates/search/search.html
 {% extends "base.html" %}
-{% load i18n %}
-{% load append_to_get %}
+{% load i18n superarchives %}
 {% block main-content %}
 <div>
   <h2>{% trans "Discussions" %}</h2>
 {% extends "base.html" %}
-{% load i18n append_to_get gravatar superarchives %}
+{% load i18n gravatar superarchives %}
  
 {% trans "Anonymous" as anonymous %}
  
  
 from django import template
  
+from super_archives.utils import url
+
  
 register = template.Library()
 TEMPLATE_PATH = 'superarchives/tags/'
@@ -12,3 +14,21 @@ def display_message(email):
         email.update_blocks()
  
     return { 'blocks': email.blocks.all }
+
+
+@register.simple_tag(takes_context=True)
+def append_to_get(context, **kwargs):
+    return url.append_to_get(
+        context['request'].META['PATH_INFO'],
+        context['request'].META['QUERY_STRING'],
+        **kwargs
+    )
+
+
+@register.simple_tag(takes_context=True)
+def pop_from_get(context, **kwargs):
+    return url.pop_from_get(
+        context['request'].META['PATH_INFO'],
+        context['request'].META['QUERY_STRING'],
+        **kwargs
+    )
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from django import template
-
-from super_archives.utils import url
-
-register = template.Library()
-
-
-@register.simple_tag(takes_context=True)
-def append_to_get(context, **kwargs):
-    return url.append_to_get(
-        context['request'].META['PATH_INFO'],
-        context['request'].META['QUERY_STRING'],
-        **kwargs
-    )
-
-@register.simple_tag(takes_context=True)
-def pop_from_get(context, **kwargs):
-    return url.pop_from_get(
-        context['request'].META['PATH_INFO'],
-        context['request'].META['QUERY_STRING'],
-        **kwargs
-    )
 {% extends "base.html" %}
-{% load i18n %}
-{% load urlutils %}
-{% load highlight %}
+{% load i18n highlight superarchives %}
  
 {% block main-content %}
   <div class="row">
1	1	{% extends "base.html" %}
2		-{% load i18n %}
3		-{% load append_to_get %}
	2	+{% load i18n superarchives %}
4	3	{% block main-content %}
5	4	<div>
6	5	<h2>{% trans "Discussions" %}</h2>
...	...
1	1	{% extends "base.html" %}
2		-{% load i18n append_to_get gravatar superarchives %}
	2	+{% load i18n gravatar superarchives %}
3	3
4	4	{% trans "Anonymous" as anonymous %}
5	5
...	...
1	1
2	2	from django import template
3	3
	4	+from super_archives.utils import url
	5	+
4	6
5	7	register = template.Library()
6	8	TEMPLATE_PATH = 'superarchives/tags/'
...	...	@@ -12,3 +14,21 @@ def display_message(email):
12	14	email.update_blocks()
13	15
14	16	return { 'blocks': email.blocks.all }
	17	+
	18	+
	19	+@register.simple_tag(takes_context=True)
	20	+def append_to_get(context, **kwargs):
	21	+ return url.append_to_get(
	22	+ context['request'].META['PATH_INFO'],
	23	+ context['request'].META['QUERY_STRING'],
	24	+ **kwargs
	25	+ )
	26	+
	27	+
	28	+@register.simple_tag(takes_context=True)
	29	+def pop_from_get(context, **kwargs):
	30	+ return url.pop_from_get(
	31	+ context['request'].META['PATH_INFO'],
	32	+ context['request'].META['QUERY_STRING'],
	33	+ **kwargs
	34	+ )
...	...
...	...	@@ -1,24 +0,0 @@
1		-# -- coding: utf-8 --
2		-
3		-from django import template
4		-
5		-from super_archives.utils import url
6		-
7		-register = template.Library()
8		-
9		-
10		-@register.simple_tag(takes_context=True)
11		-def append_to_get(context, **kwargs):
12		- return url.append_to_get(
13		- context['request'].META['PATH_INFO'],
14		- context['request'].META['QUERY_STRING'],
15		- **kwargs
16		- )
17		-
18		-@register.simple_tag(takes_context=True)
19		-def pop_from_get(context, **kwargs):
20		- return url.pop_from_get(
21		- context['request'].META['PATH_INFO'],
22		- context['request'].META['QUERY_STRING'],
23		- **kwargs
24		- )
1	1	{% extends "base.html" %}
2		-{% load i18n %}
3		-{% load urlutils %}
4		-{% load highlight %}
	2	+{% load i18n highlight superarchives %}
5	3
6	4	{% block main-content %}
7	5	<div class="row">
...	...