August 2008 - bknr-cvs@common-lisp.net - mailman3.common-lisp.net

[bknr-cvs] hans changed trunk/projects/quickhoney/upgrade-stuff/import.lisp
by BKNR Commits 30 Aug '08

30 Aug '08

Revision: 3754 Author: hans URL: http://bknr.net/trac/changeset/3754 Add form to initialize news archive. U trunk/projects/quickhoney/upgrade-stuff/import.lisp Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-08-30 20:11:12 UTC (rev 3753) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-08-30 20:20:16 UTC (rev 3754) @@ -41,6 +41,16 @@ (mapc #'delete-object (get-keywords-intersection-store-images '(:upload :home :button))) (mapc #'delete-object (get-keywords-intersection-store-images '(:clients :nicejobs))) +(with-transaction (:initialize-news) + (setf (slot-value (find-rss-channel "quickhoney") 'bknr.rss::items) + (sort (remove-if (lambda (image) + (or (member :explicit (store-image-keywords image)) + (not (and (quickhoney-image-category image) + (quickhoney-image-subcategory image))))) + (class-instances 'quickhoney-image)) + #'> + :key #'blob-timestamp))) + (dolist (image (class-instances 'quickhoney-image)) (unless (and (quickhoney-image-category image) (quickhoney-image-subcategory image))

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/website/static/javascript.js
by BKNR Commits 30 Aug '08

30 Aug '08

Revision: 3753 Author: hans URL: http://bknr.net/trac/changeset/3753 Hack around Internet Explorer overlap problem. U trunk/projects/quickhoney/website/static/javascript.js Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-08-30 14:11:09 UTC (rev 3752) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-08-30 20:11:12 UTC (rev 3753) @@ -504,6 +504,11 @@ debug('show_page ' + pagename + ' subpath ' + subpath + ' current_directory ' + current_directory); + /* workaround for IE, which does not display the overlapping menu items expectedly */ + map(function (keyword) { + $('m_' + keyword).style.zIndex = (keyword == pagename) ? 101 : 100; + }, ['pixel', 'vector', 'news', 'shop', 'contact']); + // Activate the menu by coloring the menu choices correctly $('menu').className = pagename;

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/
by BKNR Commits 30 Aug '08

30 Aug '08

Revision: 3752 Author: hans URL: http://bknr.net/trac/changeset/3752 Update contact page. Sanitize page navigation links. Fake shop page. Use CSS floating remote. U trunk/projects/quickhoney/src/shop.lisp U trunk/projects/quickhoney/upgrade-stuff/buy.gif U trunk/projects/quickhoney/upgrade-stuff/hey.gif U trunk/projects/quickhoney/upgrade-stuff/import.lisp A trunk/projects/quickhoney/upgrade-stuff/pixelcontact.gif U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/quickhoney/website/static/styles.css U trunk/projects/quickhoney/website/static/test.html U trunk/projects/quickhoney/website/templates/index.xml Change set too large, please see URL above

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/
by BKNR Commits 29 Aug '08

29 Aug '08

