September 2008 - bknr-cvs@common-lisp.net

[bknr-cvs] ksprotte changed trunk/projects/bos/test/tsung
by BKNR Commits 11 Sep '08

11 Sep '08

Revision: 3889 Author: ksprotte URL: http://bknr.net/trac/changeset/3889 tsung whitespace / indent U trunk/projects/bos/test/tsung.xml U trunk/projects/bos/test/tsung2.xml Modified: trunk/projects/bos/test/tsung.xml =================================================================== --- trunk/projects/bos/test/tsung.xml 2008-09-11 05:12:53 UTC (rev 3888) +++ trunk/projects/bos/test/tsung.xml 2008-09-11 10:33:22 UTC (rev 3889) @@ -6,18 +6,18 @@ <clients> <client host="localhost" use_controller_vm="true" maxusers="15000"/> </clients> - +  <servers> <server host="prod.headcraft.de" port="80" type="tcp"></server> </servers>  + agent on the remote machine or SNMP. erlang is the default -->    - +  @@ -26,7 +26,7 @@ <arrivalphase phase="1" duration="30" unit="second"> <users interarrival="2" unit="second" maxnumber="500"></users> </arrivalphase> - + <arrivalphase phase="2" duration="2" unit="minute"> <users interarrival="0.1" unit="second" maxnumber="500"></users> </arrivalphase> @@ -494,46 +494,46 @@ <request><http url='/images/step1.gif' version='1.1' method='GET'></http></request> <thinktime random='true' value='7'/> - - <transaction name='buy_sqm'> - <request> -  -  - <dyn_variable name="contract_id" regexp='cartId=$[0-9]*$'></dyn_variable> - <dyn_variable name="sponsor_id" regexp='MC_sponsorid=$[0-9]*$'></dyn_variable> - <dyn_variable name="master_code" regexp='MC_password=$[0-9]*$'></dyn_variable> - <http url='/de/buy-sqm' - version='1.1' - contents='numsqm=1&numsqm1=&disclaimer_read=1' - content_type='application/x-www-form-urlencoded' method='POST'></http> - </request> - <request><http url='/images/step3.gif' version='1.1' method='GET'></http></request> + + <transaction name='buy_sqm'> + <request> +  +  + <dyn_variable name="contract_id" regexp='cartId=$[0-9]*$'></dyn_variable> + <dyn_variable name="sponsor_id" regexp='MC_sponsorid=$[0-9]*$'></dyn_variable> + <dyn_variable name="master_code" regexp='MC_password=$[0-9]*$'></dyn_variable> + <http url='/de/buy-sqm' + version='1.1' + contents='numsqm=1&numsqm1=&disclaimer_read=1' + content_type='application/x-www-form-urlencoded' method='POST'></http> + </request> + <request><http url='/images/step3.gif' version='1.1' method='GET'></http></request> </transaction>  - + <thinktime random='false' value='10'/> - + <request subst="true"> - <http url='/handle-sale?transStatus=P&name=TestSponsor&address=abc&instId=103530&cartId=%%_contract_id%%&amount=3&currency=EUR&lang=de&desc=3%20qm%20Regenwald%20in%20Samboja%20Lestari&MC_sponsorid=%%_sponsor_id%%&MC_password=%%_master_code%%&MC_donationcert-yearly=0&MC_gift=0&testMode=100' - version='1.1' method='GET'></http> + <http url='/handle-sale?transStatus=P&name=TestSponsor&address=abc&instId=103530&cartId=%%_contract_id%%&amount=3&currency=EUR&lang=de&desc=3%20qm%20Regenwald%20in%20Samboja%20Lestari&MC_sponsorid=%%_sponsor_id%%&MC_password=%%_master_code%%&MC_donationcert-yearly=0&MC_gift=0&testMode=100' + version='1.1' method='GET'></http> </request> - + <thinktime random='true' value='5'/> <request subst="true"> - <http url='/de/versand_quittung' version='1.1' - contents='sponsor-id=%%_sponsor_id%%&master-code=%%_master_code%%&contract-id=%%_contract_id%%&email=&next-step-name=weiter&name=TestSponsor&want-print=no&address=TestSponsor%0D%0Aabc%0D%0A&Button=speichern+und+weiter' - content_type='application/x-www-form-urlencoded' - method='POST'></http> + <http url='/de/versand_quittung' version='1.1' + contents='sponsor-id=%%_sponsor_id%%&master-code=%%_master_code%%&contract-id=%%_contract_id%%&email=&next-step-name=weiter&name=TestSponsor&want-print=no&address=TestSponsor%0D%0Aabc%0D%0A&Button=speichern+und+weiter' + content_type='application/x-www-form-urlencoded' + method='POST'></http> </request> <thinktime random='true' value='2'/> <request subst="true"> - <http url='/de/generate-cert' version='1.1' - contents='sponsor-id=%%_sponsor_id%%&__sponsorid=%%_sponsor_id%%&__password=%%_master_code%%&contract-id=%%_contract_id%%&want-print=no&name=TestSponsor&address=TestSponsor%0D%0Aabc%0D%0A&email=&gift=&Button=weiter' - content_type='application/x-www-form-urlencoded' - method='POST'></http> + <http url='/de/generate-cert' version='1.1' + contents='sponsor-id=%%_sponsor_id%%&__sponsorid=%%_sponsor_id%%&__password=%%_master_code%%&contract-id=%%_contract_id%%&want-print=no&name=TestSponsor&address=TestSponsor%0D%0Aabc%0D%0A&email=&gift=&Button=weiter' + content_type='application/x-www-form-urlencoded' + method='POST'></http> </request> <request subst="true"><http url='/de/profil_setup?name=TestSponsor&email=&sponsor-id=%%_sponsor_id%%' version='1.1' method='GET'></http></request> @@ -1069,5 +1069,3 @@ </session> </sessions> </tsung> - - Modified: trunk/projects/bos/test/tsung2.xml =================================================================== --- trunk/projects/bos/test/tsung2.xml 2008-09-11 05:12:53 UTC (rev 3888) +++ trunk/projects/bos/test/tsung2.xml 2008-09-11 10:33:22 UTC (rev 3889) @@ -6,18 +6,18 @@ <clients> <client host="localhost" use_controller_vm="true" maxusers="15000"/> </clients> - +  <servers> <server host="prod.headcraft.de" port="80" type="tcp"></server> </servers>  + agent on the remote machine or SNMP. erlang is the default -->    - +  @@ -2150,5 +2150,3 @@ </sessions> </tsung> - -

1 0

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

11 Sep '08

Revision: 3888 Author: hans URL: http://bknr.net/trac/changeset/3888 Fix for Opera U trunk/projects/quickhoney/website/static/javascript.js Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-10 20:23:30 UTC (rev 3887) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-11 05:12:53 UTC (rev 3888) @@ -880,7 +880,7 @@ } }, getElementsByTagAndClassName('img', null)); - if (waiting == 0) { + if (waiting == 0 || window.opera) { hide_cue(); callback(); } else { @@ -1137,6 +1137,7 @@ } function init_applicaton() { + log('init_applicaton'); if (navigator.userAgent.indexOf("Safari") != -1) { safari = true; safari_compatibility_hack(); @@ -1157,13 +1158,16 @@ poll_path(); application_initialized = true; + log('init_applicaton done'); } function button_images_loaded() { + log('button_images_loaded'); wait_for_images(init_applicaton); } function init() { + log('init'); show_cue(); load_button_images(button_images_loaded);

1 0

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

10 Sep '08

