Skip to content

Commit

Permalink
#1247 url "view"
Browse files Browse the repository at this point in the history
  • Loading branch information
jayjay-montalbo committed Sep 15, 2014
1 parent 6ae4f99 commit e7a3d58
Show file tree
Hide file tree
Showing 19 changed files with 113 additions and 113 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<section id="box-{{ box.pk }}" class="boxes">
{% blocktrans with c=box.content|safe %}{{ c }}{% endblocktrans %}
{% if user.profile.is_superuser %}
<a href="{% url admin:boxes_box_change box.pk %}?next={{ request.path }}" title="{% trans 'Edit Box' %}" class="edit-box">{% blocktrans with t=box.title|title %}Admin: Edit {{ t }} Box{% endblocktrans %}</a>
<a href="{% url "admin:boxes_box_change" box.pk %}?next={{ request.path }}" title="{% trans 'Edit Box' %}" class="edit-box">{% blocktrans with t=box.title|title %}Admin: Edit {{ t }} Box{% endblocktrans %}</a>
{% endif %}
</section>
{% theme_setting setting_name %}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<section id="box-{{ box.pk }}" class="boxes">
{% blocktrans with c=box.content|safe %}{{ c }}{% endblocktrans %}
{% if user.profile.is_superuser %}
<a href="{% url admin:boxes_box_change box.pk %}?next={{ request.path }}" title="{% trans 'Edit Box' %}" class="edit-box">{% blocktrans with t=box.title|title %}Admin: Edit {{ t }} Box{% endblocktrans %}</a>
<a href="{% url "admin:boxes_box_change" box.pk %}?next={{ request.path }}" title="{% trans 'Edit Box' %}" class="edit-box">{% blocktrans with t=box.title|title %}Admin: Edit {{ t }} Box{% endblocktrans %}</a>
{% endif %}
</section>
{% theme_setting setting_name %}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<section id="box-{{ box.pk }}" class="boxes">
{% blocktrans with c=box.content|safe %}{{ c }}{% endblocktrans %}
{% if user.profile.is_superuser %}
<a href="{% url admin:boxes_box_change box.pk %}?next={{ request.path }}" title="{% trans 'Edit Box' %}" class="edit-box">{% blocktrans with t=box.title|title %}Admin: Edit {{ t }} Box{% endblocktrans %}</a>
<a href="{% url "admin:boxes_box_change" box.pk %}?next={{ request.path }}" title="{% trans 'Edit Box' %}" class="edit-box">{% blocktrans with t=box.title|title %}Admin: Edit {{ t }} Box{% endblocktrans %}</a>
{% endif %}
</section>
{% theme_setting setting_name %}
2 changes: 1 addition & 1 deletion tendenci/templates/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h1>{% trans "The page was not found" %}</h1>
</ul>
<p>{% blocktrans %}You may be able to find what you're looking for by:{% endblocktrans %}</p>
<ul>
<li><a href="{% url home %}">{% trans "Visiting the Home Page" %}</a></li>
<li><a href="{% url "home" %}">{% trans "Visiting the Home Page" %}</a></li>
<li>
{% trans "Searching the site:" %}&nbsp;&nbsp;
<form method="get" action="{% url 'haystack_search' %}">
Expand Down
8 changes: 4 additions & 4 deletions tendenci/templates/homepage.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ <h2>{% trans 'Search' %}</h2>
<h2>{% trans 'Meta' %}</h2>
<ul>
{% if user.is_authenticated %}
<li><a href="{% url dashboard %}">{% trans 'Dashboard' %}</a></li>
<li><a href="{% url auth_logout %}">{% trans 'Log Out' %}</a></li>
<li><a href="{% url "dashboard" %}">{% trans 'Dashboard' %}</a></li>
<li><a href="{% url "auth_logout" %}">{% trans 'Log Out' %}</a></li>
{% else %}
{% if MODULE_USERS_SELFREGISTRATION %}
<li><a href="{% url registration_register %}">{% trans 'Register' %}</a></li>
<li><a href="{% url "registration_register" %}">{% trans 'Register' %}</a></li>
{% endif %}
<li><a href="{% url auth_login %}">{% trans 'Log in' %}</a></li>
<li><a href="{% url "auth_login" %}">{% trans 'Log in' %}</a></li>
{% endif %}
</ul>
</li>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{% load i18n %}

