# HG changeset patch # User Nicolas Chauvat # Date 1251233867 -7200 # Node ID 866a2c135c3359a7985125444302889c9d574629 # Parent 4ef565c1d18338eaafc9256117712d69aa7ea003 B #345282 xhtml requires to use   instead of   diff -r 4ef565c1d183 -r 866a2c135c33 common/mixins.py --- a/common/mixins.py Tue Aug 25 19:42:19 2009 +0200 +++ b/common/mixins.py Tue Aug 25 22:57:47 2009 +0200 @@ -1,4 +1,4 @@ -"""mixins of entity/views organized somewhat in a graph or tree structure + """mixins of entity/views organized somewhat in a graph or tree structure :organization: Logilab @@ -343,7 +343,7 @@ """a recursive path view""" id = 'path' item_vid = 'oneline' - separator = u' > ' + separator = u' > ' def call(self, **kwargs): self.w(u'
') diff -r 4ef565c1d183 -r 866a2c135c33 common/test/unittest_uilib.py --- a/common/test/unittest_uilib.py Tue Aug 25 19:42:19 2009 +0200 +++ b/common/test/unittest_uilib.py Tue Aug 25 22:57:47 2009 +0200 @@ -92,16 +92,16 @@ generated_html = """\ - - - - - - - - - - + + + + + + + + + +
root
  
child_1_1
  
child_2_1
   
      
      
child_2_2
  
child_3_1
      
         
child_3_2
      
         
child_3_3
      
   
child_1_2
  
child_2_3
   
      
root
  
child_1_1
  
child_2_1
   
      
      
child_2_2
  
child_3_1
      
         
child_3_2
      
         
child_3_3
      
   
child_1_2
  