Revision: 3887 Author: hans URL: http://bknr.net/trac/changeset/3887 More deep link page display tweaks U trunk/projects/quickhoney/src/tags.lisp U trunk/projects/quickhoney/website/static/index.css U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/projects/quickhoney/src/tags.lisp =================================================================== --- trunk/projects/quickhoney/src/tags.lisp 2008-09-10 16:32:48 UTC (rev 3886) +++ trunk/projects/quickhoney/src/tags.lisp 2008-09-10 20:23:30 UTC (rev 3887) @@ -27,6 +27,14 @@ (html ((:div :class "next") ((:a :href next) ">>"))))))) +(defmacro with-navigation ((&key previous up next) &body body) + `(prog1 + (html ((:div :id "html-content-foo") + (navigation :previous ,previous :up ,up :next ,next) + ,@body)) + (html ((:script :type "text/javascript") + "document.getElementById('html-content-foo').style.visibility = 'hidden'")))) + (define-bknr-tag simple-image-browser () (tbnl:handle-if-modified-since (last-image-upload-timestamp)) (destructuring-bind (&optional category subcategory image-name) @@ -41,56 +49,57 @@ when (equal image (cadr rest)) do (return (car rest)))) (next (cadr (member image images-in-category)))) - (navigation :previous (and previous (image-url previous)) - :up (format nil "/~(~A/~A~)" - (quickhoney-image-category image) - (quickhoney-image-subcategory image)) - :next (and next (image-url next))) + (with-navigation (:previous (and previous (image-url previous)) + :up (format nil "/~(~A/~A~)" + (quickhoney-image-category image) + (quickhoney-image-subcategory image)) + :next (and next (image-url next))) + (html + (:h1 (:princ #?"$(category) / $(subcategory)")) + ((:img :src #?"/image/$(image-name)" + :class "image" + :alt "" + :width (bknr.images:store-image-width image) + :height (bknr.images:store-image-height image))) + ((:div :class "metadata" :style #?"height: $((bknr.images:store-image-height image))px") + (:table + (:tbody + (:tr (:th "name") + (:td (:princ image-name))) + (:tr (:th "artist") + (:td (:princ (bknr.user:user-full-name (or (bknr.user:owned-object-owner image) + (bknr.user:find-user "hans")))) + ", QuickHoney")) + (:tr (:th "date") + (:td (:princ (format-date-time (bknr.datastore:blob-timestamp image) :vms-style t :show-time nil)))) + (when (and (quickhoney-image-client image) + (not (equal "" (quickhoney-image-client image)))) + (html (:tr (:th "client") + (:td (:princ (quickhoney-image-client image)))))) + (when (quickhoney-image-spider-keywords image) + (html (:tr (:th "keywords") + (:td (:princ (quickhoney-image-spider-keywords image))))))))))))) + (subcategory + (with-navigation (:up (format nil "/~(~A~)" category)) (html (:h1 (:princ #?"$(category) / $(subcategory)")) - ((:img :src #?"/image/$(image-name)" - :class "image" - :alt "" - :width (bknr.images:store-image-width image) - :height (bknr.images:store-image-height image))) - ((:div :class "metadata" :style #?"height: $((bknr.images:store-image-height image))px") - (:table - (:tbody - (:tr (:th "name") - (:td (:princ image-name))) - (:tr (:th "artist") - (:td (:princ (bknr.user:user-full-name (or (bknr.user:owned-object-owner image) - (bknr.user:find-user "hans")))) - ", QuickHoney")) - (:tr (:th "date") - (:td (:princ (format-date-time (bknr.datastore:blob-timestamp image) :vms-style t :show-time nil)))) - (when (and (quickhoney-image-client image) - (not (equal "" (quickhoney-image-client image)))) - (html (:tr (:th "client") - (:td (:princ (quickhoney-image-client image)))))) - (when (quickhoney-image-spider-keywords image) - (html (:tr (:th "keywords") - (:td (:princ (quickhoney-image-spider-keywords image)))))))))))) - (subcategory - (navigation :up (format nil "/~(~A~)" category)) - (html - (:h1 (:princ #?"$(category) / $(subcategory)")) - (:ul - (dolist (image (sort (copy-list (quickhoney:images-in-category (mapcar #'make-keyword-from-string (list category subcategory)))) - #'> - :key #'bknr.datastore:blob-timestamp)) - (html - (:li ((:a :href #?"/$(category)/$(subcategory)/$((bknr.images:store-image-name image))") - (:princ (bknr.images:store-image-name image))))))))) + (:ul + (dolist (image (sort (copy-list (quickhoney:images-in-category + (mapcar #'make-keyword-from-string (list category subcategory)))) + #'> + :key #'bknr.datastore:blob-timestamp)) + (html + (:li ((:a :href #?"/$(category)/$(subcategory)/$((bknr.images:store-image-name image))") + (:princ (bknr.images:store-image-name image)))))))))) (category - (navigation :up "/") - (html - (:h1 (:princ category)) - (:ul - (dolist (subcategory (subcategories-of (make-keyword-from-string category))) - (html - (:li ((:a :href (format nil "/~A/~(~A~)" category subcategory))) - (:princ subcategory))))))) + (with-navigation (:up "/") + (html + (:h1 (:princ category)) + (:ul + (dolist (subcategory (subcategories-of (make-keyword-from-string category))) + (html + (:li ((:a :href (format nil "/~A/~(~A~)" category subcategory))) + (:princ subcategory)))))))) (t (emit-tag-children))))) Modified: trunk/projects/quickhoney/website/static/index.css =================================================================== --- trunk/projects/quickhoney/website/static/index.css 2008-09-10 16:32:48 UTC (rev 3886) +++ trunk/projects/quickhoney/website/static/index.css 2008-09-10 20:23:30 UTC (rev 3887) @@ -317,6 +317,7 @@ width: 648px; margin-top: 36px; text-align: center; + visibility: hidden; } /* cue bar */ Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-10 16:32:48 UTC (rev 3886) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-10 20:23:30 UTC (rev 3887) @@ -21,6 +21,7 @@ /* logged_in - will be set when the user has CMS access */ var logged_in; +var application_initialized = false; /* current colors */ @@ -435,7 +436,9 @@ function hide_cue() { $("cue").style.visibility = 'hidden'; - $('footer').style.visibility = 'inherit'; + if (application_initialized) { + $('footer').style.visibility = 'inherit'; + } } var db_cache = {}; @@ -479,7 +482,7 @@ process_query_result(key, db_cache[key]); } else { - show_cue(); + show_cue(); loadJSONDoc("/json-image-query/" + key) .addCallbacks(partial(process_query_result, key), alert); } @@ -1152,6 +1155,8 @@ document.location.href = "/#" + path; poll_path(); + + application_initialized = true; } function button_images_loaded() { Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-09-10 16:32:48 UTC (rev 3886) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-10 20:23:30 UTC (rev 3887) @@ -4,8 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:bknr="http://bknr.net/" - xmlns:quickhoney="http://quickhoney.com/" - > + xmlns:quickhoney="http://quickhoney.com/"> <head> <link rel="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css" /> <link rel="stylesheet" href="/static/quickhoney.css" />

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/website/templates/index.xml
by BKNR Commits 10 Sep '08

10 Sep '08

Revision: 3886 Author: hans URL: http://bknr.net/trac/changeset/3886 Oops, revive spinner U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-09-10 16:18:53 UTC (rev 3885) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-10 16:32:48 UTC (rev 3886) @@ -331,6 +331,8 @@ </div> </div> + + <div id="cue"><img alt="" src="/static/spinner.gif" width="16" height="16"/></div> <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/website/
by BKNR Commits 10 Sep '08

10 Sep '08

Revision: 3885 Author: hans URL: http://bknr.net/trac/changeset/3885 Clean out some cruft. U trunk/projects/quickhoney/website/static/index.css U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/projects/quickhoney/website/static/index.css =================================================================== --- trunk/projects/quickhoney/website/static/index.css 2008-09-10 16:03:09 UTC (rev 3884) +++ trunk/projects/quickhoney/website/static/index.css 2008-09-10 16:18:53 UTC (rev 3885) @@ -332,15 +332,6 @@ padding: 0em 0.5em 0em 0.5em; } -/* iframes for javascript loading */ - -div.hidden_iframe { - position: absolute; - left: 0px; - top: 0px; - visibility: hidden; -} - /* news styles */ .autonews a { color: #30be01; } Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-09-10 16:03:09 UTC (rev 3884) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-10 16:18:53 UTC (rev 3885) @@ -332,19 +332,6 @@ </div> - <div id="debugger" class="debugger"> - <b>Debugger</b> <br /> <br /> - <a id="clear_debug_window" href="#" onclick="clear_debug_window()" class="debugger">clear debug window</a><br /> <br /> - <p id="debugger_text" class="debugger"> - </p> - </div> - - <div id="cue"><img alt="" src="/static/spinner.gif" width="16" height="16"/></div> - - <div id="edit_frame" class="hidden_iframe"> - <iframe src="about:blank" height="0" width="0" name="edit_iframe"> </iframe> - </div> - <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/src/tags.lisp
by BKNR Commits 10 Sep '08

10 Sep '08

Revision: 3884 Author: hans URL: http://bknr.net/trac/changeset/3884 Remove logo here, it is coming from index.xml U trunk/projects/quickhoney/src/tags.lisp Modified: trunk/projects/quickhoney/src/tags.lisp =================================================================== --- trunk/projects/quickhoney/src/tags.lisp 2008-09-10 15:59:45 UTC (rev 3883) +++ trunk/projects/quickhoney/src/tags.lisp 2008-09-10 16:03:09 UTC (rev 3884) @@ -16,9 +16,7 @@ (bknr.images:store-image-name image))) (defun navigation (&key previous up next) - (html ((:div :id "logo") - ((:img :src "/image/quickhoney-black" :alt "" :id "the_logo"))) - ((:div :class "nav") + (html ((:div :class "nav") (when previous (html ((:div :class "previous") ((:a :href previous) "<<"))))

1 0

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

10 Sep '08

Revision: 3883 Author: hans URL: http://bknr.net/trac/changeset/3883 Implement :catch-all template handler option. If it is set, the default-template is used for all requests that do not match a specific template. It obviously needs to be put at the end of the handler list. 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-09-10 15:55:20 UTC (rev 3882) +++ trunk/bknr/web/src/web/template-handler.lisp 2008-09-10 15:59:45 UTC (rev 3883) @@ -43,7 +43,11 @@ :reader template-expander-default-template :documentation "Name of the default template to use when no path -name has been specified."))) +name has been specified.") + (catch-all :initarg :catch-all :initform nil + :reader template-expander-catch-all + :documentation "If non-NIL, direct all requests to the + default template."))) (defmethod find-tag-function ((expander template-expander) name ns) (let ((package-name (cdr (find ns (template-expander-command-packages expander) @@ -226,11 +230,15 @@ (remove "" (split "/" path) :test #'equal)) (defmethod find-template-pathname ((expander template-expander) template-name) - (let ((components (or (split-path template-name) - (and (template-expander-default-template expander) - (split-path (template-expander-default-template expander)))))) + (let* ((default-template-components (and (template-expander-default-template expander) + (split-path (template-expander-default-template expander)))) + (components (or (split-path template-name) default-template-components))) (multiple-value-bind (pathname ret-components) - (find-template (template-expander-destination expander) components) + (find-template (template-expander-destination expander) components) + (when (and (not pathname) + (template-expander-catch-all expander)) + (multiple-value-setq (pathname ret-components) + (find-template (template-expander-destination expander) default-template-components))) (unless pathname (template-not-found template-name)) (values pathname

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/website/static/
by BKNR Commits 10 Sep '08

