Martinvlba/evorepo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop search/ url and just go to packages

Browse Source
This commit is contained in:
Dusty Phillips 2008-10-10 17:28:05 -04:00
parent edc9dfb7a4
commit d97d3a447c
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/devel/siteindex.html
View File

@ -25,7 +25,7 @@ <h3>Latest News</h2>
</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 @@ <h3>Latest News</h2>
{% block content_right %}
<div id="search">
<form method="get" action="/packages/search/">
<form method="get" action="/packages/">
<p><b>Package Search:</b>&nbsp;&nbsp;<input type="text" name="q" size="20" maxlength="200" /></p>
</form>
</div>

16
templates/packages/search.html
View File

@ -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 @@ <h4 style="text-align: right">Search Criteria</h4>
<tr>
<form method="post" action="/packages/update/">
<th>&nbsp;</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 @@ <h4 style="text-align: right">Search Criteria</h4>
</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}}">
&lt;&lt;&lt; Previous
</a>
{% else %}
@ -84,7 +84,7 @@ <h4 style="text-align: right">Search Criteria</h4>
</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 &gt;&gt;&gt;
</a>
{% else %}

10
urls.py
View File

@ -15,15 +15,17 @@
(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'),