# HG changeset patch # User Julien Cristau # Date 1405692701 -7200 # Node ID cba05de9a1a0255f86e4b9ed3016fe5ad7d2a18c # Parent e0532c37c9c23fe198dea26d19c38d6c42014afc# Parent f288ab643958e3d8a924a035ee474de6b4aa1f79 merge 3.17.16 into 3.18 branch diff -r e0532c37c9c2 -r cba05de9a1a0 .hgtags --- a/.hgtags Tue Jun 17 14:43:28 2014 +0200 +++ b/.hgtags Fri Jul 18 16:11:41 2014 +0200 @@ -332,6 +332,9 @@ ee413076752b3e606801ef55e48f7e7ccd1f7238 cubicweb-version-3.17.15 ee413076752b3e606801ef55e48f7e7ccd1f7238 cubicweb-debian-version-3.17.15-1 ee413076752b3e606801ef55e48f7e7ccd1f7238 cubicweb-centos-version-3.17.15-1 +a979d1594af6501a774fb32eb67cd32fea626655 cubicweb-version-3.17.16 +a979d1594af6501a774fb32eb67cd32fea626655 cubicweb-debian-version-3.17.16-1 +a979d1594af6501a774fb32eb67cd32fea626655 cubicweb-centos-version-3.17.16-1 db37bf35a1474843ded0a537f9cb4838f4a78cda cubicweb-version-3.18.0 db37bf35a1474843ded0a537f9cb4838f4a78cda cubicweb-debian-version-3.18.0-1 db37bf35a1474843ded0a537f9cb4838f4a78cda cubicweb-centos-version-3.18.0-1 diff -r e0532c37c9c2 -r cba05de9a1a0 __pkginfo__.py diff -r e0532c37c9c2 -r cba05de9a1a0 cubicweb.spec diff -r e0532c37c9c2 -r cba05de9a1a0 debian/changelog --- a/debian/changelog Tue Jun 17 14:43:28 2014 +0200 +++ b/debian/changelog Fri Jul 18 16:11:41 2014 +0200 @@ -34,6 +34,12 @@ -- Julien Cristau Fri, 10 Jan 2014 17:14:18 +0100 +cubicweb (3.17.16-1) unstable; urgency=low + + * new upstream value + + -- Aurelien Campeas Mon, 07 Jul 2014 19:26:12 +0200 + cubicweb (3.17.15-1) unstable; urgency=low * new upstream release diff -r e0532c37c9c2 -r cba05de9a1a0 web/data/cubicweb.css --- a/web/data/cubicweb.css Tue Jun 17 14:43:28 2014 +0200 +++ b/web/data/cubicweb.css Fri Jul 18 16:11:41 2014 +0200 @@ -200,13 +200,15 @@ visibility: hidden; } -li.invisible { - background: none; - padding: 0px 0px 1px 1px; +/* copied verbatim from bootstrap 3.0 */ +.invisible { + visibility: hidden; } -li.invisible div{ - display: inline; +/* copied verbatim from bootstrap 3.0 */ +.list-unstyled { + padding-left: 0; + list-style: none; } .caption { diff -r e0532c37c9c2 -r cba05de9a1a0 web/data/cubicweb.old.css --- a/web/data/cubicweb.old.css Tue Jun 17 14:43:28 2014 +0200 +++ b/web/data/cubicweb.old.css Fri Jul 18 16:11:41 2014 +0200 @@ -219,14 +219,15 @@ visibility: hidden; } -li.invisible { - list-style: none; - background: none; - padding: 0px 0px 1px 1px; +/* copied verbatim from bootstrap 3.0 */ +.invisible { + visibility: hidden; } -li.invisible div { - display: inline; +/* copied verbatim from bootstrap 3.0 */ +.list-unstyled { + padding-left: 0; + list-style: none; } .caption { diff -r e0532c37c9c2 -r cba05de9a1a0 web/test/unittest_reledit.py --- a/web/test/unittest_reledit.py Tue Jun 17 14:43:28 2014 +0200 +++ b/web/test/unittest_reledit.py Fri Jul 18 16:11:41 2014 +0200 @@ -1,4 +1,4 @@ -# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved. # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr # # This file is part of CubicWeb. @@ -33,9 +33,9 @@ class ClickAndEditFormTC(ReleditMixinTC, CubicWebTC): def test_default_config(self): - reledit = {'title': '''
cubicweb-world-domination
''', - 'long_desc': '''
<not specified>
''', - 'manager': '''
<not specified>
''', + reledit = {'title': '''
cubicweb-world-domination
''', + 'long_desc': '''
<not specified>
''', + 'manager': '''
<not specified>
''', 'composite_card11_2ttypes': """<not specified>""", 'concerns': """<not specified>"""} @@ -49,7 +49,7 @@ def test_default_forms(self): self.skipTest('Need to check if this test should still run post reledit/doreledit merge') - doreledit = {'title': """
cubicweb-world-domination
+ doreledit = {'title': """
cubicweb-world-domination
@@ -78,12 +78,12 @@
-
""", +
""", - 'long_desc': """
<not specified>
+ 'long_desc': """
<not specified>
- - + + @@ -122,9 +122,9 @@
-
""", +
""", - 'manager': """
<not specified>
+ 'manager': """
<not specified>
@@ -158,7 +158,7 @@
-
""", +
""", 'composite_card11_2ttypes': """<not specified>""", 'concerns': """<not specified>""" } @@ -192,11 +192,11 @@ reledit_ctrl.tag_object_of(('Ticket', 'concerns', 'Project'), {'edit_target': 'rtype'}) reledit = { - 'title': """
cubicweb-world-domination
""", - 'long_desc': """
<long_desc is required>
""", - 'manager': """""", + 'title': """
cubicweb-world-domination
""", + 'long_desc': """
<long_desc is required>
""", + 'manager': """""", 'composite_card11_2ttypes': """<not specified>""", - 'concerns': """""" + 'concerns': """""" } for rschema, ttypes, role in self.proj.e_schema.relation_definitions(includefinal=True): if rschema not in reledit: diff -r e0532c37c9c2 -r cba05de9a1a0 web/views/ajaxedit.py --- a/web/views/ajaxedit.py Tue Jun 17 14:43:28 2014 +0200 +++ b/web/views/ajaxedit.py Fri Jul 18 16:11:41 2014 +0200 @@ -55,9 +55,9 @@ self.w(u'

%s

' % self._cw._('relation %(relname)s of %(ent)s') % {'relname': rschema.display_name(self._cw, role(self)), 'ent': entity.view('incontext')}) - self.w(u'
    ') + self.w(u'
      ') for boxitem in self.unrelated_boxitems(entity): - self.w('' % boxitem) + self.w('
    • %s
    • ' % boxitem) self.w(u'
    ') def unrelated_entities(self, entity): diff -r e0532c37c9c2 -r cba05de9a1a0 web/views/autoform.py --- a/web/views/autoform.py Tue Jun 17 14:43:28 2014 +0200 +++ b/web/views/autoform.py Fri Jul 18 16:11:41 2014 +0200 @@ -504,15 +504,15 @@ label = rschema.display_name(req, role, context=form.edited_entity.cw_etype) w(u'%s' % label) w(u'') - w(u'
      ') + w(u'
        ') for viewparams in related: - w(u'' + w(u'
      • %s%s
      • ' % (viewparams[1], viewparams[0], viewparams[2], viewparams[3])) if not form.force_display and form.maxrelitems < len(related): - link = (u'
      ') w(u'') w(u'') diff -r e0532c37c9c2 -r cba05de9a1a0 web/views/reledit.py --- a/web/views/reledit.py Tue Jun 17 14:43:28 2014 +0200 +++ b/web/views/reledit.py Fri Jul 18 16:11:41 2014 +0200 @@ -1,4 +1,4 @@ -# copyright 2003-2012 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved. # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr # # This file is part of CubicWeb. @@ -329,13 +329,13 @@ w = self.w w(u'
      ' % {'id': divid, 'css': 'releditField', - 'out': "jQuery('#%s').addClass('hidden')" % divid, - 'over': "jQuery('#%s').removeClass('hidden')" % divid}) + 'out': "jQuery('#%s').addClass('invisible')" % divid, + 'over': "jQuery('#%s').removeClass('invisible')" % divid}) w(u'
      ' % divid) w(value) w(u'
      ') form.render(w=w, renderer=renderer) - w(u'