Revision: 3751 Author: hans URL: http://bknr.net/trac/changeset/3751 Add CSS based button box implementation U trunk/projects/quickhoney/upgrade-stuff/buy-file.gif U trunk/projects/quickhoney/upgrade-stuff/buy-print.gif U trunk/projects/quickhoney/upgrade-stuff/buy-t-shirt.gif U trunk/projects/quickhoney/upgrade-stuff/buy.gif A trunk/projects/quickhoney/upgrade-stuff/cart.gif A trunk/projects/quickhoney/upgrade-stuff/comment.gif U trunk/projects/quickhoney/upgrade-stuff/hey.gif U trunk/projects/quickhoney/upgrade-stuff/import.lisp A trunk/projects/quickhoney/upgrade-stuff/ipod.gif A trunk/projects/quickhoney/upgrade-stuff/shoot.gif U trunk/projects/quickhoney/website/static/styles.css A trunk/projects/quickhoney/website/static/test.html U trunk/projects/quickhoney/website/templates/frontpage.xml Modified: trunk/projects/quickhoney/upgrade-stuff/buy-file.gif =================================================================== (Binary files differ) Modified: trunk/projects/quickhoney/upgrade-stuff/buy-print.gif =================================================================== (Binary files differ) Modified: trunk/projects/quickhoney/upgrade-stuff/buy-t-shirt.gif =================================================================== (Binary files differ) Modified: trunk/projects/quickhoney/upgrade-stuff/buy.gif =================================================================== (Binary files differ) Added: trunk/projects/quickhoney/upgrade-stuff/cart.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/cart.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/projects/quickhoney/upgrade-stuff/comment.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/comment.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/projects/quickhoney/upgrade-stuff/hey.gif =================================================================== (Binary files differ) Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-08-29 14:18:35 UTC (rev 3750) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-08-29 16:22:43 UTC (rev 3751) @@ -15,8 +15,10 @@ (dolist (pathname '(#P"overlay-close.gif" #P"hey.gif" - #P"buy.gif" #P"buy-top.gif" #P"buy-print.gif" #P"buy-file.gif" #P"buy-t-shirt.gif" + #P"buy.gif" #P"buy-top.gif" #P"buy-right-line.gif" + #P"buy-print.gif" #P"buy-file.gif" #P"buy-t-shirt.gif" + #P"cart.gif" #P"comment.gif" #P"ipod.gif" #P"shoot.gif" #P"t-shirt-sample-background.gif" #P"print-sample.jpg" #P"button-bottom.gif" Added: trunk/projects/quickhoney/upgrade-stuff/ipod.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/ipod.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/projects/quickhoney/upgrade-stuff/shoot.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/shoot.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2008-08-29 14:18:35 UTC (rev 3750) +++ trunk/projects/quickhoney/website/static/styles.css 2008-08-29 16:22:43 UTC (rev 3751) @@ -541,36 +541,6 @@ background-color: #FFFF33; } -#image_action_buttons { - position: absolute; - left: 624px; - top: 142px; - width: 60px; - overflow: hidden; - z-index: 100; -} - -#image_action_buttons #buy { - z-index: 110; - position: absolute; - left: 0px; - top: 0px; -} - -#image_action_buttons #buy-top { - z-index: 110; - position: absolute; - left: 37px; - top: 0px; -} - -#image_action_buttons #buy-right-line { - z-index: 100; - position: absolute; - right: 0px; - top: 0px; -} - #overlay #hey { padding: 10px 15px 10px 10px; } @@ -613,3 +583,70 @@ left: 585px; visibility: hidden; } + +/* image action button box / "floating remote" */ + +#image_action_buttons { + position: absolute; +} + +.buttonbox { + overflow: hidden; + z-index: 100; + position: absolute; + left: 624px; + top: 142px; +} + +.buttonbox .button-section-items { + border: 1px solid; + border-bottom-width: 0px; + margin-left: 37px; +} + +body.pixel .button-section-items { + border-color: #ff00ff; +} + +body.vector .button-section-items { + border-color: #00ccff; +} + +.buttonbox .button-section-items a span { + padding: 0.5em; + color: black; +} + +.buttonbox .button-section-items.last { + border-bottom-width: 1px; +} + +.buttonbox li img { + margin: 0px 3px 0px 3px; +} + +.buttonbox img.flag { + float: left; +} + +#image_action_buttons #buy { + z-index: 110; + position: absolute; + left: 0px; + top: 0px; +} + +#image_action_buttons #buy-top { + z-index: 110; + position: absolute; + left: 37px; + top: 0px; +} + +#image_action_buttons #buy-right-line { + z-index: 100; + position: absolute; + right: 0px; + top: 0px; +} + Added: trunk/projects/quickhoney/website/static/test.html =================================================================== --- trunk/projects/quickhoney/website/static/test.html (rev 0) +++ trunk/projects/quickhoney/website/static/test.html 2008-08-29 16:22:43 UTC (rev 3751) @@ -0,0 +1,35 @@ +<html> + <head> + <link rel="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css" /> + <link rel="stylesheet" href="/static/styles.css" /> + <title> + buttonbox-test + </title> + </head> + <body class="pixel"> + <div class="buttonbox"> + <div class="button-section"> + <img src="/image/buy" class="flag" width="37" height="16"/> + <div class="button-section-items"> + <ul> + <li><a href="#"><img src="/image/buy-file/color,000000,ff00ff" width="17" height="18"/><span>File</span></a></li> + <li><a href="#"><img src="/image/buy-t-shirt/color,000000,ff00ff" width="17" height="18"/><span>T-Shirt</span></a></li> + </ul> + </div> + </div> + <div class="button-section"> + <img src="/image/hey" class="flag" width="37" height="16"/> + <div class="button-section-items last"> + <ul> + <li><a href="#"><img src="/image/ipod/color,000000,ff00ff" width="17" height="18"/><span>iPod</span></a></li> + <li><a href="#"><img src="/image/shoot/color,000000,ff00ff" width="17" height="18"/><span>Bookmark</span></a></li> + </ul> + </div> + </div> + </div> + </body> +</html> + + + + Modified: trunk/projects/quickhoney/website/templates/frontpage.xml =================================================================== --- trunk/projects/quickhoney/website/templates/frontpage.xml 2008-08-29 14:18:35 UTC (rev 3750) +++ trunk/projects/quickhoney/website/templates/frontpage.xml 2008-08-29 16:22:43 UTC (rev 3751) @@ -2,6 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html + xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns="http://www.w3.org/1999/xhtml" xmlns:bknr="http://bknr.net" xmlns:quickhoney="http://quickhoney.com/"

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/src/imageproc.lisp
by BKNR Commits 29 Aug '08