10 Sep '08

Revision: 3882 Author: hans URL: http://bknr.net/trac/changeset/3882 Add missing variable declaration for IE. Put logo into the center. U trunk/projects/quickhoney/website/static/index.css U trunk/projects/quickhoney/website/static/javascript.js Modified: trunk/projects/quickhoney/website/static/index.css =================================================================== --- trunk/projects/quickhoney/website/static/index.css 2008-09-10 15:36:40 UTC (rev 3881) +++ trunk/projects/quickhoney/website/static/index.css 2008-09-10 15:55:20 UTC (rev 3882) @@ -635,13 +635,6 @@ padding: 0px 5px 0px 5px; } -#loading #logo { - position: absolute; - right: 10px; - top: 10px; - z-index: 2; -} - #loading .image { position: absolute; z-index: 5; Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-10 15:36:40 UTC (rev 3881) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-10 15:55:20 UTC (rev 3882) @@ -1143,7 +1143,7 @@ loadJSONDoc("/json-clients").addCallbacks(set_clients, alert); loadJSONDoc('/json-news-archive/quickhoney').addCallbacks(initialize_news_archive, alert); - path = 'home'; + var path = 'home'; if (document.location.pathname != '/') { path = document.location.pathname.substr(1); } else if (document.location.href.match(/#./)) {

1 0

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

10 Sep '08

Revision: 3881 Author: hans URL: http://bknr.net/trac/changeset/3881 Consolidate all HTML into one template. Remove template names from URL. Improve Javascript-less mode. _U trunk/projects/quickhoney/src/ U trunk/projects/quickhoney/src/config.lisp U trunk/projects/quickhoney/src/init.lisp U trunk/projects/quickhoney/src/tags.lisp U trunk/projects/quickhoney/src/webserver.lisp D trunk/projects/quickhoney/website/static/frontpage.css D trunk/projects/quickhoney/website/static/image-browse.css U trunk/projects/quickhoney/website/static/index.css U trunk/projects/quickhoney/website/static/javascript.js D trunk/projects/quickhoney/website/templates/frontpage.xml D trunk/projects/quickhoney/website/templates/image-browse.xml U trunk/projects/quickhoney/website/templates/index.xml Change set too large, please see URL above

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/test/tsung
by BKNR Commits 10 Sep '08

10 Sep '08

Revision: 3880 Author: ksprotte URL: http://bknr.net/trac/changeset/3880 small tsung test update U trunk/projects/bos/test/tsung.xml U trunk/projects/bos/test/tsung2.xml Modified: trunk/projects/bos/test/tsung.xml =================================================================== --- trunk/projects/bos/test/tsung.xml 2008-09-10 14:58:16 UTC (rev 3879) +++ trunk/projects/bos/test/tsung.xml 2008-09-10 15:16:21 UTC (rev 3880) @@ -9,7 +9,7 @@  <servers> - <server host="horst.headcraft.de" port="80" type="tcp"></server> + <server host="prod.headcraft.de" port="80" type="tcp"></server> </servers>  <servers> - <server host="horst.headcraft.de" port="80" type="tcp"></server> + <server host="prod.headcraft.de" port="80" type="tcp"></server> </servers> <!-- to start os monitoring (cpu, network, memory). Use an erlang

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/
by BKNR Commits 10 Sep '08

10 Sep '08

Revision: 3879 Author: ksprotte URL: http://bknr.net/trac/changeset/3879 bos hunchentoot single-threaded startup U trunk/projects/bos/test/web/drakma-requests.lisp U trunk/projects/bos/web/startup.lisp Modified: trunk/projects/bos/test/web/drakma-requests.lisp =================================================================== --- trunk/projects/bos/test/web/drakma-requests.lisp 2008-09-10 14:06:45 UTC (rev 3878) +++ trunk/projects/bos/test/web/drakma-requests.lisp 2008-09-10 14:58:16 UTC (rev 3879) @@ -1,24 +1,27 @@ (in-package :bos.test) (in-suite :bos.test.web) -(defmacro with-bos-test-server ((port-var) &body body) - (check-type port-var symbol) - `(with-fixture initial-bos-store () - (let* ((,port-var (+ 70000 (random 5253))) - (server (bos.web::init :port ,port-var - :worldpay-test-mode t))) - (check-type server hunchentoot::server) - (unwind-protect - (progn ,@body) - (hunchentoot:stop-server server))))) +;;; not functional anymore in single-threaded hunchentoot +;;; (server can't be stopped) -(test web-init - (with-bos-test-server (port) - (pass))) +;; (defmacro with-bos-test-server ((port-var) &body body) +;; (check-type port-var symbol) +;; `(with-fixture initial-bos-store () +;; (let* ((,port-var (+ 70000 (random 5253))) +;; (server (bos.web::init :port ,port-var +;; :worldpay-test-mode t))) +;; (check-type server hunchentoot::server) +;; (unwind-protect +;; (progn ,@body) +;; (hunchentoot:stop-server server))))) -(test request-start-page - #+(or ccl openmcl)(skip "known to fail on ccl") - #-(or ccl openmcl) - (with-bos-test-server (port) - (let ((uri (format nil "http://localhost:~D" port))) - (is (= 200 (nth-value 1 (drakma:http-request uri))))))) +;; (test web-init +;; (with-bos-test-server (port) +;; (pass))) + +;; (test request-start-page +;; #+(or ccl openmcl)(skip "known to fail on ccl") +;; #-(or ccl openmcl) +;; (with-bos-test-server (port) +;; (let ((uri (format nil "http://localhost:~D" port))) +;; (is (= 200 (nth-value 1 (drakma:http-request uri))))))) Modified: trunk/projects/bos/web/startup.lisp =================================================================== --- trunk/projects/bos/web/startup.lisp 2008-09-10 14:06:45 UTC (rev 3878) +++ trunk/projects/bos/web/startup.lisp 2008-09-10 14:58:16 UTC (rev 3879) @@ -23,8 +23,7 @@ (website-url (format nil "http://~A" host) website-url-given) worldpay-test-mode (google-analytics-account "UA-3432041-1") - start-frontend - debug) + start-frontend) (when website-url-given (warn "Specifying :website-url in web.rc is deprecated. Use :host instead.~ ~%Website-url will then be initialized by (format nil \"http://~~A\" host).")) @@ -39,17 +38,20 @@ (bos.web::publish-website :website-directory *website-directory* :website-url *website-url* :worldpay-test-mode *worldpay-test-mode*) - (format t "~&; Starting hunchentoot~@[ in debug mode~].~%" debug) + (format t "~&; Starting hunchentoot.~%") (force-output) (when *webserver* - (hunchentoot:stop-server *webserver*)) + (error "webserver already running")) (setf hunchentoot:*hunchentoot-default-external-format* (flex:make-external-format :utf-8 :eol-style :lf) hunchentoot:*rewrite-for-session-urls* nil ;; the reason for the following setting is that ptviewer sends ;; a different User-Agent -- (when requesting PTDefault.html) hunchentoot:*use-user-agent-for-sessions* nil) - (setq *webserver* (hunchentoot:start-server :port *port* :threaded (not debug) - :persistent-connections-p (not debug))) + (bt:make-thread (lambda () + (hunchentoot:start-server :port *port* :threaded nil + :persistent-connections-p nil)) + :name "hunchentoot non-threaded wrapper") + (setq *webserver* t) (if start-frontend (start-frontend :host host :backend-port port :port frontend-port) (warn "frontend not started - to achieve this specify :start-frontend t"))

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/
by BKNR Commits 10 Sep '08

10 Sep '08

