SchoolTool

Merge lp:~aelkner/schooltool/january_fixes into lp:schooltool/1.7

  1. january_fixes
  2. Merge into 1.7
Proposed by Gediminas Paulauskas
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
Reviewer Review Type Date Requested Status
SchoolTool Owners Pending
Review via email: mp+18953@code.launchpad.net

This proposal supersedes a proposal from 2010-01-30.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 </div>
6 </metal:block>
7
8+<metal:block define-macro="widget_split_row">
9+ <label for="field.name" title="The widget's hint" style="width: 20em"
10+ tal:condition="widget/label"
11+ tal:attributes="for widget/name; title widget/hint"
12+ tal:content="widget/label">The Label</label>
13+ <p class="hint" tal:condition="widget/hint" tal:content="widget/hint" />
14+ <div class="field">
15+ <input type="text" style="width:100%" tal:replace="structure widget" />
16+ <metal:block define-slot="extra" />
17+ </div>
18+ <div class="clear">&nbsp;</div>
19+ <div class="error" tal:define="error widget/error"
20+ tal:condition="error" tal:content="structure error">
21+ The Error
22+ </div>
23+</metal:block>
24+
25+<metal:block define-macro="widget_fieldset_row">
26+<fieldset>
27+ <legend tal:content="widget/label" />
28+ <p class="hint" tal:condition="widget/hint" tal:content="widget/hint" />
29+ <div class="field">
30+ <input type="text" style="width:100%" tal:replace="structure widget" />
31+ <metal:block define-slot="extra" />
32+ </div>
33+ <div class="clear">&nbsp;</div>
34+ <div class="error" tal:define="error widget/error"
35+ tal:condition="error" tal:content="structure error">
36+ The Error
37+ </div>
38+</fieldset>
39+</metal:block>
40+
41 <div class="field" metal:define-macro="checkbox_widget">
42 <input type="text" tal:replace="structure widget" />
43 <label tal:attributes="for widget/name"

Subscribers

People subscribed via source and target branches