29 Aug '08

Revision: 3750 Author: hans URL: http://bknr.net/trac/changeset/3750 Always use integer scale factor for pixel images when creating button. U trunk/projects/quickhoney/src/imageproc.lisp Modified: trunk/projects/quickhoney/src/imageproc.lisp =================================================================== --- trunk/projects/quickhoney/src/imageproc.lisp 2008-08-29 13:51:00 UTC (rev 3749) +++ trunk/projects/quickhoney/src/imageproc.lisp 2008-08-29 14:18:35 UTC (rev 3750) @@ -64,13 +64,12 @@ (button-height (parse-integer button-height)) (button-image (create-image button-width button-height t)) (category (bknr.utils:make-keyword-from-string category)) - (scale-factor (apply #'max - (if (> (/ (image-width input-image) (image-height input-image)) - (/ button-width button-height)) - (/ button-height (image-height input-image)) - (/ button-width (image-width input-image))) - (when (eq :pixel category) - (list 1)))) + (scale-factor (funcall (if (eq :pixel category) + #'ceiling #'identity) + (if (> (/ (image-width input-image) (image-height input-image)) + (/ button-width button-height)) + (/ button-height (image-height input-image)) + (/ button-width (image-width input-image))))) (cutout-width (floor (/ button-width scale-factor))) (cutout-height (floor (/ button-height scale-factor))) (radius (parse-integer radius)))

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/website/static/javascript.js
by BKNR Commits 29 Aug '08

29 Aug '08

Revision: 3749 Author: hans URL: http://bknr.net/trac/changeset/3749 remove debug message U trunk/projects/quickhoney/website/static/javascript.js Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-08-29 13:47:43 UTC (rev 3748) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-08-29 13:51:00 UTC (rev 3749) @@ -1049,7 +1049,6 @@ $("edit_client").value = current_image.client; $("edit_keywords").value = current_image.spider_keywords; map(function(keyword) { - log("initialize edit keyword " + keyword); $('edit_' + keyword).checked = current_image.keywords[keyword] ? true : false; }, ['explicit', 'buy-file', 'buy-print', 'buy-t-shirt']); show_cms_window("edit_form");

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/
by BKNR Commits 29 Aug '08

29 Aug '08