Revision: 3878 Author: ksprotte URL: http://bknr.net/trac/changeset/3878 rollback of last 3 commits U trunk/projects/bos/test/web/drakma-requests.lisp U trunk/projects/bos/web/startup.lisp U trunk/projects/bos/web/webserver.lisp Modified: trunk/projects/bos/test/web/drakma-requests.lisp =================================================================== --- trunk/projects/bos/test/web/drakma-requests.lisp 2008-09-10 13:45:42 UTC (rev 3877) +++ trunk/projects/bos/test/web/drakma-requests.lisp 2008-09-10 14:06:45 UTC (rev 3878) @@ -7,10 +7,10 @@ (let* ((,port-var (+ 70000 (random 5253))) (server (bos.web::init :port ,port-var :worldpay-test-mode t))) - (check-type server bos.web::bos-server) + (check-type server hunchentoot::server) (unwind-protect (progn ,@body) - (bos.web::bos-server-stop))))) + (hunchentoot:stop-server server))))) (test web-init (with-bos-test-server (port) Modified: trunk/projects/bos/web/startup.lisp =================================================================== --- trunk/projects/bos/web/startup.lisp 2008-09-10 13:45:42 UTC (rev 3877) +++ trunk/projects/bos/web/startup.lisp 2008-09-10 14:06:45 UTC (rev 3878) @@ -8,6 +8,8 @@ :host (pathname-host me) :version nil))) +(defvar *webserver* nil) + (defvar *port*) (defvar *website-directory*) (defvar *website-url*) @@ -22,7 +24,7 @@ worldpay-test-mode (google-analytics-account "UA-3432041-1") start-frontend - threaded) + debug) (when website-url-given (warn "Specifying :website-url in web.rc is deprecated. Use :host instead.~ ~%Website-url will then be initialized by (format nil \"http://~~A\" host).")) @@ -37,9 +39,17 @@ (bos.web::publish-website :website-directory *website-directory* :website-url *website-url* :worldpay-test-mode *worldpay-test-mode*) - (format t "~&; Starting hunchentoot.~%") - (force-output) - (bos-server-restart :port *port* :threaded threaded) + (format t "~&; Starting hunchentoot~@[ in debug mode~].~%" debug) + (force-output) + (when *webserver* + (hunchentoot:stop-server *webserver*)) + (setf hunchentoot:*hunchentoot-default-external-format* (flex:make-external-format :utf-8 :eol-style :lf) + hunchentoot:*rewrite-for-session-urls* nil + ;; the reason for the following setting is that ptviewer sends + ;; a different User-Agent -- (when requesting PTDefault.html) + hunchentoot:*use-user-agent-for-sessions* nil) + (setq *webserver* (hunchentoot:start-server :port *port* :threaded (not debug) + :persistent-connections-p (not debug))) (if start-frontend (start-frontend :host host :backend-port port :port frontend-port) (warn "frontend not started - to achieve this specify :start-frontend t")) Modified: trunk/projects/bos/web/webserver.lisp =================================================================== --- trunk/projects/bos/web/webserver.lisp 2008-09-10 13:45:42 UTC (rev 3877) +++ trunk/projects/bos/web/webserver.lisp 2008-09-10 14:06:45 UTC (rev 3878) @@ -2,115 +2,6 @@ (enable-interpol-syntax) -;;;; bos-server -(defvar *webserver* nil - "When the bos-server is running this is set to the server -instance.") - -(defclass bos-server () - ()) - -;;; internal protocol -(defgeneric bos-server-start-internal (server)) -(defgeneric bos-server-stop-internal (server)) -(defgeneric bos-server-running-p-internal (server)) - -;;; external protocol -(defun bos-server-start (&key port threaded) - (let ((server-class (if threaded - 'bos-multi-threaded-server - 'bos-single-threaded-server))) - (prog1 - (setq *webserver* (make-instance server-class :port port)) - (bos-server-start-internal *webserver*)))) - -(defun bos-server-stop () - (unless (bos-server-running-p) - (error "BOS server is not running")) - (bos-server-stop-internal *webserver*)) - -(defun bos-server-running-p () - (when *webserver* - (bos-server-running-p-internal *webserver*))) - -(defun bos-server-restart (&key port threaded) - (when (bos-server-running-p) - (bos-server-stop)) - (bos-server-start :port port :threaded threaded)) - -(defgeneric bos-server-port (server)) - -;;; bos-server-hunchentoot-mixin -(defclass bos-server-hunchentoot-mixin () - ()) - -(defmethod bos-server-start-internal :before ((server bos-server-hunchentoot-mixin)) - (declare (ignore server)) - (setf hunchentoot:*hunchentoot-default-external-format* - (flex:make-external-format :utf-8 :eol-style :lf) - hunchentoot:*rewrite-for-session-urls* - nil - ;; the reason for the following setting is that ptviewer sends - ;; a different User-Agent -- (when requesting PTDefault.html) - hunchentoot:*use-user-agent-for-sessions* - nil)) - -;;;; bos-multi-threaded-server -(defclass bos-multi-threaded-server (bos-server bos-server-hunchentoot-mixin) - ((port :reader bos-server-port :initarg :port) - (native-server :accessor bos-server-native-server))) - -(defmethod bos-server-start-internal ((server bos-multi-threaded-server)) - (setf (bos-server-native-server server) - (hunchentoot:start-server :port (bos-server-port server) - :threaded t :persistent-connections-p t))) - -(defmethod bos-server-stop-internal ((server bos-multi-threaded-server)) - (hunchentoot:stop-server (bos-server-native-server server))) - -(defmethod bos-server-running-p-internal ((server bos-multi-threaded-server)) - (not (hunchentoot::server-shutdown-p (bos-server-native-server server)))) - -;;;; bos-single-threaded-server -(defclass bos-single-threaded-server (bos-server bos-server-hunchentoot-mixin) - ((port :reader bos-server-port :initarg :port) - (server-thread :accessor bos-server-thread :initform nil))) - -(defmethod bos-server-start-internal ((server bos-single-threaded-server)) - (setf (bos-server-thread server) - (bt:make-thread (lambda () - (catch 'stop-tag - (hunchentoot:start-server :port (bos-server-port server) - :threaded nil :persistent-connections-p nil))) - :name "bos-single-threaded-server"))) - -(defvar *stop-server-handler-authorized-p* nil) - -(defmacro with-stop-server-handler-autorization (&body body) - `(unwind-protect - (progn - (setq *stop-server-handler-authorized-p* t) - ,@body) - (setq *stop-server-handler-authorized-p* nil))) - -(defclass stop-server-handler (page-handler) - ()) - -(defmethod handle ((handler stop-server-handler)) - (if *stop-server-handler-authorized-p* - (throw 'stop-tag nil) - (error "not found"))) - -(defmethod bos-server-stop-internal ((server bos-single-threaded-server)) - (with-stop-server-handler-autorization - (ignore-errors (drakma:http-request (format nil "http://localhost:~D/stop-server" - (bos-server-port server))))) - nil) - -(defmethod bos-server-running-p-internal ((server bos-single-threaded-server)) - (and (bos-server-thread server) - (bt:thread-alive-p (bos-server-thread server)))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -265,8 +156,7 @@ (make-instance 'bos-website :name "create-rainforest.org CMS" - :handler-definitions `(("/stop-server" stop-server-handler) - ("/edit-poi-medium" edit-poi-medium-handler) + :handler-definitions `(("/edit-poi-medium" edit-poi-medium-handler) ("/edit-poi" edit-poi-handler) ("/edit-sponsor" edit-sponsor-handler) ("/kml-upload" kml-upload-handler)

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/test/web/drakma-requests.lisp
by BKNR Commits 10 Sep '08

10 Sep '08

Revision: 3877 Author: ksprotte URL: http://bknr.net/trac/changeset/3877 NOW fixed bos tests for prev commit U trunk/projects/bos/test/web/drakma-requests.lisp Modified: trunk/projects/bos/test/web/drakma-requests.lisp =================================================================== --- trunk/projects/bos/test/web/drakma-requests.lisp 2008-09-10 13:33:04 UTC (rev 3876) +++ trunk/projects/bos/test/web/drakma-requests.lisp 2008-09-10 13:45:42 UTC (rev 3877) @@ -10,7 +10,7 @@ (check-type server bos.web::bos-server) (unwind-protect (progn ,@body) - (hunchentoot:stop-server server))))) + (bos.web::bos-server-stop))))) (test web-init (with-bos-test-server (port)

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/test/web/drakma-requests.lisp
by BKNR Commits 10 Sep '08

10 Sep '08

Revision: 3876 Author: ksprotte URL: http://bknr.net/trac/changeset/3876 fixed bos tests for prev commit U trunk/projects/bos/test/web/drakma-requests.lisp Modified: trunk/projects/bos/test/web/drakma-requests.lisp =================================================================== --- trunk/projects/bos/test/web/drakma-requests.lisp 2008-09-10 13:12:22 UTC (rev 3875) +++ trunk/projects/bos/test/web/drakma-requests.lisp 2008-09-10 13:33:04 UTC (rev 3876) @@ -7,7 +7,7 @@ (let* ((,port-var (+ 70000 (random 5253))) (server (bos.web::init :port ,port-var :worldpay-test-mode t))) - (check-type server hunchentoot::server) + (check-type server bos.web::bos-server) (unwind-protect (progn ,@body) (hunchentoot:stop-server server)))))

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/web/
by BKNR Commits 10 Sep '08

10 Sep '08

