diff options
| author | Dusty Phillips <buchuki@gmail.com> | 2008-10-10 17:28:05 -0400 |
|---|---|---|
| committer | Dusty Phillips <buchuki@gmail.com> | 2008-10-10 17:28:05 -0400 |
| commit | d97d3a447c328e98df6d3b51d61a979d12cdad46 (patch) | |
| tree | 60e992f14b5341425f6f79455c4fe9e9ec6887b6 | |
| parent | edc9dfb7a49c91f7db3c4a3a568e218dffae70cf (diff) | |
drop search/ url and just go to packages
| -rw-r--r-- | templates/devel/siteindex.html | 4 | ||||
| -rw-r--r-- | templates/packages/search.html | 16 | ||||
| -rw-r--r-- | urls.py | 10 |
3 files changed, 16 insertions, 14 deletions
diff --git a/templates/devel/siteindex.html b/templates/devel/siteindex.html index efce282c..94ef405d 100644 --- a/templates/devel/siteindex.html +++ b/templates/devel/siteindex.html @@ -25,7 +25,7 @@ </tr> {% endfor %} <tr> - <td colspan="2" style="text-align:left;font-size:x-small"><br /><a href="/packages/search?sort=-last_update">More Updates...</a></td> + <td colspan="2" style="text-align:left;font-size:x-small"><br /><a href="/packages/?sort=-last_update">More Updates...</a></td> </tr> </table> </div> @@ -34,7 +34,7 @@ {% block content_right %} <div id="search"> - <form method="get" action="/packages/search/"> + <form method="get" action="/packages/"> <p><b>Package Search:</b> <input type="text" name="q" size="20" maxlength="200" /></p> </form> </div> diff --git a/templates/packages/search.html b/templates/packages/search.html index 75bc906b..af3fd9a0 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -10,7 +10,7 @@ {% block content %} <div class="greybox"> <h4 style="text-align: right">Search Criteria</h4> - <form method="get" action="/packages/search/"> + <form method="get" action="/packages/"> <table width="100%"> <tr> <td><span class="smalltext">Arch</span></td> @@ -42,13 +42,13 @@ <tr> <form method="post" action="/packages/update/"> <th> </th> - <th><a href="/packages/search/{% buildsortqs "arch" %}">Arch</a></th> - <th><a href="/packages/search/{% buildsortqs "repo" %}">Repo</a></th> - <th><a href="/packages/search/{% buildsortqs "pkgname" %}">Name</a></th> + <th><a href="/packages/{% buildsortqs "arch" %}">Arch</a></th> + <th><a href="/packages/{% buildsortqs "repo" %}">Repo</a></th> + <th><a href="/packages/{% buildsortqs "pkgname" %}">Name</a></th> <th>Version</th> <th>Description</th> - <th><a href="/packages/search/{% buildsortqs "maintainer" %}">Maintainer</a></th> - <th><a href="/packages/search/{% buildsortqs "-last_update" %}">Last Updated</a></th> + <th><a href="/packages/{% buildsortqs "maintainer" %}">Maintainer</a></th> + <th><a href="/packages/{% buildsortqs "-last_update" %}">Last Updated</a></th> </tr> {% for pkg in package_list %} @@ -75,7 +75,7 @@ </td> <td> {% if page_obj.has_previous %} - <a href="/packages/search/{{page_obj.previous_page_number}}/{{current_query}}"> + <a href="/packages/{{page_obj.previous_page_number}}/{{current_query}}"> <<< Previous </a> {% else %} @@ -84,7 +84,7 @@ </td> <td> {% if page_obj.has_next %} - <a href="/packages/search/{{page_obj.next_page_number}}/{{current_query}}"> + <a href="/packages/{{page_obj.next_page_number}}/{{current_query}}"> Next >>> </a> {% else %} @@ -15,15 +15,17 @@ urlpatterns = patterns('', (r'^packages/signoffs/$', 'archweb_dev.packages.views.signoffs'), (r'^packages/signoff_package/(?P<arch>[A-z0-9]+)/(?P<pkgname>[A-z0-9\-+.]+)/$', 'archweb_dev.packages.views.signoff_package'), - (r'^packages/search/$', 'archweb_dev.packages.views.search'), - (r'^packages/search/(?P<page>\d+)/$', 'archweb_dev.packages.views.search'), (r'^packages/update/$', 'archweb_dev.packages.views.update'), - (r'^packages/(?P<name>[A-z0-9\-+.]+)/$', 'archweb_dev.packages.views.details'), + + (r'^packages/$', 'archweb_dev.packages.views.search'), + (r'^packages/(?P<page>\d+)/$', 'archweb_dev.packages.views.search'), + + (r'^packages/(?P<name>[A-z0-9\-+.]+)/$', + 'archweb_dev.packages.views.details'), (r'^packages/(?P<repo>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/$', 'archweb_dev.packages.views.details'), (r'^packages/(?P<repo>[A-z0-9]+)/(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/$', 'archweb_dev.packages.views.details'), - (r'^packages/$', 'archweb_dev.packages.views.search'), (r'^todo/(\d+)/$', 'archweb_dev.todolists.views.view'), (r'^todo/add/$', 'archweb_dev.todolists.views.add'), |