node and
+ * put its content into the real document's head.
+ * This enables dynamic css and js loading and is used by replacePageChunk
+ */
+function loadAjaxHtmlHead(node) {
+ jQuery(node).find('div.ajaxHtmlHead').appendTo(jQuery('head'));
+}
+
+function postAjaxLoad(node, req) {
+ // addStylesheets(evalJSON(req.getResponseHeader('X-Cubicweb-Stylesheets') || '[]'));
+ loadAjaxHtmlHead(node);
// find sortable tables if there are some
if (typeof(Sortable) != 'undefined') {
Sortable.sortTables(node);
@@ -28,23 +39,18 @@
// cubicweb loadxhtml plugin to make jquery handle xhtml response
jQuery.fn.loadxhtml = function(url, data, reqtype, mode) {
- var ajax = null;
- if (reqtype == 'post') {
- ajax = jQuery.post;
- } else {
- ajax = jQuery.get;
- }
if (this.size() > 1) {
log('loadxhtml was called with more than one element');
}
+ var node = this.get(0); // only consider the first element
mode = mode || 'replace';
var callback = null;
if (data && data.callback) {
callback = data.callback;
delete data.callback;
}
- var node = this.get(0); // only consider the first element
- ajax(url, data, function(response) {
+ var deferred = loadJSON(url, data, reqtype);
+ deferred.addCallback(function(response, req) {
var domnode = getDomFromResponse(response);
if (mode == 'swap') {
var origId = node.id;
@@ -57,7 +63,7 @@
} else if (mode == 'append') {
jQuery(node).append(domnode);
}
- postAjaxLoad(node);
+ postAjaxLoad(node, req);
while (jQuery.isFunction(callback)) {
callback = callback.apply(this, [domnode]);
}
diff -r 8e64f12be69c -r 5e5b296a657e web/views/basecontrollers.py
--- a/web/views/basecontrollers.py Mon Feb 16 20:51:24 2009 +0100
+++ b/web/views/basecontrollers.py Mon Feb 16 20:51:41 2009 +0100
@@ -211,14 +211,14 @@
self.req.set_content_type(content_type)
return xmlize(data)
return data
-
+
def html_exec(self, rset=None):
- """html mode: execute query and return the view as HTML"""
+ # XXX try to use the page-content template
req = self.req
rql = req.form.get('rql')
if rset is None and rql:
rset = self._exec(rql)
-
+
vid = req.form.get('vid') or vid_from_rset(req, rset, self.schema)
try:
view = self.vreg.select_view(vid, req, rset)
@@ -239,6 +239,10 @@
if divid == 'pageContent':
stream.write(u'
')
view.dispatch()
+ extresources = req.html_headers.getvalue(skiphead=True)
+ stream.write(u'
\n') # XXX use a widget ?
+ stream.write(extresources)
+ stream.write(u'
\n')
if req.form.get('paginate') and divid == 'pageContent':
stream.write(u'
\n')
-
+
def template_html_header(self, content_type, page_title, additional_headers=()):
w = self.whead
lang = self.req.lang
@@ -196,15 +181,8 @@
if msgcomp:
msgcomp.dispatch(w=self.w)
self.content_header(view)
- w(u'
\n')
- vtitle = self.req.form.get('vtitle')
- if vtitle:
- w(u'
%s
\n' % html_escape(vtitle))
-
+
def template_footer(self, view=None):
- self.w(u'\n') # close id=contentmain
- self.w(_(self.nav_html.getvalue()))
- self.w(u'
\n')
+ vtitle = self.req.form.get('vtitle')
+ if vtitle:
+ w(u'
%s
\n' % html_escape(vtitle))
+ # display entity type restriction component
+ etypefilter = self.vreg.select_component('etypenavigation',
+ self.req, self.rset)
+ if etypefilter and etypefilter.propval('visible'):
+ etypefilter.dispatch(w=w)
+ self.nav_html = UStringIO()
+ self.pagination(self.req, self.rset, self.nav_html.write,
+ not (view and view.need_navigation))
+ w(_(self.nav_html.getvalue()))
+ w(u'
\n')
+ if view.binary:
+ # have to replace our unicode stream using view's binary stream
+ view.dispatch()
+ assert self._stream, 'duh, template used as a sub-view ?? (%s)' % self._stream
+ self._stream = view._stream
+ else:
+ view.dispatch(w=w)
+ if with_templates:
+ w(u'
\n') # close id=contentmain
+ w(_(self.nav_html.getvalue()))
+ w(u'