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

[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

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

09 Sep '08

Revision: 3864 Author: ksprotte URL: http://bknr.net/trac/changeset/3864 Infosystem: Auf POI-Seite: Link zu Google Earth nur wenn published-earth U trunk/projects/bos/m2/poi.lisp U trunk/projects/bos/payment-website/infosystem/javascript.js Modified: trunk/projects/bos/m2/poi.lisp =================================================================== --- trunk/projects/bos/m2/poi.lisp 2008-09-09 11:03:16 UTC (rev 3863) +++ trunk/projects/bos/m2/poi.lisp 2008-09-09 11:15:40 UTC (rev 3864) @@ -218,7 +218,8 @@ text: ~S, x: ~D, y: ~D, - thumbnail: ~D + thumbnail: ~D, + published_earth: ~:[false~;true~] }; " (store-object-id poi) @@ -229,7 +230,8 @@ (escape-nl (slot-string poi 'description language)) (poi-center-x poi) (poi-center-y poi) - (length (poi-sat-images poi))) + (length (poi-sat-images poi)) + (poi-published-earth poi)) (format t "poi.thumbnail = ~D;~%" (length (poi-sat-images poi))) (when (poi-airals poi) Modified: trunk/projects/bos/payment-website/infosystem/javascript.js =================================================================== --- trunk/projects/bos/payment-website/infosystem/javascript.js 2008-09-09 11:03:16 UTC (rev 3863) +++ trunk/projects/bos/payment-website/infosystem/javascript.js 2008-09-09 11:15:40 UTC (rev 3864) @@ -947,7 +947,8 @@ poi_menu_items = []; poi_menu_items.push(["More-Info", show_poi_microsite]); - poi_menu_items.push(["Google-Earth", show_poi_google_earth]); + if (the_poi.published_earth) + poi_menu_items.push(["Google-Earth", show_poi_google_earth]); make_poi_menu();

1 0

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

09 Sep '08

Revision: 3863 Author: ksprotte URL: http://bknr.net/trac/changeset/3863 infosystem: hacked javascript poi_menu to show only More-Info and Google-Earth links --This line, and those below, will be ignored-- M projects/bos/payment-website/infosystem/javascript.js U trunk/projects/bos/payment-website/infosystem/javascript.js Modified: trunk/projects/bos/payment-website/infosystem/javascript.js =================================================================== --- trunk/projects/bos/payment-website/infosystem/javascript.js 2008-09-09 10:50:51 UTC (rev 3862) +++ trunk/projects/bos/payment-website/infosystem/javascript.js 2008-09-09 11:03:16 UTC (rev 3863) @@ -922,9 +922,7 @@ var poi_menu_items; var poi_active_menu_item; -function poi_menu_select(index) { - poi_active_menu_item = poi_menu_items[index][0]; - make_poi_menu(); +function invoke_poi_menu(index) { document.getElementById("PoiInfoText").innerHTML = poi[aktuelles_objekt]['text']; poi_menu_items[index][1].call(); } @@ -937,7 +935,7 @@ if (item_name == poi_active_menu_item) { poi_menu += '<span class="PoiMenuItemActive">' + item_name + '</span>'; } else { - poi_menu += '<a class="PoiMenuItem" href="#" onclick="poi_menu_select(' + i + ');">' + item_name + '</a>'; + poi_menu += '<a class="PoiMenuItem" href="#" onclick="invoke_poi_menu(' + i + ');">' + item_name + '</a>'; } } @@ -947,22 +945,10 @@ function PoiDetail_anzeigen(index) { var the_poi = poi[index]; - poi_menu_items = [ [ msg("Sat-Karte"), show_poi_satbild ] ]; - if (the_poi['luftbild']) { - poi_menu_items.push([ msg('Luftbild'), show_poi_luftbild ]); - } - if (the_poi.panoramas) { - poi_menu_items.push([ msg('Panorama'), show_poi_panorama ]); - } - if (the_poi.movies) { - poi_menu_items.push([ msg('Film'), show_poi_movie ]); - } - poi_menu_items.push(["More-Info", show_poi_microsite]); - + poi_menu_items = []; + poi_menu_items.push(["More-Info", show_poi_microsite]); poi_menu_items.push(["Google-Earth", show_poi_google_earth]); - poi_active_menu_item = msg('Sat-Karte'); - make_poi_menu(); // Funktion zur Anzeige der POIs im Detail

1 0

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

09 Sep '08

Revision: 3862 Author: ksprotte URL: http://bknr.net/trac/changeset/3862 infosystem: added poi GE link via show_poi_google_earth U trunk/projects/bos/payment-website/infosystem/javascript.js U trunk/projects/bos/web/poi-handlers.lisp U trunk/projects/bos/web/webserver.lisp Modified: trunk/projects/bos/payment-website/infosystem/javascript.js =================================================================== --- trunk/projects/bos/payment-website/infosystem/javascript.js 2008-09-09 10:05:39 UTC (rev 3861) +++ trunk/projects/bos/payment-website/infosystem/javascript.js 2008-09-09 10:50:51 UTC (rev 3862) @@ -914,6 +914,11 @@ "microsite", "width=820,height=780,scrollbars=yes"); } +function show_poi_google_earth() { + var the_poi = poi[aktuelles_objekt]; + document.location = "/poi-kml-look-at/" + the_poi.id; +} + var poi_menu_items; var poi_active_menu_item; @@ -952,8 +957,10 @@ if (the_poi.movies) { poi_menu_items.push([ msg('Film'), show_poi_movie ]); } - poi_menu_items.push(["more info", show_poi_microsite]); + poi_menu_items.push(["More-Info", show_poi_microsite]); + poi_menu_items.push(["Google-Earth", show_poi_google_earth]); + poi_active_menu_item = msg('Sat-Karte'); make_poi_menu(); Modified: trunk/projects/bos/web/poi-handlers.lisp =================================================================== --- trunk/projects/bos/web/poi-handlers.lisp 2008-09-09 10:05:39 UTC (rev 3861) +++ trunk/projects/bos/web/poi-handlers.lisp 2008-09-09 10:50:51 UTC (rev 3862) @@ -635,6 +635,31 @@ (with-element "href" (text (format nil "http://~a/static/Orang_weiss.png" (website-host))))))) (mapc #'(lambda (poi) (write-poi-kml poi lang)) relevant-pois)))))))) +;;; poi-kml-look-at-handler +(defclass poi-kml-look-at-handler (object-handler) + () + (:default-initargs :object-class 'poi :query-function #'find-poi)) + +(defmethod handle-object ((handler poi-kml-look-at-handler) poi) + (let ((poi-last-change (store-object-last-change poi 0))) + (hunchentoot:handle-if-modified-since poi-last-change) + (setf (hunchentoot:header-out :last-modified) + (hunchentoot:rfc-1123-date poi-last-change) + (hunchentoot:header-out :content-disposition) + (format nil "attachment; filename=look-at-~A.kml" (store-object-id poi))) + (destructuring-bind (lon lat) + (poi-center-lon-lat poi) + (with-xml-response (:content-type "application/vnd.google-earth.kml+xml; charset=utf-8") + (with-namespace (nil "http://earth.google.com/kml/2.1") + (with-element "kml" + (with-element "Document" + (with-element "LookAt" + (with-element "longitude" (text (format nil "~,20F" lon))) + (with-element "latitude" (text (format nil "~,20F" lat))) + (with-element "range" (text "253")) + (with-element "tilt" (text "0")) + (with-element "heading" (text "0")))))))))) + ;;; poi-image-handler (defclass poi-image-handler (object-handler) () Modified: trunk/projects/bos/web/webserver.lisp =================================================================== --- trunk/projects/bos/web/webserver.lisp 2008-09-09 10:05:39 UTC (rev 3861) +++ trunk/projects/bos/web/webserver.lisp 2008-09-09 10:50:51 UTC (rev 3862) @@ -177,6 +177,7 @@ ("/poi-image" poi-image-handler) ("/poi-xml" poi-xml-handler) ("/poi-kml-all" poi-kml-all-handler) + ("/poi-kml-look-at" poi-kml-look-at-handler) ("/poi-kml" poi-kml-handler) ("/map-browser" map-browser-handler) ("/poi-javascript" poi-javascript-handler)

1 0

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

09 Sep '08

Revision: 3861 Author: ksprotte URL: http://bknr.net/trac/changeset/3861 infosystem: added "more info" link to microsite U trunk/projects/bos/payment-website/infosystem/javascript.js Modified: trunk/projects/bos/payment-website/infosystem/javascript.js =================================================================== --- trunk/projects/bos/payment-website/infosystem/javascript.js 2008-09-09 09:21:48 UTC (rev 3860) +++ trunk/projects/bos/payment-website/infosystem/javascript.js 2008-09-09 10:05:39 UTC (rev 3861) @@ -908,6 +908,12 @@ document.getElementById("MovieApplet").innerHTML = ''; } +function show_poi_microsite() { + var the_poi = poi[aktuelles_objekt]; // would be nice as an arg + window.open("/poi-xml/" + the_poi.id + "?lang=" + document.language, + "microsite", "width=820,height=780,scrollbars=yes"); +} + var poi_menu_items; var poi_active_menu_item; @@ -946,6 +952,7 @@ if (the_poi.movies) { poi_menu_items.push([ msg('Film'), show_poi_movie ]); } + poi_menu_items.push(["more info", show_poi_microsite]); poi_active_menu_item = msg('Sat-Karte');

1 0