Skip to content

Commit f46f3b7

Browse files
author
Richard Jones
committed
merge from maint-0-7
1 parent 64195c8 commit f46f3b7

File tree

2 files changed

+70
-76
lines changed

2 files changed

+70
-76
lines changed

‎templates/classic/html/_generic.help.html‎

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,66 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2-
<html tal:define="property request/form/property/value" >
2+
<html>
33
<head>
44
<link rel="stylesheet" type="text/css" href="@@file/style.css" />
5-
<meta http-equiv="Content-Type"
6-
tal:attributes="content string:text/html;; charset=${request/client/charset}" />
5+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8;" />
76
<tal:block tal:condition="python:request.form.has_key('property')">
8-
<title i18n:translate=""><tal:x i18n:name="property"
9-
tal:content="property" i18n:translate="" /> help - <span i18n:name="tracker"
10-
tal:replace="config/TRACKER_NAME" /></title>
11-
<script language="Javascript" type="text/javascript"
7+
<title tal:content="string:${request/form/property/value} help">Property</title>
8+
<script language="Javascript" type="text/javascript"
129
tal:content="structure string:
1310
// this is the name of the field in the original form that we're working on
14-
field = '${property}';" >
11+
field = '${request/form/property/value}';" >
1512
</script>
16-
<script src="@@file/help_controls.js" type="text/javascript"><!--
13+
<script src="@@file/help_controls.js" type="text/javascript"><!--
1714
//--></script>
1815
</tal:block>
1916
</head>
2017
<body class="body" onload="resetList();">
2118
<form name="frm_help" tal:attributes="action request/base"
2219
tal:define="batch request/batch;
2320
props python:request.form['properties'].value.split(',')">
24-
21+
2522
<div id="classhelp-controls">
26-
<!--input type="button" name="btn_clear"
23+
<!--input type="button" name="btn_clear"
2724
value="Clear" onClick="clearList()"/ -->
2825
<input type="text" name="text_preview" size="24" class="preview"
2926
onchange="reviseList(this.value);"/>
30-
<input type="button" name="btn_reset"
31-
value=" Cancel " onclick="resetList(); window.close();"
32-
i18n:attributes="value" />
27+
<input type="button" name="btn_reset"
28+
value=" Cancel " onclick="resetList(); window.close();"/>
3329
<input type="button" name="btn_apply" class="apply"
34-
value=" Apply " onclick="updateList(); window.close();"
35-
i18n:attributes="value" />
30+
value=" Apply " onclick="updateList(); window.close();"/>
3631
</div>
32+
<table width="100%">
33+
<tr class="navigation">
34+
<th>
35+
<a tal:define="prev batch/previous" tal:condition="prev"
36+
tal:attributes="href python:request.indexargs_href(request.classname,
37+
{'@template':'help', 'property': request.form['property'].value,
38+
'properties': request.form['properties'].value,
39+
'@startwith':prev.first, '@pagesize':prev.size})">&lt;&lt; previous</a>
40+
&nbsp;
41+
</th>
42+
<th tal:content="python: '%d...%d out of %d'%(batch.start,
43+
batch.start+batch.length-1, batch.sequence_length)">current</th>
44+
<th>
45+
<a tal:define="next batch/next" tal:condition="next"
46+
tal:attributes="href python:request.indexargs_href(request.classname,
47+
{'@template':'help', 'property': request.form['property'].value,
48+
'properties': request.form['properties'].value,
49+
'@startwith':next.first, '@pagesize':next.size})">next &gt;&gt;</a>
50+
&nbsp;
51+
</th>
52+
</tr>
53+
</table>
3754

3855
<table class="classhelp">
3956
<tr>
4057
<th>&nbsp;<b>x</b></th>
41-
<th tal:repeat="prop props" tal:content="prop" i18n:translate=""></th>
58+
<th tal:repeat="prop props" tal:content="prop"></th>
4259
</tr>
4360
<tr tal:repeat="item batch">
4461
<tal:block tal:define="attr python:item[props[0]]">
4562
<td>
46-
<input type="checkbox" name="check"
63+
<input type="checkbox" name="check"
4764
onclick="updatePreview();"
4865
tal:attributes="value attr; id string:id_$attr" />
4966
</td>
@@ -56,29 +73,9 @@
5673
</tr>
5774
<tr>
5875
<th>&nbsp;<b>x</b></th>
59-
<th tal:repeat="prop props" tal:content="prop" i18n:translate=""></th>
76+
<th tal:repeat="prop props" tal:content="prop"></th>
6077
</tr>
6178
</table>
62-
<table width="100%">
63-
<tr class="navigation">
64-
<th>
65-
<a tal:define="prev batch/previous" tal:condition="prev"
66-
tal:attributes="href string:${request/classname}?@template=help&@startwith=${prev/first}&property=${property}&properties=${request/form/properties/value}"
67-
i18n:translate="">&lt;&lt; previous</a>
68-
&nbsp;
69-
</th>
70-
<th i18n:translate=""><span tal:replace="batch/start" i18n:name="start"
71-
/>..<span tal:replace="python: batch.start + batch.length -1" i18n:name="end"
72-
/> out of <span tal:replace="batch/sequence_length" i18n:name="total"
73-
/></th>
74-
<th>
75-
<a tal:define="next batch/next" tal:condition="next"
76-
tal:attributes="href string:${request/classname}?@template=help&@startwith=${next/first}&property=${property}&properties=${request/form/properties/value}"
77-
i18n:translate="">next &gt;&gt;</a>
78-
&nbsp;
79-
</th>
80-
</tr>
81-
</table>
8279

