Revert "Fix url tags"

This reverts commit 3a1e454fde.
refactor-builder
Eric Holscher 2013-11-24 11:41:51 -08:00
parent cd1b80da4f
commit d350e2de1f
31 changed files with 60 additions and 60 deletions

View File

@ -121,7 +121,7 @@
})();
$('.rtfd-header-search input:text').autocomplete({
source: '{% url "search_autocomplete" %}',
source: '{% url search_autocomplete %}',
minLength: 2,
open: function(event, ui) {
ac_top = $('.ui-autocomplete').css('top');

View File

@ -30,7 +30,7 @@
<div class="module-header">
<div style="float:right;">
<form method="post" action="{% url "generic_build" project.pk %}">
<form method="post" action="{% url generic_build project.pk %}">
<ul class="build_a_version">
<li style="display: inline-block">
<input style="display: inline-block" type="submit" value="{% trans "Build Version:" %}">

View File

@ -7,7 +7,7 @@
{% block content %}
<ul>
{% for tag in tag_list %}
<li><a href="{% url "projects_tag_detail" tag.slug %}">{{ tag.name }}</a></li>
<li><a href="{% url projects_tag_detail tag.slug %}">{{ tag.name }}</a></li>
{% endfor %}
</ul>
{% endblock %}

View File

@ -1,7 +1,7 @@
{% for bookmark in bookmark_list %}
<li class="module-item">
<a class="module-item-title" href="{{ bookmark.get_absolute_url }}">{{ bookmark.url }}</a>
<a href="{% url "projects_user_list" bookmark.user.username %}" class="quiet">({{ bookmark.user }})</a>
<a href="{% url projects_user_list bookmark.user.username %}" class="quiet">({{ bookmark.user }})</a>
<span class="quiet">{% if bookmark.project.version %}version {{ bookmark.project.version }} -{% endif %} {{ bookmark.date|timesince }} ago</span>
</li>
{% endfor %}

View File

@ -7,14 +7,14 @@
<div class="rtfd-header-title">
<h1>
{% comment %}Translators: Name of the website{% endcomment %}
<a href="{% url "core.views.homepage" %}">{% trans "Read the Docs" %}</a>
<a href="{% url core.views.homepage %}">{% trans "Read the Docs" %}</a>
</h1>
</div>
<!-- END header title -->
<!-- BEGIN global search -->
<div class="rtfd-header-search">
<form action="{% url "haystack_project" %}" method="GET">
<form action="{% url haystack_project %}" method="GET">
<input type="text" name="q" value="{{ term }}" id="id_site_search">
<input type="submit" value="{% trans "Go" %}">
</form>
@ -27,9 +27,9 @@
{% if request.META.PATH_INFO != '/' %}
<div class="rtfd-header-bookmark">
{% if has_bookmark %}
<a href="{% url "bookmarks_remove" request.META.PATH_INFO %}" class="rtfd-header-bookmark-icon active">{% trans "Remove bookmark" %}</a>
<a href="{% url bookmarks_remove request.META.PATH_INFO %}" class="rtfd-header-bookmark-icon active">{% trans "Remove bookmark" %}</a>
{% else %}
<a href="{% url "bookmarks_add" request.META.PATH_INFO %}" class="rtfd-header-bookmark-icon">{% trans "Bookmark this URL" %}</a>
<a href="{% url bookmarks_add request.META.PATH_INFO %}" class="rtfd-header-bookmark-icon">{% trans "Bookmark this URL" %}</a>
{% endif %}
</div>
{% endif %}
@ -41,10 +41,10 @@
<div class="rtfd-header-nav">
<ul>
{% if request.user.is_authenticated %}
<li class="{{ dashboard_active }}"><a href="{% url "projects_dashboard" %}">{% trans "Dashboard" %}</a></li>
<li><a href="{% url "auth_logout" %}">{% trans "Log Out" %}</a></li>
<li class="{{ dashboard_active }}"><a href="{% url projects_dashboard %}">{% trans "Dashboard" %}</a></li>
<li><a href="{% url auth_logout %}">{% trans "Log Out" %}</a></li>
{% else %}
<li><a href="{% url "auth_login" %}">{% trans "Log in" %}</a></li>
<li><a href="{% url auth_login %}">{% trans "Log in" %}</a></li>
{% endif %}

View File

@ -14,9 +14,9 @@
<!-- BEGIN header links-->
<div class="home-header-links">
{% comment %}Translators: Note, the full sentence goes 'Sign up' 'or' 'Log in'. But unfortunately the three bits have to be separate.{% endcomment %}
<a class="reg" href="{% url "registration_register" %}">{% trans "Sign up" %}</a>
<a class="reg" href="{% url registration_register %}">{% trans "Sign up" %}</a>
<div class="login-box">
<p>{% trans "or" %} <a class="login" href="{% url "auth_login" %}">{% trans "Log in" %}</a></p>
<p>{% trans "or" %} <a class="login" href="{% url auth_login %}">{% trans "Log in" %}</a></p>
</div>
</div>
<!-- END header links -->

View File

@ -27,7 +27,7 @@
<p class="build-success">&nbsp;</p>
{% endif %}
{% else %}
<p class="build-missing">{% trans "There are no builds for this project" %}.{% if request.user in project.users.all %} <a href="{% url "projects_edit" project.slug %}">{% trans "Is the repo correct?" %}</a>{% endif %}</p>
<p class="build-missing">{% trans "There are no builds for this project" %}.{% if request.user in project.users.all %} <a href="{% url projects_edit project.slug %}">{% trans "Is the repo correct?" %}</a>{% endif %}</p>
{% endif %}
<ul>
@ -36,14 +36,14 @@
<li><a href="{{ project.get_docs_url }}">{% trans "View Docs" %}</a></li>
{% endif %}
<li class="{{ downloads_active }}"><a href="{% url "project_downloads" project.slug %}" rel="nofollow,noindex">Downloads</a></li>
<li class="{{ downloads_active }}"><a href="{% url project_downloads project.slug %}" rel="nofollow,noindex">Downloads</a></li>
{% if project.get_latest_build %}
<li class="{{ builds_active }}"><a href="{{ project.get_builds_url }}">{% trans "Builds" %}</a></li>
{% endif %}
{% if request.user in project.users.all %}
<li class="{{ edit_active }}"><a href="{% url "projects_edit" project.slug %}"><i class="gear"></i>{% trans "Admin" %} </a></li>
<li class="{{ edit_active }}"><a href="{% url projects_edit project.slug %}"><i class="gear"></i>{% trans "Admin" %} </a></li>
{% endif %}

View File

@ -12,7 +12,7 @@
<!-- BEGIN search bar -->
<div class="search">
<form action="{% url "haystack_project" %}" method="GET">
<form action="{% url haystack_project %}" method="GET">
<input type="text" name="q" value="" placeholder="{% blocktrans %}Search {{ project }}{% endblocktrans %}" id="id_site_search">
<input type="hidden" name="selected_facets" value="project_exact:{{ project.name }}">
<input type="submit" value="{% trans "Search" %}">
@ -57,7 +57,7 @@
{% endif %}
{% if request.user in project.users.all %}
<ul class="module-item-menu">
<li><a href="{% url "project_version_detail" project.slug version.slug %}">{% trans "Edit" %}</a></li>
<li><a href="{% url project_version_detail project.slug version.slug %}">{% trans "Edit" %}</a></li>
</ul>
{% endif %}
</li>
@ -69,7 +69,7 @@
<div class="build_a_version">
<h3>{% trans "Build a version" %}</h3>
<div style="float: left; margin-right: 5px;" class="version_right">
<form method="post" action="{% url "generic_build" project.pk %}">
<form method="post" action="{% url generic_build project.pk %}">
<select id="id_version" name="version_slug">
{% for version in project.ordered_active_versions %}
<option value="{{ version.slug }}">{{ version.slug }}</option>
@ -93,7 +93,7 @@
<h3>{% trans "Tags" %}</h3>
<p>
{% for tag in project.tags.all %}
<a href="{% url "projects_tag_detail" tag.slug %}">{{ tag.name }}</a>{% if forloop.last %}{% else %}, {% endif %}
<a href="{% url projects_tag_detail tag.slug %}">{{ tag.name }}</a>{% if forloop.last %}{% else %}, {% endif %}
{% empty %}
<span class="quiet">{% trans "No tags" %}</span>
{% endfor %}
@ -162,7 +162,7 @@
{% if request.user in project.users.all %}
<h3>{% trans "Post Commit Hook" %}</h3>
<p>
curl -X POST http://{{ PRODUCTION_DOMAIN }}{% url "generic_build" project.slug %}
curl -X POST http://{{ PRODUCTION_DOMAIN }}{% url generic_build project.slug %}
</p>
{% endif %}

View File

@ -9,7 +9,7 @@
{% endif %}
{% if request.user in project.users.all %}
<ul class="module-item-menu">
<li><a href="{% url "project_version_detail" project.slug version.slug %}">{% trans "Add tags" %}</a></li>
<li><a href="{% url project_version_detail project.slug version.slug %}">{% trans "Add tags" %}</a></li>
</ul>
{% endif %}
</li>

View File

@ -7,7 +7,7 @@
<div class="wide-search-bar-wrapper clearfix">
<form action="{% url "haystack_project" %}" method="GET">
<form action="{% url haystack_project %}" method="GET">
<div class="text-input-wrapper">
<input type="text" name="q" value="{{ term }}" id="id_site_search">
</div>
@ -22,7 +22,7 @@
{% comment %}
<script type="text/javascript">
$('.wide-search-bar #id_site_search').autocomplete({
source: '{% url "search_autocomplete" %}',
source: '{% url search_autocomplete %}',
minLength: 2,
open: function(event, ui) {
ac_top = $('.ui-autocomplete').css('top');

View File

@ -5,14 +5,14 @@
<div class="wrapper">
<ul>
<li class="first last {{ projects_active }}"><a href="{% url "projects_dashboard" %}">{% trans "Projects" %}</a></li>
<li class="first last {{ projects_active }}"><a href="{% url projects_dashboard %}">{% trans "Projects" %}</a></li>
{% comment %}
<li class="{% block dash-nav-bookmarks %}{% endblock %}"><a href="{% url "user_bookmarks" %}">{% trans "Bookmarks" %}</a></li>
<li class="{% block dash-nav-bookmarks %}{% endblock %}"><a href="{% url user_bookmarks %}">{% trans "Bookmarks" %}</a></li>
{% endcomment %}
</ul>
<ul>
<li class="first last {{ import_active }}"><a href="{% url "projects_import" %}">{% trans "Import" %}</a></li>
<li class="first last {{ import_active }}"><a href="{% url projects_import %}">{% trans "Import" %}</a></li>
</ul>
<ul>

View File

@ -86,7 +86,7 @@ There's also support for versioning so you can build docs from tags and branches
<div class="module-wrapper">
<div class="module-header">
<h3>{% trans "Recently Updated Projects" %} <span class="small_head"><a href="{% url "projects_list" %}">{% trans "(All Projects)" %}</a></span></h3>
<h3>{% trans "Recently Updated Projects" %} <span class="small_head"><a href="{% url projects_list %}">{% trans "(All Projects)" %}</a></span></h3>
</div>
<div class="module-list">
@ -108,7 +108,7 @@ There's also support for versioning so you can build docs from tags and branches
<div class="module-wrapper">
<div class="module-header">
<h3>{% trans "Most Viewed Pages" %} <span class="small_head"><a href="{% url "pageviews_list" %}">{% trans "(All Views)" %}</a></span></h3>
<h3>{% trans "Most Viewed Pages" %} <span class="small_head"><a href="{% url pageviews_list %}">{% trans "(All Views)" %}</a></span></h3>
</div>
<div class="module-list">
@ -131,7 +131,7 @@ There's also support for versioning so you can build docs from tags and branches
<div class="module-wrapper">
<div class="module-header">
<h3>{% trans "Recently Bookmarked Docs" %} <span class="small_head"><a href="{% url "bookmarks_list" %}">{% trans "(All Bookmarks)" %}</a></span></h3>
<h3>{% trans "Recently Bookmarked Docs" %} <span class="small_head"><a href="{% url bookmarks_list %}">{% trans "(All Bookmarks)" %}</a></span></h3>
</div>
<div class="module-list">

View File

@ -20,7 +20,7 @@
{% with profile.get_form as form %}
{% if profile.user.pk == user.pk %}
<form id="edit_form" method="POST" action="{% url "profiles_profile_edit" %}">
<form id="edit_form" method="POST" action="{% url profiles_profile_edit %}">
{% endif %}
<div class="navigable">

View File

@ -10,6 +10,6 @@
{% block content %}
{% for profile in object_list %}
<p><a href="{% url "profiles_profile_detail" profile.user %}">{{ profile }}</a></p>
<p><a href="{% url profiles_profile_detail profile.user %}">{{ profile }}</a></p>
{% endfor %}
{% endblock %}

View File

@ -25,7 +25,7 @@
<ul>
{% for alias in alias_list %}
<li><a href="{% url "projects_alias_edit" alias.project.slug alias.pk %}">{{ alias }}</a></li>
<li><a href="{% url projects_alias_edit alias.project.slug alias.pk %}">{{ alias }}</a></li>
{% endfor %}
</ul>

View File

@ -35,7 +35,7 @@
{% block content %}
<p class="help_text">
{% trans "Create new documentation here. If you already have docs in a public repository," %}
<a class="" href="{% url "projects_import" %}">{% trans "import an existing project" %}</a>.
<a class="" href="{% url projects_import %}">{% trans "import an existing project" %}</a>.
</p>
<form method="post" action=".">{% csrf_token %}
{{ form.as_p }}

View File

@ -63,9 +63,9 @@
<ul>
{% for project in project_list %}
<li class="module-item col-span">
<a href="{% url "projects_manage" project.slug %}">{{ project.name }}</a>
<a href="{% url projects_manage project.slug %}">{{ project.name }}</a>
<ul class="module-item-menu">
<li><a href="{% url "projects_edit" project.slug %}"><i class="gear"></i>{% trans "Admin" %}</a></li>
<li><a href="{% url projects_edit project.slug %}"><i class="gear"></i>{% trans "Admin" %}</a></li>
<li>&nbsp;&nbsp;</li>
<li><a href="{{ project.get_docs_url }}">{% trans "View Docs" %}</a></li>
</ul>
@ -78,7 +78,7 @@
</div>
</div>
{% else %}
{% url "projects_import" as projects_import_url %}
{% url projects_import as projects_import_url %}
<p class="empty">
{% blocktrans with "https://read-the-docs.readthedocs.org/en/latest/getting_started.html" as getting_started_url %}You don't have any projects. You should <a href="{{ projects_import_url }}">create new docs</a> on the site.<br>
Check out the <a href="{{ getting_started_url }}">Getting Started</a> documentation for information about how to get going.{% endblocktrans %}</p>
@ -91,7 +91,7 @@
<div class="module">
<div class="module-wrapper">
<div class="module-header">
<h3>{% trans "Recently Bookmarked Docs" %} <span class="small_head"><a href="{% url "user_bookmarks" %}">{% trans "(All My Bookmarks)" %}</a></span></h3>
<h3>{% trans "Recently Bookmarked Docs" %} <span class="small_head"><a href="{% url user_bookmarks %}">{% trans "(All My Bookmarks)" %}</a></span></h3>
</div>
<div class="module-list">

View File

@ -33,7 +33,7 @@
<input style="display: inline;" type="submit" value="{% trans "Submit" %}">
{% comment %}Translators: The 'or' here is in between 'Submit' and 'delete'.{% endcomment %}
{% trans "or" %}
<a href="{% url "projects_delete" project.slug %}">{% trans "delete" %}</a>
<a href="{% url projects_delete project.slug %}">{% trans "delete" %}</a>
</p>
</form>
{% endblock %}

View File

@ -12,12 +12,12 @@
{% block content %}
<div class="navigable">
<ul>
<li class="{% block project-edit-active %}{% endblock %}"><a href="{% url "projects_edit" project.slug %}">{% trans "Settings" %} </a></li>
<li class="{% block project-admins-active %}{% endblock %}"><a href="{% url "projects_users" project.slug %}">{% trans "Maintainers" %}</a></li>
<li class="{% block project-versions-active %}{% endblock %}"><a href="{% url "projects_versions" project.slug %}" rel="nofollow,noindex">{% trans "Versions" %}</a></li>
<li class="{% block project-translations-active %}{% endblock %}"><a href="{% url "projects_translations" project.slug %}">{% trans "Translations" %}</a></li>
<li class="{% block project-subprojects-active %}{% endblock %}"><a href="{% url "projects_subprojects" project.slug %}">{% trans "Subprojects" %}</a></li>
<li class="{% block project-notifications-active %}{% endblock %}"><a href="{% url "projects_notifications" project.slug %}">{% trans "Notifications" %}</a></li>
<li class="{% block project-edit-active %}{% endblock %}"><a href="{% url projects_edit project.slug %}">{% trans "Settings" %} </a></li>
<li class="{% block project-admins-active %}{% endblock %}"><a href="{% url projects_users project.slug %}">{% trans "Maintainers" %}</a></li>
<li class="{% block project-versions-active %}{% endblock %}"><a href="{% url projects_versions project.slug %}" rel="nofollow,noindex">{% trans "Versions" %}</a></li>
<li class="{% block project-translations-active %}{% endblock %}"><a href="{% url projects_translations project.slug %}">{% trans "Translations" %}</a></li>
<li class="{% block project-subprojects-active %}{% endblock %}"><a href="{% url projects_subprojects project.slug %}">{% trans "Subprojects" %}</a></li>
<li class="{% block project-notifications-active %}{% endblock %}"><a href="{% url projects_notifications project.slug %}">{% trans "Notifications" %}</a></li>
</ul>
<div>
<h2>{% block project_edit_content_header %}{% endblock %}</h2>

View File

@ -29,7 +29,7 @@
{% if emails|length > 0 %}
<h3>{% trans "Remove Notifications" %}</h3>
<p>
<form method="post" action="{% url "projects_notification_delete" project.slug %}">
<form method="post" action="{% url projects_notification_delete project.slug %}">
{% csrf_token %}
<select id="id_email" name="email">
{% for email in emails %}

View File

@ -24,7 +24,7 @@
<a href="{{ relationship.get_absolute_url }}">
{{ relationship.child }}
</a>
(<a href="{% url "projects_subprojects_delete" relationship.parent.slug relationship.child.slug %}">{% trans "Remove" %}</a>)
(<a href="{% url projects_subprojects_delete relationship.parent.slug relationship.child.slug %}">{% trans "Remove" %}</a>)
</li>
{% endfor %}
</ul>
@ -42,7 +42,7 @@
{% block footerjs %}
$('#id_subproject').autocomplete({
source: '{% url "search_autocomplete" %}',
source: '{% url search_autocomplete %}',
minLength: 2,
open: function(event, ui) {
ac_top = $('.ui-autocomplete').css('top');

View File

@ -23,7 +23,7 @@
<li>
<a href="{{ lang_project.get_absolute_url }}">{{ lang_project }}</a>
({{ lang_project.language }})
(<a href="{% url "projects_translations_delete" project.slug lang_project.slug %}">{% trans "Remove" %}</a>)
(<a href="{% url projects_translations_delete project.slug lang_project.slug %}">{% trans "Remove" %}</a>)
</li>
{% endfor %}
</ul>
@ -41,7 +41,7 @@
{% block footerjs %}
$('#id_project').autocomplete({
source: '{% url "search_autocomplete" %}',
source: '{% url search_autocomplete %}',
minLength: 2,
open: function(event, ui) {
ac_top = $('.ui-autocomplete').css('top');

View File

@ -17,7 +17,7 @@
<ul>
{% for user in users %}
<li>
<a href="{% url "profiles_profile_detail" user.username %}">
<a href="{% url profiles_profile_detail user.username %}">
{{ user }}
</a>
</li>
@ -27,7 +27,7 @@
{% if users|length > 1 %}
<h3>{% trans "Remove Maintainer" %}</h3>
<p>
<form method="post" action="{% url "projects_users_delete" project.slug %}">
<form method="post" action="{% url projects_users_delete project.slug %}">
{% csrf_token %}
<select id="id_user" name="username">
{% for user in users %}

View File

@ -10,7 +10,7 @@
{% block content %}
<ul>
{% for tag in tag_list %}
<li><a href="{% url "projects_tag_detail" tag.slug %}">{{ tag.name }}</a></li>
<li><a href="{% url projects_tag_detail tag.slug %}">{{ tag.name }}</a></li>
{% endfor %}
</ul>
{% endblock %}

View File

@ -10,7 +10,7 @@
<p class="help_text">
{% trans "Use this to upload pre-existing HTML documentation for versions that don't build correctly anymore." %}
</p>
<form enctype="multipart/form-data" method="post" action="{% url "projects_upload_html" project.slug %}"> {% csrf_token %}
<form enctype="multipart/form-data" method="post" action="{% url projects_upload_html project.slug %}"> {% csrf_token %}
{{ form.as_p }}
<p><input type="submit" value="{% trans "Upload" %}" /></p>
</form>

View File

@ -18,6 +18,6 @@
{% blocktrans %}Did you really think activation key "{{ activation_key }}" was going to work?!{% endblocktrans %}
</p>
<p>
{% trans "We're not sure how you got that key, but would you mind registering again" %} <a href="{% url "registration_register" %}">{% trans "here" %}</a>?
{% trans "We're not sure how you got that key, but would you mind registering again" %} <a href="{% url registration_register %}">{% trans "here" %}</a>?
</p>
{% endblock %}

View File

@ -14,5 +14,5 @@
{% block content %}
<p>{% trans "Your account has been activated." %} ^_^</p>
<p>{% trans "Log in with the username and password you just created," %} <a href="{% url "auth_login" %}">{% trans "here" %}</a>.</p>
<p>{% trans "Log in with the username and password you just created," %} <a href="{% url auth_login %}">{% trans "here" %}</a>.</p>
{% endblock %}

View File

@ -1,4 +1,4 @@
{% load i18n %}{% url "registration_activate" activation_key as activation_url %}{% blocktrans with expiration_days=expiration_days domain=site.domain %}Thank you for registering an account at {{ domain }}.
{% load i18n %}{% url registration_activate activation_key as activation_url %}{% blocktrans with expiration_days=expiration_days domain=site.domain %}Thank you for registering an account at {{ domain }}.
To activate your registration, please visit the following page:
http://{{ domain }}{{ activation_url }}

View File

@ -17,7 +17,7 @@
{% trans "Thanks for visiting!" %}
</p>
<p>
{% url "auth_login" as login_url %}
{% url auth_login as login_url %}
{% blocktrans %}If you are looking to log in again, you can do that <a href="{{ login_url }}">here</a>{% endblocktrans %}.
</p>
{% endblock %}

View File

@ -4,7 +4,7 @@
{% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %}
{{ protocol }}://{{ domain }}{% url "django.contrib.auth.views.password_reset_confirm" uidb36=uid token=token %}
{{ protocol }}://{{ domain }}{% url django.contrib.auth.views.password_reset_confirm uidb36=uid token=token %}
{% endblock %}
{% trans "Your username, in case you've forgotten:" %} {{ user.username }}

View File

@ -17,7 +17,7 @@
{% blocktrans %} You registered a long time ago.
We aren't sure if you are a robot or if
something got lost or what.{% endblocktrans %}
{% trans "Please try" %} <a href="{% url "registration_register" %}">{% trans "registering again" %}</a>.
{% trans "Please try" %} <a href="{% url registration_register %}">{% trans "registering again" %}</a>.
</p>
<p class="quiet">
{% trans "We hope that isn't too inconvenient." %}