# HG changeset patch # User Paul Boddie # Date 1431521970 -7200 # Node ID 82483130bd024787e5fc7093e787e4e93a4a1513 # Parent 123e849c3982b83220c54df4da82a5d8bce70281 Replaced page.input usage with that of the _control method. diff -r 123e849c3982 -r 82483130bd02 imipweb/event.py --- a/imipweb/event.py Wed May 13 14:18:07 2015 +0200 +++ b/imipweb/event.py Wed May 13 14:59:30 2015 +0200 @@ -464,27 +464,27 @@ page.p("An action is required for this request:") page.p() - page.input(name="reply", type="submit", value="Send reply") + self._control("reply", "submit", "Send reply") page.add(" ") - page.input(name="discard", type="submit", value="Discard event") + self._control("discard", "submit", "Discard event") page.add(" ") - page.input(name="ignore", type="submit", value="Do nothing for now") + self._control("ignore", "submit", "Do nothing for now") page.p.close() if self.is_organiser(obj): page.p("As organiser, you can perform the following:") page.p() - page.input(name="create", type="submit", value=(sequence is None and "Create event" or "Update event")) + self._control("create", "submit", sequence is None and "Create event" or "Update event") page.add(" ") if sequence is not None and not is_request: - page.input(name="cancel", type="submit", value="Cancel event") + self._control("cancel", "submit", "Cancel event") else: - page.input(name="discard", type="submit", value="Discard event") + self._control("discard", "submit", "Discard event") page.add(" ") - page.input(name="save", type="submit", value="Save without sending") + self._control("save", "submit", "Save without sending") page.p.close() def show_object_on_page(self, uid, obj, errors=None): @@ -498,7 +498,7 @@ page = self.page page.form(method="POST") - page.input(name="editing", type="hidden", value="true") + self._control("editing", "hidden", "true") args = self.env.get_args() @@ -574,7 +574,7 @@ page.td(class_="objectvalue summary") if self.is_organiser(obj): - page.input(name="summary", type="text", value=value, size=80) + self._control("summary", "text", value, size=80) else: page.add(value) page.td.close() @@ -604,7 +604,7 @@ page.tr() page.td() - page.input(name="add", type="submit", value="add", id="add", class_="add") + self._control("add", "submit", "add", id="add", class_="add") page.label("Add attendee", for_="add", class_="add") page.td.close() page.tr.close() @@ -653,9 +653,9 @@ # Show a form control as organiser for new attendees. if self.is_organiser(obj) and (not existing or sequence is None): - page.input(name="attendee", type="value", value=attendee, size="40") + self._control("attendee", "value", attendee, size="40") else: - page.input(name="attendee", type="hidden", value=attendee) + self._control("attendee", "hidden", attendee) page.add(attendee) page.add(" ") @@ -669,7 +669,7 @@ # the current user, if indicated. elif self.is_organiser(obj) and not existing: - page.input(name="partstat-refresh", type="submit", value="refresh", id="partstat-%d" % i, class_="refresh") + self._control("partstat-refresh", "submit", "refresh", id="partstat-%d" % i, class_="refresh") page.label(dict(self.partstat_items).get(partstat, ""), for_="partstat-%s" % i, class_="partstat") else: page.span(dict(self.partstat_items).get(partstat, ""), class_="partstat") @@ -996,7 +996,7 @@ # Put the origin somewhere. - page.input(name="recur-origin", type="hidden", value=p.origin or "") + self._control("recur-origin", "hidden", p.origin or "") else: page.div(class_="dt disabled") @@ -1071,7 +1071,7 @@ # Utility methods. - def _control(self, name, type, value, selected, **kw): + def _control(self, name, type, value, selected=False, **kw): """ Show a control with the given 'name', 'type' and 'value', with @@ -1142,7 +1142,7 @@ # Show a date label with a hidden field if read-only. if read_only: - page.input(name="%s-date" % name, type="hidden", value=format_datetime(base)) + self._control("%s-date" % name, "hidden", format_datetime(base)) page.span(self.format_date(base, "long")) # Show dates for up to one week around the current date. @@ -1160,15 +1160,15 @@ if read_only: page.span("%s:%s:%s" % (default.get_hour(), default.get_minute(), default.get_second())) - page.input(name="%s-hour" % name, type="hidden", value=default.get_hour()) - page.input(name="%s-minute" % name, type="hidden", value=default.get_minute()) - page.input(name="%s-second" % name, type="hidden", value=default.get_second()) + self._control("%s-hour" % name, "hidden", default.get_hour()) + self._control("%s-minute" % name, "hidden", default.get_minute()) + self._control("%s-second" % name, "hidden", default.get_second()) else: - page.input(name="%s-hour" % name, type="text", value=default.get_hour(), maxlength=2, size=2) + self._control("%s-hour" % name, "text", default.get_hour(), maxlength=2, size=2) page.add(":") - page.input(name="%s-minute" % name, type="text", value=default.get_minute(), maxlength=2, size=2) + self._control("%s-minute" % name, "text", default.get_minute(), maxlength=2, size=2) page.add(":") - page.input(name="%s-second" % name, type="text", value=default.get_second(), maxlength=2, size=2) + self._control("%s-second" % name, "text", default.get_second(), maxlength=2, size=2) # Show time zone details. @@ -1179,7 +1179,7 @@ # Show a label if read-only or a menu otherwise. if read_only: - page.input(name="%s-tzid" % name, type="hidden", value=tzid) + self._control("%s-tzid" % name, "hidden", tzid) page.span(tzid) else: self._show_timezone_menu("%s-tzid" % name, tzid, index)