<a href="{% url model_report_view report.slug %}">{% blocktrans with t=report.get_title %}{{ t }}{% endblocktrans %}</a>
<a href="{% url "model_report_view" report.slug %}">{% blocktrans with t=report.get_title %}{{ t }}{% endblocktrans %}</a>
2 changes: 1 addition & 1 deletion tendenci/templates/model_report/includes/report_title.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{% load i18n %}<h1><a href="{% url model_report_list %}">{% trans "Report list" %}</a> &raquo; {% blocktrans with t=report.get_title %}{{ t }}{% endblocktrans %}</h1>
{% load i18n %}<h1><a href="{% url "model_report_list" %}">{% trans "Report list" %}</a> &raquo; {% blocktrans with t=report.get_title %}{{ t }}{% endblocktrans %}</h1>
6 changes: 3 additions & 3 deletions tendenci/templates/reports/active_members_ytd.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ <h1>{% trans "New and Renewing Members YTD" %} {{ year_selected }}</h1>
<div class="mems-wrap stat-table">

<div style="float: right; margin-right: 1em;"><a href="?year={{ year_selected }}&print=on{% if exclude_total %}&exclude_total=on{% endif %}" target="_blank">{% trans 'Print' %}</a></div>
<form class="search-form" action="{% url reports-active-members-ytd %}" method="get">
<form class="search-form" action="{% url "reports-active-members-ytd" %}" method="get">
<label for="id_year">{% trans "Select a Year" %}:</label><select name="year" id="id_year" onchange="this.form.submit();">
<option value="">-----------</option>
{% for year in years %}
Expand Down Expand Up @@ -79,9 +79,9 @@ <h1>{% trans "New and Renewing Members YTD" %} {{ year_selected }}</h1>
</div>
<div>
{% if not exclude_total %}
<a href="{% url reports-active-members-ytd %}?exclude_total=on">{% trans 'Exclude Total Active from Chart' %}</a>
<a href="{% url "reports-active-members-ytd" %}?exclude_total=on">{% trans 'Exclude Total Active from Chart' %}</a>
{% else %}
<a href="{% url reports-active-members-ytd %}">{% trans 'Include Total Active to Chart' %}</a>
<a href="{% url "reports-active-members-ytd" %}">{% trans 'Include Total Active to Chart' %}</a>
{% endif %}
</div>

Expand Down
4 changes: 2 additions & 2 deletions tendenci/templates/reports/event_summary.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{% load reports_tags %}
{% load humanize %}
{% load i18n %}
{% url reports-events-summary-historical as hist_logs_url %}
{% url event_log.search as logs_search %}
{% url "reports-events-summary-historical" as hist_logs_url %}
{% url "event_log.search" as logs_search %}

{% block content %}
<h1>{% trans "Tendenci&reg; Event Log Summary Report" %}</h1>
Expand Down
60 changes: 30 additions & 30 deletions tendenci/templates/reports/membership_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ <h1>{% trans "Expired Memberships Report" %}</h1>
{% autopaginate mems 50 %}

{% if active %}
<p><a href="{% url reports-active-members %}?output=csv{% if request.GET.days %}&days={{ request.GET.days }}{% endif %}">
<p><a href="{% url "reports-active-members" %}?output=csv{% if request.GET.days %}&days={{ request.GET.days }}{% endif %}">
{% trans 'Download CSV File' %}</a></p>
{% else %}
<p><a href="{% url reports-expired-members %}?output=csv{% if request.GET.days %}&days={{ request.GET.days }}{% endif %}">
<p><a href="{% url "reports-expired-members" %}?output=csv{% if request.GET.days %}&days={{ request.GET.days }}{% endif %}">
{% trans 'Download CSV File' %}</a></p>
{% endif %}

