bknr-cvs

bknr-cvs@common-lisp.net

1964 discussions

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

11 Sep '08

Revision: 3890 Author: ksprotte URL: http://bknr.net/trac/changeset/3890 new tsung script A trunk/projects/bos/test/tsung3.xml Change set too large, please see URL above

1 0

[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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

bknr-cvs