Skip to content
Snippets Groups Projects
Commit 50d7d3b4a41e authored by Katia Saurfelt's avatar Katia Saurfelt
Browse files

[header] make `main_header` more bootstrap compilant (related to #3597030)

parent 9d85cd2fb37b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/html_page_header.rst 0 → 100644
+ 28
− 0
View file @ 50d7d3b4
class HTMLPageHeader
====================
This class has been completly rewritten.
* new context `header-logo` has been introducted for logo and site
title (used by `basecomponents.ApplLogo` and
`basecomponents.ApplicationName`) to be displyed on the very left of
the navbar.
* Breadcumbs habe been removed from the header to a specific div.
* A new dict `headers_classes` now provids the match between context
and bootsrap classes ::
basetemplates.HTMLPageHeader.headers_classes = {
'header-left':'navbar-left',
'header-right':'navbar-right',
}
* A new dict `css` provides the possiliblity to easily customize the
header navbar and breadcrumbs ::
basetemplates.HTMLPageHeader.css = {
'header-navbar' : 'navbar-default',
'breadcrumbs' : 'cw-breadcrumbs-default'
}
views/__init__.py
+ 13
− 0
View file @ 50d7d3b4
...@@ -16,3 +16,16 @@ ...@@ -16,3 +16,16 @@
# with this program. If not, see <http://www.gnu.org/licenses/>. # with this program. If not, see <http://www.gnu.org/licenses/>.
"""cubicweb-squareui views/forms/actions/components for web ui""" """cubicweb-squareui views/forms/actions/components for web ui"""
from cubicweb.web.views.boxes import ContextualBoxLayout, contextual
_ = unicode
class SimpleBoxContextFreeBoxLayout(ContextualBoxLayout):
__select__ = ~contextual()
cssclass = 'contextFreeBox'
__regid__ = 'simple-layout'
def render(self, w):
if self.init_rendering():
view = self.cw_extra_kwargs['view']
view.render_body(w)
views/basetemplates.py
+ 118
− 23
View file @ 50d7d3b4
...@@ -12,5 +12,4 @@ ...@@ -12,5 +12,4 @@
from logilab.mtconverter import xml_escape from logilab.mtconverter import xml_escape
from cubicweb.utils import UStringIO from cubicweb.utils import UStringIO
from cubicweb.web.views import basetemplates
...@@ -16,4 +15,8 @@ ...@@ -16,4 +15,8 @@
from cubicweb.web.views import basetemplates, \
basecomponents
from cubicweb.web.views.boxes import SearchBox
HTML5 = u'<!DOCTYPE html>' HTML5 = u'<!DOCTYPE html>'
...@@ -92,7 +95,8 @@ ...@@ -92,7 +95,8 @@
@monkeypatch(basetemplates.TheMainTemplate) @monkeypatch(basetemplates.TheMainTemplate)
def content_column(self, view, content_cols): def content_column(self, view, content_cols):
w = self.w w = self.w
w(u'<div id="contentColumn" class="col-md-%s">' % content_cols) w(u'<div id="pageContent" class="col-md-%(col)s" role="main">' % {
'col': content_cols})
components = self._cw.vreg['components'] components = self._cw.vreg['components']
self.content_components(view, components) self.content_components(view, components)
self.content_header(view) self.content_header(view)
...@@ -96,8 +100,6 @@ ...@@ -96,8 +100,6 @@
components = self._cw.vreg['components'] components = self._cw.vreg['components']
self.content_components(view, components) self.content_components(view, components)
self.content_header(view) self.content_header(view)
w(u'<div class="row">')
w(u'<div id="pageContent">')
vtitle = self._cw.form.get('vtitle') vtitle = self._cw.form.get('vtitle')
if vtitle: if vtitle:
w(u'<div class="vtitle">%s</div>\n' % xml_escape(vtitle)) w(u'<div class="vtitle">%s</div>\n' % xml_escape(vtitle))
...@@ -110,8 +112,6 @@ ...@@ -110,8 +112,6 @@
view.render(w=w) view.render(w=w)
w(u'</div>\n') # closes id=contentmain w(u'</div>\n') # closes id=contentmain
w(nav_html.getvalue()) w(nav_html.getvalue())
w(u'</div>\n' # closes id=pageContent
u'</div>\n') # closes row
self.content_footer(view) self.content_footer(view)
w(u'</div>\n') # closes div#contentColumn in template_body_header w(u'</div>\n') # closes div#contentColumn in template_body_header
...@@ -148,5 +148,41 @@ ...@@ -148,5 +148,41 @@
self.w(u'</div>\n') # closes id="page" self.w(u'</div>\n') # closes id="page"
self.w(u'</body>\n') self.w(u'</body>\n')
# main header
basecomponents.ApplLogo.context = 'header-logo'
# use basecomponents.ApplicationName.visible = False
basecomponents.ApplicationName.context = 'header-logo'
basecomponents.ApplLogo.order = 1
basecomponents.ApplicationName.order = 10
basecomponents.CookieLoginComponent.order = 10
basecomponents.AuthenticatedUserStatus.order = 5
SearchBox.order = 0
SearchBox.context = 'header-right'
SearchBox.layout_id = 'simple-layout'
basetemplates.HTMLPageHeader.headers_classes = {
'header-left':'navbar-left',
'header-right':'navbar-right',
}
@monkeypatch(basetemplates.HTMLPageHeader)
def call(self, view, **kwargs):
self.main_header(view)
self.breadcrumbs(view)
self.state_header()
def get_components(self, view, context):
ctxcomponents = self._cw.vreg['ctxcomponents']
return ctxcomponents.poss_visible_objects(self._cw,
rset=self.cw_rset,
view=view,
context=context)
basetemplates.HTMLPageHeader.get_components = get_components
basetemplates.HTMLPageHeader.css = {'header-navbar' : 'navbar-default',
'breadcrumbs' : 'cw-breadcrumbs-default'}
@monkeypatch(basetemplates.HTMLPageHeader) @monkeypatch(basetemplates.HTMLPageHeader)
def main_header(self, view): def main_header(self, view):
...@@ -151,8 +187,3 @@ ...@@ -151,8 +187,3 @@
@monkeypatch(basetemplates.HTMLPageHeader) @monkeypatch(basetemplates.HTMLPageHeader)
def main_header(self, view): def main_header(self, view):
"""build the top menu with authentification info and the rql box"""
spans = {'headtext': 'col-md-2',
'header-center': 'col-md-9',
'header-right': 'col-md-1 pull-right',
}
w = self.w w = self.w
...@@ -158,16 +189,76 @@ ...@@ -158,16 +189,76 @@
w = self.w w = self.w
w(u'<div id="header" class="navbar navbar-default" role="navigation">' title = self._cw.property_value('ui.site-title')
u'<div class="container">') w(u'<header class="navbar %s" role="banner">' %
for colid, context in self.headers: self.css.get('header-navbar', 'header-navbar'))
w(u'<div id="%s" class="%s">' % (colid, spans.get(colid, 'col-md-2'))) w(u'<nav class="container-fluid">')
components = self._cw.vreg['ctxcomponents'].poss_visible_objects( self.dispaly_navbar_header(w, view)
self._cw, rset=self.cw_rset, view=view, context=context) self.display_header_components(w, view, 'header-left')
for comp in components: self.display_header_components(w, view, 'header-right')
comp.render(w=w) w(u'</nav></header>')
w(u'&#160;')
w(u'</div>\n') def dispaly_navbar_header(self, w, view):
w(u'</div>\n') # closes class="container, w(u'''<div class="navbar-header">
w(u'</div>\n') # closes id="header" <button class="navbar-toggle" data-target="#tools-group" data-toggle="collapse" type="button">
<span class="sr-only">%(toggle_label)s</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>''' % {'toggle_label':self._cw._('Toggle navigation')})
components = self.get_components(view, context='header-logo')
if components:
for component in components:
component.render(w=w)
w(u'</div>')
basetemplates.HTMLPageHeader.dispaly_navbar_header = dispaly_navbar_header
def display_header_components(self, w, view, context):
components = self.get_components(view, context=context)
if components:
w(u'<div id="tools-group" class="collapse navbar-collapse">')
w(u'<ul class="nav navbar-nav %s">' % \
self.headers_classes[context])
for component in components:
w(u'<li>')
component.render(w=w)
w(u'</li>')
w(u'</ul>')
w(u'</div>')
basetemplates.HTMLPageHeader.display_header_components = display_header_components
@monkeypatch(basetemplates.HTMLPageHeader)
def breadcrumbs(self, view):
components = self.get_components(view, context='header-center')
if components:
self.w(u'<nav role="navigation" class="%s">' %
self.css.get('breadcrumbs', 'breadcrumbs-defaul'))
self.w(u'<div class="container">')
for component in components:
component.render(w=self.w)
self.w(u'</div>')
self.w(u'</nav>')
@monkeypatch(basetemplates.HTMLPageHeader)
def state_header(self):
state = self._cw.search_state
if state[0] == 'normal':
return
_ = self._cw._
value = self._cw.view('oneline', self._cw.eid_rset(state[1][1]))
target, eid, r_type, searched_type = self._cw.search_state[1]
cancel_link = u'<a href="%(url)s" role="button" title="%(title)s">[%(title)s]</a>' % {
'url' : self._cw.build_url(str(eid),
vid='edition', __mode='normal'),
'title': _('cancel')}
msg = ' '.join((_("searching for"),
display_name(self._cw, state[1][3]),
_("to associate with"), value,
_("by relation"),
'<strong>"%s"</strong>' % \
display_name(self._cw, state[1][2], state[1][0]),
cancel_link))
return self.w(u'<div class="alert alert-info">%s</div>' % msg)
@monkeypatch(basetemplates.HTMLPageFooter) @monkeypatch(basetemplates.HTMLPageFooter)
def call(self, **kwargs): def call(self, **kwargs):
...@@ -176,3 +267,7 @@ ...@@ -176,3 +267,7 @@
self.footer_content() self.footer_content()
self.w(u'</div>\n') self.w(u'</div>\n')
self.w(u'</footer>\n') self.w(u'</footer>\n')
def registration_callback(vreg):
vreg.register_all(globals().values(), __name__)
vreg.unregister(actions.CancelSelectAction)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment