From d87ee55b8e72da14c37a12084c5d5787515dd1c9 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria
Date: Wed, 12 Oct 2011 16:28:44 -0300
Subject: Adding macros/utils_macros renamed old macros into new ones.
---
.../default/templates/avatar/confirm_delete.html | 1 -
askbot/skins/default/templates/blocks/header.html | 2 +-
.../skins/default/templates/blocks/paginator.html | 4 +-
.../default/templates/blocks/user_navigation.html | 4 +-
askbot/skins/default/templates/macros/macros.html | 121 +--------------------
.../default/templates/macros/utils_macros.html | 105 ++++++++++++++++++
.../default/templates/main_page/paginator.html | 6 +-
askbot/skins/default/templates/question.html | 5 +-
askbot/skins/default/templates/tags.html | 3 +-
askbot/skins/default/templates/users.html | 4 +-
.../default/templates/widgets/tag_selector.html | 2 +-
11 files changed, 122 insertions(+), 135 deletions(-)
create mode 100644 askbot/skins/default/templates/macros/utils_macros.html
diff --git a/askbot/skins/default/templates/avatar/confirm_delete.html b/askbot/skins/default/templates/avatar/confirm_delete.html
index 282d72fa..ee3d10d7 100644
--- a/askbot/skins/default/templates/avatar/confirm_delete.html
+++ b/askbot/skins/default/templates/avatar/confirm_delete.html
@@ -1,5 +1,4 @@
{% extends "user_profile/user.html" %}
-{% import "macros.html" as macros %}
{% block profilesection %}{% trans %}delete avatar{% endtrans %}{% endblock %}
{% block usercontent %}
{% trans %}Please select the avatars that you would like to delete.{% endtrans %}
diff --git a/askbot/skins/default/templates/blocks/header.html b/askbot/skins/default/templates/blocks/header.html
index d18be8db..5ee9e52d 100644
--- a/askbot/skins/default/templates/blocks/header.html
+++ b/askbot/skins/default/templates/blocks/header.html
@@ -1,5 +1,5 @@
-{% import "macros/macros.html" as macros %}
+{% import "macros/utils_macros.html" as utils_macros %}
{% import "macros/user_macros.html" as user_macros %}
- {{ macros.paginator(paginator_context) }}
+ {{ utils_macros.paginator(paginator_context) }}
{% for answer in answers %}
@@ -291,7 +292,7 @@
{% endfor %}
- {{ macros.paginator(paginator_context) }}
+ {{ utils_macros.paginator(paginator_context) }}
{% else %}
{% set question_url=settings.APP_URL+question.get_absolute_url()|urlencode %}
{% trans %}Know someone who can answer? Share a link to this question via{% endtrans %}
diff --git a/askbot/skins/default/templates/tags.html b/askbot/skins/default/templates/tags.html
index aa1e55d5..43235e23 100644
--- a/askbot/skins/default/templates/tags.html
+++ b/askbot/skins/default/templates/tags.html
@@ -1,5 +1,6 @@
{% extends "two_column_body.html" %}
{% import "macros/macros.html" as macros %}
+{% import "macros/utils_macros.html" as utils_macros%}
{% block title %}{% spaceless %}{% trans %}Tag list{% endtrans %}{% endspaceless %}{% endblock %}
{% block content %}
@@ -47,7 +48,7 @@
{% endfor %}
{% endif %}
{% else %}
diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html
index 790be537..2604297f 100644
--- a/askbot/skins/default/templates/users.html
+++ b/askbot/skins/default/templates/users.html
@@ -1,6 +1,6 @@
{% extends "two_column_body.html" %}
-{% import "macros/macros.html" as macros %}
{% import "macros/user_macros.html" as user_macros %}
+{% import "macros/utils_macros.html" as utils_macros %}
{% block title %}{% spaceless %}{% trans %}Users{% endtrans %}{% endspaceless %}{% endblock %}
{% block content %}
@@ -43,7 +43,7 @@
{{ user_macros.user_list(users.object_list) }}
{% endblock %}
{% block endjs %}
diff --git a/askbot/skins/default/templates/widgets/tag_selector.html b/askbot/skins/default/templates/widgets/tag_selector.html
index be456ad1..8054ef63 100644
--- a/askbot/skins/default/templates/widgets/tag_selector.html
+++ b/askbot/skins/default/templates/widgets/tag_selector.html
@@ -1,5 +1,5 @@
{# todo - maybe disable navigation from ignored tags here when "hide" is on - with js? #}
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
{% trans %}Interesting tags{% endtrans %}
{{
--
cgit v1.2.3-1-g7c22