Revision: 3875 Author: ksprotte URL: http://bknr.net/trac/changeset/3875 implemented bos-multi-threaded-server and bos-single-threaded-server (now default) U trunk/projects/bos/web/startup.lisp U trunk/projects/bos/web/webserver.lisp Modified: trunk/projects/bos/web/startup.lisp =================================================================== --- trunk/projects/bos/web/startup.lisp 2008-09-10 09:27:54 UTC (rev 3874) +++ trunk/projects/bos/web/startup.lisp 2008-09-10 13:12:22 UTC (rev 3875) @@ -8,8 +8,6 @@ :host (pathname-host me) :version nil))) -(defvar *webserver* nil) - (defvar *port*) (defvar *website-directory*) (defvar *website-url*) @@ -24,7 +22,7 @@ worldpay-test-mode (google-analytics-account "UA-3432041-1") start-frontend - debug) + threaded) (when website-url-given (warn "Specifying :website-url in web.rc is deprecated. Use :host instead.~ ~%Website-url will then be initialized by (format nil \"http://~~A\" host).")) @@ -39,17 +37,9 @@ (bos.web::publish-website :website-directory *website-directory* :website-url *website-url* :worldpay-test-mode *worldpay-test-mode*) - (format t "~&; Starting hunchentoot~@[ in debug mode~].~%" debug) - (force-output) - (when *webserver* - (hunchentoot:stop-server *webserver*)) - (setf hunchentoot:*hunchentoot-default-external-format* (flex:make-external-format :utf-8 :eol-style :lf) - hunchentoot:*rewrite-for-session-urls* nil - ;; the reason for the following setting is that ptviewer sends - ;; a different User-Agent -- (when requesting PTDefault.html) - hunchentoot:*use-user-agent-for-sessions* nil) - (setq *webserver* (hunchentoot:start-server :port *port* :threaded (not debug) - :persistent-connections-p (not debug))) + (format t "~&; Starting hunchentoot.~%") + (force-output) + (bos-server-restart :port *port* :threaded threaded) (if start-frontend (start-frontend :host host :backend-port port :port frontend-port) (warn "frontend not started - to achieve this specify :start-frontend t")) Modified: trunk/projects/bos/web/webserver.lisp =================================================================== --- trunk/projects/bos/web/webserver.lisp 2008-09-10 09:27:54 UTC (rev 3874) +++ trunk/projects/bos/web/webserver.lisp 2008-09-10 13:12:22 UTC (rev 3875) @@ -2,6 +2,115 @@ (enable-interpol-syntax) +;;;; bos-server +(defvar *webserver* nil + "When the bos-server is running this is set to the server +instance.") + +(defclass bos-server () + ()) + +;;; internal protocol +(defgeneric bos-server-start-internal (server)) +(defgeneric bos-server-stop-internal (server)) +(defgeneric bos-server-running-p-internal (server)) + +;;; external protocol +(defun bos-server-start (&key port threaded) + (let ((server-class (if threaded + 'bos-multi-threaded-server + 'bos-single-threaded-server))) + (prog1 + (setq *webserver* (make-instance server-class :port port)) + (bos-server-start-internal *webserver*)))) + +(defun bos-server-stop () + (unless (bos-server-running-p) + (error "BOS server is not running")) + (bos-server-stop-internal *webserver*)) + +(defun bos-server-running-p () + (when *webserver* + (bos-server-running-p-internal *webserver*))) + +(defun bos-server-restart (&key port threaded) + (when (bos-server-running-p) + (bos-server-stop)) + (bos-server-start :port port :threaded threaded)) + +(defgeneric bos-server-port (server)) + +;;; bos-server-hunchentoot-mixin +(defclass bos-server-hunchentoot-mixin () + ()) + +(defmethod bos-server-start-internal :before ((server bos-server-hunchentoot-mixin)) + (declare (ignore server)) + (setf hunchentoot:*hunchentoot-default-external-format* + (flex:make-external-format :utf-8 :eol-style :lf) + hunchentoot:*rewrite-for-session-urls* + nil + ;; the reason for the following setting is that ptviewer sends + ;; a different User-Agent -- (when requesting PTDefault.html) + hunchentoot:*use-user-agent-for-sessions* + nil)) + +;;;; bos-multi-threaded-server +(defclass bos-multi-threaded-server (bos-server bos-server-hunchentoot-mixin) + ((port :reader bos-server-port :initarg :port) + (native-server :accessor bos-server-native-server))) + +(defmethod bos-server-start-internal ((server bos-multi-threaded-server)) + (setf (bos-server-native-server server) + (hunchentoot:start-server :port (bos-server-port server) + :threaded t :persistent-connections-p t))) + +(defmethod bos-server-stop-internal ((server bos-multi-threaded-server)) + (hunchentoot:stop-server (bos-server-native-server server))) + +(defmethod bos-server-running-p-internal ((server bos-multi-threaded-server)) + (not (hunchentoot::server-shutdown-p (bos-server-native-server server)))) + +;;;; bos-single-threaded-server +(defclass bos-single-threaded-server (bos-server bos-server-hunchentoot-mixin) + ((port :reader bos-server-port :initarg :port) + (server-thread :accessor bos-server-thread :initform nil))) + +(defmethod bos-server-start-internal ((server bos-single-threaded-server)) + (setf (bos-server-thread server) + (bt:make-thread (lambda () + (catch 'stop-tag + (hunchentoot:start-server :port (bos-server-port server) + :threaded nil :persistent-connections-p nil))) + :name "bos-single-threaded-server"))) + +(defvar *stop-server-handler-authorized-p* nil) + +(defmacro with-stop-server-handler-autorization (&body body) + `(unwind-protect + (progn + (setq *stop-server-handler-authorized-p* t) + ,@body) + (setq *stop-server-handler-authorized-p* nil))) + +(defclass stop-server-handler (page-handler) + ()) + +(defmethod handle ((handler stop-server-handler)) + (if *stop-server-handler-authorized-p* + (throw 'stop-tag nil) + (error "not found"))) + +(defmethod bos-server-stop-internal ((server bos-single-threaded-server)) + (with-stop-server-handler-autorization + (ignore-errors (drakma:http-request (format nil "http://localhost:~D/stop-server" + (bos-server-port server))))) + nil) + +(defmethod bos-server-running-p-internal ((server bos-single-threaded-server)) + (and (bos-server-thread server) + (bt:thread-alive-p (bos-server-thread server)))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -156,7 +265,8 @@ (make-instance 'bos-website :name "create-rainforest.org CMS" - :handler-definitions `(("/edit-poi-medium" edit-poi-medium-handler) + :handler-definitions `(("/stop-server" stop-server-handler) + ("/edit-poi-medium" edit-poi-medium-handler) ("/edit-poi" edit-poi-handler) ("/edit-sponsor" edit-sponsor-handler) ("/kml-upload" kml-upload-handler)

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/payment-website/static/toplevel_style.css
by BKNR Commits 10 Sep '08

10 Sep '08

Revision: 3874 Author: ksprotte URL: http://bknr.net/trac/changeset/3874 bos css anpassung menue_header_main U trunk/projects/bos/payment-website/static/toplevel_style.css Modified: trunk/projects/bos/payment-website/static/toplevel_style.css =================================================================== --- trunk/projects/bos/payment-website/static/toplevel_style.css 2008-09-10 09:17:03 UTC (rev 3873) +++ trunk/projects/bos/payment-website/static/toplevel_style.css 2008-09-10 09:27:54 UTC (rev 3874) @@ -105,10 +105,10 @@ /* menueleiste im header - neue version - mittlerer bereich hauptmenue */ #menue_header_main { position: absolute; - z-index: 9; + z-index: 120; margin-top: 74px; margin-left: 230px; - width: 450px; + width: 410px; height: 15px; visibility: visible; display: block;

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/payment-website/static/
by BKNR Commits 10 Sep '08

10 Sep '08

Revision: 3873 Author: ksprotte URL: http://bknr.net/trac/changeset/3873 bos css anpassung menue_header_main U trunk/projects/bos/payment-website/static/poi/bos_style.css U trunk/projects/bos/payment-website/static/toplevel_style.css Modified: trunk/projects/bos/payment-website/static/poi/bos_style.css =================================================================== --- trunk/projects/bos/payment-website/static/poi/bos_style.css 2008-09-09 19:50:55 UTC (rev 3872) +++ trunk/projects/bos/payment-website/static/poi/bos_style.css 2008-09-10 09:17:03 UTC (rev 3873) @@ -266,7 +266,7 @@ #menue_header_main{ float:left; margin-top: 74px; - margin-left: 184px; + margin-left: 230px; width: 450px; height: 15px; visibility: visible; Modified: trunk/projects/bos/payment-website/static/toplevel_style.css =================================================================== --- trunk/projects/bos/payment-website/static/toplevel_style.css 2008-09-09 19:50:55 UTC (rev 3872) +++ trunk/projects/bos/payment-website/static/toplevel_style.css 2008-09-10 09:17:03 UTC (rev 3873) @@ -107,7 +107,7 @@ { position: absolute; z-index: 9; margin-top: 74px; - margin-left: 184px; + margin-left: 230px; width: 450px; height: 15px; visibility: visible;

1 0

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

09 Sep '08

