Ubuntu
z3c.formui package

Merge lp:~logan/ubuntu/raring/z3c.formui/2.3.0 into lp:ubuntu/raring/z3c.formui

  1. Raring (13.04)
  2. 2.3.0
  3. Merge into raring
Proposed by Logan Rosen
Status: Merged
Merged at revision: 7
Proposed branch: lp:~logan/ubuntu/raring/z3c.formui/2.3.0
Merge into: lp:ubuntu/raring/z3c.formui
Diff against target: 411 lines (+78/-33)
11 files modified
.pc/test-requires.patch/setup.py (+2/-2)
CHANGES.txt (+9/-0)
PKG-INFO (+18/-9)
debian/changelog (+10/-0)
debian/control (+2/-2)
debian/copyright (+1/-1)
setup.py (+2/-2)
src/z3c.formui.egg-info/PKG-INFO (+18/-9)
src/z3c/formui/README.txt (+7/-7)
src/z3c/formui/div-form.pt (+5/-1)
src/z3c/formui/table-form.pt (+4/-0)
To merge this branch: bzr merge lp:~logan/ubuntu/raring/z3c.formui/2.3.0
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Ubuntu branches Pending
Review via email: mp+142822@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/test-requires.patch/setup.py'
2--- .pc/test-requires.patch/setup.py 2012-01-10 18:24:42 +0000
3+++ .pc/test-requires.patch/setup.py 2013-01-11 01:49:23 +0000
4@@ -13,7 +13,7 @@
5 ##############################################################################
6 """Setup
7
8-$Id: setup.py 124003 2012-01-09 19:07:28Z menesis $
9+$Id: setup.py 124626 2012-03-15 20:22:41Z srichter $
10 """
11 import os
12 from setuptools import setup, find_packages
13@@ -23,7 +23,7 @@
14
15 setup (
16 name='z3c.formui',
17- version='2.2.1',
18+ version='2.3.0',
19 author = "Stephan Richter, Roger Ineichen and the Zope Community",
20 author_email = "zope-dev@zope.org",
21 description = "A set of initial UI components for z3c.form.",
22
23=== modified file 'CHANGES.txt'
24--- CHANGES.txt 2012-01-09 23:27:57 +0000
25+++ CHANGES.txt 2013-01-11 01:49:23 +0000
26@@ -2,11 +2,20 @@
27 CHANGES
28 =======
29
30+2.3.0 (2012-03-15)
31+------------------
32+
33+- Feature: Mark a widget row with the "required" class when the widget is
34+ required. Similarly, when the widget has an error attached, add the "error"
35+ class to the widget row. That allows you to change the styles of the label
36+ and the widget if it is reuqired.
37+
38 2.2.1 (2012-01-09)
39 ------------------
40
41 - No longer using deprecated ``zope.testing.doctest`` but built-in
42 ``doctest`` instead.
43+
44 - Fixed tests so they do not break for `z3c.form` 2.5.0.
45
46
47
48=== modified file 'PKG-INFO'
49--- PKG-INFO 2012-01-09 23:27:57 +0000
50+++ PKG-INFO 2013-01-11 01:49:23 +0000
51@@ -1,6 +1,6 @@
52-Metadata-Version: 1.1
53+Metadata-Version: 1.0
54 Name: z3c.formui
55-Version: 2.2.1
56+Version: 2.3.0
57 Summary: A set of initial UI components for z3c.form.
58 Home-page: http://pypi.python.org/pypi/z3c.formui
59 Author: Stephan Richter, Roger Ineichen and the Zope Community
60@@ -167,7 +167,7 @@
61 <span class="required">*</span> &ndash; required
62 </div>
63 <div>
64- <div id="form-widgets-name-row" class="row">
65+ <div id="form-widgets-name-row" class="row required">
66 <div class="label">
67 <label for="form-widgets-name">
68 <span>Name</span>
69@@ -216,7 +216,7 @@
70 &ndash; required
71 </div>
72 <div>
73- <div id="form-widgets-name-row" class="row">
74+ <div id="form-widgets-name-row" class="row required">
75 <div class="label">
76 <label for="form-widgets-name">
77 <span>Name</span>
78@@ -291,7 +291,7 @@
79 </div>
80 <div>
81 <table class="form-fields">
82- <tr class="row">
83+ <tr class="row required">
84 <td class="label">
85 <label for="form-widgets-name">
86 <span>Name</span>
87@@ -383,7 +383,7 @@
88 &ndash; required
89 </div>
90 <div>
91- <div id="form-widgets-name-row" class="row">
92+ <div id="form-widgets-name-row" class="row required">
93 <div class="label">
94 <label for="form-widgets-name">
95 <span>Name</span>
96@@ -447,7 +447,7 @@
97 </div>
98 <div>
99 <table class="form-fields">
100- <tr class="row">
101+ <tr class="row required">
102 <td class="label">
103 <label for="form-widgets-name">
104 <span>Name</span>
105@@ -774,7 +774,7 @@
106 &ndash; required
107 </div>
108 <div>
109- <div id="form-widgets-name-row" class="row">
110+ <div id="form-widgets-name-row" class="row required">
111 <div class="label">
112 <label for="form-widgets-name">
113 <span>Name</span>
114@@ -823,7 +823,7 @@
115 </div>
116 <div>
117 <table class="form-fields">
118- <tr class="row">
119+ <tr class="row required">
120 <td class="label">
121 <label for="form-widgets-name">
122 <span>Name</span>
123@@ -932,11 +932,20 @@
124 CHANGES
125 =======
126
127+ 2.3.0 (2012-03-15)
128+ ------------------
129+
130+ - Feature: Mark a widget row with the "required" class when the widget is
131+ required. Similarly, when the widget has an error attached, add the "error"
132+ class to the widget row. That allows you to change the styles of the label
133+ and the widget if it is reuqired.
134+
135 2.2.1 (2012-01-09)
136 ------------------
137
138 - No longer using deprecated ``zope.testing.doctest`` but built-in
139 ``doctest`` instead.
140+
141 - Fixed tests so they do not break for `z3c.form` 2.5.0.
142
143
144
145=== modified file 'debian/changelog'
146--- debian/changelog 2012-09-20 06:21:28 +0000
147+++ debian/changelog 2013-01-11 01:49:23 +0000
148@@ -1,3 +1,13 @@
149+z3c.formui (2.3.0-0ubuntu1) raring; urgency=low
150+
151+ * New upstream release (LP: #1058504).
152+ * debian/control:
153+ - Remove article from description synopsis.
154+ - Bump Standards-Version to 3.9.4.
155+ * debian/copyright: Update Format URI.
156+
157+ -- Logan Rosen <logatronico@gmail.com> Thu, 10 Jan 2013 20:28:38 -0500
158+
159 z3c.formui (2.2.1-0ubuntu2) quantal; urgency=low
160
161 * debian/control: added Homepage field.
162
163=== modified file 'debian/control'
164--- debian/control 2012-09-20 06:21:28 +0000
165+++ debian/control 2013-01-11 01:49:23 +0000
166@@ -5,7 +5,7 @@
167 XSBC-Original-Maintainer: Gediminas Paulauskas <menesis@pov.lt>
168 Build-Depends: debhelper (>= 7), python-all (>= 2.6.6-3~),
169 python-setuptools (>= 0.6b3), python-van.pydeb (>= 1.3.0-4)
170-Standards-Version: 3.9.2
171+Standards-Version: 3.9.4
172 X-Python-Version: >= 2.5
173 Homepage: http://pypi.python.org/pypi/z3c.formui
174
175@@ -14,7 +14,7 @@
176 Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}
177 Provides: ${pydeb:Provides}
178 Suggests: ${pydeb:Suggests}
179-Description: A set of initial UI components for z3c.form
180+Description: set of initial UI components for z3c.form
181 This package provides a set of default layouts for the ``z3c.form``
182 framework. In particular it provides a DIV-based and a TABLE-based layout. The
183 developer can use either layout by inheriting from a different base layer.
184
185=== modified file 'debian/copyright'
186--- debian/copyright 2012-01-10 18:24:42 +0000
187+++ debian/copyright 2013-01-11 01:49:23 +0000
188@@ -1,4 +1,4 @@
189-Format: http://dep.debian.net/deps/dep5/
190+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
191 Upstream-Name: z3c.formui
192 Upstream-Contact: Stephan Richter, Roger Ineichen and the Zope Community <zope-dev@zope.org>
193 Source: http://pypi.python.org/pypi/z3c.formui
194
195=== modified file 'setup.py'
196--- setup.py 2012-01-10 18:24:42 +0000
197+++ setup.py 2013-01-11 01:49:23 +0000
198@@ -13,7 +13,7 @@
199 ##############################################################################
200 """Setup
201
202-$Id: setup.py 124003 2012-01-09 19:07:28Z menesis $
203+$Id: setup.py 124626 2012-03-15 20:22:41Z srichter $
204 """
205 import os
206 from setuptools import setup, find_packages
207@@ -23,7 +23,7 @@
208
209 setup (
210 name='z3c.formui',
211- version='2.2.1',
212+ version='2.3.0',
213 author = "Stephan Richter, Roger Ineichen and the Zope Community",
214 author_email = "zope-dev@zope.org",
215 description = "A set of initial UI components for z3c.form.",
216
217=== modified file 'src/z3c.formui.egg-info/PKG-INFO'
218--- src/z3c.formui.egg-info/PKG-INFO 2012-01-09 23:27:57 +0000
219+++ src/z3c.formui.egg-info/PKG-INFO 2013-01-11 01:49:23 +0000
220@@ -1,6 +1,6 @@
221-Metadata-Version: 1.1
222+Metadata-Version: 1.0
223 Name: z3c.formui
224-Version: 2.2.1
225+Version: 2.3.0
226 Summary: A set of initial UI components for z3c.form.
227 Home-page: http://pypi.python.org/pypi/z3c.formui
228 Author: Stephan Richter, Roger Ineichen and the Zope Community
229@@ -167,7 +167,7 @@
230 <span class="required">*</span> &ndash; required
231 </div>
232 <div>
233- <div id="form-widgets-name-row" class="row">
234+ <div id="form-widgets-name-row" class="row required">
235 <div class="label">
236 <label for="form-widgets-name">
237 <span>Name</span>
238@@ -216,7 +216,7 @@
239 &ndash; required
240 </div>
241 <div>
242- <div id="form-widgets-name-row" class="row">
243+ <div id="form-widgets-name-row" class="row required">
244 <div class="label">
245 <label for="form-widgets-name">
246 <span>Name</span>
247@@ -291,7 +291,7 @@
248 </div>
249 <div>
250 <table class="form-fields">
251- <tr class="row">
252+ <tr class="row required">
253 <td class="label">
254 <label for="form-widgets-name">
255 <span>Name</span>
256@@ -383,7 +383,7 @@
257 &ndash; required
258 </div>
259 <div>
260- <div id="form-widgets-name-row" class="row">
261+ <div id="form-widgets-name-row" class="row required">
262 <div class="label">
263 <label for="form-widgets-name">
264 <span>Name</span>
265@@ -447,7 +447,7 @@
266 </div>
267 <div>
268 <table class="form-fields">
269- <tr class="row">
270+ <tr class="row required">
271 <td class="label">
272 <label for="form-widgets-name">
273 <span>Name</span>
274@@ -774,7 +774,7 @@
275 &ndash; required
276 </div>
277 <div>
278- <div id="form-widgets-name-row" class="row">
279+ <div id="form-widgets-name-row" class="row required">
280 <div class="label">
281 <label for="form-widgets-name">
282 <span>Name</span>
283@@ -823,7 +823,7 @@
284 </div>
285 <div>
286 <table class="form-fields">
287- <tr class="row">
288+ <tr class="row required">
289 <td class="label">
290 <label for="form-widgets-name">
291 <span>Name</span>
292@@ -932,11 +932,20 @@
293 CHANGES
294 =======
295
296+ 2.3.0 (2012-03-15)
297+ ------------------
298+
299+ - Feature: Mark a widget row with the "required" class when the widget is
300+ required. Similarly, when the widget has an error attached, add the "error"
301+ class to the widget row. That allows you to change the styles of the label
302+ and the widget if it is reuqired.
303+
304 2.2.1 (2012-01-09)
305 ------------------
306
307 - No longer using deprecated ``zope.testing.doctest`` but built-in
308 ``doctest`` instead.
309+
310 - Fixed tests so they do not break for `z3c.form` 2.5.0.
311
312
313
314=== modified file 'src/z3c/formui/README.txt'
315--- src/z3c/formui/README.txt 2012-01-09 23:27:57 +0000
316+++ src/z3c/formui/README.txt 2013-01-11 01:49:23 +0000
317@@ -150,7 +150,7 @@
318 <span class="required">*</span> &ndash; required
319 </div>
320 <div>
321- <div id="form-widgets-name-row" class="row">
322+ <div id="form-widgets-name-row" class="row required">
323 <div class="label">
324 <label for="form-widgets-name">
325 <span>Name</span>
326@@ -199,7 +199,7 @@
327 &ndash; required
328 </div>
329 <div>
330- <div id="form-widgets-name-row" class="row">
331+ <div id="form-widgets-name-row" class="row required">
332 <div class="label">
333 <label for="form-widgets-name">
334 <span>Name</span>
335@@ -274,7 +274,7 @@
336 </div>
337 <div>
338 <table class="form-fields">
339- <tr class="row">
340+ <tr class="row required">
341 <td class="label">
342 <label for="form-widgets-name">
343 <span>Name</span>
344@@ -366,7 +366,7 @@
345 &ndash; required
346 </div>
347 <div>
348- <div id="form-widgets-name-row" class="row">
349+ <div id="form-widgets-name-row" class="row required">
350 <div class="label">
351 <label for="form-widgets-name">
352 <span>Name</span>
353@@ -430,7 +430,7 @@
354 </div>
355 <div>
356 <table class="form-fields">
357- <tr class="row">
358+ <tr class="row required">
359 <td class="label">
360 <label for="form-widgets-name">
361 <span>Name</span>
362@@ -757,7 +757,7 @@
363 &ndash; required
364 </div>
365 <div>
366- <div id="form-widgets-name-row" class="row">
367+ <div id="form-widgets-name-row" class="row required">
368 <div class="label">
369 <label for="form-widgets-name">
370 <span>Name</span>
371@@ -806,7 +806,7 @@
372 </div>
373 <div>
374 <table class="form-fields">
375- <tr class="row">
376+ <tr class="row required">
377 <td class="label">
378 <label for="form-widgets-name">
379 <span>Name</span>
380
381=== modified file 'src/z3c/formui/div-form.pt'
382--- src/z3c/formui/div-form.pt 2011-01-05 22:37:07 +0000
383+++ src/z3c/formui/div-form.pt 2013-01-11 01:49:23 +0000
384@@ -50,7 +50,11 @@
385 <metal:block define-macro="widget-rows">
386 <tal:block repeat="widget view/widgets/values">
387 <div id="" class="row"
388- tal:attributes="id string:${widget/id}-row"
389+ tal:attributes="
390+ id string:${widget/id}-row;
391+ class python: 'row' + \
392+ (widget.required and ' required' or '') + \
393+ (widget.error and ' error' or '')"
394 tal:condition="python:widget.mode != 'hidden'">
395 <metal:block define-macro="widget-row">
396 <div class="label">
397
398=== modified file 'src/z3c/formui/table-form.pt'
399--- src/z3c/formui/table-form.pt 2011-01-05 22:37:07 +0000
400+++ src/z3c/formui/table-form.pt 2013-01-11 01:49:23 +0000
401@@ -58,6 +58,10 @@
402 <tbody metal:define-slot="formbody" tal:omit-tag="">
403 <tal:block omit-tag="" repeat="widget view/widgets/values">
404 <tr metal:define-macro="formrow" class="row"
405+ tal:attributes="
406+ class python: 'row' +
407+ (widget.required and ' required' or '') + \
408+ (widget.error and ' error' or '')"
409 tal:condition="python:widget.mode != 'hidden'">
410 <td class="label" metal:define-macro="labelcell">
411 <label tal:attributes="for widget/id">

Subscribers

People subscribed via source and target branches

to all changes: