Skip to content

Commit 76055b5

Browse files
author
Richard Jones
committed
more fixes
1 parent e4adc74 commit 76055b5

File tree

2 files changed

+60
-48
lines changed

2 files changed

+60
-48
lines changed

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

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,28 @@
2929
<input type="button" name="btn_apply" class="apply"
3030
value=" Apply " onclick="updateList(); window.close();"/>
3131
</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>
3254

3355
<table class="classhelp">
3456
<tr>
@@ -54,22 +76,6 @@
5476
<th tal:repeat="prop props" tal:content="prop"></th>
5577
</tr>
5678
</table>
57-
<table width="100%">
58-
<tr class="navigation">
59-
<th>
60-
<a tal:define="prev batch/previous" tal:condition="prev"
61-
tal:attributes="href string:${request/classname}?@template=help&@startwith=${prev/first}&property=${request/form/property/value}&properties=${request/form/properties/value}">&lt;&lt; previous</a>
62-
&nbsp;
63-
</th>
64-
<th tal:content="python: '%d...%d out of %d'%(batch.start,
65-
batch.start+batch.length-1, batch.sequence_length)">current</th>
66-
<th>
67-
<a tal:define="next batch/next" tal:condition="next"
68-
tal:attributes="href string:${request/classname}?@template=help&@startwith=${next/first}&property=${request/form/property/value}&properties=${request/form/properties/value}">next &gt;&gt;</a>
69-
&nbsp;
70-
</th>
71-
</tr>
72-
</table>
7379

7480
</form>
7581
</body>

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

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<html>
33
<head>
4-
<link rel="stylesheet" type="text/css" href="_file/style.css" />
4+
<link rel="stylesheet" type="text/css" href="@@file/style.css" />
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8;" />
66
<tal:block tal:condition="python:request.form.has_key('property')">
77
<title tal:content="string:${request/form/property/value} help">Property</title>
@@ -10,16 +10,16 @@
1010
// this is the name of the field in the original form that we're working on
1111
field = '${request/form/property/value}';" >
1212
</script>
13-
<script src="_file/help_controls.js" type="text/javascript"><!--
13+
<script src="@@file/help_controls.js" type="text/javascript"><!--
1414
//--></script>
1515
</tal:block>
1616
</head>
17-
<body class="body" marginwidth="0" marginheight="0" onload="resetList();">
18-
<form name="frm_help" action=""
17+
<body class="body" onload="resetList();">
18+
<form name="frm_help" tal:attributes="action request/base"
1919
tal:define="batch request/batch;
2020
props python:request.form['properties'].value.split(',')">
2121

22-
<div id="classhelp-controls" tal:condition="python:start==0">
22+
<div id="classhelp-controls">
2323
<!--input type="button" name="btn_clear"
2424
value="Clear" onClick="clearList()"/ -->
2525
<input type="text" name="text_preview" size="24" class="preview"
@@ -29,48 +29,54 @@
2929
<input type="button" name="btn_apply" class="apply"
3030
value=" Apply " onclick="updateList(); window.close();"/>
3131
</div>
32-
33-
<table class="classhelp">
34-
<tr>
35-
<th>&nbsp;<b>x</b></th>
36-
<th tal:repeat="prop props" tal:content="prop"></th>
37-
</tr>
38-
<tr tal:repeat="item batch">
39-
<td>
40-
<input type="checkbox" name="check"
41-
onclick="updatePreview();"
42-
tal:condition="python:start==0"
43-
tal:define="attr python:item[props[0]]"
44-
tal:attributes="value attr; id attr" />
45-
</td>
46-
<td tal:repeat="prop props">
47-
<label class="classhelp-label"
48-
tal:attributes="for python:item[props[0]]"
49-
tal:content="structure python:item[prop]"></label>
50-
</td>
51-
</tr>
52-
<tr>
53-
<th>&nbsp;<b>x</b></th>
54-
<th tal:repeat="prop props" tal:content="prop"></th>
55-
</tr>
56-
</table>
5732
<table width="100%">
5833
<tr class="navigation">
5934
<th>
6035
<a tal:define="prev batch/previous" tal:condition="prev"
61-
tal:attributes="href string:${request/classname}?@template=help&@startwith=${prev/first}&properties=${request/form/properties/value}">&lt;&lt; previous</a>
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>
6240
&nbsp;
6341
</th>
6442
<th tal:content="python: '%d...%d out of %d'%(batch.start,
6543
batch.start+batch.length-1, batch.sequence_length)">current</th>
6644
<th>
6745
<a tal:define="next batch/next" tal:condition="next"
68-
tal:attributes="href string:${request/classname}?@template=help&@startwith=${next/first}&properties=${request/form/properties/value}">next &gt;&gt;</a>
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>
6950
&nbsp;
7051
</th>
7152
</tr>
7253
</table>
7354

55+
<table class="classhelp">
56+
<tr>
57+
<th>&nbsp;<b>x</b></th>
58+
<th tal:repeat="prop props" tal:content="prop"></th>
59+
</tr>
60+
<tr tal:repeat="item batch">
61+
<tal:block tal:define="attr python:item[props[0]]">
62+
<td>
63+
<input type="checkbox" name="check"
64+
onclick="updatePreview();"
65+
tal:attributes="value attr; id string:id_$attr" />
66+
</td>
67+
<td tal:repeat="prop props">
68+
<label class="classhelp-label"
69+
tal:attributes="for string:id_$attr"
70+
tal:content="structure python:item[prop]"></label>
71+
</td>
72+
</tal:block>
73+
</tr>
74+
<tr>
75+
<th>&nbsp;<b>x</b></th>
76+
<th tal:repeat="prop props" tal:content="prop"></th>
77+
</tr>
78+
</table>
79+
7480
</form>
7581
</body>
7682
</html>

0 commit comments

Comments
 (0)