Revision: 3872 Author: hans URL: http://bknr.net/trac/changeset/3872 Fix image editing. Factor out login Javascript. Minor tweaks. U trunk/projects/quickhoney/src/handlers.lisp U trunk/projects/quickhoney/src/webserver.lisp U trunk/projects/quickhoney/website/static/javascript.js A trunk/projects/quickhoney/website/static/login.js U trunk/projects/quickhoney/website/templates/image-browse.xml U trunk/projects/quickhoney/website/templates/index.xml U trunk/projects/quickhoney/website/templates/login.xml Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-09-09 17:41:22 UTC (rev 3871) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-09-09 19:50:55 UTC (rev 3872) @@ -139,26 +139,32 @@ (:default-initargs :object-class 'quickhoney-image)) (defmethod handle-object-form ((handler json-edit-image-handler) action image) - (format t "; invalid action ~A or invalid object ~A~%" action image)) + (with-json-response () + (encode-object-element "result" "error") + (encode-object-element "message" (format nil "; invalid action ~A or invalid object ~A~%" action image)))) (defun image-keywords-from-request-parameters () (let (retval) - (dolist (keyword *editable-keywords* retval) + (dolist (keyword *editable-keywords* + retval) (when (query-param (string-downcase (symbol-name keyword))) (push keyword retval))))) (defmethod handle-object-form ((handler json-edit-image-handler) (action (eql :edit)) image) (with-query-params (client spider-keywords) + (format t "editing image ~A client ~A spider-keywords ~A~%" image client spider-keywords) (with-transaction (:edit-image) (setf (quickhoney-image-client image) client (quickhoney-image-spider-keywords image) spider-keywords (store-image-keywords image) (append (set-difference (store-image-keywords image) *editable-keywords*) (image-keywords-from-request-parameters))))) + (setf *last-image-upload-timestamp* (get-universal-time)) (with-json-response () (encode-object-element "result" "edited"))) (defmethod handle-object-form ((handler json-edit-image-handler) (action (eql :delete)) (image quickhoney-image)) (delete-object image) + (setf *last-image-upload-timestamp* (get-universal-time)) (with-json-response () (encode-object-element "result" "deleted"))) @@ -292,7 +298,8 @@ (let* ((image (make-store-image :name (pathname-name (upload-original-filename uploaded-file)) :class-name 'quickhoney-image :keywords (cons :upload (image-keywords-from-request-parameters)) - :initargs (list :cat-sub (mapcar #'make-keyword-from-string (decoded-handler-path handler)) + :initargs (list :owner (bknr-session-user) + :cat-sub (mapcar #'make-keyword-from-string (decoded-handler-path handler)) :client client :spider-keywords spider-keywords)))) (with-http-response () Modified: trunk/projects/quickhoney/src/webserver.lisp =================================================================== --- trunk/projects/quickhoney/src/webserver.lisp 2008-09-09 17:41:22 UTC (rev 3871) +++ trunk/projects/quickhoney/src/webserver.lisp 2008-09-09 19:50:55 UTC (rev 3872) @@ -59,4 +59,4 @@ :site-logo-url "/image/quickhoney/color,000000,33ff00" :login-logo-url "/image/quickhoney/color,000000,33ff00/double,3" :style-sheet-urls '("/static/yui/reset-fonts/reset-fonts.css" "/static/quickhoney.css" "/static/cms.css") - :javascript-urls '("/static/javascript.js"))) + :javascript-urls '("/MochiKit/MochiKit.js" "/static/javascript.js"))) Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 17:41:22 UTC (rev 3871) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 19:50:55 UTC (rev 3872) @@ -97,31 +97,76 @@ /* image editing */ +function all_inputs(parent) { + var inputs = []; + map(function (tag) { + inputs = inputs.concat(getElementsByTagAndClassName(tag, null, parent)); + }, ['textarea', 'select', 'input']); + return inputs; +} + +function submit_json(url, form, handler) { + var names = []; + var values = []; + + if (form) { + map(function (input) { + names.push(input.name); + if (input.type != 'checkbox' || input.checked) { + values.push(input.value); + } + }, all_inputs(form)); + } + + MochiKit.Async.doXHR(url, { mimeType: 'text/plain', + headers: [['Accept', 'application/json']], + method: 'POST', + headers: {"Content-Type":"application/x-www-form-urlencoded"}, + sendContent: queryString(names, values) }) + .addCallbacks(function (req) { handler(MochiKit.Base.evalJSON(req.responseText)) }, + alert); + +} + function do_edit() { current_image.client = $("edit_client").value; current_image.spider_keywords = $("edit_keywords").value; current_image.keywords.explicit = $("edit_explicit").checked ? true : false; show_cms_window('saving_edits_form'); // hide edit window until server replies + + submit_json('/json-edit-image/' + current_image.id + '?action=edit', 'edit_form_element', image_edited); + + return false; } -function image_edited() { +function image_edited(json_data) { + if (json_data.result == 'error') { + alert(json_data.message); + } show_cms_window("image_edited_form"); setTimeout("show_cms_window('edit_form')", 2000); // reload_clients(); } +function do_delete() { + + if (confirm('delete this image?')) { + show_cms_window('saving_edits_form'); // hide edit window until server replies + + submit_json('/json-edit-image/' + current_image.id + '?action=delete', null, image_deleted); + } + + return false; +} + function image_deleted() { show_cms_window("image_deleted_form"); current_image = null; $("image_detail").innerHTML = ''; - if (current_directory == 'home') { - load_button_images(); - } else { - setTimeout("if (!current_image) { show_cms_window('upload_form'); }", 2000); - do_query(); - } + setTimeout("if (!current_image) { show_cms_window('upload_form'); }", 2000); + do_query(); } /* clients list */ @@ -441,6 +486,11 @@ } } +function do_query() +{ + query_imagedb(current_directory, current_subdirectory, true); +} + /* pages handling */ function Page(link_color, action) { @@ -469,6 +519,7 @@ if (logged_in) { if (current_directory == "home") { + show_cms_window(); } else if (current_directory == "news") { show_cms_window("edit_news"); } else if (current_directory && current_subdirectory) { @@ -1008,14 +1059,12 @@ wait_for_images(function () { img.style.visibility = 'inherit' }); } - if (logged_in) { - $("edit_form_element").setAttribute("action", "/edit-image-js/" + current_image.id); $("edit_client").value = current_image.client; - $("edit_keywords").value = current_image.spider_keywords; + $("edit_keywords").value = current_image.spider_keywords || ""; map(function(keyword) { $('edit_' + keyword).checked = current_image.keywords[keyword] ? true : false; - }, ['explicit', 'buy-file', 'buy-print', 'buy-t-shirt']); + }, ['explicit']); show_cms_window("edit_form"); } } @@ -1217,7 +1266,11 @@ } function make_ipod_image() { - window.open('/image/' + encodeURI(current_image.name) + '/cell,,320,480/download,' + encodeURI(current_image.name) + '.jpg'); + window.open('/image/' + + encodeURI(current_image.name) + + '/cell,,' + + ((current_image.width < current_image.height) ? '320,480' : '480,320') + + '/download,' + encodeURI(current_image.name) + '.jpg'); } NOTICE = partial(SPAN, { 'class': 'notice' }); @@ -1414,7 +1467,7 @@ hidden_IMG({ src: recolored_image_path('hey'), 'class': 'flag', width: 37, height: 16}), DIV({ 'class': 'button-section-items last' }, UL(null, - make_image_action_button('ipod', 'iPod', make_ipod_image), + make_image_action_button('ipod', 'iPhone', make_ipod_image), make_image_action_button('comment', 'Comment', make_comment_form))))); replaceChildNodes('image_action_buttons', groups); @@ -1436,18 +1489,3 @@ wait_for_images(function () { $('image_action_buttons').style.visibility = 'inherit'; }); } -/* login stuff */ - -function init_login () { - $('username').focus(); - $('login_form').style.display = 'block'; -} - -function do_login () { - - $('login_form').style.display = 'none'; - $('logging-in').style.display = 'block'; - - return true; -} - Added: trunk/projects/quickhoney/website/static/login.js =================================================================== --- trunk/projects/quickhoney/website/static/login.js (rev 0) +++ trunk/projects/quickhoney/website/static/login.js 2008-09-09 19:50:55 UTC (rev 3872) @@ -0,0 +1,15 @@ +/* login stuff */ + +function init_login () { + $('login_form').style.display = 'block'; + $('username').focus(); +} + +function do_login () { + + $('login_form').style.display = 'none'; + $('logging-in').style.display = 'block'; + + return true; +} + Modified: trunk/projects/quickhoney/website/templates/image-browse.xml =================================================================== --- trunk/projects/quickhoney/website/templates/image-browse.xml 2008-09-09 17:41:22 UTC (rev 3871) +++ trunk/projects/quickhoney/website/templates/image-browse.xml 2008-09-09 19:50:55 UTC (rev 3872) @@ -10,8 +10,6 @@ <link rel="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css" /> <link rel="stylesheet" href="/static/quickhoney.css" /> <link rel="stylesheet" href="/static/image-browse.css" /> - <script src="/static/javascript.js" type="text/javascript"> - </script> <title>QuickHoney image</title> </head> <body id="image-browse"> Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-09-09 17:41:22 UTC (rev 3871) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-09 19:50:55 UTC (rev 3872) @@ -179,12 +179,15 @@ <input type="text" id="upload_client" name="client" value="" /><br /> <span id="upload_client_select"> </span> + <br /> Keywords:<br /> <input type="text" id="upload_keywords" name="spider-keywords" value="" /><br /> <input type="checkbox" id="explicit" name="explicit" value="1" /> Explicit<br/> +  </p> <p class="cms"> <input type="submit" name="upload" value="upload" /> @@ -240,24 +243,26 @@ </div> <div id="edit_form" class="cms_form"> - <form id="edit_form_element" action="/edit-image-js" target="edit_iframe" method="post" - onsubmit="return do_edit();"> + <form id="edit_form_element" action="#" method="post" onsubmit="return false;"> <div class="cms_title">Edit image</div> <p class="cms"> Client:<br /> <input type="text" id="edit_client" name="client" value="" /><br /> <span id="edit_client_select"> </span> + <br /> 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/> +  </p> <p class="cms"> - <input type="submit" name="action" value="edit" /> - <input type="submit" name="action" value="delete" onclick="return confirm('Really delete this image?');" /> + <button type="submit" onclick="do_edit();">edit</button> + <button type="submit" onclick="do_delete();">delete</button> </p> </form> </div> Modified: trunk/projects/quickhoney/website/templates/login.xml =================================================================== --- trunk/projects/quickhoney/website/templates/login.xml 2008-09-09 17:41:22 UTC (rev 3871) +++ trunk/projects/quickhoney/website/templates/login.xml 2008-09-09 19:50:55 UTC (rev 3872) @@ -10,7 +10,7 @@ <link rel="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css" /> <link rel="stylesheet" href="/static/login.css" /> <script src="/MochiKit/MochiKit.js" type="text/javascript"> </script> - <script src="/static/javascript.js" type="text/javascript"> </script> + <script src="/static/login.js" type="text/javascript"> </script> <title>QuickHoney CMS Login</title> </head>

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/web/
by BKNR Commits 09 Sep '08

