1
=== modified file 'src/schooltool/skin/templates/widget_macros.pt'
2
--- src/schooltool/skin/templates/widget_macros.pt	2007-11-14 18:47:28 +0000
3
+++ src/schooltool/skin/templates/widget_macros.pt	2010-02-09 20:26:10 +0000
4
@@ -20,6 +20,39 @@
5
20
</div>
20
</div>
6
21
</metal:block>
21
</metal:block>
7
22
22
8
23
<metal:block define-macro="widget_split_row">
9
24
  <label for="field.name" title="The widget's hint" style="width: 20em"
10
25
    tal:condition="widget/label"
11
26
    tal:attributes="for widget/name; title widget/hint"
12
27
    tal:content="widget/label">The Label</label>
13
28
  <p class="hint" tal:condition="widget/hint" tal:content="widget/hint" />
14
29
  <div class="field">
15
30
    <input type="text" style="width:100%" tal:replace="structure widget" />
16
31
    <metal:block define-slot="extra" />
17
32
  </div>
18
33
  <div class="clear">&nbsp;</div>
19
34
  <div class="error" tal:define="error widget/error"
20
35
    tal:condition="error" tal:content="structure error">
21
36
    The Error
22
37
  </div>
23
38
</metal:block>
24
39
25
40
<metal:block define-macro="widget_fieldset_row">
26
41
<fieldset>
27
42
  <legend tal:content="widget/label" />
28
43
  <p class="hint" tal:condition="widget/hint" tal:content="widget/hint" />
29
44
  <div class="field">
30
45
    <input type="text" style="width:100%" tal:replace="structure widget" />
31
46
    <metal:block define-slot="extra" />
32
47
  </div>
33
48
  <div class="clear">&nbsp;</div>
34
49
  <div class="error" tal:define="error widget/error"
35
50
    tal:condition="error" tal:content="structure error">
36
51
    The Error
37
52
  </div>
38
53
</fieldset>
39
54
</metal:block>
40
55
41
23
<div class="field" metal:define-macro="checkbox_widget">
56
<div class="field" metal:define-macro="checkbox_widget">
42
24
  <input type="text" tal:replace="structure widget" />
57
  <input type="text" tal:replace="structure widget" />
43
25
  <label tal:attributes="for widget/name"
58
  <label tal:attributes="for widget/name"
Status:	Merged
Merged at revision:	not available
Proposed branch:	lp:~aelkner/schooltool/january_fixes
Merge into:	lp:schooltool/1.7
Diff against target:	43 lines (+33/-0) 1 file modified src/schooltool/skin/templates/widget_macros.pt (+33/-0)
To merge this branch:	bzr merge lp:~aelkner/schooltool/january_fixes
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
SchoolTool Owners		2010-02-09	Pending
Review via email: mp+18953@code.launchpad.net