diff --git a/djangobb_forum/templates/djangobb_forum/add_topic.html b/djangobb_forum/templates/djangobb_forum/add_topic.html index cac1b71..b0c85fc 100644 --- a/djangobb_forum/templates/djangobb_forum/add_topic.html +++ b/djangobb_forum/templates/djangobb_forum/add_topic.html @@ -3,12 +3,12 @@ {% load i18n %} {% block page-name %}{% trans "New Topic" %}{% endblock %} -{% block mobile %}{% url djangobb:mobile_add_topic forum.id %}{% endblock %} +{% block mobile %}{% url 'djangobb:mobile_add_topic' forum.id %}{% endblock %} {% block content %} <div class="linkst"> <ul> - <li><a href="{% url djangobb:index %}">{% trans "Discussion Forums" %}</a></li> + <li><a href="{% url 'djangobb:index' %}">{% trans "Discussion Forums" %}</a></li> <li>» {% link forum %}</li> <li>» {% trans "New Topic" %}</li> </ul> diff --git a/djangobb_forum/templates/djangobb_forum/base.html b/djangobb_forum/templates/djangobb_forum/base.html index 730b6f7..94da565 100644 --- a/djangobb_forum/templates/djangobb_forum/base.html +++ b/djangobb_forum/templates/djangobb_forum/base.html @@ -12,8 +12,8 @@ {% set_theme_style request.user %} - <link rel="alternate" type="application/atom+xml" href="{% url djangobb:forum_posts_feed %}" title="{% trans "Latest posts on forum" %}" /> - <link rel="alternate" type="application/atom+xml" href="{% url djangobb:forum_topics_feed %}" title="{% trans "Latest topics on forum" %}" /> + <link rel="alternate" type="application/atom+xml" href="{% url 'djangobb:forum_posts_feed' %}" title="{% trans "Latest posts on forum" %}" /> + <link rel="alternate" type="application/atom+xml" href="{% url 'djangobb:forum_topics_feed' %}" title="{% trans "Latest topics on forum" %}" /> <link rel="shortcut icon" href="{{ STATIC_URL }}djangobb_forum/favicon.png" type="image/png" /> {% endblock %} @@ -33,7 +33,7 @@ <script type="text/javascript"> var STATIC_URL = "{{ STATIC_URL }}"; var MEDIA_URL = "{{ MEDIA_URL }}"; - var POST_PREVIEW_URL = "{% url djangobb:post_preview %}"; + var POST_PREVIEW_URL = "{% url 'djangobb:post_preview' %}"; </script> <script type="text/javascript" src="{{ STATIC_URL }}/djangobb_forum/scratchblocks2/scratchblocks2.js"></script> @@ -147,7 +147,7 @@ <p class="foot conr">Powered by <a href="http://djangobb.org/">DjangoBB</a></p> {% if forum_settings.LOFI_SUPPORT %} <p class="foot"> - <strong>Standard</strong> | <a href="{% block mobile %}{% url djangobb:mobile_index %}{% endblock mobile%}">Mobile</a> + <strong>Standard</strong> | <a href="{% block mobile %}{% url 'djangobb:mobile_index' %}{% endblock mobile%}">Mobile</a> </p> {% endif %} <div class="clearer"></div> diff --git a/djangobb_forum/templates/djangobb_forum/delete_posts.html b/djangobb_forum/templates/djangobb_forum/delete_posts.html index 8980e74..9f21b71 100644 --- a/djangobb_forum/templates/djangobb_forum/delete_posts.html +++ b/djangobb_forum/templates/djangobb_forum/delete_posts.html @@ -12,7 +12,7 @@ <div class="inbox"> <div class="pagelink conl">{% paginate %}</div> <ul> - <li><a href="{% url djangobb:index %}">{% trans "Discussion Forums" %}</a></li> + <li><a href="{% url 'djangobb:index' %}">{% trans "Discussion Forums" %}</a></li> <li>» {% link topic.forum %}</li> <li>» {% link topic %}</li> <li>» {% trans "Delete Posts" %}</li> diff --git a/djangobb_forum/templates/djangobb_forum/edit_post.html b/djangobb_forum/templates/djangobb_forum/edit_post.html index f2df868..78e8699 100644 --- a/djangobb_forum/templates/djangobb_forum/edit_post.html +++ b/djangobb_forum/templates/djangobb_forum/edit_post.html @@ -8,7 +8,7 @@ <div class="linkst"> <div class="inbox"> <ul> - <li><a href="{% url djangobb:index %}">{% trans "Discussion Forums" %}</a></li> + <li><a href="{% url 'djangobb:index' %}">{% trans "Discussion Forums" %}</a></li> <li>» {% link post.topic.forum %} </li> <li>» {% link post.topic %}</li> <li>» {% trans "Edit Post" %}</li> diff --git a/djangobb_forum/templates/djangobb_forum/forum.html b/djangobb_forum/templates/djangobb_forum/forum.html index 45f8219..2791f6a 100644 --- a/djangobb_forum/templates/djangobb_forum/forum.html +++ b/djangobb_forum/templates/djangobb_forum/forum.html @@ -12,16 +12,16 @@ <div class="linkst"> {% paginate %} <ul> - <li><a href="{% url djangobb:index %}">{% trans "Discussion Forums" %}</a></li> + <li><a href="{% url 'djangobb:index' %}">{% trans "Discussion Forums" %}</a></li> <li> - » {{ forum.name }} <a href="{% url djangobb:forum_forum_feed forum.id %}"><img src="{{ STATIC_URL }}djangobb_forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" class="breadcrumb_rss" /></a> + » {{ forum.name }} <a href="{% url 'djangobb:forum_forum_feed' forum.id %}"><img src="{{ STATIC_URL }}djangobb_forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" class="breadcrumb_rss" /></a> </li> </ul> </div> <div id="vf" class="blocktable"> <div class="box"> {% if can_create_topics %} - <a class="small button new_topic" href="{% url djangobb:add_topic forum.id %}" title="{% trans "Can't find an answer to your question? Click here to ask it in a new thread." %}"><span>{% trans "New topic" %}</span></a> + <a class="small button new_topic" href="{% url 'djangobb:add_topic' forum.id %}" title="{% trans "Can't find an answer to your question? Click here to ask it in a new thread." %}"><span>{% trans "New topic" %}</span></a> {% endif %} <div class="box-head"> <h4> @@ -54,7 +54,7 @@ {% endif %} <h3 {% if not topic|has_unreads:user %}class="topic_isread"{% endif %}>{% link topic %}</h3> <span class="byuser">{% trans "by" %} {{ topic.user.username }}</span> - {% if topic|has_unreads:user %}<a href="{% url djangobb:topic_unread topic.id %}">{% trans "(New Posts)" %}</a>{% endif %} + {% if topic|has_unreads:user %}<a href="{% url 'djangobb:topic_unread' topic.id %}">{% trans "(New Posts)" %}</a>{% endif %} </div> </div> </td> @@ -74,9 +74,9 @@ <div class="linksb"> {% paginate %} <ul> - <li><a href="{% url djangobb:index %}">{% trans "Discussion Forums" %}</a> </li> + <li><a href="{% url 'djangobb:index' %}">{% trans "Discussion Forums" %}</a> </li> <li> - » {{ forum.name }} <a href="{% url djangobb:forum_forum_feed forum.id %}"><img src="{{ STATIC_URL }}djangobb_forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" class="breadcrumb_rss" /></a> + » {{ forum.name }} <a href="{% url 'djangobb:forum_forum_feed' forum.id %}"><img src="{{ STATIC_URL }}djangobb_forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" class="breadcrumb_rss" /></a> </li> </ul> </div> @@ -89,7 +89,7 @@ <form id="qjump" method="get" action="forum"> <div><label>{% trans "Jump to" %} <br /> - <select name="id" id="forum_id" onchange="window.location=('{% url djangobb:index %}'+this.options[this.selectedIndex].value)"> + <select name="id" id="forum_id" onchange="window.location=('{% url 'djangobb:index' %}'+this.options[this.selectedIndex].value)"> {% for category in categories %} <optgroup label="{{ category }}"> {% for forum in category.forums.all %} @@ -103,7 +103,7 @@ {% endif %} {% endcomment %} {% if moderator %} - <p id="modcontrols"><a class="moderator-only" href="{% url djangobb:moderate forum.id %}">{% trans "Moderate forum" %}</a></p> + <p id="modcontrols"><a class="moderator-only" href="{% url 'djangobb:moderate' forum.id %}">{% trans "Moderate forum" %}</a></p> {% endif %} </div> {% endblock %} diff --git a/djangobb_forum/templates/djangobb_forum/forum_row.html b/djangobb_forum/templates/djangobb_forum/forum_row.html index 0e1c0d7..4e47e3f 100644 --- a/djangobb_forum/templates/djangobb_forum/forum_row.html +++ b/djangobb_forum/templates/djangobb_forum/forum_row.html @@ -11,7 +11,7 @@ </div> <div class="tclcon"> <h3>{% link forum %} - {% if forum_settings.RSS %} <a href="{% url djangobb:forum_forum_feed forum.id %}"><img src="{{ STATIC_URL }}djangobb_forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" class="rss" /></a> + {% if forum_settings.RSS %} <a href="{% url 'djangobb:forum_forum_feed' forum.id %}"><img src="{{ STATIC_URL }}djangobb_forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" class="rss" /></a> {% endif %} </h3> {{ forum.description|safe }} diff --git a/djangobb_forum/templates/djangobb_forum/header.html b/djangobb_forum/templates/djangobb_forum/header.html index dbe1dbc..83b1516 100644 --- a/djangobb_forum/templates/djangobb_forum/header.html +++ b/djangobb_forum/templates/djangobb_forum/header.html @@ -7,23 +7,23 @@ <div id="djangobbindex" class="djangobb"> <div id="brdheader" class="box"> <div class="box-head"> - <h2><!--<span><a href="{% url djangobb:index %}">-->{{ forum_settings.HEADER|safe }}<!--</a></span>--></h2> + <h2><!--<span><a href="{% url 'djangobb:index' %}">-->{{ forum_settings.HEADER|safe }}<!--</a></span>--></h2> <p><span>{{ forum_settings.TAGLINE|safe }}</span></p> </div> <div id="brdmenu" class="box-content"> {% if user.is_authenticated %} <ul class="conr"> - <li><a href="{% url djangobb:search %}?action=show_new">{% trans "Show new posts since last visit" %}</a></li> + <li><a href="{% url 'djangobb:search' %}?action=show_new">{% trans "Show new posts since last visit" %}</a></li> </ul> {% endif %} <ul> {% block menu %} - <li id="navindex"><a href="{% url djangobb:index %}">{% trans "Discussion Home" %}</a></li> + <li id="navindex"><a href="{% url 'djangobb:index' %}">{% trans "Discussion Home" %}</a></li> {% ifswitch google_searches %}{% else %} - <li id="navsearch"><a href="{% url djangobb:search %}">{% trans "Search" %}</a></li> + <li id="navsearch"><a href="{% url 'djangobb:search' %}">{% trans "Search" %}</a></li> {% endifswitch %} {% if user|forum_can_view_reports %} - <li class="moderator-only"><a href="{% url djangobb:forum_reports %}"> + <li class="moderator-only"><a href="{% url 'djangobb:forum_reports' %}"> {% with user|forum_reports as report_count %} {% if report_count %} <strong>{% blocktrans %}Reports ({{ report_count }}){% endblocktrans %}</strong> diff --git a/djangobb_forum/templates/djangobb_forum/index.html b/djangobb_forum/templates/djangobb_forum/index.html index c021f84..0a9729e 100644 --- a/djangobb_forum/templates/djangobb_forum/index.html +++ b/djangobb_forum/templates/djangobb_forum/index.html @@ -3,7 +3,7 @@ {% load i18n %} {% block page-title %}{% trans "Discuss Scratch" %}{% endblock %} -{% block mobile %}{% url djangobb:mobile_index %}{% endblock %} +{% block mobile %}{% url 'djangobb:mobile_index' %}{% endblock %} {% block extra_meta %} <script type="text/javascript"> @@ -74,15 +74,15 @@ {{ block.super }} <ul class="conl"> {% if user.is_authenticated %} - <li>{% trans "Show your" %} <a href="{% url djangobb:search %}?action=show_user&show_as=topics">{% trans "topics" %}</a>/<a href="{% url djangobb:search %}?action=show_user&show_as=posts">{% trans "posts" %}</a></li> - <li id="navprofile"><a href="{% url djangobb:forum_settings request.user %}">{% trans "Change your signature" %}</a></li> + <li>{% trans "Show your" %} <a href="{% url 'djangobb:search' %}?action=show_user&show_as=topics">{% trans "topics" %}</a>/<a href="{% url 'djangobb:search' %}?action=show_user&show_as=posts">{% trans "posts" %}</a></li> + <li id="navprofile"><a href="{% url 'djangobb:forum_settings' request.user %}">{% trans "Change your signature" %}</a></li> {% endif %} </ul> <ul class="conr"> - <li><a href="{% url djangobb:search %}?action=show_24h">{% trans "Show recent posts" %}</a></li> - <li><a href="{% url djangobb:search %}?action=show_unanswered">{% trans "Show unanswered posts" %}</a></li> + <li><a href="{% url 'djangobb:search' %}?action=show_24h">{% trans "Show recent posts" %}</a></li> + <li><a href="{% url 'djangobb:search' %}?action=show_unanswered">{% trans "Show unanswered posts" %}</a></li> {% if user.is_authenticated %} - <li><a href="{% url djangobb:misc %}?action=markread">{% trans "Mark all topics as read" %}</a></li> + <li><a href="{% url 'djangobb:misc' %}?action=markread">{% trans "Mark all topics as read" %}</a></li> {% endif %} </ul> {% endblock %} diff --git a/djangobb_forum/templates/djangobb_forum/mobile/add_topic.html b/djangobb_forum/templates/djangobb_forum/mobile/add_topic.html index e0f36cc..e8427e0 100644 --- a/djangobb_forum/templates/djangobb_forum/mobile/add_topic.html +++ b/djangobb_forum/templates/djangobb_forum/mobile/add_topic.html @@ -2,10 +2,10 @@ {% load i18n %} {% load forum_extras %} -{% block full-link %}{% url djangobb:add_topic forum.id %}{% endblock %} +{% block full-link %}{% url 'djangobb:add_topic' forum.id %}{% endblock %} {% block title %} - <span><a href="{% url djangobb:mobile_index %}">{% trans "Discuss" %}</a></span> + <span><a href="{% url 'djangobb:mobile_index' %}">{% trans "Discuss" %}</a></span> <span>{{ forum|mobile_link }}</span> {% block page-name %}{% trans "New Topic" %}{% endblock %} {% endblock %} diff --git a/djangobb_forum/templates/djangobb_forum/mobile/base.html b/djangobb_forum/templates/djangobb_forum/mobile/base.html index fb7ef9b..9920d2d 100644 --- a/djangobb_forum/templates/djangobb_forum/mobile/base.html +++ b/djangobb_forum/templates/djangobb_forum/mobile/base.html @@ -17,11 +17,11 @@ <div class=content>{% block content %}{% endblock %}</div> {% mobile_pagination %} <footer> - <p class=right><a href="{% url djangobb:mobile_search %}">{% trans "Search" %}</a></p> + <p class=right><a href="{% url 'djangobb:mobile_search' %}">{% trans "Search" %}</a></p> <p><a href="{% block full-link %}{% endblock %}">Standard</a> | <strong>Mobile</strong></p> <p>{% if user.is_authenticated %} - {% blocktrans %}Signed in as <strong>{{ user }}</strong>{% endblocktrans %} | <a href="{% url logout %}?next={% url djangobb:mobile_index %}">Sign Out</a> + {% blocktrans %}Signed in as <strong>{{ user }}</strong>{% endblocktrans %} | <a href="{% url logout %}?next={% url 'djangobb:mobile_index' %}">Sign Out</a> {% else %} - Not signed in | <a href="{% url djangobb:mobile_sign_in %}">{% trans "Sign In" %}</a> + Not signed in | <a href="{% url 'djangobb:mobile_sign_in' %}">{% trans "Sign In" %}</a> {% endif %}</p> </footer>{% endblock %}</body> diff --git a/djangobb_forum/templates/djangobb_forum/mobile/forum.html b/djangobb_forum/templates/djangobb_forum/mobile/forum.html index 96a5725..4f45a6b 100644 --- a/djangobb_forum/templates/djangobb_forum/mobile/forum.html +++ b/djangobb_forum/templates/djangobb_forum/mobile/forum.html @@ -6,13 +6,13 @@ {% block full-link %}{{ forum.get_absolute_url }}{% endblock %} {% block title %} - <span><a href="{% url djangobb:mobile_index %}">{% trans "Discuss" %}</a></span> + <span><a href="{% url 'djangobb:mobile_index' %}">{% trans "Discuss" %}</a></span> {% block page-name %}{{ forum.name }}{% endblock %} {% endblock %} {% block root %}{% autopaginate topics forum_settings.FORUM_PAGE_SIZE %}{{ block.super }}{% endblock %} {% block content %} -{% if can_create_topics %}<p class=list-header><a href="{% url djangobb:mobile_add_topic forum.id %}">New Topic</a></p>{% endif %} +{% if can_create_topics %}<p class=list-header><a href="{% url 'djangobb:mobile_add_topic' forum.id %}">New Topic</a></p>{% endif %} {% include 'djangobb_forum/mobile/includes/topic_list.html' with topics=topics %} {% endblock %} diff --git a/djangobb_forum/templates/djangobb_forum/mobile/includes/topic_list.html b/djangobb_forum/templates/djangobb_forum/mobile/includes/topic_list.html index 0fd27d0..38e592b 100644 --- a/djangobb_forum/templates/djangobb_forum/mobile/includes/topic_list.html +++ b/djangobb_forum/templates/djangobb_forum/mobile/includes/topic_list.html @@ -2,7 +2,7 @@ {% load forum_extras %} <ol class="topic list">{% for topic in topics %}{% with unread=topic|has_unreads:user %} <li class="{% if topic.sticky %}sticky {% endif %}{% if topic.closed %}closed {% endif %}{% if unread %}unread{% endif %}"> - <a class="item" href="{% if unread %}{% url djangobb:mobile_topic_unread topic.id %}{% else %}{{ topic.get_mobile_url }}{% endif %}"> + <a class="item" href="{% if unread %}{% url 'djangobb:mobile_topic_unread' topic.id %}{% else %}{{ topic.get_mobile_url }}{% endif %}"> <strong>{{ topic.name }}</strong> <span>{% blocktrans count topic.reply_count as replies %}{{ replies }} reply{% plural %}{{ replies }} replies{% endblocktrans %}</span> </a> diff --git a/djangobb_forum/templates/djangobb_forum/mobile/index.html b/djangobb_forum/templates/djangobb_forum/mobile/index.html index b0326c7..ea1c551 100644 --- a/djangobb_forum/templates/djangobb_forum/mobile/index.html +++ b/djangobb_forum/templates/djangobb_forum/mobile/index.html @@ -22,6 +22,6 @@ </ul> {% endblock %} -{% block full-link %}{% url djangobb:index %}{% endblock %} +{% block full-link %}{% url 'djangobb:index' %}{% endblock %} diff --git a/djangobb_forum/templates/djangobb_forum/mobile/reply.html b/djangobb_forum/templates/djangobb_forum/mobile/reply.html index d43bc95..8a913ca 100644 --- a/djangobb_forum/templates/djangobb_forum/mobile/reply.html +++ b/djangobb_forum/templates/djangobb_forum/mobile/reply.html @@ -2,10 +2,10 @@ {% load i18n %} {% load forum_extras %} -{% block full-link %}{% url djangobb:topic post.topic.id %}{% endblock %} +{% block full-link %}{% url 'djangobb:topic' post.topic.id %}{% endblock %} {% block title %} - <span><a href="{% url djangobb:mobile_index %}">{% trans "Discuss" %}</a></span> + <span><a href="{% url 'djangobb:mobile_index' %}">{% trans "Discuss" %}</a></span> <span>{{ post.topic.forum|mobile_link }}</span> <span>{{ post.topic|mobile_link }}</span> {% block page-name %}{% trans "Reply" %}{% endblock %} diff --git a/djangobb_forum/templates/djangobb_forum/mobile/search_form.html b/djangobb_forum/templates/djangobb_forum/mobile/search_form.html index 654e63c..7253263 100644 --- a/djangobb_forum/templates/djangobb_forum/mobile/search_form.html +++ b/djangobb_forum/templates/djangobb_forum/mobile/search_form.html @@ -3,10 +3,10 @@ {% load pagination_tags %} {% load forum_extras %} -{% block full-link %}{% url djangobb:search %}{% endblock %} +{% block full-link %}{% url 'djangobb:search' %}{% endblock %} {% block title %} - <span><a href="{% url djangobb:mobile_index %}">{% trans "Discuss" %}</a></span> + <span><a href="{% url 'djangobb:mobile_index' %}">{% trans "Discuss" %}</a></span> {% block page-name %}{% trans "Search" %}{% endblock %} {% endblock %} diff --git a/djangobb_forum/templates/djangobb_forum/mobile/search_posts.html b/djangobb_forum/templates/djangobb_forum/mobile/search_posts.html index ceb4997..51e5433 100644 --- a/djangobb_forum/templates/djangobb_forum/mobile/search_posts.html +++ b/djangobb_forum/templates/djangobb_forum/mobile/search_posts.html @@ -6,7 +6,7 @@ {% block root %}{% autopaginate posts forum_settings.FORUM_PAGE_SIZE %}{{ block.super }}{% endblock %} {% block title %} - <span><a href="{% url djangobb:mobile_index %}">{% trans "Discuss" %}</a></span> + <span><a href="{% url 'djangobb:mobile_index' %}">{% trans "Discuss" %}</a></span> {% block page-name %}{% trans "Search Results" %}{% endblock %} {% endblock %} diff --git a/djangobb_forum/templates/djangobb_forum/mobile/search_topics.html b/djangobb_forum/templates/djangobb_forum/mobile/search_topics.html index c858e8d..d8e3ab5 100644 --- a/djangobb_forum/templates/djangobb_forum/mobile/search_topics.html +++ b/djangobb_forum/templates/djangobb_forum/mobile/search_topics.html @@ -6,7 +6,7 @@ {% block root %}{% autopaginate topics forum_settings.FORUM_PAGE_SIZE %}{{ block.super }}{% endblock %} {% block title %} - <span><a href="{% url djangobb:mobile_index %}">{% trans "Discuss" %}</a></span> + <span><a href="{% url 'djangobb:mobile_index' %}">{% trans "Discuss" %}</a></span> {% block page-name %}{% trans "Search Results" %}{% endblock %} {% endblock %} diff --git a/djangobb_forum/templates/djangobb_forum/mobile/sign_in.html b/djangobb_forum/templates/djangobb_forum/mobile/sign_in.html index 197e385..7e5fe8d 100644 --- a/djangobb_forum/templates/djangobb_forum/mobile/sign_in.html +++ b/djangobb_forum/templates/djangobb_forum/mobile/sign_in.html @@ -3,14 +3,14 @@ {% load i18n %} {% block title %} - <span><a href="{% url djangobb:mobile_index %}">{% trans "Discuss" %}</a></span> + <span><a href="{% url 'djangobb:mobile_index' %}">{% trans "Discuss" %}</a></span> {% block page-name %}{% trans "Sign In" %}{% endblock %} {% endblock %} {% block content %} <form method=post> {% csrf_token %} - <input type="hidden" name="next" value="{% url djangobb:mobile_index %}" /> + <input type="hidden" name="next" value="{% url 'djangobb:mobile_index' %}" /> {{ form.non_field_errors }} <fieldset> <label> diff --git a/djangobb_forum/templates/djangobb_forum/mobile/topic.html b/djangobb_forum/templates/djangobb_forum/mobile/topic.html index 2eb89f4..7d1f967 100644 --- a/djangobb_forum/templates/djangobb_forum/mobile/topic.html +++ b/djangobb_forum/templates/djangobb_forum/mobile/topic.html @@ -7,7 +7,7 @@ {% block full-link %}{{ topic.get_absolute_url }}{% endblock %} {% block title %} - <span><a href="{% url djangobb:mobile_index %}">{% trans "Discuss" %}</a></span> + <span><a href="{% url 'djangobb:mobile_index' %}">{% trans "Discuss" %}</a></span> <span>{{ topic.forum|mobile_link }}</span> {% block page-name %}{{ topic.name }}{% endblock %} {% endblock %} @@ -21,7 +21,7 @@ <header> <time datetime={{ post.created|date:"c" }}>{{ post.created|localtime|forum_time }}</time> {% if reply_form %} - <a class=reply href="{% url djangobb:mobile_reply post.id %}">Reply</a> + <a class=reply href="{% url 'djangobb:mobile_reply' post.id %}">Reply</a> {% endif %} <h1>{{ post.user.username }}</h1> </header> diff --git a/djangobb_forum/templates/djangobb_forum/moderate.html b/djangobb_forum/templates/djangobb_forum/moderate.html index ca40e7b..abedbf7 100644 --- a/djangobb_forum/templates/djangobb_forum/moderate.html +++ b/djangobb_forum/templates/djangobb_forum/moderate.html @@ -11,7 +11,7 @@ <div class="linkst"> {% paginate %} <ul> - <li><a href="{% url djangobb:index %}">{% trans "Discussion Forums" %}</a></li> + <li><a href="{% url 'djangobb:index' %}">{% trans "Discussion Forums" %}</a></li> <li>» {% link forum %}</li> <li>» {% trans "Moderate Forum" %}</li> </ul> @@ -69,7 +69,7 @@ <div class="linksb"> {% paginate %} <ul> - <li><a href="{% url djangobb:index %}">{% trans "Discussion Forums" %}</a></li> + <li><a href="{% url 'djangobb:index' %}">{% trans "Discussion Forums" %}</a></li> <li>» {% link forum %}</li> <li>» {% trans "Moderate Forum" %}</li> </ul> diff --git a/djangobb_forum/templates/djangobb_forum/move_posts.html b/djangobb_forum/templates/djangobb_forum/move_posts.html index c98354b..637affa 100644 --- a/djangobb_forum/templates/djangobb_forum/move_posts.html +++ b/djangobb_forum/templates/djangobb_forum/move_posts.html @@ -16,7 +16,7 @@ <div class="linkst"> {% paginate %} <ul> - <li><a href="{% url djangobb:index %}">{% trans "Discussion Forums" %}</a></li> + <li><a href="{% url 'djangobb:index' %}">{% trans "Discussion Forums" %}</a></li> <li>» {% link topic.forum %}</li> <li>» {% link topic %}</li> <li>» {% trans "Move Posts" %}</li> @@ -62,7 +62,7 @@ <div class="linksb"> {% paginate %} <ul> - <li><a href="{% url djangobb:index %}">{% trans "Discussion Forums" %}</a></li> + <li><a href="{% url 'djangobb:index' %}">{% trans "Discussion Forums" %}</a></li> <li>» {% link topic.forum %}</li> <li>» {% link topic %}</li> <li>» {% trans "Move Posts" %}</li> diff --git a/djangobb_forum/templates/djangobb_forum/move_topic.html b/djangobb_forum/templates/djangobb_forum/move_topic.html index 982261d..0ebbf7a 100644 --- a/djangobb_forum/templates/djangobb_forum/move_topic.html +++ b/djangobb_forum/templates/djangobb_forum/move_topic.html @@ -7,7 +7,7 @@ {% block content %} <div class="linkst"> <ul> - <li><a href="{% url djangobb:index %}">{% trans "Discussion Forums" %}</a></li> + <li><a href="{% url 'djangobb:index' %}">{% trans "Discussion Forums" %}</a></li> <li>» {% trans "Move Topic" %}</li> </ul> </div> @@ -17,7 +17,7 @@ <h4>{% trans "Move Topic" %}</h4> </div> <div class="box-content"> - <form method="post" action="{% url djangobb:move_topic %}"> + <form method="post" action="{% url 'djangobb:move_topic' %}"> {% csrf_token %} {% for topic_id in topic_ids %} <input type="hidden" value="{{ topic_id }}" name="topic_id"/> diff --git a/djangobb_forum/templates/djangobb_forum/report.html b/djangobb_forum/templates/djangobb_forum/report.html index 66bcbcd..b087001 100644 --- a/djangobb_forum/templates/djangobb_forum/report.html +++ b/djangobb_forum/templates/djangobb_forum/report.html @@ -8,7 +8,7 @@ <div class="linkst"> <div class="inbox"> <ul> - <li><a href="{% url djangobb:index %}">{% trans "Discussion Forums" %}</a></li> + <li><a href="{% url 'djangobb:index' %}">{% trans "Discussion Forums" %}</a></li> <li>» {% link post.topic.forum %} </li> <li>» {% link post.topic %}</li> <li>» {% trans "Report Post" %}</li> diff --git a/djangobb_forum/templates/djangobb_forum/reputation.html b/djangobb_forum/templates/djangobb_forum/reputation.html index d103038..d5d67b7 100644 --- a/djangobb_forum/templates/djangobb_forum/reputation.html +++ b/djangobb_forum/templates/djangobb_forum/reputation.html @@ -33,7 +33,7 @@ <tbody> {% for reputation in reputations %} <tr> - <td><a href="{% url djangobb:reputation reputation.from_user %}">{{ reputation.from_user }}</a></td> + <td><a href="{% url 'djangobb:reputation' reputation.from_user %}">{{ reputation.from_user }}</a></td> <td><a href="{{ reputation.post.get_absolute_url }}">{{ reputation.post.topic }}</a></td> <td>{{ reputation.reason }}</td> <td style="text-align: center;"> diff --git a/djangobb_forum/templates/djangobb_forum/reputation_form.html b/djangobb_forum/templates/djangobb_forum/reputation_form.html index 9c29450..befda5d 100644 --- a/djangobb_forum/templates/djangobb_forum/reputation_form.html +++ b/djangobb_forum/templates/djangobb_forum/reputation_form.html @@ -7,7 +7,7 @@ <h2><span>{% trans "Please, fill the form" %}</span></h2> <div class="box"> <div class="inbox"> - <form action="{% url djangobb:reputation form.to_user %}" method="post"> + <form action="{% url 'djangobb:reputation' form.to_user %}" method="post"> {% csrf_token %} <table cellspacing="0"> {{ form.errors.as_ul }} diff --git a/djangobb_forum/templates/djangobb_forum/search_form.html b/djangobb_forum/templates/djangobb_forum/search_form.html index f9e465d..53b4a48 100644 --- a/djangobb_forum/templates/djangobb_forum/search_form.html +++ b/djangobb_forum/templates/djangobb_forum/search_form.html @@ -3,7 +3,7 @@ {% load i18n %} {% block page-name %}{% trans "Search" %}{% endblock %} -{% block mobile %}{% url djangobb:mobile_search %}{% endblock %} +{% block mobile %}{% url 'djangobb:mobile_search' %}{% endblock %} {% block js %} {{ block.super }} diff --git a/djangobb_forum/templates/djangobb_forum/search_posts.html b/djangobb_forum/templates/djangobb_forum/search_posts.html index 0b6851b..fff8e44 100644 --- a/djangobb_forum/templates/djangobb_forum/search_posts.html +++ b/djangobb_forum/templates/djangobb_forum/search_posts.html @@ -40,11 +40,11 @@ {% block controls %} <dl id="searchlinks" class="conl"> <dt><strong>{% trans "Search links" %}</strong></dt> - <dd><a href="{% url djangobb:search %}?action=show_24h">{% trans "Show recent posts" %}</a></dd> - <dd><a href="{% url djangobb:search %}?action=show_unanswered">{% trans "Show unanswered posts" %}</a></dd> + <dd><a href="{% url 'djangobb:search' %}?action=show_24h">{% trans "Show recent posts" %}</a></dd> + <dd><a href="{% url 'djangobb:search' %}?action=show_unanswered">{% trans "Show unanswered posts" %}</a></dd> {% if user.is_authenticated %} - <dd><a href="{% url djangobb:search %}?action=show_subscriptions">{% trans "Show your subscribed topics" %}</a></dd> - <dd><a href="{% url djangobb:search %}?action=show_user">{% trans "Show your topics" %}</a></dd> + <dd><a href="{% url 'djangobb:search' %}?action=show_subscriptions">{% trans "Show your subscribed topics" %}</a></dd> + <dd><a href="{% url 'djangobb:search' %}?action=show_user">{% trans "Show your topics" %}</a></dd> {% endif %} </dl> {% endblock %} diff --git a/djangobb_forum/templates/djangobb_forum/topic.html b/djangobb_forum/templates/djangobb_forum/topic.html index 03596d0..bb70f7b 100644 --- a/djangobb_forum/templates/djangobb_forum/topic.html +++ b/djangobb_forum/templates/djangobb_forum/topic.html @@ -15,8 +15,8 @@ <div class="follow-topic top"> <img src="{{ STATIC_URL }}/images/ajax-loader.gif" class="loading" style="display: none;" alt="{% trans 'loading...' %}" /> <p class="error" style="display: none;">{% trans "There was an error :( Try again?" %}</p> - <a {% if subscribed %}style="display: none;"{% endif %} class="follow-button button blue" href="{% url djangobb:forum_add_subscription topic.id %}" title="{% trans "Follow this discussion to get a message when there's a new post" %}">{% trans 'Follow Discussion' %}</a> - <a {% if not subscribed %}style="display: none;"{% endif %} class="unfollow-button button grey" href="{% url djangobb:forum_delete_subscription topic.id %}" title="{% trans 'Stop getting messages about new posts to this discussion' %}">{% trans 'Unfollow Discussion' %}</a> + <a {% if subscribed %}style="display: none;"{% endif %} class="follow-button button blue" href="{% url 'djangobb:forum_add_subscription' topic.id %}" title="{% trans "Follow this discussion to get a message when there's a new post" %}">{% trans 'Follow Discussion' %}</a> + <a {% if not subscribed %}style="display: none;"{% endif %} class="unfollow-button button grey" href="{% url 'djangobb:forum_delete_subscription' topic.id %}" title="{% trans 'Stop getting messages about new posts to this discussion' %}">{% trans 'Unfollow Discussion' %}</a> </div> {% endif %} @@ -24,8 +24,8 @@ <ul> <li> - <a href="{% url djangobb:index %}">{% trans "Discussion Forums" %}</a> </li><li>» {% link topic.forum %} </li><li>» {{ topic.name }} - <a href="{% url djangobb:forum_topic_feed topic.id %}"><img src="{{ STATIC_URL }}/djangobb_forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" class="breadcrumb_rss" /></a> + <a href="{% url 'djangobb:index' %}">{% trans "Discussion Forums" %}</a> </li><li>» {% link topic.forum %} </li><li>» {{ topic.name }} + <a href="{% url 'djangobb:forum_topic_feed' topic.id %}"><img src="{{ STATIC_URL }}/djangobb_forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" class="breadcrumb_rss" /></a> </li> </ul> </div> @@ -134,7 +134,7 @@ <div class="postsignature"> <hr> {% if moderator %} - <a class="edit-signature" href="{% url djangobb:forum_settings post.user.username %}">{% trans "(Edit Signature)" %}</a> + <a class="edit-signature" href="{% url 'djangobb:forum_settings' post.user.username %}">{% trans "(Edit Signature)" %}</a> {% endif %} {{ post.user.forum_profile.signature_html|safe }} </div> @@ -155,20 +155,20 @@ <div class="postfootright"> <ul> {% if user.is_authenticated %} - <li class="postreport"><a href="{% url djangobb:misc %}?action=report&post_id={{ post.id }}">{% trans "Report" %}</a> </li> + <li class="postreport"><a href="{% url 'djangobb:misc' %}?action=report&post_id={{ post.id }}">{% trans "Report" %}</a> </li> {% if moderator and post.poststatus and post.poststatus|can_proceed:"mark_spam" %} - <li class="postmarkspam">| <a onclick="return confirm('{% trans "Are you sure you want to mark this as spam?" %}')" href="{% url djangobb:mark_post_spam post.id %}">{% trans "Mark as Spam" %}</a> </li> + <li class="postmarkspam">| <a onclick="return confirm('{% trans "Are you sure you want to mark this as spam?" %}')" href="{% url 'djangobb:mark_post_spam' post.id %}">{% trans "Mark as Spam" %}</a> </li> {% endif %} {% if moderator and post.poststatus and post.poststatus|can_proceed:"mark_ham" %} - <li class="postmarkham">| <a onclick="return confirm('{% trans "Are you sure you want to unmark this as spam?" %}')" href="{% url djangobb:mark_post_ham post.id %}">{% trans "Un-mark as Spam" %}</a> </li> + <li class="postmarkham">| <a onclick="return confirm('{% trans "Are you sure you want to unmark this as spam?" %}')" href="{% url 'djangobb:mark_post_ham' post.id %}">{% trans "Un-mark as Spam" %}</a> </li> {% endif %} {% if reply_form %} {% if moderator or user|forum_can_delete:post %} - <li class="postdelete">| <a onclick="return confirm('{% trans "Are you sure you want to delete this post?" %}')" href="{% url djangobb:delete_post post.id %}">{% trans "Delete" %}</a> </li> + <li class="postdelete">| <a onclick="return confirm('{% trans "Are you sure you want to delete this post?" %}')" href="{% url 'djangobb:delete_post' post.id %}">{% trans "Delete" %}</a> </li> {% endif %} {% if moderator or post|forum_posted_by:user %} {% if post in editable or can_edit %} - <li class="postedit">| <a href="{% url djangobb:edit_post post.id %}">{% trans "Edit" %}</a> </li> + <li class="postedit">| <a href="{% url 'djangobb:edit_post' post.id %}">{% trans "Edit" %}</a> </li> {% endif %} {% endif %} <li class="postquote">| <a onclick="return copy_paste('p{{ post.id }}');" href="#reply" title="{% trans "Insert a quotation of this post in your reply." %}">{% trans "Quote" %}</a></li> @@ -185,10 +185,10 @@ {% paginate %} <ul> - <li><a href="{% url djangobb:index %}">{% trans "Discussion Forums" %}</a></li> + <li><a href="{% url 'djangobb:index' %}">{% trans "Discussion Forums" %}</a></li> <li>» {% link topic.forum %} </li> <li> - » {{ topic }} <a href="{% url djangobb:forum_topic_feed topic.id %}"><img src="{{ STATIC_URL }}/djangobb_forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" class="breadcrumb_rss" /></a> + » {{ topic }} <a href="{% url 'djangobb:forum_topic_feed' topic.id %}"><img src="{{ STATIC_URL }}/djangobb_forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" class="breadcrumb_rss" /></a> </li> </ul> @@ -196,8 +196,8 @@ <div class="follow-topic bottom"> <img src="{{ STATIC_URL }}/images/ajax-loader.gif" class="loading" style="display: none;" alt="{% trans 'loading...' %}" /> <p class="error" style="display: none;">{% trans "There was an error :( Try again?" %}</p> - <a {% if subscribed %}style="display: none;"{% endif %} class="follow-button button blue" href="{% url djangobb:forum_add_subscription topic.id %}" title="{% trans "Follow this discussion to get a message when there's a new post" %}">{% trans 'Follow Discussion' %}</a> - <a {% if not subscribed %}style="display: none;"{% endif %} class="unfollow-button button grey" href="{% url djangobb:forum_delete_subscription topic.id %}" title="{% trans 'Stop getting messages about new posts to this discussion' %}">{% trans 'Unfollow Discussion' %}</a> + <a {% if subscribed %}style="display: none;"{% endif %} class="follow-button button blue" href="{% url 'djangobb:forum_add_subscription' topic.id %}" title="{% trans "Follow this discussion to get a message when there's a new post" %}">{% trans 'Follow Discussion' %}</a> + <a {% if not subscribed %}style="display: none;"{% endif %} class="unfollow-button button grey" href="{% url 'djangobb:forum_delete_subscription' topic.id %}" title="{% trans 'Stop getting messages about new posts to this discussion' %}">{% trans 'Unfollow Discussion' %}</a> </div> {% endif %} @@ -218,7 +218,7 @@ <form id="qjump" method="get" action="forum"> <div><label>{% trans "Jump to" %} <br /> - <select name="id" id="forum_id" onchange="window.location=('{% url djangobb:index %}'+this.options[this.selectedIndex].value)"> + <select name="id" id="forum_id" onchange="window.location=('{% url 'djangobb:index' %}'+this.options[this.selectedIndex].value)"> {% for category in categories %} <optgroup label="{{ category }}"> {% for forum in category.forums.all %} @@ -227,32 +227,32 @@ </optgroup> {% endfor %} </select> - <input type="button" onclick="window.location=('{% url djangobb:index %}'+getElementById('forum_id').value)" value=" {% trans "Go" %} " accesskey="g" /> + <input type="button" onclick="window.location=('{% url 'djangobb:index' %}'+getElementById('forum_id').value)" value=" {% trans "Go" %} " accesskey="g" /> </label></div> </form> {% endif %} {% if moderator %} <dl id="modcontrols"><dt><strong>{% trans "Moderator control" %}</strong></dt> - <dd><a class="moderator-only" href="{% url djangobb:delete_posts topic.id %}">{% trans "Delete multiple posts" %}</a></dd> - <dd><a class="moderator-only" href="{% url djangobb:move_posts topic.id %}">{% trans "Move multiple posts" %}</a></dd> - <dd><a class="moderator-only" href="{% url djangobb:move_topic %}?topic_id={{ topic.id }}">{% trans "Move topic" %}</a></dd> + <dd><a class="moderator-only" href="{% url 'djangobb:delete_posts' topic.id %}">{% trans "Delete multiple posts" %}</a></dd> + <dd><a class="moderator-only" href="{% url 'djangobb:move_posts' topic.id %}">{% trans "Move multiple posts" %}</a></dd> + <dd><a class="moderator-only" href="{% url 'djangobb:move_topic' %}?topic_id={{ topic.id }}">{% trans "Move topic" %}</a></dd> {% if topic.closed %} - <dd><a class="moderator-only" href="{% url djangobb:open_close_topic topic.id 'o' %}">{% trans "Open topic" %}</a></dd> + <dd><a class="moderator-only" href="{% url 'djangobb:open_close_topic' topic.id 'o' %}">{% trans "Open topic" %}</a></dd> {% else %} - <dd><a class="moderator-only" href="{% url djangobb:open_close_topic topic.id 'c' %}">{% trans "Close topic" %}</a></dd> + <dd><a class="moderator-only" href="{% url 'djangobb:open_close_topic' topic.id 'c' %}">{% trans "Close topic" %}</a></dd> {% endif %} {% if topic.sticky %} - <dd><a class="moderator-only" href="{% url djangobb:stick_unstick_topic topic.id 'u' %}">{% trans "Unstick topic" %}</a></dd></dl> + <dd><a class="moderator-only" href="{% url 'djangobb:stick_unstick_topic' topic.id 'u' %}">{% trans "Unstick topic" %}</a></dd></dl> {% else %} - <dd><a class="moderator-only" href="{% url djangobb:stick_unstick_topic topic.id 's' %}">{% trans "Stick topic" %}</a></dd></dl> + <dd><a class="moderator-only" href="{% url 'djangobb:stick_unstick_topic' topic.id 's' %}">{% trans "Stick topic" %}</a></dd></dl> {% endif %} {% elif can_close %} {% if topic.closed %} {% if moderator %} - <dd><a href="{% url djangobb:open_close_topic topic.id 'o' %}">{% trans "Open topic" %}</a></dd> + <dd><a href="{% url 'djangobb:open_close_topic' topic.id 'o' %}">{% trans "Open topic" %}</a></dd> {% endif %} {% else %} - <dd><a href="{% url djangobb:open_close_topic topic.id 'c' %}">{% trans "Close topic" %}</a></dd> + <dd><a href="{% url 'djangobb:open_close_topic' topic.id 'c' %}">{% trans "Close topic" %}</a></dd> {% endif %} {% endif %} </dl>