09 Sep '08

Revision: 3871 Author: ksprotte URL: http://bknr.net/trac/changeset/3871 added handlers /sitemap.xml and /contract-placemark for Google crawler U trunk/projects/bos/web/contract-tree.lisp U trunk/projects/bos/web/webserver.lisp Modified: trunk/projects/bos/web/contract-tree.lisp =================================================================== --- trunk/projects/bos/web/contract-tree.lisp 2008-09-09 15:57:45 UTC (rev 3870) +++ trunk/projects/bos/web/contract-tree.lisp 2008-09-09 17:41:22 UTC (rev 3871) @@ -132,7 +132,64 @@ (hunchentoot:handle-if-modified-since (timestamp node)) ,@body)) -;;; kml handler +;;; contract-placemark-handler +(defclass contract-placemark-handler (object-handler) + () + (:default-initargs :object-class 'contract) + (:documentation "Publishes a contract as a kml placemark to be +crawled by Google.")) + +(defmethod handle-object ((handler contract-placemark-handler) contract + &aux (last-change (store-object-last-change contract 0))) + (hunchentoot:handle-if-modified-since last-change) + (setf (hunchentoot:header-out :last-modified) + (hunchentoot:rfc-1123-date last-change)) + (let ((name (user-full-name (contract-sponsor contract)))) + (with-xml-response (:content-type "application/vnd.google-earth.kml+xml") + (with-namespace (nil "http://www.opengis.net/kml/2.2") + (with-namespace ("atom" "http://www.w3.org/2005/Atom") + (with-element "kml" + (with-element "Document" + (when name (with-element "name" (text name))) + (with-element* ("atom" "author") + (with-element* ("atom" "name") + (text "BOS Deutschland e.V. - Borneo Orangutan Survival Deutschland"))) + (with-element* ("atom" "link") + (attribute "href" (format nil "http://~A" (website-host)))) + (with-element "Placemark" + (when name (with-element "name" (text name))) + (with-element "Snippet" + (attribute "maxLines" "2") + (text (format-date-time (contract-date contract) :show-time nil)) + (with-element "br") + (text (format nil "~D m²" (contract-area contract)))) + (with-element "description" (cdata (contract-description contract "en"))) + (with-element "Point" + (with-element "coordinates" + (destructuring-bind (x y) + (contract-center contract) + (text (with-output-to-string (out) + (kml-format-point (make-point :x x :y y) out)))))))))))))) + +;;; sitemap-handler +(defclass sitemap-handler (page-handler) + ()) + +(defmethod handle ((handler sitemap-handler)) + (with-xml-response () + (with-namespace (nil "http://www.sitemaps.org/schemas/sitemap/0.9") + (with-namespace ("geo" "http://www.google.com/geo/schemas/sitemap/1.0") + (with-element "urlset" + (dolist (contract (class-instances 'contract)) + (when (user-full-name (contract-sponsor contract)) + (with-element "url" + (with-element "loc" + (text (format nil "http://~A/contract-placemark/~D" + (website-host) (store-object-id contract)))) + (with-element* ("geo" "geo") + (with-element* ("geo" "format") (text "kml"))))))))))) + +;;; contract-tree-kml-handler (defclass contract-tree-kml-handler (page-handler) () (:documentation "Generates a kml representation of the queried Modified: trunk/projects/bos/web/webserver.lisp =================================================================== --- trunk/projects/bos/web/webserver.lisp 2008-09-09 15:57:45 UTC (rev 3870) +++ trunk/projects/bos/web/webserver.lisp 2008-09-09 17:41:22 UTC (rev 3871) @@ -163,6 +163,8 @@ ("/kml-root-dynamic" kml-root-dynamic-handler) ("/kml-root" kml-root-handler) ("/country-stats" country-stats-handler) + ("/sitemap.xml" sitemap-handler) + ("/contract-placemark" contract-placemark-handler) ("/contract-tree-kml" contract-tree-kml-handler) ("/contract-tree-image" contract-tree-image-handler) ("/contract-image" contract-image-handler)

1 0

[bknr-cvs] hans changed trunk/bknr/web/src/web/web-utils.lisp
by BKNR Commits 09 Sep '08

09 Sep '08

Revision: 3870 Author: hans URL: http://bknr.net/trac/changeset/3870 discard path information of uploaded file, hoping that the rest is a parsable pathname. U trunk/bknr/web/src/web/web-utils.lisp Modified: trunk/bknr/web/src/web/web-utils.lisp =================================================================== --- trunk/bknr/web/src/web/web-utils.lisp 2008-09-09 15:50:25 UTC (rev 3869) +++ trunk/bknr/web/src/web/web-utils.lisp 2008-09-09 15:57:45 UTC (rev 3870) @@ -26,8 +26,8 @@ (setf (aux-request-value 'uploaded-files) (let ((uploads (remove-if-not #'listp (post-parameters*) :key #'cdr)) retval) (dolist (upload-info uploads) - (destructuring-bind (name pathname original-filename content-type) upload-info - (push (make-upload :name name :pathname pathname :original-filename original-filename + (destructuring-bind (name pathname original-pathname content-type) upload-info + (push (make-upload :name name :pathname pathname :original-filename (cl-ppcre:regex-replace "^.*[\\\\/]" original-pathname "") :content-type content-type) retval))) (nreverse retval)))) (aux-request-value 'uploaded-files))

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/payment-website/static/poi/functions.js
by BKNR Commits 09 Sep '08

09 Sep '08

Revision: 3869 Author: ksprotte URL: http://bknr.net/trac/changeset/3869 cleanup poi/functions.js U trunk/projects/bos/payment-website/static/poi/functions.js Modified: trunk/projects/bos/payment-website/static/poi/functions.js =================================================================== --- trunk/projects/bos/payment-website/static/poi/functions.js 2008-09-09 15:25:03 UTC (rev 3868) +++ trunk/projects/bos/payment-website/static/poi/functions.js 2008-09-09 15:50:25 UTC (rev 3869) @@ -1,59 +1,59 @@ // JavaScript Document - // - // In my case I want to load them onload, this is how you do it! - // +// +// In my case I want to load them onload, this is how you do it! +// Event.observe(window, 'load', loadAccordions, false); - // - // Set up all accordions - // +// +// Set up all accordions +// function loadAccordions() { - - var mainAccordion = new accordion('content_main',{ - resizeSpeed : 15, - - defaultSize : { - height:75 - } - }); - -/* var VerticalAccordion = new accordion('vertical_container', { - classNames : { - toggle : 'vertical_accordion_toggle', - toggleActive : 'vertical_accordion_toggle_active', - content : 'vertical_accordion_content' - } - });*/ - - // Open first one - mainAccordion.activate($$('#content_main .accordion_toggle')[0]); - //VerticalAccordion.activate($$('#vertical_container .vertical_accordion_toggle')[0]); - // Special thanks go out to Will Shaver @ http://primedigit.com/ + var mainAccordion = new accordion('content_main',{ + resizeSpeed : 15, -/*var verticalAccordions = $$('.accordion_toggle'); -verticalAccordions.each(function(accordion) { - $(accordion.next(0)).setStyle( - { - height: '0px'} - ); -});*/ + defaultSize : { + height:75 + } + }); + // var VerticalAccordion = new accordion('vertical_container', { + + // classNames : { + // toggle : 'vertical_accordion_toggle', + // toggleActive : 'vertical_accordion_toggle_active', + // content : 'vertical_accordion_content' + // } + // }); + + // Open first one + mainAccordion.activate($$('#content_main .accordion_toggle')[0]); + + //VerticalAccordion.activate($$('#vertical_container .vertical_accordion_toggle')[0]); + // Special thanks go out to Will Shaver @ http://primedigit.com/ + + // var verticalAccordions = $$('.accordion_toggle'); + // verticalAccordions.each(function(accordion) { + // $(accordion.next(0)).setStyle( + // { + // height: '0px'} + // ); + // }); + } - // remove the registerOverlay call to disable the controlbar - hs.registerOverlay( - { - thumbnailId: null, - overlayId: 'controlbar', - position: 'top right', - hideOnMouseOut: true - } - ); - - hs.graphicsDir = '/static/poi/graphics/'; - hs.outlineType = 'rounded-white'; - // Tell Highslide to use the thumbnail's title for captions - //hs.captionEval = 'this.thumb.title'; +// remove the registerOverlay call to disable the controlbar +hs.registerOverlay( + { + thumbnailId: null, + overlayId: 'controlbar', + position: 'top right', + hideOnMouseOut: true + } + ); +hs.graphicsDir = '/static/poi/graphics/'; +hs.outlineType = 'rounded-white'; +// Tell Highslide to use the thumbnail's title for captions +//hs.captionEval = 'this.thumb.title';