Revision: 3748 Author: hans URL: http://bknr.net/trac/changeset/3748 Update news layout. CSS tweaks to remove dotted focus indicator in Firefox. U trunk/projects/quickhoney/src/imageproc.lisp U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/quickhoney/website/static/styles.css U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/projects/quickhoney/src/imageproc.lisp =================================================================== --- trunk/projects/quickhoney/src/imageproc.lisp 2008-08-28 15:56:17 UTC (rev 3747) +++ trunk/projects/quickhoney/src/imageproc.lisp 2008-08-29 13:47:43 UTC (rev 3748) @@ -72,7 +72,8 @@ (when (eq :pixel category) (list 1)))) (cutout-width (floor (/ button-width scale-factor))) - (cutout-height (floor (/ button-height scale-factor)))) + (cutout-height (floor (/ button-height scale-factor))) + (radius (parse-integer radius))) (copy-image input-image button-image (floor (- (image-width input-image) cutout-width) 2) (if (eq :vector category) @@ -91,7 +92,8 @@ 0 0 0 0 (image-width type-image) (image-height type-image))))) - (corner-image :image button-image :radius (parse-integer radius)) + (unless (zerop radius) + (corner-image :image button-image :radius radius)) button-image)) (define-imageproc-handler center-thumbnail (input-image width height) Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-08-28 15:56:17 UTC (rev 3747) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-08-29 13:47:43 UTC (rev 3748) @@ -231,7 +231,7 @@ onclick: function () { jump_to(item.category + '/' + item.subcategory + '/' + item.name) } }; return DIV({ 'class': 'newsentry autonews news_' + item.category }, A(link_dest, - revealer.IMG({ src: "/image/" + item.name + '/cutout-button,,' + color + ',98,98,4,' + item.category, + revealer.IMG({ src: "/image/" + item.name + '/cutout-button,,' + color + ',98,98,0,' + item.category, style: 'visibility: hidden', width: 98, height: 98, onload: 'reveal_image(this)' })), @@ -1049,6 +1049,7 @@ $("edit_client").value = current_image.client; $("edit_keywords").value = current_image.spider_keywords; map(function(keyword) { + log("initialize edit keyword " + keyword); $('edit_' + keyword).checked = current_image.keywords[keyword] ? true : false; }, ['explicit', 'buy-file', 'buy-print', 'buy-t-shirt']); show_cms_window("edit_form"); Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2008-08-28 15:56:17 UTC (rev 3747) +++ trunk/projects/quickhoney/website/static/styles.css 2008-08-29 13:47:43 UTC (rev 3748) @@ -7,6 +7,10 @@ font-size: 80%; } +/* remove dotted borders around links */ +a:active { outline: none } +a:focus { -moz-outline-style: none } + .page { display: none; border: 0px; @@ -146,8 +150,6 @@ #menu.contact a#m_contact img.selected { visibility: inherit; } #menu.contact a#m_contact img.unselected { visibility: hidden } -.autonews a { color: #30be01; } - #m_home { top: 30px; left: 36px; } #m_pixel { top: 36px; left: 250px; } #m_vector { top: 36px; left: 331px; } @@ -381,6 +383,8 @@ /* news styles */ +.autonews a { color: #30be01; } + #newsentries { width: 486px; } @@ -389,35 +393,48 @@ width: 486px; } -.autonews { - height: 108px; +.newsentry h1 { + margin: 5px 0px 2px 0px; + font-size: 120%; + font-weight: normal; + color: #30be01 } -.newsentry img { - margin-bottom: 8px; +.autonews { + height: 106px; + color: #000; border-width: 1px; border-style: solid } .autonews img { padding: 0px; + padding-right: 4px; float: left; - margin: 5px; + margin: 4px; } -.newsentry h1 { - margin: 0px 0px 2px 0px; - font-size: 120%; - font-weight: normal; - color: #30be01 -} +.news_pixel h1, .news_pixel a { color: #00ccff } +.news_vector h1, .news_vector a { color: #00ccff } -.autonews h1 { - color: white; -} - -.news_vector { background-color: #00ccff; } -.news_pixel { background-color: #ff00ff; } -.autonews a { color: white } +.news_vector { border-color: #00ccff } +.news_pixel { border-color: #ff00ff } div.news_sep { width: 486px; height: 17px; background-image: url(/image/news-sep); } +.archive { width: 162px } +.archive a.year { font-size: 1.2em; margin: 2px 0px 2px 0px} +.archive a.year.active { color: #000; } +.archive a.month.active { display: block; } +.archive a.month { display: none; margin-top: 2px; font-size: 1em; } +#archive-navigation.m1 a.m1 { color: #000; } +#archive-navigation.m2 a.m2 { color: #000; } +#archive-navigation.m3 a.m3 { color: #000; } +#archive-navigation.m4 a.m4 { color: #000; } +#archive-navigation.m5 a.m5 { color: #000; } +#archive-navigation.m6 a.m6 { color: #000; } +#archive-navigation.m7 a.m7 { color: #000; } +#archive-navigation.m8 a.m8 { color: #000; } +#archive-navigation.m9 a.m9 { color: #000; } +#archive-navigation.m10 a.m10 { color: #000; } +#archive-navigation.m11 a.m11 { color: #000; } +#archive-navigation.m12 a.m12 { color: #000; } /* cms styles */ @@ -596,21 +613,3 @@ left: 585px; visibility: hidden; } - -.archive a.year { font-size: 1.2em; margin: 2px 0px 2px 0px; } -.archive a.year.active { color: #000; } -.archive a.month.active { display: block; } -.archive a.month { display: none; padding: 0px 5px 2px 5px; margin-top: 2px; font-size: 0.8em; } -#archive-navigation.m1 a.m1 { color: #000; } -#archive-navigation.m2 a.m2 { color: #000; } -#archive-navigation.m3 a.m3 { color: #000; } -#archive-navigation.m4 a.m4 { color: #000; } -#archive-navigation.m5 a.m5 { color: #000; } -#archive-navigation.m6 a.m6 { color: #000; } -#archive-navigation.m7 a.m7 { color: #000; } -#archive-navigation.m8 a.m8 { color: #000; } -#archive-navigation.m9 a.m9 { color: #000; } -#archive-navigation.m10 a.m10 { color: #000; } -#archive-navigation.m11 a.m11 { color: #000; } -#archive-navigation.m12 a.m12 { color: #000; } -.archive { padding-left: 1em; } Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-08-28 15:56:17 UTC (rev 3747) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-08-29 13:47:43 UTC (rev 3748) @@ -150,7 +150,7 @@ <tr> <td valign="top" id="newsentries"> </td> - <td class="archive" id="archive-navigation" valign="top"> + <td class="archive" id="archive-navigation" valign="top" align="right"> </td> </tr> </tbody> @@ -278,9 +278,9 @@ Keywords:<br /> <input type="text" id="edit_keywords" name="spider-keywords" value="" /><br /> <input type="checkbox" id="edit_explicit" name="explicit" value="1" /> Explicit<br/> - <input type="checkbox" id="edit_buy_file" name="buy-file" value="1"/> Sell as file<br/> - <input type="checkbox" id="edit_buy_print" name="buy-print" value="1"/> Sell as print<br/> - <input type="checkbox" id="edit_buy_t_shirt" name="buy-t-shirt" value="1"/> Sell as t-shirt<br/> + <input type="checkbox" id="edit_buy-file" name="buy-file" value="1"/> Sell as file<br/> + <input type="checkbox" id="edit_buy-print" name="buy-print" value="1"/> Sell as print<br/> + <input type="checkbox" id="edit_buy-t-shirt" name="buy-t-shirt" value="1"/> Sell as t-shirt<br/> </p> <p class="cms"> <input type="submit" name="action" value="edit" />