Expand All @@ -74,102 +74,102 @@ <h1>{% trans "Expired Memberships Report" %}</h1>
<th></th>
<th>
{% if is_ascending_username %}
<a href="{% url reports-active-members %}?sort=username" >{% trans "Username" %}
<a href="{% url "reports-active-members" %}?sort=username" >{% trans "Username" %}
{% else %}
<a href="{% url reports-active-members %}?sort=-username" >{% trans "Username" %}
<a href="{% url "reports-active-members" %}?sort=-username" >{% trans "Username" %}
{% endif %}
</th>
<th>
{% if is_ascending_full_name %}
<a href="{% url reports-active-members %}?sort=full_name" >{% trans "Fullname" %}</a>
<a href="{% url "reports-active-members" %}?sort=full_name" >{% trans "Fullname" %}</a>
{% else %}
<a href="{% url reports-active-members %}?sort=-full_name" >{% trans "Fullname" %}</a>
<a href="{% url "reports-active-members" %}?sort=-full_name" >{% trans "Fullname" %}</a>
{% endif %}
</th>
<th>
{% if is_ascending_email %}
<a href="{% url reports-active-members %}?sort=email" >{% trans "Email" %}</a>
<a href="{% url "reports-active-members" %}?sort=email" >{% trans "Email" %}</a>
{% else %}
<a href="{% url reports-active-members %}?sort=-email" >{% trans "Email" %}</a>
<a href="{% url "reports-active-members" %}?sort=-email" >{% trans "Email" %}</a>
{% endif %}
</th>
<th>
{% if is_ascending_type %}
<a href="{% url reports-active-members %}?sort=type" >{% trans "Type" %}</a>
<a href="{% url "reports-active-members" %}?sort=type" >{% trans "Type" %}</a>
{% else %}
<a href="{% url reports-active-members %}?sort=-type" >{% trans "Type" %}</a>
<a href="{% url "reports-active-members" %}?sort=-type" >{% trans "Type" %}</a>
{% endif %}
</th>
<th>
{% if is_ascending_subscription %}
<a href="{% url reports-active-members %}?sort=subscription" >{% trans "Join" %}</a>
<a href="{% url "reports-active-members" %}?sort=subscription" >{% trans "Join" %}</a>
{% else %}
<a href="{% url reports-active-members %}?sort=-subscription" >{% trans "Join" %}</a>
<a href="{% url "reports-active-members" %}?sort=-subscription" >{% trans "Join" %}</a>
{% endif %}
</th>
<th>
{% if is_ascending_expiration %}
<a href="{% url reports-active-members %}?sort=expiration" >{% trans "Expiration" %}</a>
<a href="{% url "reports-active-members" %}?sort=expiration" >{% trans "Expiration" %}</a>
{% else %}
<a href="{% url reports-active-members %}?sort=-expiration" >{% trans "Expiration" %}</a>
<a href="{% url "reports-active-members" %}?sort=-expiration" >{% trans "Expiration" %}</a>
{% endif %}
</th>
<th>
{% if is_ascending_invoice %}
<a href="{% url reports-active-members %}?sort=invoice" >{% trans "Invoice" %}</a>
<a href="{% url "reports-active-members" %}?sort=invoice" >{% trans "Invoice" %}</a>
{% else %}
<a href="{% url reports-active-members %}?sort=-invoice" >{% trans "Invoice" %}</a>
<a href="{% url "reports-active-members" %}?sort=-invoice" >{% trans "Invoice" %}</a>
{% endif %}
</th>
{% else %}
<th></th>
<th>
{% if is_ascending_username %}
<a href="{% url reports-expired-members %}?sort=username" >{% trans "Username" %}</a>
<a href="{% url "reports-expired-members" %}?sort=username" >{% trans "Username" %}</a>
{% else %}
<a href="{% url reports-expired-members %}?sort=-username" >{% trans "Username" %}</a>
<a href="{% url "reports-expired-members" %}?sort=-username" >{% trans "Username" %}</a>
{% endif %}
</th>
<th>
{% if is_ascending_full_name %}
<a href="{% url reports-expired-members %}?sort=full_name" >{% trans "Fullname" %}</a>
<a href="{% url "reports-expired-members" %}?sort=full_name" >{% trans "Fullname" %}</a>
{% else %}
<a href="{% url reports-expired-members %}?sort=-full_name" >{% trans "Fullname" %}</a>
<a href="{% url "reports-expired-members" %}?sort=-full_name" >{% trans "Fullname" %}</a>
{% endif %}
</th>
<th>
{% if is_ascending_email %}
<a href="{% url reports-expired-members %}?sort=email" >{% trans "Email" %}</a>
<a href="{% url "reports-expired-members" %}?sort=email" >{% trans "Email" %}</a>
{% else %}
<a href="{% url reports-expired-members %}?sort=-email" >{% trans "Email" %}</a>
<a href="{% url "reports-expired-members" %}?sort=-email" >{% trans "Email" %}</a>
{% endif %}
</th>
<th>
{% if is_ascending_type %}
<a href="{% url reports-expired-members %}?sort=type" >{% trans "Type" %}</a>
<a href="{% url "reports-expired-members" %}?sort=type" >{% trans "Type" %}</a>
{% else %}
<a href="{% url reports-expired-members %}?sort=-type" >{% trans "Type" %}</a>
<a href="{% url "reports-expired-members" %}?sort=-type" >{% trans "Type" %}</a>
{% endif %}
</th>
<th>
{% if is_ascending_subscription %}
<a href="{% url reports-expired-members %}?sort=subscription" >{% trans "Join" %}</a>
<a href="{% url "reports-expired-members" %}?sort=subscription" >{% trans "Join" %}</a>
{% else %}
<a href="{% url reports-expired-members %}?sort=-subscription" >{% trans "Join" %}</a>
<a href="{% url "reports-expired-members" %}?sort=-subscription" >{% trans "Join" %}</a>
{% endif %}
</th>
<th>
{% if is_ascending_expiration %}
<a href="{% url reports-expired-members %}?sort=expiration" >{% trans "Expiration" %}</a>
<a href="{% url "reports-expired-members" %}?sort=expiration" >{% trans "Expiration" %}</a>
{% else %}
<a href="{% url reports-expired-members %}?sort=-expiration" >{% trans "Expiration" %}</a>
<a href="{% url "reports-expired-members" %}?sort=-expiration" >{% trans "Expiration" %}</a>
{% endif %}
</th>
<th>
{% if is_ascending_invoice %}
<a href="{% url reports-expired-members %}?sort=invoice" >{% trans "Invoice" %}</a>
<a href="{% url "reports-expired-members" %}?sort=invoice" >{% trans "Invoice" %}</a>
{% else %}
<a href="{% url reports-expired-members %}?sort=-invoice" >{% trans "Invoice" %}</a>
<a href="{% url "reports-expired-members" %}?sort=-invoice" >{% trans "Invoice" %}</a>
{% endif %}
</th>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion tendenci/templates/reports/membership_quick_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<h1>{% trans "Current Members Quick List" %}</h1>
<div class="mems-wrap quick-list">
{% if members %}
<p><a href="{% url reports-members-quick-list %}?output=csv">
<p><a href="{% url "reports-members-quick-list" %}?output=csv">
{% trans 'Download CSV File' %}</a></p>
<table>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion tendenci/templates/reports/renewed_members.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1>{% trans "Renewed Members" %}</h1>
</form>

{% if members %}
<p><a href="{% url reports-renewed-members %}?output=csv">
<p><a href="{% url "reports-renewed-members" %}?output=csv">
{% trans 'Download CSV File' %}</a></p>
<table>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion tendenci/templates/theme_includes/box.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<h3>{% blocktrans with t=box.title %}{{ t }}{% endblocktrans %}</h3>
{% blocktrans with c=box.content|safe %}{{ c }}{% endblocktrans %}
{% if user.profile.is_superuser %}
<a href="{% url admin:boxes_box_change box.pk %}?next={{ request.path }}" title="{% trans 'Edit Box' %}" class="edit-box">{% blocktrans with t=box.title|title %}Admin: Edit {{ t }} Box{% endblocktrans %}</a>
<a href="{% url "admin:boxes_box_change" box.pk %}?next={{ request.path }}" title="{% trans 'Edit Box' %}" class="edit-box">{% blocktrans with t=box.title|title %}Admin: Edit {{ t }} Box{% endblocktrans %}</a>
{% endif %}
</section>
{% theme_setting setting_name %}
2 changes: 1 addition & 1 deletion tendenci/templates/theme_includes/boxes_group.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<h3>{% blocktrans with t=box.title %}{{ t }}{% endblocktrans %}</h3>
<div class="box-content">{% blocktrans with c=box.safe_content %}{{ c }}{% endblocktrans %}</div>
{% if user.profile.is_superuser %}
<a href="{% url admin:boxes_box_change box.pk %}?next={{ request.path }}" title="{% trans 'Edit Box' %}" class="edit-box">{% blocktrans with t=box.title|title %}Admin: Edit {{ t }} Box{% endblocktrans %}</a>
<a href="{% url "admin:boxes_box_change" box.pk %}?next={{ request.path }}" title="{% trans 'Edit Box' %}" class="edit-box">{% blocktrans with t=box.title|title %}Admin: Edit {{ t }} Box{% endblocktrans %}</a>
{% endif %}
</div>
{% endfor %}
Expand Down
2 changes: 1 addition & 1 deletion tendenci/templates/theme_includes/space_edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<div class="admin-border admin-border-right"></div>
<div class="admin-border admin-border-bottom"></div>
<div class="admin-border admin-border-left"></div>
<div class="admin-links clear-block"><a href="{% url settings.index "module" "theme" %}?next={{ request.path }}" title="{% trans 'Change Space Content' %}" class="edit-setting">{% trans 'Change Space Content' %}</a></div>
<div class="admin-links clear-block"><a href="{% url "settings.index" "module" "theme" %}?next={{ request.path }}" title="{% trans 'Change Space Content' %}" class="edit-setting">{% trans 'Change Space Content' %}</a></div>
</div>
{% endif %}
2 changes: 1 addition & 1 deletion tendenci/templates/themes/theme_top.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<p><strong>{% trans 'Admin Theme Preview' %}:</strong><br />
{% blocktrans %}You are previewing the {{ request.session.theme }} theme.{% endblocktrans %}</p>
<div class="alert-actions">
<a class="btn" href="{{ request.path }}?theme=">{% trans 'Stop previewing' %}</a> <a class="btn" href="{% url theme_editor.editor %}?theme_edit={{ request.session.theme }}">{% trans 'Edit this theme' %}</a>
<a class="btn" href="{{ request.path }}?theme=">{% trans 'Stop previewing' %}</a> <a class="btn" href="{% url "theme_editor.editor" %}?theme_edit={{ request.session.theme }}">{% trans 'Edit this theme' %}</a>
</div>
</div>
</div>
Loading

0 comments on commit e7a3d58

Please sign in to comment.