--- a/common/mixins.py Tue Aug 25 18:47:25 2009 +0200
+++ b/common/mixins.py Wed Aug 26 00:02:57 2009 +0200
@@ -251,7 +251,7 @@
"""a recursive path view"""
id = 'path'
item_vid = 'oneline'
- separator = u' > '
+ separator = u' > '
def call(self, **kwargs):
self.w(u'<div class="pathbar">')
--- a/common/test/unittest_uilib.py Tue Aug 25 18:47:25 2009 +0200
+++ b/common/test/unittest_uilib.py Wed Aug 26 00:02:57 2009 +0200
@@ -81,8 +81,6 @@
got = uilib.text_cut(text, 30)
self.assertEquals(got, expected)
-
-
if __name__ == '__main__':
unittest_main()
--- a/common/uilib.py Tue Aug 25 18:47:25 2009 +0200
+++ b/common/uilib.py Wed Aug 26 00:02:57 2009 +0200
@@ -263,7 +263,6 @@
res = unicode(res, 'UTF8')
return res
-
# traceback formatting ########################################################
import traceback
@@ -309,7 +308,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<br/>\n' % (string))
+ strings.append(u'  %s<br/>\n' % (string))
# add locals info for each entry
try:
local_context = tcbk.tb_frame.f_locals
--- a/debian/cubicweb-ctl.cubicweb.init Tue Aug 25 18:47:25 2009 +0200
+++ b/debian/cubicweb-ctl.cubicweb.init Wed Aug 26 00:02:57 2009 +0200
@@ -22,11 +22,14 @@
# Check if we are sure to not want the start-stop-daemon machinery here
# Refer to Debian Policy Manual section 9.3.2 (Writing the scripts) for details.
-case "$1" in
- "force-reload")
- /usr/bin/cubicweb-ctl reload --force
- ;;
- "*|restart")
- /usr/bin/cubicweb-ctl $1 --force
- ;;
+case $1 in
+ force-reload)
+ /usr/bin/cubicweb-ctl reload --force
+ ;;
+ status)
+ /usr/bin/cubicweb-ctl status
+ ;;
+ *)
+ /usr/bin/cubicweb-ctl $1 --force
+ ;;
esac
--- a/entity.py Tue Aug 25 18:47:25 2009 +0200
+++ b/entity.py Wed Aug 26 00:02:57 2009 +0200
@@ -315,6 +315,9 @@
def __hash__(self):
return id(self)
+ def __cmp__(self):
+ raise NotImplementedError('comparison not implemented for %s' % self.__class__)
+
def pre_add_hook(self):
"""hook called by the repository before doing anything to add the entity
(before_add entity hooks have not been called yet). This give the
--- a/goa/appobjects/components.py Tue Aug 25 18:47:25 2009 +0200
+++ b/goa/appobjects/components.py Wed Aug 26 00:02:57 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' <a href="%s">%s</a>' % (xml_escape(url), label)
+ etypelink = u' <a href="%s">%s</a>' % (xml_escape(url), label)
yield (label, etypelink, self.add_entity_link(eschema, req))
ManageView.entity_types = entity_types_no_count
--- a/goa/appobjects/gauthservice.py Tue Aug 25 18:47:25 2009 +0200
+++ b/goa/appobjects/gauthservice.py Wed Aug 26 00:02:57 2009 +0200
@@ -17,7 +17,7 @@
def anon_user_link(self):
self.w(self.req._('anonymous'))
- self.w(u' [<a class="logout" href="%s">%s</a>]'
+ self.w(u' [<a class="logout" href="%s">%s</a>]'
% (users.create_login_url(self.req.url()), self.req._('login')))
class GAELogoutAction(LogoutAction):
--- a/i18n/en.po Tue Aug 25 18:47:25 2009 +0200
+++ b/i18n/en.po Wed Aug 26 00:02:57 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
--- a/i18n/es.po Tue Aug 25 18:47:25 2009 +0200
+++ b/i18n/es.po Wed Aug 26 00:02:57 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"
--- a/i18n/fr.po Tue Aug 25 18:47:25 2009 +0200
+++ b/i18n/fr.po Wed Aug 26 00:02:57 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"
--- a/schemaviewer.py Tue Aug 25 18:47:25 2009 +0200
+++ b/schemaviewer.py Wed Aug 26 00:02:57 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,
--- a/web/data/cubicweb.form.css Tue Aug 25 18:47:25 2009 +0200
+++ b/web/data/cubicweb.form.css Wed Aug 26 00:02:57 2009 +0200
@@ -78,7 +78,7 @@
table.attributeForm th,
table.attributeForm td {
- padding : .7em 2px;
+ padding : .2em 2px;
}
table.attributeForm th {
--- a/web/facet.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/facet.py Wed Aug 26 00:02:57 2009 +0200
@@ -718,7 +718,7 @@
imgalt = self.req._('not selected')
self.w(u'<div class="facetValue facetCheckBox%s" cubicweb:value="%s">\n'
% (cssclass, xml_escape(unicode(self.value))))
- self.w(u'<img src="%s" alt="%s"/> ' % (imgsrc, imgalt))
+ self.w(u'<img src="%s" alt="%s"/> ' % (imgsrc, imgalt))
self.w(u'<a href="javascript: {}">%s</a>' % xml_escape(self.label))
self.w(u'</div>')
@@ -747,7 +747,7 @@
self.w(u'<div class="facetValue facetCheckBox%s" cubicweb:value="%s">\n'
% (cssclass, xml_escape(unicode(self.value))))
self.w(u'<div class="facetCheckBoxWidget">')
- self.w(u'<img src="%s" alt="%s" cubicweb:unselimg="true" /> ' % (imgsrc, imgalt))
+ self.w(u'<img src="%s" alt="%s" cubicweb:unselimg="true" /> ' % (imgsrc, imgalt))
self.w(u'<label class="facetTitle" cubicweb:facetName="%s"><a href="javascript: {}">%s</a></label>' % (facetid, title))
self.w(u'</div>\n')
self.w(u'</div>\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
--- a/web/form.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/form.py Wed Aug 26 00:02:57 2009 +0200
@@ -164,7 +164,7 @@
if len(errors) > 1:
templstr = '<li>%s</li>\n'
else:
- templstr = ' %s\n'
+ templstr = ' %s\n'
for field, err in errors:
if field is None:
errormsg += templstr % err
--- a/web/formwidgets.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/formwidgets.py Wed Aug 26 00:02:57 2009 +0200
@@ -110,7 +110,7 @@
'<br/>',
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'''
<div id="newvalue">
<input type="text" id="newopt" />
- <a href="javascript:noop()" id="add_newopt"> </a></div>
+ <a href="javascript:noop()" id="add_newopt"> </a></div>
'''
# buttons ######################################################################
--- a/web/htmlwidgets.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/htmlwidgets.py Wed Aug 26 00:02:57 2009 +0200
@@ -75,7 +75,7 @@
self.w(u'</ul>\n')
self.w(u'</div>\n')
if self.shadow:
- self.w(u'<div class="shadow"> </div>')
+ self.w(u'<div class="shadow"> </div>')
def _render(self):
if self.id:
@@ -191,7 +191,7 @@
self.value = value
def _render(self):
- self.w(u'<li><div><span class="label">%s</span> '
+ self.w(u'<li><div><span class="label">%s</span> '
u'<span class="value">%s</span></div></li>'
% (self.label, self.value))
--- a/web/test/unittest_form.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/test/unittest_form.py Wed Aug 26 00:02:57 2009 +0200
@@ -219,7 +219,7 @@
'''<input id="upassword:%(eid)s" name="upassword:%(eid)s" tabindex="1" type="password" value="__cubicweb_internal_field__" />
<br/>
<input name="upassword-confirm:%(eid)s" tabindex="1" type="password" value="__cubicweb_internal_field__" />
-
+ 
<span class="emphasis">confirm password</span>''' % {'eid': self.entity.eid})
--- a/web/views/basecomponents.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/basecomponents.py Wed Aug 26 00:02:57 2009 +0200
@@ -74,7 +74,7 @@
id = 'help'
property_defs = VISIBLE_PROP_DEF
def call(self):
- self.w(u'<a href="%s" class="help" title="%s"> </a>'
+ self.w(u'<a href="%s" class="help" title="%s"> </a>'
% (self.build_url(_restpath='doc/main'),
self.req._(u'help'),))
@@ -110,11 +110,11 @@
def anon_user_link(self):
if self.config['auth-mode'] == 'cookie':
self.w(self.req._('anonymous'))
- self.w(u''' [<a class="logout" href="javascript: popupLoginBox();">%s</a>]'''
+ self.w(u''' [<a class="logout" href="javascript: popupLoginBox();">%s</a>]'''
% (self.req._('i18n_login_popup')))
else:
self.w(self.req._('anonymous'))
- self.w(u' [<a class="logout" href="%s">%s</a>]'
+ self.w(u' [<a class="logout" href="%s">%s</a>]'
% (self.build_url('login'), self.req._('login')))
@@ -212,7 +212,7 @@
url, _('Any')))
else:
html.insert(0, u'<span class="selected">%s</span>' % _('Any'))
- self.w(u' | '.join(html))
+ self.w(u' | '.join(html))
self.w(u'</div>')
class PdfViewComponent(component.Component):
--- a/web/views/baseforms.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/baseforms.py Wed Aug 26 00:02:57 2009 +0200
@@ -239,7 +239,7 @@
w(u'</tr>')
pendings = list(self.restore_pending_inserts(entity))
if not pendings:
- w(u'<tr><th> </th><td> </td></tr>')
+ w(u'<tr><th> </th><td> </td></tr>')
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'</div>')
- result.append(u'<div class="trame_grise"> </div>')
+ result.append(u'<div class="trame_grise"> </div>')
result.append(u'</div>')
return '\n'.join(result)
--- a/web/views/basetemplates.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/basetemplates.py Wed Aug 26 00:02:57 2009 +0200
@@ -479,7 +479,7 @@
self.w(u'<div id="%s" class="%s">' % (id, klass))
if title:
self.w(u'<div id="loginTitle">%s</div>'
- % (self.req.property_value('ui.site-title') or u' '))
+ % (self.req.property_value('ui.site-title') or u' '))
self.w(u'<div id="loginContent">\n')
if message:
@@ -510,7 +510,7 @@
self.w(u'<td><label for="__password" >%s</label></td>' % _('password'))
self.w(u'<td><input name="__password" id="__password" class="data" type="password" /></td>\n')
self.w(u'</tr><tr>\n')
- self.w(u'<td> </td><td><input type="submit" class="loginButton right" value="%s" />\n</td>' % _('log in'))
+ self.w(u'<td> </td><td><input type="submit" class="loginButton right" value="%s" />\n</td>' % _('log in'))
self.w(u'</tr>\n')
self.w(u'</table>\n')
self.w(u'</form>\n')
--- a/web/views/baseviews.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/baseviews.py Wed Aug 26 00:02:57 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)
--- a/web/views/bookmark.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/bookmark.py Wed Aug 26 00:02:57 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"<span class='title'><b>")
self.w(u"%s : %s" % (self.req._('Bookmark'), xml_escape(entity.title)))
self.w(u"</b></span>")
--- a/web/views/calendar.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/calendar.py Wed Aug 26 00:02:57 2009 +0200
@@ -293,7 +293,7 @@
__redirectvid=self.id
)
self.w(u'<div class="cmd"><a href="%s">%s</a></div>' % (xml_escape(url), self.req._(u'add')))
- self.w(u' ')
+ self.w(u' ')
self.w(u'</div>')
self.w(u'<div class="cellContent">')
for task_descr in rows:
@@ -312,7 +312,7 @@
self.w(u'</div>')
else:
self.w(u'<div class="task">')
- self.w(u" ")
+ self.w(u" ")
self.w(u'</div>')
self.w(u'</div>')
self.w(u'</td>')
@@ -443,7 +443,7 @@
self.w(u'</tr>')
self.w(u'</table></div>')
self.w(u'<div id="coord"></div>')
- self.w(u'<div id="debug"> </div>')
+ self.w(u'<div id="debug"> </div>')
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()]
--- a/web/views/editcontroller.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/editcontroller.py Wed Aug 26 00:02:57 2009 +0200
@@ -157,6 +157,7 @@
errorurl = self.req.form.get('__errorurl')
if errorurl:
self.req.cancel_edition(errorurl)
+ self.req.message = self.req._('edit canceled')
return self.reset()
def _action_delete(self):
--- a/web/views/editviews.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/editviews.py Wed Aug 26 00:02:57 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'<a href="%s" title="%s">%s</a> <a href="%s" title="%s">[...]</a>' % (
+ self.w(u'<a href="%s" title="%s">%s</a> <a href="%s" title="%s">[...]</a>' % (
xml_escape(linksearch_select_url(self.req, erset)),
self.req._('select this entity'),
xml_escape(entity.view('textoutofcontext')),
--- a/web/views/emailaddress.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/emailaddress.py Wed Aug 26 00:02:57 2009 +0200
@@ -27,7 +27,7 @@
if not entity.canonical:
canonemailaddr = entity.canonical_form()
if canonemailaddr:
- self.w(u' (<i>%s</i>)' % canonemailaddr.view('oneline'))
+ self.w(u' (<i>%s</i>)' % canonemailaddr.view('oneline'))
self.w(u'</h3>')
elif entity.identical_to:
self.w(u'</h3>')
--- a/web/views/formrenderers.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/formrenderers.py Wed Aug 26 00:02:57 2009 +0200
@@ -104,7 +104,7 @@
if example:
help.append('<div class="helper">(%s: %s)</div>'
% (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 = '<li>%s</li>\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'<th class="labelCol"> </th>')
+ w(u'<th class="labelCol"> </th>')
w(u'</tr>')
w(u'<tr>')
for field in fields:
@@ -436,7 +436,7 @@
w(u'</tr>')
pendings = list(form.restore_pending_inserts())
if not pendings:
- w(u'<tr><th> </th><td> </td></tr>')
+ w(u'<tr><th> </th><td> </td></tr>')
else:
for row in pendings:
# soon to be linked to entities
@@ -514,7 +514,7 @@
w(u'<a class="addEntity" id="add%s:%slink" href="javascript: %s" >+ %s.</a>'
% (rschema, entity.eid, js, __('add a %s' % targettype)))
w(u'</div>')
- w(u'<div class="trame_grise"> </div>')
+ w(u'<div class="trame_grise"> </div>')
w(u'</div>')
--- a/web/views/ibreadcrumbs.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/ibreadcrumbs.py Wed Aug 26 00:02:57 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)
--- a/web/views/iprogress.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/iprogress.py Wed Aug 26 00:02:57 2009 +0200
@@ -167,10 +167,10 @@
"""
id = 'ic_progress_table_view'
- def call(self):
+ def call(self, columns=None):
view = self.vreg['views'].select('progress_table_view', self.req,
rset=self.rset)
- columns = list(view.columns)
+ columns = list(columns or view.columns)
try:
columns.remove('project')
except ValueError:
--- a/web/views/management.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/management.py Wed Aug 26 00:02:57 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'[<a href="%s" title="%s">-</a>] ' % (
+ dellinktempl = u'[<a href="%s" title="%s">-</a>] ' % (
xml_escape(delurl), _('delete this permission'))
else:
dellinktempl = None
--- a/web/views/navigation.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/navigation.py Wed Aug 26 00:02:57 2009 +0200
@@ -40,9 +40,9 @@
self.index_display(start, stop)))
start = stop + 1
w(u'<div class="pagination">')
- w(u'%s ' % self.previous_link(params))
- w(u'[ %s ]' % u' | '.join(blocklist))
- w(u' %s' % self.next_link(params))
+ w(u'%s ' % self.previous_link(params))
+ w(u'[ %s ]' % u' | '.join(blocklist))
+ w(u' %s' % self.next_link(params))
w(u'</div>')
def index_display(self, start, stop):
@@ -140,9 +140,9 @@
def write_links(self, params, blocklist):
self.w(u'<div class="pagination">')
- self.w(u'%s ' % self.previous_link(params))
- self.w(u'[ %s ]' % u' | '.join(blocklist))
- self.w(u' %s' % self.next_link(params))
+ self.w(u'%s ' % self.previous_link(params))
+ self.w(u'[ %s ]' % u' | '.join(blocklist))
+ self.w(u' %s' % self.next_link(params))
self.w(u'</div>')
--- a/web/views/old_calendar.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/old_calendar.py Wed Aug 26 00:02:57 2009 +0200
@@ -30,8 +30,8 @@
# Navigation building methods / views ####################################
- PREV = u'<a href="%s"><<</a> <a href="%s"><</a>'
- NEXT = u'<a href="%s">></a> <a href="%s">>></a>'
+ PREV = u'<a href="%s"><<</a>  <a href="%s"><</a>'
+ NEXT = u'<a href="%s">></a>  <a href="%s">>></a>'
NAV_HEADER = u"""<table class="calendarPageHeader">
<tr><td class="prev">%s</td><td class="next">%s</td></tr>
</table>
@@ -200,7 +200,7 @@
self.w(u'<tr>')
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'<th colspan="2"><a href="%s">%s</a></th>' % (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'<td>%s %s</td>\n' % (_(WEEKDAYS[day.weekday()])[0].upper(), day_num+1))
+ self.w(u'<td>%s %s</td>\n' % (_(WEEKDAYS[day.weekday()])[0].upper(), day_num+1))
self.format_day_events(day, events)
self.w(u'</tr>')
@@ -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('<tr>%s%s</tr>'% (week_title, '\n'.join(day_row)))
- formatted_rows.append('<tr class="amRow"><td> </td>%s</tr>'% '\n'.join(am_row))
- formatted_rows.append('<tr class="pmRow"><td> </td>%s</tr>'% '\n'.join(pm_row))
+ formatted_rows.append('<tr class="amRow"><td> </td>%s</tr>'% '\n'.join(am_row))
+ formatted_rows.append('<tr class="pmRow"><td> </td>%s</tr>'% '\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'<tr>')
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'<th colspan="3"><a href="%s">%s</a></th>' % (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'<td>%s %s</td>\n' % (_(WEEKDAYS[day.weekday()])[0].upper(),
+ self.w(u'<td>%s %s</td>\n' % (_(WEEKDAYS[day.weekday()])[0].upper(),
day_num+1))
self.format_day_events(day, events)
self.w(u'</tr>')
@@ -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('<tr>%s%s</tr>'% (week_title, '\n'.join(day_row)))
- formatted_rows.append('<tr class="amRow"><td> </td>%s</tr>'% '\n'.join(am_row))
- formatted_rows.append('<tr class="pmRow"><td> </td>%s</tr>'% '\n'.join(pm_row))
+ formatted_rows.append('<tr class="amRow"><td> </td>%s</tr>'% '\n'.join(am_row))
+ formatted_rows.append('<tr class="pmRow"><td> </td>%s</tr>'% '\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 = '<a href="%s">%s</a>' % (xml_escape(url), umonth)
w(u'<tr>%s</tr>' % (
WEEK_TITLE % (_('week'), monday.isocalendar()[1], monthlink)))
- w(u'<tr><th>%s</th><th> </th></tr>'% _(u'Date'))
+ w(u'<tr><th>%s</th><th> </th></tr>'% _(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'<td class="%s"><span class="cellTitle">%s</span><div class="cellContent">%s</div></td>'
WEEK_TITLE = u'<th class="weekTitle" colspan="2">%s %s (%s)</th>'
-WEEK_EMPTY_CELL = u'<td class="weekEmptyCell"> </td>'
+WEEK_EMPTY_CELL = u'<td class="weekEmptyCell"> </td>'
WEEK_CELL = u'<td class="weekCell"><div class="cellContent">%s</div></td>'
-AMPM_DAYWEEK_EMPTY = u'<td>%s %s</td>'
-AMPM_DAYWEEK = u'<td rowspan="%d">%s %s</td>'
+AMPM_DAYWEEK_EMPTY = u'<td>%s %s</td>'
+AMPM_DAYWEEK = u'<td rowspan="%d">%s %s</td>'
AMPM_WEEK_CELL = u'<td class="ampmWeekCell"><div class="cellContent">%02d:%02d - %s</div></td>'
--- a/web/views/startup.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/startup.py Wed Aug 26 00:02:57 2009 +0200
@@ -62,10 +62,10 @@
self.wview('inlined', rset, row=0)
else:
self.entities()
- self.w(u'<div class="hr"> </div>')
+ self.w(u'<div class="hr"> </div>')
self.startup_views()
if manager and 'Card' in self.schema:
- self.w(u'<div class="hr"> </div>')
+ self.w(u'<div class="hr"> </div>')
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'<tr>\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' <a href="%s">%s</a> (%d)' % (
+ etypelink = u' <a href="%s">%s</a> (%d)' % (
xml_escape(url), label, nb)
yield (label, etypelink, self.add_entity_link(eschema, req))
--- a/web/views/timetable.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/views/timetable.py Wed Aug 26 00:02:57 2009 +0200
@@ -133,7 +133,7 @@
""" render column headers """
self.w(u'<tr class="header">\n')
- self.w(u'<th class="ttdate"> </th>\n')
+ self.w(u'<th class="ttdate"> </th>\n')
columns = []
for user, width in zip(users, widths):
self.w(u'<th colspan="%s">' % 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'<td rowspan="%d" class="%s %s" onclick="document.location=\'%s\'"> <div>' % (
+ self.w(u'<td rowspan="%d" class="%s %s" onclick="document.location=\'%s\'"> <div>' % (
task_descr.lines, task_descr.color, filled_klasses[kj], url))
task_descr.task.view('tooltip', w=self.w)
self.w(u'</div></td>')
else:
if empty_line:
- self.w(u'<td class="ttempty"> </td>')
+ self.w(u'<td class="ttempty"> </td>')
else:
- self.w(u'<td class="%s"> </td>' % empty_klasses[kj] )
+ self.w(u'<td class="%s"> </td>' % empty_klasses[kj] )
self.w(u'</tr>\n')
--- a/web/widgets.py Tue Aug 25 18:47:25 2009 +0200
+++ b/web/widgets.py Wed Aug 26 00:02:57 2009 +0200
@@ -154,7 +154,7 @@
help.append(u'<span>(%s: %s)</span>'
% (req._('sample format'), example))
help.append(u'</div>')
- 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<br/>\n<input type="%s" name="%s" id="%s" tabindex="%s"/> <span class="emphasis">(%s)</span>' % (
+ return u'%s<br/>\n<input type="%s" name="%s" id="%s" tabindex="%s"/> <span class="emphasis">(%s)</span>' % (
html, self.input_type, name, name, entity.req.next_tabindex(),
entity.req._('confirm password'))
@@ -662,7 +662,7 @@
res.append(u'</select>')
res.append(u'<div id="newvalue">')
res.append(u'<input type="text" id="newopt" />')
- res.append(u'<a href="javascript:noop()" id="add_newopt"> </a></div>')
+ res.append(u'<a href="javascript:noop()" id="add_newopt"> </a></div>')
return '\n'.join(res)
@@ -761,7 +761,7 @@
help.append('<span>(%s: %s)</span>'
% (req._('sample format'), example))
help.append(u'</div>')
- return u' '.join(help)
+ return u' '.join(help)
def render_calendar_popup(self, entity):
"""calendar popup widget"""