1 0

[bknr-cvs] hans changed trunk/bknr/web/src/web/template-handler.lisp
by BKNR Commits 28 Aug '08

28 Aug '08

Revision: 3747 Author: hans URL: http://bknr.net/trac/changeset/3747 oops, renamed special variable and forgot to save U trunk/bknr/web/src/web/template-handler.lisp Modified: trunk/bknr/web/src/web/template-handler.lisp =================================================================== --- trunk/bknr/web/src/web/template-handler.lisp 2008-08-28 15:54:05 UTC (rev 3746) +++ trunk/bknr/web/src/web/template-handler.lisp 2008-08-28 15:56:17 UTC (rev 3747) @@ -115,7 +115,7 @@ (destructuring-bind (name value) a (if (listp name) (destructuring-bind (local-name . namespace-uri) name - (let ((namespace-alias (gethash namespace-uri *nsuri-lname-map*))) + (let ((namespace-alias (gethash namespace-uri *nsuri-alias-map*))) (unless namespace-alias (error "cannot map namespace URI ~A to namespace-alias when making attribute ~A" namespace-uri a)) (sax:make-attribute :namespace-uri namespace-uri @@ -171,12 +171,9 @@ ;; be revised with newer cxml releases. (let* ((toplevel-attributes (cxml-xmls::compute-attributes/lnames toplevel t)) (*template-expander* expander) - (*nsuri-lname-map* (let ((map (make-hash-table :test #'equal))) + (*nsuri-alias-map* (let ((map (make-hash-table :test #'equal))) (dolist (attribute toplevel-attributes) (when (scan "^xmlns($|:)" (sax:attribute-qname attribute)) - (format t "mapping ~A => ~A~%" - (sax:attribute-namespace-uri attribute) - (sax:attribute-local-name attribute)) (setf (gethash (sax:attribute-value attribute) map) (sax:attribute-local-name attribute)))) map)))

1 0

[bknr-cvs] hans changed trunk/
by BKNR Commits 28 Aug '08

28 Aug '08

