changeset 145:ddeb2ac3d828 draft

urls: use /bugs/* instead of underscored urls
author diegoe-guest
date Wed, 12 Aug 2009 20:51:03 +0000
parents c93c594f1f98
children 79a57c5f9477
files bts_webui/amancay/templates/base.html bts_webui/amancay/toolbox.py bts_webui/amancay/urls.py
diffstat 3 files changed, 31 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/bts_webui/amancay/templates/base.html
+++ b/bts_webui/amancay/templates/base.html
@@ -54,11 +54,11 @@
 			<!-- Column 2 start -->
 			<h3 class="sidebar_title">Bugs</h3>
 			• <a id="search_link" href="/search">Search</a><br/>
-			• <a id="selected_bugs_link" href="/selected_bugs">Selected</a><br/>
-			• <a id="tagged_bugs_link" href="/tagged_bugs">Tagged</a><br/>
-			• <a id="submitted_bugs_link" href="/submitted_bugs">Latest Submitted</a><br/>
-			• <a id="received_bugs_link" href="/received_bugs">Latest Received</a><br/>
-			• <a id="package_bugs_link" href="/package_bugs">Selected Packages</a><br/>
+			• <a id="selected_bugs_link" href="/bugs/selected">Selected</a><br/>
+			• <a id="tagged_bugs_link" href="/bugs/tagged">Tagged</a><br/>
+			• <a id="submitted_bugs_link" href="/bugs/submitted">Latest Submitted</a><br/>
+			• <a id="received_bugs_link" href="/bugs/received">Latest Received</a><br/>
+			• <a id="package_bugs_link" href="/bugs/packages">Selected Packages</a><br/>
 
 			{% block sidebar %}
 			{% endblock %}
--- a/bts_webui/amancay/toolbox.py
+++ b/bts_webui/amancay/toolbox.py
@@ -26,4 +26,3 @@
 								   'bug_list': bug_list, 
 								   'current_user': user},
 								  context_instance=RequestContext(request))
-
--- a/bts_webui/amancay/urls.py
+++ b/bts_webui/amancay/urls.py
@@ -1,37 +1,37 @@
+# vim: set sw=4 ts=4 sts=4 noet:
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('',
-	# Normal pages
-	(r'^$', 'amancay.views.index',),
-	(r'^index', 'amancay.views.index',),
+	(r'^$',		'amancay.views.index',),
+	(r'^index',	'amancay.views.index',),
+
+	(r'^search',			'amancay.search.search',),
 
-	# Bug pages
-	(r'^package_bugs', 'amancay.tables.package_bugs',),
-	(r'^received_bugs', 'amancay.tables.received_bugs',),
-	(r'^search', 'amancay.search.search',),
-	(r'^selected_bugs', 'amancay.tables.selected_bugs',),
-	(r'^submitted_bugs', 'amancay.tables.submitted_bugs',),
-	(r'^tagged_bugs', 'amancay.tables.tagged_bugs',),
+	(r'^bugs/packages',		'amancay.tables.package_bugs',),
+	(r'^bugs/received',		'amancay.tables.received_bugs',),
+	(r'^bugs/selected',		'amancay.tables.selected_bugs',),
+	(r'^bugs/submitted',	'amancay.tables.submitted_bugs',),
+	(r'^bugs/tagged',		'amancay.tables.tagged_bugs',),
 
 	# Inside pages
-	(r'^(?P<bug_number>\d+)/?$', 'amancay.bugs.bug',),
-	(r'^bug/(?P<bug_number>\d+)', 'amancay.bugs.bug',),
-	(r'^package/(?P<package_name>\w+)', 'amancay.views.package',),
+	(r'^(?P<bug_number>\d+)/?$',		'amancay.bugs.bug',),
+	(r'^bug/(?P<bug_number>\d+)',		'amancay.bugs.bug',),
+	(r'^package/(?P<package_name>\w+)',	'amancay.views.package',),
 
-	# Small pieces
-	(r'^ajax/package/add/', 'amancay.ajax.package_add',),
-	(r'^ajax/bug/add/', 'amancay.ajax.bug_add',),
-	(r'^ajax/maintainer/add/', 'amancay.ajax.maintainer_add',),
-	(r'^ajax/submitter/add/', 'amancay.ajax.submitter_add',),
-	(r'^ajax/user/add/', 'amancay.ajax.user_add',),
-	
-	(r'^ajax/package/remove/', 'amancay.ajax.package_remove',),
-	(r'^ajax/bug/remove/', 'amancay.ajax.bug_remove',),
-	(r'^ajax/maintainer/remove/', 'amancay.ajax.maintainer_remove',),
-	(r'^ajax/submitter/remove/', 'amancay.ajax.submitter_remove',),
-	(r'^ajax/user/remove/', 'amancay.ajax.user_remove',),
+	# Small pieces for AJAX
+	(r'^ajax/package/add/',		'amancay.ajax.package_add',),
+	(r'^ajax/bug/add/',			'amancay.ajax.bug_add',),
+	(r'^ajax/maintainer/add/',	'amancay.ajax.maintainer_add',),
+	(r'^ajax/submitter/add/',	'amancay.ajax.submitter_add',),
+	(r'^ajax/user/add/',		'amancay.ajax.user_add',),
 
-	(r'^ajax/bug/subscribe/', 'amancay.ajax.bug_subscribe',),
+	(r'^ajax/package/remove/',		'amancay.ajax.package_remove',),
+	(r'^ajax/bug/remove/',			'amancay.ajax.bug_remove',),
+	(r'^ajax/maintainer/remove/',	'amancay.ajax.maintainer_remove',),
+	(r'^ajax/submitter/remove/',	'amancay.ajax.submitter_remove',),
+	(r'^ajax/user/remove/',			'amancay.ajax.user_remove',),
+
+	(r'^ajax/bug/subscribe/',	'amancay.ajax.bug_subscribe',),
 	(r'^ajax/bug/unsubscribe/', 'amancay.ajax.bug_unsubscribe',),
 
 	# Account Settings
@@ -45,7 +45,4 @@
 		{'document_root': 'amancay/images/'}),
 	(r'^static/(.*)$', 'django.views.static.serve',
 		{'document_root': 'amancay/static/'}),
-
-	# Uncomment this for admin:
-	#   (r'^admin/', include('django.contrib.admin.urls')),
 )