Mercurial > p > roundup > code
annotate templates/classic/html/query.edit.html @ 3696:790363e96852
Sorting/grouping by multiple properties.
- Implement sorting/grouping by multiple properties for the web
interface. I'm now using @sort0/@sortdir0,@sort1/@sortdir1,... and
@group0/@groupdir0,... when generating URLs from a search template.
These are converted to a list internally. When saving URLs (e.g. when
storing queries) I'm using @sort=prop1,prop2,... and @group=... with
optional '-' prepended to individual props.
This means saved URLs are backward compatible with existing trackers
(and yes, this was a design goal).
I need the clumsy version with @sort0,@sort1 etc, because I'm
currently using several selectors and checkboxes (as the classic
template does, too). I don't think there is a way around that in HTML?
- Updated (hopefully all) documentation to reflect the new URL format
and the consequences in the web-interface.
- I've set the number of sort/group properties in the classic template
to two -- this can easily be reverted by changing n_sort to 1.
Richard, would you look over these changes? I've set a tag before and
(will set) after commit, so that it would be easy to merge out.
Don't be too scared about the size of the change, most is documentation,
the guts are in cgi/templating.py and small changes in the classic
template.
| author | Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net> |
|---|---|
| date | Wed, 30 Aug 2006 20:28:26 +0000 |
| parents | 7fb8cfe3c737 |
| children | 00896a2acaa5 |
| rev | line source |
|---|---|
|
2136
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1 <!-- dollarId: user.item,v 1.7 2002/08/16 04:29:04 richard Exp dollar--> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2 <tal:block metal:use-macro="templates/page/macros/icing"> |
|
2395
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
3 <title metal:fill-slot="head_title" i18n:translate="" |
|
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
4 >"Your Queries" Editing - <span tal:replace="config/TRACKER_NAME" |
|
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
5 i18n:name="tracker" /></title> |
|
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
6 <span metal:fill-slot="body_title" tal:omit-tag="python:1" |
|
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
7 i18n:translate="">"Your Queries" Editing</span> |
|
2136
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
8 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
9 <td class="content" metal:fill-slot="content"> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
10 |
|
2395
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
11 <span tal:condition="not:context/is_edit_ok" |
|
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
12 i18n:translate="">You are not allowed to edit queries.</span> |
|
2136
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
13 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
14 <script language="javascript"> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
15 // This exists solely because I can't figure how to get the & into an |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
16 // attributes TALES expression, and so it keeps getting quoted. |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
17 function retire(qid) { |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
18 window.location = 'query'+qid+'?@action=retire&@template=edit'; |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
19 } |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
20 </script> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
21 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
22 <form method="POST" onSubmit="return submit_once()" action="query" |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
23 enctype="multipart/form-data" tal:condition="context/is_edit_ok"> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
24 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
25 <table class="list" width="100%" |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
26 tal:define="uid request/user/id; mine request/user/queries"> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
27 |
|
2395
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
28 <tr><th i18n:translate="">Query</th> |
|
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
29 <th i18n:translate="">Include in "Your Queries"</th> |
|
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
30 <th i18n:translate="">Edit</th> |
|
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
31 <th i18n:translate="">Private to you?</th> |
|
2136
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
32 <th> </th> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
33 </tr> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
34 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
35 <tr tal:repeat="query mine"> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
36 <tal:block condition="query/is_retired"> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
37 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
38 <td><a tal:attributes="href string:${query/klass}?${query/url}" |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
39 tal:content="query/name">query</a></td> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
40 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
41 <td metal:define-macro="include"> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
42 <select tal:condition="python:query.id not in mine" |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
43 tal:attributes="name string:user${uid}@add@queries"> |
|
2395
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
44 <option value="" i18n:translate="">leave out</option> |
|
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
45 <option tal:attributes="value query/id" i18n:translate="">include</option> |
|
2136
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
46 </select> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
47 <select tal:condition="python:query.id in mine" |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
48 tal:attributes="name string:user${uid}@remove@queries"> |
|
2395
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
49 <option value="" i18n:translate="">leave in</option> |
|
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
50 <option tal:attributes="value query/id" i18n:translate="">remove</option> |
|
2136
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
51 </select> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
52 </td> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
53 |
|
2395
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
54 <td colspan="3" i18n:translate="">[query is retired]</td> |
|
2136
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
55 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
56 <!-- <td> maybe offer "restore" some day </td> --> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
57 </tal:block> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
58 </tr> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
59 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
60 <tr tal:define="queries python:db.query.filter(filterspec={'private_for':uid})" |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
61 tal:repeat="query queries"> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
62 <td><a tal:attributes="href string:${query/klass}?${query/url}" |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
63 tal:content="query/name">query</a></td> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
64 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
65 <td metal:use-macro="template/macros/include" /> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
66 |
|
2395
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
67 <td><a tal:attributes="href string:query${query/id}" i18n:translate="">edit</a></td> |
|
2136
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
68 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
69 <td> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
70 <select tal:attributes="name string:query${query/id}@private_for"> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
71 <option tal:attributes="selected python:query.private_for == uid; |
|
2395
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
72 value uid" i18n:translate="">yes</option> |
|
2136
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
73 <option tal:attributes="selected python:query.private_for == None" |
|
2395
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
74 value="-1" i18n:translate="">no</option> |
|
2136
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
75 </select> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
76 </td> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
77 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
78 <td> |
|
2395
97f810f39d16
i18n markup
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2187
diff
changeset
|
79 <input type="button" value="Delete" i18n:attributes="value" |
|
2136
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
80 tal:attributes="onClick python:'''retire('%s')'''%query.id"> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
81 </td> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
82 </tr> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
83 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
84 <tr tal:define="queries python:db.query.filter(filterspec={'private_for':None})" |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
85 tal:repeat="query queries"> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
86 <td><a tal:attributes="href string:${query/klass}?${query/url}" |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
87 tal:content="query/name">query</a></td> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
88 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
89 <td metal:use-macro="template/macros/include" /> |
|
3518
7fb8cfe3c737
enable editing of public queries [SF#966144]
Richard Jones <richard@users.sourceforge.net>
parents:
2395
diff
changeset
|
90 |
|
7fb8cfe3c737
enable editing of public queries [SF#966144]
Richard Jones <richard@users.sourceforge.net>
parents:
2395
diff
changeset
|
91 <td colspan="3" tal:condition="query/is_edit_ok"> |
|
7fb8cfe3c737
enable editing of public queries [SF#966144]
Richard Jones <richard@users.sourceforge.net>
parents:
2395
diff
changeset
|
92 <a tal:attributes="href string:query${query/id}" i18n:translate="">edit</a> |
|
7fb8cfe3c737
enable editing of public queries [SF#966144]
Richard Jones <richard@users.sourceforge.net>
parents:
2395
diff
changeset
|
93 </td> |
|
7fb8cfe3c737
enable editing of public queries [SF#966144]
Richard Jones <richard@users.sourceforge.net>
parents:
2395
diff
changeset
|
94 <td tal:condition="not:query/is_edit_ok" colspan="3" |
|
7fb8cfe3c737
enable editing of public queries [SF#966144]
Richard Jones <richard@users.sourceforge.net>
parents:
2395
diff
changeset
|
95 i18n:translate="">[not yours to edit]</td> |
|
7fb8cfe3c737
enable editing of public queries [SF#966144]
Richard Jones <richard@users.sourceforge.net>
parents:
2395
diff
changeset
|
96 |
|
2136
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
97 </tr> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
98 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
99 <tr><td colspan="5"> |
|
3518
7fb8cfe3c737
enable editing of public queries [SF#966144]
Richard Jones <richard@users.sourceforge.net>
parents:
2395
diff
changeset
|
100 <input type="hidden" name="@action" value="edit"> |
|
7fb8cfe3c737
enable editing of public queries [SF#966144]
Richard Jones <richard@users.sourceforge.net>
parents:
2395
diff
changeset
|
101 <input type="hidden" name="@template" value="edit"> |
|
7fb8cfe3c737
enable editing of public queries [SF#966144]
Richard Jones <richard@users.sourceforge.net>
parents:
2395
diff
changeset
|
102 <input type="submit" value="Save Selection" i18n:attributes="value"> |
|
2136
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
103 </td></tr> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
104 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
105 </table> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
106 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
107 </form> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
108 </td> |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
109 </tal:block> |