Revision: 3746 Author: hans URL: http://bknr.net/trac/changeset/3746 XML output compatibility fixes. U trunk/bknr/web/src/web/template-handler.lisp U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/bknr/web/src/web/template-handler.lisp =================================================================== --- trunk/bknr/web/src/web/template-handler.lisp 2008-08-28 13:52:36 UTC (rev 3745) +++ trunk/bknr/web/src/web/template-handler.lisp 2008-08-28 15:54:05 UTC (rev 3746) @@ -107,15 +107,22 @@ (t (format nil "~A" val)))))) string)) +(defvar *nsuri-alias-map* nil + "Maps namespace URI to alias name as declared in the current document.") + (defun xmls-attributes-to-sax (fn attrs) (mapcar (lambda (a) (destructuring-bind (name value) a (if (listp name) - (destructuring-bind (qname . namespace-uri) name - (sax:make-attribute :namespace-uri namespace-uri - :qname qname - :value (funcall fn value) - :specified-p t)) + (destructuring-bind (local-name . namespace-uri) name + (let ((namespace-alias (gethash namespace-uri *nsuri-lname-map*))) + (unless namespace-alias + (error "cannot map namespace URI ~A to namespace-alias when making attribute ~A" namespace-uri a)) + (sax:make-attribute :namespace-uri namespace-uri + :qname (format nil "~A:~A" namespace-alias local-name) + :local-name local-name + :value (funcall fn value) + :specified-p t))) (sax:make-attribute :qname name :value (funcall fn value) :specified-p t)))) @@ -162,12 +169,22 @@ ;; In order to generate xmlns attributes, we use the internal ;; CXML-XMLS::COMPUTE-ATTRIBUTES/LNAMES function. This may need to ;; be revised with newer cxml releases. - (sax:start-element *html-sink* (node-ns toplevel) (node-name toplevel) (node-name toplevel) - (cxml-xmls::compute-attributes/lnames toplevel t)) - (let ((*template-expander* expander)) + (let* ((toplevel-attributes (cxml-xmls::compute-attributes/lnames toplevel t)) + (*template-expander* expander) + (*nsuri-lname-map* (let ((map (make-hash-table :test #'equal))) + (dolist (attribute toplevel-attributes) + (when (scan "^xmlns($|:)" (sax:attribute-qname attribute)) + (format t "mapping ~A => ~A~%" + (sax:attribute-namespace-uri attribute) + (sax:attribute-local-name attribute)) + (setf (gethash (sax:attribute-value attribute) map) + (sax:attribute-local-name attribute)))) + map))) + (sax:start-element *html-sink* (node-ns toplevel) (node-name toplevel) (node-name toplevel) + toplevel-attributes) (dolist (node (node-children toplevel)) - (emit-template-node expander node))) - (sax:end-element *html-sink* (node-ns toplevel) (node-name toplevel) (node-name toplevel))) + (emit-template-node expander node)) + (sax:end-element *html-sink* (node-ns toplevel) (node-name toplevel) (node-name toplevel)))) (defun find-template (dir components) (if (null components) Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-08-28 13:52:36 UTC (rev 3745) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-08-28 15:54:05 UTC (rev 3746) @@ -3,6 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" + xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:bknr="http://bknr.net/" xmlns:quickhoney="http://quickhoney.com/" >

1 0

[bknr-cvs] hans changed trunk/bknr/web/src/web/template-handler.lisp
by BKNR Commits 28 Aug '08

28 Aug '08

Revision: 3745 Author: hans URL: http://bknr.net/trac/changeset/3745 Fix bug that caused top-level element of a template to be output two times. U trunk/bknr/web/src/web/template-handler.lisp Modified: trunk/bknr/web/src/web/template-handler.lisp =================================================================== --- trunk/bknr/web/src/web/template-handler.lisp 2008-08-27 23:57:40 UTC (rev 3744) +++ trunk/bknr/web/src/web/template-handler.lisp 2008-08-28 13:52:36 UTC (rev 3745) @@ -165,7 +165,8 @@ (sax:start-element *html-sink* (node-ns toplevel) (node-name toplevel) (node-name toplevel) (cxml-xmls::compute-attributes/lnames toplevel t)) (let ((*template-expander* expander)) - (emit-template-node expander toplevel)) + (dolist (node (node-children toplevel)) + (emit-template-node expander node))) (sax:end-element *html-sink* (node-ns toplevel) (node-name toplevel) (node-name toplevel))) (defun find-template (dir components)

1 0