8380
</form>
8481
</body>

‎templates/minimal/html/_generic.help.html‎

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,56 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2-
<html tal:define="property request/form/property/value" >
2+
<html>
33
<head>
44
<link rel="stylesheet" type="text/css" href="@@file/style.css" />
5-
<meta http-equiv="Content-Type"
6-
tal:attributes="content string:text/html;; charset=${request/client/charset}" />
5+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8;" />
76
<tal:block tal:condition="python:request.form.has_key('property')">
8-
<title i18n:translate=""><span i18n:name="property"
9-
tal:replace="property" /> help - <span i18n:name="tracker"
10-
tal:replace="config/TRACKER_NAME" /></title>
11-
<script language="Javascript" type="text/javascript"
7+
<title tal:content="string:${request/form/property/value} help">Property</title>
8+
<script language="Javascript" type="text/javascript"
129
tal:content="structure string:
1310
// this is the name of the field in the original form that we're working on
14-
field = '${property}';" >
11+
field = '${request/form/property/value}';" >
1512
</script>
16-
<script src="@@file/help_controls.js" type="text/javascript"><!--
13+
<script src="@@file/help_controls.js" type="text/javascript"><!--
1714
//--></script>
1815
</tal:block>
1916
</head>
2017
<body class="body" onload="resetList();">
2118
<form name="frm_help" tal:attributes="action request/base"
2219
tal:define="batch request/batch;
2320
props python:request.form['properties'].value.split(',')">
24-
21+
2522
<div id="classhelp-controls">
26-
<!--input type="button" name="btn_clear"
23+
<!--input type="button" name="btn_clear"
2724
value="Clear" onClick="clearList()"/ -->
2825
<input type="text" name="text_preview" size="24" class="preview"
2926
onchange="reviseList(this.value);"/>
30-
<input type="button" name="btn_reset"
31-
value=" Cancel " onclick="resetList(); window.close();"
32-
i18n:attributes="value" />
27+
<input type="button" name="btn_reset"
28+
value=" Cancel " onclick="resetList(); window.close();"/>
3329
<input type="button" name="btn_apply" class="apply"
34-
value=" Apply " onclick="updateList(); window.close();"
35-
i18n:attributes="value" />
30+
value=" Apply " onclick="updateList(); window.close();"/>
3631
</div>
32+
<table width="100%">
33+
<tr class="navigation">
34+
<th>
35+
<a tal:define="prev batch/previous" tal:condition="prev"
36+
tal:attributes="href python:request.indexargs_href(request.classname,
37+
{'@template':'help', 'property': request.form['property'].value,
38+
'properties': request.form['properties'].value,
39+
'@startwith':prev.first, '@pagesize':prev.size})">&lt;&lt; previous</a>
40+
&nbsp;
41+
</th>
42+
<th tal:content="python: '%d...%d out of %d'%(batch.start,
43+
batch.start+batch.length-1, batch.sequence_length)">current</th>
44+
<th>
45+
<a tal:define="next batch/next" tal:condition="next"
46+
tal:attributes="href python:request.indexargs_href(request.classname,
47+
{'@template':'help', 'property': request.form['property'].value,
48+
'properties': request.form['properties'].value,
49+
'@startwith':next.first, '@pagesize':next.size})">next &gt;&gt;</a>
50+
&nbsp;
51+
</th>
52+
</tr>
53+
</table>
3754

3855
<table class="classhelp">
3956
<tr>
@@ -43,7 +60,7 @@
4360
<tr tal:repeat="item batch">
4461
<tal:block tal:define="attr python:item[props[0]]">
4562
<td>
46-
<input type="checkbox" name="check"
63+
<input type="checkbox" name="check"
4764
onclick="updatePreview();"
4865
tal:attributes="value attr; id string:id_$attr" />
4966
</td>
@@ -59,26 +76,6 @@
5976
<th tal:repeat="prop props" tal:content="prop"></th>
6077
</tr>
6178
</table>
62-
<table width="100%">
63-
<tr class="navigation">
64-
<th>
65-
<a tal:define="prev batch/previous" tal:condition="prev"
66-
tal:attributes="href string:${request/classname}?@template=help&@startwith=${prev/first}&property=${property}&properties=${request/form/properties/value}"
67-
i18n:translate="">&lt;&lt; previous</a>
68-
&nbsp;
69-
</th>
70-
<th i18n:translate=""><span tal:replace="batch/start" i18n:name="start"
71-
/>..<span tal:replace="python: batch.start + batch.length -1" i18n:name="end"
72-
/> out of <span tal:replace="batch/sequence_length" i18n:name="total"
73-
/></th>
74-
<th>
75-
<a tal:define="next batch/next" tal:condition="next"
76-
tal:attributes="href string:${request/classname}?@template=help&@startwith=${next/first}&property=${property}&properties=${request/form/properties/value}"
77-
i18n:translate="">next &gt;&gt;</a>
78-
&nbsp;
79-
</th>
80-
</tr>
81-
</table>
8279

8380
</form>
8481
</body>

0 commit comments

Comments
 (0)