1 0

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

09 Sep '08

Revision: 3868 Author: hans URL: http://bknr.net/trac/changeset/3868 Fix space between buttons. Repair "full image" display window. Automatically download iPhone pictures. U trunk/projects/quickhoney/src/imageproc.lisp A trunk/projects/quickhoney/website/static/image-full.css A trunk/projects/quickhoney/website/static/image-full.js U trunk/projects/quickhoney/website/static/index.css U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/quickhoney/website/templates/image-full.xml Modified: trunk/projects/quickhoney/src/imageproc.lisp =================================================================== --- trunk/projects/quickhoney/src/imageproc.lisp 2008-09-09 13:21:02 UTC (rev 3867) +++ trunk/projects/quickhoney/src/imageproc.lisp 2008-09-09 15:25:03 UTC (rev 3868) @@ -3,6 +3,8 @@ (defparameter *button-size* 208) (defparameter *big-button-size* 318) +(cl-interpol:enable-interpol-syntax) + (defun corner-cutout-coords (image-width image-height radius) "Return a list of coordinates that need to be made transparent or colored in background color to get a rounded corner effect. @@ -127,4 +129,8 @@ (corner-image :image output-image :radius +news-image-corner-radius+ :corner-color (allocate-color 255 255 255 :image output-image)) - output-image)) \ No newline at end of file + output-image)) + +(define-imageproc-handler download (input-image filename) + (setf (tbnl:header-out :content-disposition) #?"attachment; filename=$(filename)") + input-image) \ No newline at end of file Added: trunk/projects/quickhoney/website/static/image-full.css =================================================================== --- trunk/projects/quickhoney/website/static/image-full.css (rev 0) +++ trunk/projects/quickhoney/website/static/image-full.css 2008-09-09 15:25:03 UTC (rev 3868) @@ -0,0 +1,7 @@ +/* styles for the full image display window */ + +#logo { + position: absolute; + bottom: 18px; + left: 18px; +} \ No newline at end of file Added: trunk/projects/quickhoney/website/static/image-full.js =================================================================== --- trunk/projects/quickhoney/website/static/image-full.js (rev 0) +++ trunk/projects/quickhoney/website/static/image-full.js 2008-09-09 15:25:03 UTC (rev 3868) @@ -0,0 +1,15 @@ +/* Used from image-full to load the current image */ + +function load_image() { + var hash_index = document.location.href.indexOf('#'); + + if (hash_index != -1) { + // safari does not seem to support split, ie5mac does not have encodeURI and decodeURI. oh my! + var argument = unescape(document.location.href.substr(hash_index + 1)); + + document.getElementById("the_image").src = "/image/" + argument; + } else { + alert('missing image name'); + } +} + Modified: trunk/projects/quickhoney/website/static/index.css =================================================================== --- trunk/projects/quickhoney/website/static/index.css 2008-09-09 13:21:02 UTC (rev 3867) +++ trunk/projects/quickhoney/website/static/index.css 2008-09-09 15:25:03 UTC (rev 3868) @@ -277,34 +277,42 @@ a.home_button { visibility: inherit; - margin: 0px 7px 0px 0px; border-width: 0px; } a.home_button img { + margin-left: 12px; width: 318px; height: 318px; } +a.home_button:first-child img { + margin-left: 0px; +} + #home div { - padding-bottom: 10px; + padding-bottom: 12px; } /* directory */ a.button { visibility: inherit; - margin: 0px 7px 0px 0px; border-width: 0px; } a.button img { + margin-left: 12px; width: 208px; height: 208px; } +a.button:first-child img { + margin-left: 0px; +} + #directory div { - padding-bottom: 10px; + padding-bottom: 12px; } /* footer */ Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 13:21:02 UTC (rev 3867) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 15:25:03 UTC (rev 3868) @@ -621,6 +621,7 @@ return A({ href: '#' + category, 'class': 'home_button'}, IMG({ id: 'home_' + category, 'class': 'button-image', + width: 318, height: 318, src: random_button_image('home', category, 318, 318, category), style: 'visibility: hidden' })); } @@ -1038,21 +1039,6 @@ detail_window.focus(); } -/* Used from image-full to load the current image */ - -function load_image() { - var hash_index = document.location.href.indexOf('#'); - - if (hash_index != -1) { - // safari does not seem to support split, ie5mac does not have encodeURI and decodeURI. oh my! - var argument = unescape(document.location.href.substr(hash_index + 1)); - - $("the_image").src = "/image/" + argument; - } else { - alert('missing image name'); - } -} - /* open the upload window */ function do_upload(target) { @@ -1231,7 +1217,7 @@ } function make_ipod_image() { - window.open('/image/' + encodeURI(current_image.name) + '/cell,,320,480'); + window.open('/image/' + encodeURI(current_image.name) + '/cell,,320,480/download,' + encodeURI(current_image.name) + '.jpg'); } NOTICE = partial(SPAN, { 'class': 'notice' }); Modified: trunk/projects/quickhoney/website/templates/image-full.xml =================================================================== --- trunk/projects/quickhoney/website/templates/image-full.xml 2008-09-09 13:21:02 UTC (rev 3867) +++ trunk/projects/quickhoney/website/templates/image-full.xml 2008-09-09 15:25:03 UTC (rev 3868) @@ -1,30 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html - xmlns="http://www.w3.org/1999/xhtml" - xmlns:bknr="http://bknr.net" - > - <head> - <link rel="stylesheet" href="/static/styles.css" /> - <script src="/MochiKit/MochiKit.js" type="text/javascript"> </script> - <script src="/static/javascript.js" type="text/javascript"> </script> - <title>QuickHoney image</title> - </head> - <body id="imagedetail"> - <div id="logo"> - <a href="javascript:window.close()"> - <img src="/image/quickhoney-black" id="the_logo" name="logo" border="0" /> - </a> - </div> + xmlns="http://www.w3.org/1999/xhtml" + xmlns:bknr="http://bknr.net" + > + <head> + <link rel="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css" /> + <link rel="stylesheet" href="/static/image-full.css" /> + <script src="/static/image-full.js" type="text/javascript"> </script> + <title>QuickHoney image</title> + </head> + <body id="imagedetail"> + <div id="logo"> + <a href="javascript:window.close()"> + <img src="/image/quickhoney-black" id="the_logo" name="logo" border="0" /> + </a> + </div> - <div id="image"> - <a href="javascript:window.close()"> - <img src="/image/trans" id="the_image" name="image" border="0" /> - </a> - </div> - </body> - <script language="javascript"> - load_image(); - </script> + <div id="image"> + <a href="javascript:window.close()"> + <img src="/image/trans" id="the_image" name="image" border="0" /> + </a> + </div> + </body> + <script language="javascript"> + load_image(); + </script> </html>

1 0

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

09 Sep '08

Revision: 3867 Author: hans URL: http://bknr.net/trac/changeset/3867 Don't create news item pictures as 'hidden'. U trunk/projects/quickhoney/website/static/javascript.js Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 13:14:48 UTC (rev 3866) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 13:21:02 UTC (rev 3867) @@ -235,7 +235,7 @@ } } return DIV({ 'class': 'newsentry' }, - hidden_IMG({ src: "/image/" + encodeURI(item.name) + '/news-article-cutout' }), + IMG({ src: "/image/" + encodeURI(item.name) + '/news-article-cutout' }), DIV(null, H1(null, item.title), item.date, ' by ', item.owner, ' | ',

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/website/
by BKNR Commits 09 Sep '08

09 Sep '08

Revision: 3866 Author: hans URL: http://bknr.net/trac/changeset/3866 Fix image revealing for Internet Explorer. U trunk/projects/quickhoney/website/static/index.css U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/quickhoney/website/templates/index.xml Change set too large, please see URL above

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/payment-website/static/poi/
by BKNR Commits 09 Sep '08

09 Sep '08

Revision: 3865 Author: ksprotte URL: http://bknr.net/trac/changeset/3865 microsite header exchange U trunk/projects/bos/payment-website/static/poi/bos_style.css D trunk/projects/bos/payment-website/static/poi/header_ganzneu.gif Modified: trunk/projects/bos/payment-website/static/poi/bos_style.css =================================================================== --- trunk/projects/bos/payment-website/static/poi/bos_style.css 2008-09-09 11:15:40 UTC (rev 3864) +++ trunk/projects/bos/payment-website/static/poi/bos_style.css 2008-09-09 12:53:43 UTC (rev 3865) @@ -277,5 +277,5 @@ { width:780px; height:92px; - background-image:url(header_ganzneu.gif); + background-image:url(/images/site_header-en.gif); } \ No newline at end of file Deleted: trunk/projects/bos/payment-website/static/poi/header_ganzneu.gif =================================================================== (Binary files differ)

1 0