Here's book.module. All theme functions were converted but it may need some more work.

book_export_html(), book_node_visitor_html_pre() and book_node_visitor_html_post() have html in them that cannot be overridden. Should we break off some of these functions into template files too? And why is there a pre/post function for adding the html?

book_tree() and book_tree_recurse() uses theme functions for building lists now. It generated them manually duplicating some code. HTML is the same.

CommentFileSizeAuthor
#19 tplify-book.patch19.46 KBchx
#18 tplify-book.patch13.17 KBchx
#14 tplify_book.patch19.43 KBchx
#13 tplify_book.patch31.23 KBchx
#10 tplify_book.patch19.11 KBchx
#5 tplify_book_2c.patch19.41 KBdvessel
#4 tplify_book_2b.patch19.36 KBdvessel
#3 tplify_book_2.patch12.54 KBdvessel
tplify_book_1.patch13.06 KBdvessel

Comments

rstamm’s picture

rstamm commented
Status: Needs review » Needs work

patch doesn't apply anymore.

cvs id tags broken and missing blank line after cvs id tags.

dvessel’s picture

dvessel commented

I'll have another patch soon. book.module was under heavy development after I made that patch.

dvessel’s picture

dvessel commented
Priority: Normal » Critical
Status: Needs work » Needs review
StatusFileSize
new tplify_book_2.patch12.54 KB

Changes:

This removes the need for the pre/post visit functions. It's now passed in as a child so it can be wrapped with "book_node_export". Not "book_node_visitor_html_pre" and "book_node_visitor_html_post". Those two had hard coded html. It was moved into theme_book_node_export.

Hard coded html removed from "book_export_html", moved into "theme_book_export_html".

Please don't forget about the search conversion.
http://drupal.org/node/164032

dvessel’s picture

dvessel commented
StatusFileSize
new tplify_book_2b.patch19.36 KB

Includes the template files this time.

dvessel’s picture

dvessel commented
StatusFileSize
new tplify_book_2c.patch19.41 KB

Rerolled for latest head.. /sigh.

dvessel’s picture

dvessel commented

Note that the book sections don't put out the right classes anymore. Something was changed since the last patch so some nodes no longer contain the book depth.

gábor hojtsy’s picture

gábor hojtsy
he/him
Primary language Hungarian
Location Hungary
commented
Status: Needs review » Needs work

The book split patch (I just committed) possibly broke this, as you noticed there.

dvessel’s picture

dvessel commented

ugh, I have less time now but I'll try to get another patch going soon...

senpai’s picture

senpai commented

Dvessel, keep trying to shoot that moving target, and PM me when a patch is ready for testing. I wanna see this get in.

chx’s picture

chx commented
Status: Needs work » Needs review
StatusFileSize
new tplify_book.patch19.11 KB

Reroll.

catch’s picture

catch
he/him
Primary language English
commented
Status: Needs review » Needs work

The back and up links are generating urls like node/node/3

everything else seems fine.

catch’s picture

catch
he/him
Primary language English
commented

$variables['book_url'] = 'node/'. $book_link['bid']; maybe the culprit?

chx’s picture

chx commented
Status: Needs work » Needs review
StatusFileSize
new tplify_book.patch31.23 KB

A few url() calls were missed.

chx’s picture

chx commented
StatusFileSize
new tplify_book.patch19.43 KB

Some menu stuff got into it.

catch’s picture

catch
he/him
Primary language English
commented
Status: Needs review » Reviewed & tested by the community

Fixes all the issues I found, RTBC.

dvessel’s picture

dvessel commented

Woo hoo!! Nice guys, thanks!

AjK’s picture

AjK commented
Status: Reviewed & tested by the community » Needs work

Export html gives me a wsod. function book_export_traverse() doesn't return it's carefully constructed $output. Am I missing something here?

chx’s picture

chx commented
Status: Needs work » Needs review
StatusFileSize
new tplify-book.patch13.17 KB
chx’s picture

chx commented
StatusFileSize
new tplify-book.patch19.46 KB
AjK’s picture

AjK commented
Status: Needs review » Reviewed & tested by the community

Yup, looks good now.

PedroC-1’s picture

PedroC-1 commented

I am not sure but is the DOCTYPE in the first line of book-export-html.tpl.php?

Or is it better to write 

...
+?><!DOCTYPE ...
...

instead of 

...
+?>
+<!DOCTYPE ...
...

in book-export-html.tpl.php

john morahan’s picture

john morahan commented

No, ?>\n is equivalent to ?> - see http://www.php.net/manual/en/faq.using.php#faq.using.newlines

gábor hojtsy’s picture

gábor hojtsy
he/him
Primary language Hungarian
Location Hungary
commented
Status: Reviewed & tested by the community » Fixed

Thanks, committed. (Although I corrected a coding style violation in book_theme)

Anonymous’s picture

(not verified) commented
Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for two weeks with no activity.