child_2_3
   
      
\ """ diff -r 4ef565c1d183 -r 866a2c135c33 common/uilib.py --- a/common/uilib.py Tue Aug 25 19:42:19 2009 +0200 +++ b/common/uilib.py Tue Aug 25 22:57:47 2009 +0200 @@ -357,9 +357,9 @@ else: s += '
%s
' % (render_node(cell.id)) else: - s += ' ' - s += ' ' % link_cell - s += ' ' % link_cell + s += ' ' + s += ' ' % link_cell + s += ' ' % link_cell cell = line[-1] if cell: @@ -368,14 +368,14 @@ else: s += '
%s
' % (render_node(cell.id)) else: - s += ' ' + s += ' ' s += '\n' if link_line: s += '' for j, link_cell in enumerate(link_line): - s += ' ' % link_cell - s += ' ' % link_cell + s += ' ' % link_cell + s += ' ' % link_cell s += '\n' s += '' @@ -428,7 +428,7 @@ xml_escape(stackentry[0]), stackentry[1], xml_escape(stackentry[2]))) if stackentry[3]: string = xml_escape(stackentry[3]).decode('utf-8', 'replace') - strings.append(u'  %s
\n' % (string)) + strings.append(u'  %s
\n' % (string)) # add locals info for each entry try: local_context = tcbk.tb_frame.f_locals diff -r 4ef565c1d183 -r 866a2c135c33 goa/appobjects/components.py --- a/goa/appobjects/components.py Tue Aug 25 19:42:19 2009 +0200 +++ b/goa/appobjects/components.py Tue Aug 25 22:57:47 2009 +0200 @@ -74,7 +74,7 @@ label = display_name(req, etype, 'plural') view = self.vreg.select('views', 'list', req, req.etype_rset(etype)) url = view.url() - etypelink = u' %s' % (xml_escape(url), label) + etypelink = u' %s' % (xml_escape(url), label) yield (label, etypelink, self.add_entity_link(eschema, req)) ManageView.entity_types = entity_types_no_count diff -r 4ef565c1d183 -r 866a2c135c33 goa/appobjects/gauthservice.py --- a/goa/appobjects/gauthservice.py Tue Aug 25 19:42:19 2009 +0200 +++ b/goa/appobjects/gauthservice.py Tue Aug 25 22:57:47 2009 +0200 @@ -17,7 +17,7 @@ def anon_user_link(self): self.w(self.req._('anonymous')) - self.w(u' [%s]' + self.w(u' [%s]' % (users.create_login_url(self.req.url()), self.req._('login'))) class GAELogoutAction(LogoutAction): diff -r 4ef565c1d183 -r 866a2c135c33 i18n/en.po --- a/i18n/en.po Tue Aug 25 19:42:19 2009 +0200 +++ b/i18n/en.po Tue Aug 25 22:57:47 2009 +0200 @@ -75,31 +75,31 @@ msgstr "" #, python-format -msgid "%d days" +msgid "%d days" msgstr "" #, python-format -msgid "%d hours" +msgid "%d hours" msgstr "" #, python-format -msgid "%d minutes" +msgid "%d minutes" msgstr "" #, python-format -msgid "%d months" +msgid "%d months" msgstr "" #, python-format -msgid "%d seconds" +msgid "%d seconds" msgstr "" #, python-format -msgid "%d weeks" +msgid "%d weeks" msgstr "" #, python-format -msgid "%d years" +msgid "%d years" msgstr "" #, python-format diff -r 4ef565c1d183 -r 866a2c135c33 i18n/es.po --- a/i18n/es.po Tue Aug 25 19:42:19 2009 +0200 +++ b/i18n/es.po Tue Aug 25 22:57:47 2009 +0200 @@ -80,32 +80,32 @@ msgstr "%d años" #, python-format -msgid "%d days" -msgstr "%d días" +msgid "%d days" +msgstr "%d días" #, python-format -msgid "%d hours" -msgstr "%d horas" +msgid "%d hours" +msgstr "%d horas" #, python-format -msgid "%d minutes" -msgstr "%d minutos" +msgid "%d minutes" +msgstr "%d minutos" #, python-format -msgid "%d months" -msgstr "%d meses" +msgid "%d months" +msgstr "%d meses" #, python-format -msgid "%d seconds" -msgstr "%d segundos" +msgid "%d seconds" +msgstr "%d segundos" #, python-format -msgid "%d weeks" -msgstr "%d semanas" +msgid "%d weeks" +msgstr "%d semanas" #, python-format -msgid "%d years" -msgstr "%d años" +msgid "%d years" +msgstr "%d años" #, python-format msgid "%s error report" diff -r 4ef565c1d183 -r 866a2c135c33 i18n/fr.po --- a/i18n/fr.po Tue Aug 25 19:42:19 2009 +0200 +++ b/i18n/fr.po Tue Aug 25 22:57:47 2009 +0200 @@ -80,32 +80,32 @@ msgstr "%d années" #, python-format -msgid "%d days" -msgstr "%d jours" +msgid "%d days" +msgstr "%d jours" #, python-format -msgid "%d hours" -msgstr "%d heures" +msgid "%d hours" +msgstr "%d heures" #, python-format -msgid "%d minutes" -msgstr "%d minutes" +msgid "%d minutes" +msgstr "%d minutes" #, python-format -msgid "%d months" -msgstr "%d mois" +msgid "%d months" +msgstr "%d mois" #, python-format -msgid "%d seconds" -msgstr "%d secondes" +msgid "%d seconds" +msgstr "%d secondes" #, python-format -msgid "%d weeks" -msgstr "%d semaines" +msgid "%d weeks" +msgstr "%d semaines" #, python-format -msgid "%d years" -msgstr "%d années" +msgid "%d years" +msgstr "%d années" #, python-format msgid "%s error report" diff -r 4ef565c1d183 -r 866a2c135c33 schemaviewer.py --- a/schemaviewer.py Tue Aug 25 19:42:19 2009 +0200 +++ b/schemaviewer.py Tue Aug 25 22:57:47 2009 +0200 @@ -104,7 +104,7 @@ """get a layout for an entity schema""" etype = eschema.type layout = Section(children=' ', klass='clear') - layout.append(Link(etype,' ' , id=etype)) # anchor + layout.append(Link(etype,' ' , id=etype)) # anchor title = Link(self.eschema_link_url(eschema), etype) boxchild = [Section(children=(title, ' (%s)'% eschema.display_name(self.req)), klass='title')] table = Table(cols=4, rheaders=1, diff -r 4ef565c1d183 -r 866a2c135c33 web/facet.py --- a/web/facet.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/facet.py Tue Aug 25 22:57:47 2009 +0200 @@ -718,7 +718,7 @@ imgalt = self.req._('not selected') self.w(u'
\n' % (cssclass, xml_escape(unicode(self.value)))) - self.w(u'%s ' % (imgsrc, imgalt)) + self.w(u'%s ' % (imgsrc, imgalt)) self.w(u'%s' % xml_escape(self.label)) self.w(u'
') @@ -747,7 +747,7 @@ self.w(u'
\n' % (cssclass, xml_escape(unicode(self.value)))) self.w(u'
') - self.w(u'%s ' % (imgsrc, imgalt)) + self.w(u'%s ' % (imgsrc, imgalt)) self.w(u'' % (facetid, title)) self.w(u'
\n') self.w(u'
\n') @@ -755,7 +755,7 @@ class FacetSeparator(HTMLWidget): def __init__(self, label=None): - self.label = label or u' ' + self.label = label or u' ' def _render(self): pass diff -r 4ef565c1d183 -r 866a2c135c33 web/form.py --- a/web/form.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/form.py Tue Aug 25 22:57:47 2009 +0200 @@ -164,7 +164,7 @@ if len(errors) > 1: templstr = '
  • %s
    • \n' else: - templstr = ' %s\n' + templstr = ' %s\n' for field, err in errors: if field is None: errormsg += templstr % err diff -r 4ef565c1d183 -r 866a2c135c33 web/formwidgets.py --- a/web/formwidgets.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/formwidgets.py Tue Aug 25 22:57:47 2009 +0200 @@ -110,7 +110,7 @@ '
    ', tags.input(name=confirmname, value=values[0], type=self.type, **attrs), - ' ', tags.span(form.req._('confirm password'), + ' ', tags.span(form.req._('confirm password'), **{'class': 'emphasis'})] return u'\n'.join(inputs) @@ -437,7 +437,7 @@ return super(AddComboBoxWidget, self).render(form, field, renderer) + u'''
    -  
    +  
    ''' # buttons ###################################################################### diff -r 4ef565c1d183 -r 866a2c135c33 web/htmlwidgets.py --- a/web/htmlwidgets.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/htmlwidgets.py Tue Aug 25 22:57:47 2009 +0200 @@ -75,7 +75,7 @@ self.w(u'\n') self.w(u'\n') if self.shadow: - self.w(u'
     
    ') + self.w(u'
     
    ') def _render(self): if self.id: @@ -191,7 +191,7 @@ self.value = value def _render(self): - self.w(u'
  • %s ' + self.w(u'
  • %s ' u'%s
    • ' % (self.label, self.value)) diff -r 4ef565c1d183 -r 866a2c135c33 web/test/unittest_form.py --- a/web/test/unittest_form.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/test/unittest_form.py Tue Aug 25 22:57:47 2009 +0200 @@ -219,7 +219,7 @@ '''
    -  +  confirm password''' % {'eid': self.entity.eid}) diff -r 4ef565c1d183 -r 866a2c135c33 web/views/basecomponents.py --- a/web/views/basecomponents.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/basecomponents.py Tue Aug 25 22:57:47 2009 +0200 @@ -73,7 +73,7 @@ id = 'help' property_defs = VISIBLE_PROP_DEF def call(self): - self.w(u' ' + self.w(u' ' % (self.build_url(_restpath='doc/main'), self.req._(u'help'),)) @@ -109,11 +109,11 @@ def anon_user_link(self): if self.config['auth-mode'] == 'cookie': self.w(self.req._('anonymous')) - self.w(u''' [%s]''' + self.w(u''' [%s]''' % (self.req._('i18n_login_popup'))) else: self.w(self.req._('anonymous')) - self.w(u' [%s]' + self.w(u' [%s]' % (self.build_url('login'), self.req._('login'))) @@ -211,7 +211,7 @@ url, _('Any'))) else: html.insert(0, u'%s' % _('Any')) - self.w(u' | '.join(html)) + self.w(u' | '.join(html)) self.w(u'') diff -r 4ef565c1d183 -r 866a2c135c33 web/views/baseforms.py --- a/web/views/baseforms.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/baseforms.py Tue Aug 25 22:57:47 2009 +0200 @@ -239,7 +239,7 @@ w(u'') pendings = list(self.restore_pending_inserts(entity)) if not pendings: - w(u'  ') + w(u'  ') else: for row in pendings: # soon to be linked to entities @@ -314,7 +314,7 @@ % (rschema, entity.eid, js, self.req.__('add a %s' % targettype))) result.append(u'') - result.append(u'
     
    ') + result.append(u'
     
    ') result.append(u'') return '\n'.join(result) diff -r 4ef565c1d183 -r 866a2c135c33 web/views/basetemplates.py --- a/web/views/basetemplates.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/basetemplates.py Tue Aug 25 22:57:47 2009 +0200 @@ -441,7 +441,7 @@ self.w(u'
    ' % (id, klass)) if title: self.w(u'
    %s
    ' - % (self.req.property_value('ui.site-title') or u' ')) + % (self.req.property_value('ui.site-title') or u' ')) self.w(u'
    \n') if message: @@ -472,7 +472,7 @@ self.w(u'' % _('password')) self.w(u'\n') self.w(u'\n') - self.w(u' \n' % _('log in')) + self.w(u' \n' % _('log in')) self.w(u'\n') self.w(u'\n') self.w(u'\n') diff -r 4ef565c1d183 -r 866a2c135c33 web/views/baseviews.py --- a/web/views/baseviews.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/baseviews.py Tue Aug 25 22:57:47 2009 +0200 @@ -51,13 +51,13 @@ """ id = 'final' # record generated i18n catalog messages - _('%d years') - _('%d months') - _('%d weeks') - _('%d days') - _('%d hours') - _('%d minutes') - _('%d seconds') + _('%d years') + _('%d months') + _('%d weeks') + _('%d days') + _('%d hours') + _('%d minutes') + _('%d seconds') _('%d years') _('%d months') _('%d weeks') @@ -80,7 +80,7 @@ # value is DateTimeDelta but we have no idea about what is the # reference date here, so we can only approximate years and months if format == 'text/html': - space = ' ' + space = ' ' else: space = ' ' if value.days > 730: # 2 years @@ -111,7 +111,7 @@ secondary = icon + view(oneline) """ entity = self.entity(row, col) - self.w(u' ') + self.w(u' ') self.wview('oneline', self.rset, row=row, col=col) diff -r 4ef565c1d183 -r 866a2c135c33 web/views/bookmark.py --- a/web/views/bookmark.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/bookmark.py Tue Aug 25 22:57:47 2009 +0200 @@ -33,7 +33,7 @@ def cell_call(self, row, col): """the primary view for bookmark entity""" entity = self.complete_entity(row, col) - self.w(u' ') + self.w(u' ') self.w(u"") self.w(u"%s : %s" % (self.req._('Bookmark'), xml_escape(entity.title))) self.w(u"") diff -r 4ef565c1d183 -r 866a2c135c33 web/views/calendar.py --- a/web/views/calendar.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/calendar.py Tue Aug 25 22:57:47 2009 +0200 @@ -293,7 +293,7 @@ __redirectvid=self.id ) self.w(u'
    %s
    ' % (xml_escape(url), self.req._(u'add'))) - self.w(u' ') + self.w(u' ') self.w(u'
    ') self.w(u'
    ') for task_descr in rows: @@ -312,7 +312,7 @@ self.w(u'
    ') else: self.w(u'
    ') - self.w(u" ") + self.w(u" ") self.w(u'
    ') self.w(u'
    ') self.w(u'') @@ -443,7 +443,7 @@ self.w(u'') self.w(u'') self.w(u'
    ') - self.w(u'
     
    ') + self.w(u'
     
    ') def _build_calendar_cell(self, date, task_descrs): inday_tasks = [t for t in task_descrs if t.is_one_day_task() and t.in_working_hours()] diff -r 4ef565c1d183 -r 866a2c135c33 web/views/editviews.py --- a/web/views/editviews.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/editviews.py Tue Aug 25 22:57:47 2009 +0200 @@ -63,7 +63,7 @@ entity = self.entity(row, col) erset = entity.as_rset() if self.req.match_search_state(erset): - self.w(u'%s [...]' % ( + self.w(u'%s [...]' % ( xml_escape(linksearch_select_url(self.req, erset)), self.req._('select this entity'), xml_escape(entity.view('textoutofcontext')), diff -r 4ef565c1d183 -r 866a2c135c33 web/views/emailaddress.py --- a/web/views/emailaddress.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/emailaddress.py Tue Aug 25 22:57:47 2009 +0200 @@ -27,7 +27,7 @@ if not entity.canonical: canonemailaddr = entity.canonical_form() if canonemailaddr: - self.w(u' (%s)' % canonemailaddr.view('oneline')) + self.w(u' (%s)' % canonemailaddr.view('oneline')) self.w(u'') elif entity.identical_to: self.w(u'') diff -r 4ef565c1d183 -r 866a2c135c33 web/views/formrenderers.py --- a/web/views/formrenderers.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/formrenderers.py Tue Aug 25 22:57:47 2009 +0200 @@ -104,7 +104,7 @@ if example: help.append('
    (%s: %s)
    ' % (self.req._('sample format'), example)) - return u' '.join(help) + return u' '.join(help) # specific methods (mostly to ease overriding) ############################# @@ -125,7 +125,7 @@ if len(errors) > 1: templstr = '
  • %s
    • \n' else: - templstr = ' %s\n' + templstr = ' %s\n' for field, err in errors: if field is None: errormsg += templstr % err @@ -279,7 +279,7 @@ if self.display_help: w(self.render_help(form, field)) # empty slot for buttons - w(u' ') + w(u' ') w(u'') w(u'') for field in fields: @@ -436,7 +436,7 @@ w(u'') pendings = list(form.restore_pending_inserts()) if not pendings: - w(u'  ') + w(u'  ') else: for row in pendings: # soon to be linked to entities @@ -514,7 +514,7 @@ w(u'+ %s.' % (rschema, entity.eid, js, __('add a %s' % targettype))) w(u'') - w(u'
     
    ') + w(u'
     
    ') w(u'') diff -r 4ef565c1d183 -r 866a2c135c33 web/views/ibreadcrumbs.py --- a/web/views/ibreadcrumbs.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/ibreadcrumbs.py Tue Aug 25 22:57:47 2009 +0200 @@ -33,7 +33,7 @@ context = 'navtop' order = 5 visible = False - separator = u' > ' + separator = u' > ' def call(self, view=None, first_separator=True): entity = self.entity(0) diff -r 4ef565c1d183 -r 866a2c135c33 web/views/management.py --- a/web/views/management.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/management.py Tue Aug 25 22:57:47 2009 +0200 @@ -139,7 +139,7 @@ # don't give __delete value to build_url else it will be urlquoted # and this will replace %s by %25s delurl += '&__delete=%s:require_permission:%%s' % entity.eid - dellinktempl = u'[-] ' % ( + dellinktempl = u'[-] ' % ( xml_escape(delurl), _('delete this permission')) else: dellinktempl = None diff -r 4ef565c1d183 -r 866a2c135c33 web/views/navigation.py --- a/web/views/navigation.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/navigation.py Tue Aug 25 22:57:47 2009 +0200 @@ -40,9 +40,9 @@ self.index_display(start, stop))) start = stop + 1 w(u'') def index_display(self, start, stop): @@ -140,9 +140,9 @@ def write_links(self, params, blocklist): self.w(u'') diff -r 4ef565c1d183 -r 866a2c135c33 web/views/old_calendar.py --- a/web/views/old_calendar.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/old_calendar.py Tue Aug 25 22:57:47 2009 +0200 @@ -30,8 +30,8 @@ # Navigation building methods / views #################################### - PREV = u'<<  <' - NEXT = u'>  >>' + PREV = u'<<  <' + NEXT = u'>  >>' NAV_HEADER = u"""
    %s%s
    @@ -200,7 +200,7 @@ self.w(u'') rql = self.rset.printable_rql() for cur_month in date_range(begin, end, incmonth=1): - umonth = u'%s %s' % (self.format_date(cur_month, '%B'), cur_month.year) + umonth = u'%s %s' % (self.format_date(cur_month, '%B'), cur_month.year) url = self.build_url(rql=rql, vid=self.id, year=cur_month.year, month=cur_month.month) self.w(u'%s' % (xml_escape(url), @@ -215,7 +215,7 @@ else: day = date(cur_month.year, cur_month.month, day_num+1) events = schedule.get(day) - self.w(u'%s %s\n' % (_(WEEKDAYS[day.weekday()])[0].upper(), day_num+1)) + self.w(u'%s %s\n' % (_(WEEKDAYS[day.weekday()])[0].upper(), day_num+1)) self.format_day_events(day, events) self.w(u'') @@ -345,8 +345,8 @@ am_row = [am for day, am, pm in row] pm_row = [pm for day, am, pm in row] formatted_rows.append('%s%s'% (week_title, '\n'.join(day_row))) - formatted_rows.append(' %s'% '\n'.join(am_row)) - formatted_rows.append(' %s'% '\n'.join(pm_row)) + formatted_rows.append(' %s'% '\n'.join(am_row)) + formatted_rows.append(' %s'% '\n'.join(pm_row)) # tigh everything together url = self.build_url(rql=rql, vid='ampmcalendarmonth', year=first_day.year, month=first_day.month) @@ -364,7 +364,7 @@ self.w(u'') rql = self.rset.printable_rql() for cur_month in date_range(begin, end, incmonth=1): - umonth = u'%s %s' % (self.format_date(cur_month, '%B'), cur_month.year) + umonth = u'%s %s' % (self.format_date(cur_month, '%B'), cur_month.year) url = self.build_url(rql=rql, vid=self.id, year=cur_month.year, month=cur_month.month) self.w(u'%s' % (xml_escape(url), @@ -379,7 +379,7 @@ else: day = date(cur_month.year, cur_month.month, day_num+1) events = schedule.get(day) - self.w(u'%s %s\n' % (_(WEEKDAYS[day.weekday()])[0].upper(), + self.w(u'%s %s\n' % (_(WEEKDAYS[day.weekday()])[0].upper(), day_num+1)) self.format_day_events(day, events) self.w(u'') @@ -437,8 +437,8 @@ am_row = [am for day, am, pm in row] pm_row = [pm for day, am, pm in row] formatted_rows.append('%s%s'% (week_title, '\n'.join(day_row))) - formatted_rows.append(' %s'% '\n'.join(am_row)) - formatted_rows.append(' %s'% '\n'.join(pm_row)) + formatted_rows.append(' %s'% '\n'.join(am_row)) + formatted_rows.append(' %s'% '\n'.join(pm_row)) # tigh everything together url = self.build_url(rql=rql, vid='ampmcalendarmonth', year=first_day.year, month=first_day.month) @@ -464,7 +464,7 @@ monthlink = '%s' % (xml_escape(url), umonth) w(u'%s' % ( WEEK_TITLE % (_('week'), monday.isocalendar()[1], monthlink))) - w(u'%s '% _(u'Date')) + w(u'%s '% _(u'Date')) for day in date_range(monday, sunday): events = schedule.get(day) style = day.weekday() % 2 and "even" or "odd" @@ -534,9 +534,9 @@ AMPM_CONTENT = u'%s
    %s
    ' WEEK_TITLE = u'%s %s (%s)' -WEEK_EMPTY_CELL = u' ' +WEEK_EMPTY_CELL = u' ' WEEK_CELL = u'
    %s
    ' -AMPM_DAYWEEK_EMPTY = u'%s %s' -AMPM_DAYWEEK = u'%s %s' +AMPM_DAYWEEK_EMPTY = u'%s %s' +AMPM_DAYWEEK = u'%s %s' AMPM_WEEK_CELL = u'
    %02d:%02d - %s
    ' diff -r 4ef565c1d183 -r 866a2c135c33 web/views/startup.py --- a/web/views/startup.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/startup.py Tue Aug 25 22:57:47 2009 +0200 @@ -62,10 +62,10 @@ self.wview('inlined', rset, row=0) else: self.entities() - self.w(u'
     
    ') + self.w(u'
     
    ') self.startup_views() if manager and 'Card' in self.schema: - self.w(u'
     
    ') + self.w(u'
     
    ') if rset: href = rset.get_entity(0, 0).absolute_url(vid='edition') label = self.req._('edit the index page') @@ -114,7 +114,7 @@ key=lambda (l,a,e):unormalize(l)) q, r = divmod(len(infos), 2) if r: - infos.append( (None, ' ', ' ') ) + infos.append( (None, ' ', ' ') ) infos = zip(infos[:q+r], infos[q+r:]) for (_, etypelink, addlink), (_, etypelink2, addlink2) in infos: self.w(u'\n') @@ -136,7 +136,7 @@ label = display_name(req, etype, 'plural') nb = req.execute('Any COUNT(X) WHERE X is %s' % etype)[0][0] url = self.build_url(etype) - etypelink = u' %s (%d)' % ( + etypelink = u' %s (%d)' % ( xml_escape(url), label, nb) yield (label, etypelink, self.add_entity_link(eschema, req)) diff -r 4ef565c1d183 -r 866a2c135c33 web/views/timetable.py --- a/web/views/timetable.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/views/timetable.py Tue Aug 25 22:57:47 2009 +0200 @@ -133,7 +133,7 @@ """ render column headers """ self.w(u'\n') - self.w(u' \n') + self.w(u' \n') columns = [] for user, width in zip(users, widths): self.w(u'' % max(MIN_COLS, width)) @@ -191,13 +191,13 @@ task_descr, first_row = value if first_row: url = xml_escape(task_descr.task.absolute_url(vid="edition")) - self.w(u' 
    ' % ( + self.w(u' 
    ' % ( task_descr.lines, task_descr.color, filled_klasses[kj], url)) task_descr.task.view('tooltip', w=self.w) self.w(u'
    ') else: if empty_line: - self.w(u' ') + self.w(u' ') else: - self.w(u' ' % empty_klasses[kj] ) + self.w(u' ' % empty_klasses[kj] ) self.w(u'\n') diff -r 4ef565c1d183 -r 866a2c135c33 web/widgets.py --- a/web/widgets.py Tue Aug 25 19:42:19 2009 +0200 +++ b/web/widgets.py Tue Aug 25 22:57:47 2009 +0200 @@ -154,7 +154,7 @@ help.append(u'(%s: %s)' % (req._('sample format'), example)) help.append(u'
    ') - return u' '.join(help) + return u' '.join(help) def render_example(self, req): return u'' @@ -372,7 +372,7 @@ def _edit_render(self, entity): html = super(PasswordWidget, self)._edit_render(entity) name = eid_param(self.name + '-confirm', entity.eid) - return u'%s
    \n (%s)' % ( + return u'%s
    \n (%s)' % ( html, self.input_type, name, name, entity.req.next_tabindex(), entity.req._('confirm password')) @@ -662,7 +662,7 @@ res.append(u'') res.append(u'
    ') res.append(u'') - res.append(u' 
    ') + res.append(u' ') return '\n'.join(res) @@ -761,7 +761,7 @@ help.append('(%s: %s)' % (req._('sample format'), example)) help.append(u'') - return u' '.join(help) + return u' '.join(help) def render_calendar_popup(self, entity): """calendar popup widget"""