# HG changeset patch
# User Nicolas Chauvat <nicolas.chauvat@logilab.fr>
# Date 1390928283 -3600
# Tue Jan 28 17:58:03 2014 +0100
# Node ID 937da92c7c394bf7f0745bf894233484d1c09f38
# Parent 6317488364cbf59ac4b66d81b1b27147abb92a2b
upgrade to twitter bootstrap 3.0.0
diff --git a/__pkginfo__.py b/__pkginfo__.py
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -14,7 +14,7 @@
web = 'http://www.cubicweb.org/project/%s' % distname
__depends__ = {'cubicweb': '>= 3.15.6',
- 'cubicweb-bootstrap': None,
+ 'cubicweb-bootstrap': '>= 0.3.0',
}
__recommends__ = {}
diff --git a/views/basetemplates.py b/views/basetemplates.py
--- a/views/basetemplates.py
+++ b/views/basetemplates.py
@@ -30,8 +30,8 @@
self.set_request_content_type()
self.template_header(self.content_type, view)
w = self.w
- w(u'<div class="row-fluid">')
- w(u'<div class="span12" id="pageContent">')
+ w(u'<div class="row">')
+ w(u'<div class="col-md-12" id="pageContent">')
vtitle = self._cw.form.get('vtitle')
if vtitle:
w(u'<div class="vtitle">%s</div>\n' % xml_escape(vtitle))
@@ -49,7 +49,7 @@
w(u'</div>\n') # closes id=contentmain
w(nav_html.getvalue())
w(u'</div>\n' # closes id=pageContent
- u'</div>\n') # closes row-fluid
+ u'</div>\n') # closes row
self.template_footer(view)
@@ -83,16 +83,16 @@
w = self.w
w(u'<body>\n')
self.wview('header', rset=self.cw_rset, view=view)
- w(u'<div id="page" class="container-fluid">\n'
- u'<div class="row-fluid">\n')
- #w(u'<div class="span3">')
+ w(u'<div id="page" class="container">\n'
+ u'<div class="row">\n')
+ #w(u'<div class="col-md-3">')
nb_boxes = self.nav_column(view, 'left')
#w(u'</div>')
if nb_boxes is not None and nb_boxes:
content_span = 9
else:
content_span = 12
- w(u'<div id="contentColumn" class="span%s">' % content_span)
+ w(u'<div id="contentColumn" class="col-md-%s">' % content_span)
components = self._cw.vreg['components']
rqlcomp = components.select_or_none('rqlinput', self._cw, rset=self.cw_rset)
if rqlcomp:
@@ -107,12 +107,12 @@
self.w(u'<div class="row">')
self.content_footer(view)
self.w(u'</div>')
- self.w(u'</div>\n') # XXX closes div#contentColumn span9 in template_body_header
+ self.w(u'</div>\n') # XXX closes div#contentColumn col-md-9 in template_body_header
self.nav_column(view, 'right')
self.w(u'</div>\n') # XXX closes div#page in template_body_header
self.wview('footer', rset=self.cw_rset)
- self.w(u'</div>' # closes class="row-fluid"
- u'</div>') # closes class="container-fluid"
+ self.w(u'</div>' # closes class="row"
+ u'</div>') # closes class="container"
self.w(u'</body>')
@monkeypatch(basetemplates.TheMainTemplate)
@@ -121,7 +121,7 @@
self._cw, rset=self.cw_rset, view=view, context=context))
if boxes:
getlayout = self._cw.vreg['components'].select
- self.w(u'<div id="aside-main-%s" class="span3">\n'
+ self.w(u'<div id="aside-main-%s" class="col-md-3">\n'
u'<div class="well">\n' %
context) # XXX Should arrange Facets soon
self.w(u'<div class="navboxes" id="navColumn%s">\n' % context.capitalize())
@@ -136,16 +136,16 @@
@monkeypatch(basetemplates.HTMLPageHeader)
def main_header(self, view):
"""build the top menu with authentification info and the rql box"""
- spans = {'headtext': 'span2',
- 'header-center': 'span9',
- 'header-right': 'span1 pull-right',
+ spans = {'headtext': 'col-md-2',
+ 'header-center': 'col-md-9',
+ 'header-right': 'col-md-1 pull-right',
}
w = self.w
w(u'<div id="header" class="navbar">'
u'<div class="navbar-inner">'
u'<div class="container">')
for colid, context in self.headers:
- w(u'<div id="%s" class="%s">' % (colid, spans.get(colid, 'span2')))
+ w(u'<div id="%s" class="%s">' % (colid, spans.get(colid, 'col-md-2')))
components = self._cw.vreg['ctxcomponents'].poss_visible_objects(
self._cw, rset=self.cw_rset, view=view, context=context)
for comp in components: