![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 84743f9)
raw | patch | inline | side by side (parent: 84743f9)
| author | stefan <stefan@57a73879-2fb5-44c3-a270-3262357dd7e2> | |
| Thu, 21 Apr 2011 15:30:17 +0000 (15:30 +0000) | ||
| committer | stefan <stefan@57a73879-2fb5-44c3-a270-3262357dd7e2> | |
| Thu, 21 Apr 2011 15:30:17 +0000 (15:30 +0000) |
git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/roundup/trunk@4602 57a73879-2fb5-44c3-a270-3262357dd7e2
diff --git a/share/roundup/templates/devel/html/_generic.keywords_expr.html b/share/roundup/templates/devel/html/_generic.keywords_expr.html
--- /dev/null
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+ <head>
+ <link rel="stylesheet" type="text/css" href="@@file/help.css" />
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8;" />
+ <title tal:content="string:Roundup Keywords Expression Editor"></title>
+ </head>
+ <body class="body"
+ tal:content="structure python:utils.keywords_expressions(request)">
+ </body>
+</html>
diff --git a/share/roundup/templates/devel/html/bug.search.html b/share/roundup/templates/devel/html/bug.search.html
index 4bfd6650b6c1f8e4ceb8796b88da720454062f51..51c9be05374849f616e7a89c699b86bfb1139c54 100644 (file)
sort_input templates/page/macros/sort_input;
group_input templates/page/macros/group_input;
search_select templates/page/macros/search_select;
+ search_select_keywords templates/page/macros/search_select_keywords;
search_select_translated templates/page/macros/search_select_translated;
search_multiselect templates/page/macros/search_multiselect;">
<td metal:use-macro="group_input"></td>
</tr>
-<tr tal:define="name string:keywords;
+<tr tal:define="name string:keyword;
db_klass string:keyword;
db_content string:name;">
<th i18n:translate="">Keyword:</th>
- <td metal:use-macro="search_select_translated">
+ <td metal:use-macro="search_select_keywords">
<option metal:fill-slot="extra_options" value="-1" i18n:translate=""
tal:attributes="selected python:value == '-1'">not set</option>
</td>
diff --git a/share/roundup/templates/devel/html/page.html b/share/roundup/templates/devel/html/page.html
index fcbf0afa9dab58364b120bc2bbf243d48692c66f..fc464024e081e835d59d23aab60da8feb2f60872 100644 (file)
</td>
<td metal:define-macro="search_select_keywords">
+ <div tal:attributes="id python:'''keywords_%s'''%name">
<select tal:attributes="name name; id name"
tal:define="value python:request.form.getvalue(name)">
<option value="" i18n:translate="">don't care</option>
tal:content="python:s[db_content]"></option>
</select>
<a class="classhelp"
- tal:attributes="href python:'''javascript:help_window('task?@template=&property=%s&form=itemSynopsis', 300, 200)'''%name">(edit)</a>
+ tal:attributes="href python:'''javascript:help_window('%s?@template=keywords_expr&property=%s&form=itemSynopsis', 300, 200)'''%(request.classname, name)">(edit)</a>
+ </div>
</td>
<!-- like search_select, but translates the further values.
diff --git a/share/roundup/templates/devel/html/task.search.html b/share/roundup/templates/devel/html/task.search.html
index 9679cfbe8c7b34641a49590813110cca8a9e12bc..c1aac6caf2687e667ae9dc6f7df9a4d5b9a07d3d 100644 (file)
sort_input templates/page/macros/sort_input;
group_input templates/page/macros/group_input;
search_select templates/page/macros/search_select;
+ search_select_keywords templates/page/macros/search_select_keywords;
search_select_translated templates/page/macros/search_select_translated;
search_multiselect templates/page/macros/search_multiselect;">
db_klass string:keyword;
db_content string:name;">
<th i18n:translate="">Keyword:</th>
- <td metal:use-macro="search_select_translated">
+ <td metal:use-macro="search_select_keywords">
<option metal:fill-slot="extra_options" value="-1" i18n:translate=""
tal:attributes="selected python:value == '-1'">not set</option>
</td>