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

[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

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

09 Sep '08

Revision: 3860 Author: ksprotte URL: http://bknr.net/trac/changeset/3860 STORE-OBJECT-ID of each POI now present in its Java-script representation U trunk/projects/bos/m2/poi.lisp Modified: trunk/projects/bos/m2/poi.lisp =================================================================== --- trunk/projects/bos/m2/poi.lisp 2008-09-09 08:57:35 UTC (rev 3859) +++ trunk/projects/bos/m2/poi.lisp 2008-09-09 09:21:48 UTC (rev 3860) @@ -210,7 +210,8 @@ (store-objects-with-class 'poi)) #'(lambda (poi-1 poi-2) (string-lessp (slot-string poi-1 'title language) (slot-string poi-2 'title language))))) (format t " -var poi = { symbol: ~S, +var poi = { id: ~S, + symbol: ~S, icon: ~S, name: ~S, untertitel: ~S, @@ -220,6 +221,7 @@ thumbnail: ~D }; " + (store-object-id poi) (poi-name poi) (poi-icon poi) (slot-string poi 'title language)

1 0

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

09 Sep '08

Revision: 3859 Author: hans URL: http://bknr.net/trac/changeset/3859 Remove debugger, improve load appearance. 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-09 08:45:08 UTC (rev 3858) +++ trunk/projects/quickhoney/website/static/index.css 2008-09-09 08:57:35 UTC (rev 3859) @@ -7,6 +7,10 @@ a:active { outline: none } a:focus { -moz-outline-style: none } +#logo { + margin: 290px 0px 305px 105px; +} + .page { display: none; border: 0px; @@ -156,6 +160,7 @@ /* path / version */ #path-and-version { + visibility: hidden; position: absolute; top: 68px; left: 36px; @@ -314,7 +319,7 @@ #cue { position: absolute; - visibility: hidden; + visibility: visible; left: 0px; background-color: white; top: 8px; @@ -399,7 +404,7 @@ /* cms styles */ -p.cms { +.cms { margin-top: 10px; } Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 08:45:08 UTC (rev 3858) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 08:57:35 UTC (rev 3859) @@ -36,30 +36,6 @@ return document.getElementById(id); } -/* debugger */ - -var want_debugger = false; -var debug_string = ''; - -function debug() { - var message = ''; - for (var i = 0; i < arguments.length; i++) { - message += arguments[i]; - } - if (window.console && window.console.log) { - window.console.log(message); - } - if (want_debugger) { - debug_string += message + '<br />'; - $("debugger_text").innerHTML = debug_string; - } -} - -function clear_debug_window() { - debug_string = ''; - debug('debug window cleared'); -} - /* login status */ function login_status(json_result) { @@ -79,7 +55,7 @@ function show_cms_window(name) { - debug('show_cms_window ' + name); + log('show_cms_window ' + name); $("cms").style.top = "106px"; $("cms").style.left = "730px"; @@ -392,7 +368,7 @@ // make sure that the right elements are displayed if (document.show_picture) { - debug('directly jump to ' + document.show_picture); + log('directly jump to ' + document.show_picture); for (var i = 0; i < query_result.length; i++) { if (query_result[i].name == document.show_picture) { display_image(i); @@ -442,14 +418,14 @@ } } - debug('got ', query_result.length.toString(), ' images'); + log('got ', query_result.length.toString(), ' images'); display_query_result(); hide_cue(); } function query_imagedb(directory, subdirectory, force) { - debug('query_imagedb - keywords: ', directory, " ", subdirectory); + log('query_imagedb - keywords: ', directory, " ", subdirectory); var key = directory + ((subdirectory == "browseall") ? "" : ("/" + subdirectory)) + ((subdirectory == "smallworld") ? "?layout=smallworld" : ""); @@ -522,9 +498,10 @@ function show_page(pagename, subpath) { var page = pages[pagename]; - debug('show_page ' + pagename + ' subpath ' + subpath + ' current_directory ' + current_directory); + log('show_page ' + pagename + ' subpath ' + subpath + ' current_directory ' + current_directory); $('loading').style.display = 'none'; + $('path-and-version').style.visibility = 'visible'; /* workaround for IE, which does not display the overlapping menu items expectedly */ map(function (keyword) { @@ -598,7 +575,7 @@ function home_loaded(image) { - debug('home_loaded - image is ' + image + ' width: ' + image.width); + log('home_loaded - image is ' + image + ' width: ' + image.width); reveal_image(image); } @@ -732,7 +709,7 @@ function directory(directory_name, subpath) { - debug('directory: ', directory_name, ' subpath: ', subpath, ' current_directory: ', current_directory); + log('directory: ', directory_name, ' subpath: ', subpath, ' current_directory: ', current_directory); replaceChildNodes("thumbnails", " "); @@ -769,7 +746,7 @@ function subdirectory(subdirectory, page) { - debug('subdirectory: ', subdirectory, ' page: ', page); + log('subdirectory: ', subdirectory, ' page: ', page); $('explicit').checked = (subdirectory == 'nudes'); @@ -887,6 +864,21 @@ } } +function wait_for_images(callback) { + var complete = true; + map(function (image) { + if (!image.complete) { + complete = false; + } + }, getElementsByTagAndClassName('img', null)); + + if (complete) { + callback(); + } else { + callLater(.2, partial(wait_for_images, callback)); + } +} + function display_thumbnail_page() { var current_page_index = position_to_page_number(query_position) - 1; @@ -951,7 +943,7 @@ query_position = index; current_image = query_result[index]; - debug('display_image index ' + index); + log('display_image index ' + index); overlay_remove(); display_path(); @@ -976,7 +968,7 @@ var percent = Math.round(100 * ratio); - debug("calculated scaling: ratio " + (Math.round(ratio * 100) / 100) + " percent " + percent + " width " + display_width + " height " + display_height); + log("calculated scaling: ratio " + (Math.round(ratio * 100) / 100) + " percent " + percent + " width " + display_width + " height " + display_height); var may_enlarge = (current_directory == 'pixel' && (current_image.ratio < 1)); @@ -1095,7 +1087,7 @@ /* open the upload window */ function do_upload(target) { - debug('do_upload - target is ', target); + log('do_upload - target is ', target); var upload_window = window.open('', target, "width=500,height=300,status=no,toolbar=no,menubar=no,resizable=no,scrollbars=no"); upload_window.focus(); @@ -1106,7 +1098,7 @@ /* open the button upload window */ function do_button_upload(target) { - debug('do_button_upload - target is ', target); + log('do_button_upload - target is ', target); var upload_window = window.open('', target, "width=500,height=300,status=no,toolbar=no,menubar=no,resizable=no,scrollbars=no"); upload_window.focus(); @@ -1134,7 +1126,7 @@ function safari_compatibility_hack() { // for safari, we change the style sheet so that images are not hidden during load - debug('changing stylesheet for safari'); + log('changing stylesheet for safari'); for (var i = 0; i < document.styleSheets.length; i++) { var rules = document.styleSheets[i][document.all ? 'rules' : 'cssRules']; for (var j = 0; j < rules.length; j++) { @@ -1147,22 +1139,14 @@ } } -function enable_debuger() -{ - want_debugger = true; - - $("debugger").style.visibility = 'visible'; - $("debugger").style.left = '730px'; - $("debugger").style.width = '400px'; - $("debugger").style.heigth = '640px'; -} - -function init() { +function init_() { if (navigator.userAgent.indexOf("Safari") != -1) { safari = true; safari_compatibility_hack(); } + show_cue('initializing'); + load_button_images(); loadJSONDoc("/json-login").addCallbacks(login_status, alert); loadJSONDoc("/json-clients").addCallbacks(set_clients, alert); @@ -1175,10 +1159,14 @@ poll_path(); } +function init() { + wait_for_images(init_); +} + function jump_to(path) { document.current_path = path; - debug('jump_to - path is ', path); + log('jump_to - path is ', path); path = decodeURI(path.replace(/[&#].*/, "")); var components = path.split("/");

1 0

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

09 Sep '08

Revision: 3858 Author: hans URL: http://bknr.net/trac/changeset/3858 Fix some XHTML 1.0 validation errors. U trunk/projects/quickhoney/src/tags.lisp Modified: trunk/projects/quickhoney/src/tags.lisp =================================================================== --- trunk/projects/quickhoney/src/tags.lisp 2008-09-09 08:43:17 UTC (rev 3857) +++ trunk/projects/quickhoney/src/tags.lisp 2008-09-09 08:45:08 UTC (rev 3858) @@ -48,6 +48,7 @@ (html ((: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")

1 0

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

09 Sep '08

Revision: 3857 Author: hans URL: http://bknr.net/trac/changeset/3857 Fix some XHTML 1.0 validation errors. U trunk/projects/quickhoney/website/templates/image-browse.xml Modified: trunk/projects/quickhoney/website/templates/image-browse.xml =================================================================== --- trunk/projects/quickhoney/website/templates/image-browse.xml 2008-09-09 08:42:03 UTC (rev 3856) +++ trunk/projects/quickhoney/website/templates/image-browse.xml 2008-09-09 08:43:17 UTC (rev 3857) @@ -16,7 +16,7 @@ </head> <body id="image-browse"> <div id="logo"> - <img src="/image/quickhoney-black" id="the_logo" name="logo" border="0" /> + <img src="/image/quickhoney-black" alt="" id="the_logo" name="logo" border="0" /> </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/templates/index.xml
by BKNR Commits 09 Sep '08

09 Sep '08

Revision: 3856 Author: hans URL: http://bknr.net/trac/changeset/3856 Fix some XHTML 1.0 validation errors. 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-09 08:39:51 UTC (rev 3855) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-09 08:42:03 UTC (rev 3856) @@ -66,7 +66,7 @@ </div> <div id="loading" class="page"> - <img src="/image/startscreen" id="logo" border="0" width="438" height="67" /> + <img alt="" src="/image/startscreen" id="logo" border="0" width="438" height="67" /> </div> <div id="home" class="page"> @@ -308,25 +308,23 @@ <div class="cms_title">Create news entry</div> <form action="/upload-news" method="post" id="edit_news_form" enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);"> + <table class="cms"> + <tbody> + <tr> + <td>Image:</td> + <td><input type="file" name="image-file" /></td> + </tr> + <tr> + <td>Title:</td> + <td><input name="title" size="60"/></td> + </tr> + <tr> + <td>Text:</td> + <td><textarea class="mce_editor" name="text" cols="60" rows="10"> </textarea></td> + </tr> + </tbody> + </table> <p class="cms"> - <table> - <tbody> - <tr> - <td>Image:</td> - <td><input type="file" name="image-file" /></td> - </tr> - <tr> - <td>Title:</td> - <td><input name="title" size="60"/></td> - </tr> - <tr> - <td>Text:</td> - <td><textarea class="mce_editor" name="text" cols="60" rows="10"> </textarea></td> - </tr> - </tbody> - </table> - </p> - <p class="cms"> <input type="submit" name="action" value="upload" /> </p> </form>

1 0

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

09 Sep '08

Revision: 3855 Author: hans URL: http://bknr.net/trac/changeset/3855 Fix some XHTML 1.0 validation errors. 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-09 08:34:50 UTC (rev 3854) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-09 08:39:51 UTC (rev 3855) @@ -3,7 +3,6 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" - xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:bknr="http://bknr.net/" xmlns:quickhoney="http://quickhoney.com/" > @@ -27,37 +26,37 @@ <div id="overlay" class="page"> </div> - <a id="checkout" href="#cart" onclick="show_page('cart');"><img src="/image/checkout" width="112" height="24"/></a> + <a id="checkout" href="#cart" onclick="show_page('cart');"><img src="/image/checkout" alt="" width="112" height="24"/></a> <div id="menu"> <a onclick="shuffle_button_images('home')" href="#home" id="m_home"> - <img alt="home" class="menu" src="/image/quickhoney" /> + <img alt="" class="menu" src="/image/quickhoney" /> </a> <a onclick="shuffle_button_images('pixel')" href="#pixel" id="m_pixel"> - <img alt="pixel" class="unselected" src="/image/pixel-unselected" /> - <img alt="pixel" class="selected" src="/image/pixel-selected" /> + <img alt="" class="unselected" src="/image/pixel-unselected" /> + <img alt="" class="selected" src="/image/pixel-selected" /> </a> <a onclick="shuffle_button_images('vector')" href="#vector" id="m_vector"> - <img alt="vector" class="unselected" src="/image/vector-unselected" /> - <img alt="vector" class="selected" src="/image/vector-selected" /> + <img alt="" class="unselected" src="/image/vector-unselected" /> + <img alt="" class="selected" src="/image/vector-selected" /> </a> <a onclick="shuffle_button_images('pen')" href="#pen" id="m_pen"> - <img alt="pen" class="unselected" src="/image/pen-unselected" /> - <img alt="pen" class="selected" src="/image/pen-selected" /> + <img alt="" class="unselected" src="/image/pen-unselected" /> + <img alt="" class="selected" src="/image/pen-selected" /> </a> <a onclick="shuffle_button_images('news')" href="#news" id="m_news"> - <img alt="news" class="unselected" src="/image/news-unselected" /> - <img alt="news" class="selected" src="/image/news-selected" /> + <img alt="" class="unselected" src="/image/news-unselected" /> + <img alt="" class="selected" src="/image/news-selected" /> </a>  <a onclick="shuffle_button_images('contact')" href="#contact" id="m_contact"> - <img alt="contact" class="unselected" src="/image/contact-unselected" /> - <img alt="contact" class="selected" src="/image/contact-selected" /> + <img alt="" class="unselected" src="/image/contact-unselected" /> + <img alt="" class="selected" src="/image/contact-selected" /> </a> </div> @@ -67,27 +66,27 @@ </div> <div id="loading" class="page"> - <h1>Loading site...</h1> + <img src="/image/startscreen" id="logo" border="0" width="438" height="67" /> </div> <div id="home" class="page"> <div> <a href="#pixel" class="home_button"> - <img alt="home pixel" id="home_pixel" src="/image/trans" width="318" height="318" + <img alt="" id="home_pixel" src="/image/trans" width="318" height="318" onload="reveal_image(this);" class="button-image" /> </a> <a href="#vector" class="home_button"> - <img alt="home vector" id="home_vector" src="/image/trans" width="318" height="318" + <img alt="" id="home_vector" src="/image/trans" width="318" height="318" onload="reveal_image(this);" class="button-image" /> </a> </div> <div> <a href="#pen" class="home_button"> - <img alt="home pen" id="home_pen" src="/image/trans" width="318" height="318" + <img alt="" id="home_pen" src="/image/trans" width="318" height="318" onload="reveal_image(this);" class="button-image" /> </a> <a href="#news" class="home_button"> - <img alt="home news" id="home_news" src="/image/trans" width="318" height="318" + <img alt="" id="home_news" src="/image/trans" width="318" height="318" onload="reveal_image(this);" class="button-image" /> </a> </div> @@ -98,24 +97,24 @@ <div id="directory" class="subform"> <div> <a href="#" class="button"> - <img alt="button0" id="button0" onload="reveal_image(this);" src="/image/trans" class="button-image" /> + <img alt="" id="button0" onload="reveal_image(this);" src="/image/trans" class="button-image" /> </a> <a href="#" class="button"> - <img alt="button1" id="button1" onload="reveal_image(this);" src="/image/trans" class="button-image" /> + <img alt="" id="button1" onload="reveal_image(this);" src="/image/trans" class="button-image" /> </a> <a href="#" class="button"> - <img alt="button2" id="button2" onload="reveal_image(this);" src="/image/trans" class="button-image" /> + <img alt="" id="button2" onload="reveal_image(this);" src="/image/trans" class="button-image" /> </a> </div> <div> <a href="#" class="button"> - <img alt="button3" id="button3" onload="reveal_image(this);" src="/image/trans" class="button-image" /> + <img alt="" id="button3" onload="reveal_image(this);" src="/image/trans" class="button-image" /> </a> <a href="#" class="button"> - <img alt="button4" id="button4" onload="reveal_image(this);" src="/image/trans" class="button-image" /> + <img alt="" id="button4" onload="reveal_image(this);" src="/image/trans" class="button-image" /> </a> <a href="#" class="button"> - <img alt="button5" id="button5" onload="reveal_image(this);" src="/image/trans" class="button-image" /> + <img alt="" id="button5" onload="reveal_image(this);" src="/image/trans" class="button-image" /> </a> </div> </div> @@ -173,7 +172,7 @@ <div id="contact" class="page"> <div style="height: 300px"> - <img id="contactimage" src="/image/pixelcontact"/> + <img id="contactimage" alt="" src="/image/pixelcontact"/> <br /><br /> <h1>email</h1> <p> @@ -220,8 +219,8 @@ <p class="cms"> Client:<br /> <input type="text" id="upload_client" name="client" value="" /><br /> - <div id="upload_client_select"> - </div> + <span id="upload_client_select"> + </span> Keywords:<br /> <input type="text" id="upload_keywords" name="spider-keywords" value="" /><br /> <input type="checkbox" id="explicit" name="explicit" value="1" /> Explicit<br/> @@ -261,7 +260,7 @@ </div> <div id="upload_animation_form" class="cms_form"> - <form id="upload_form_element" action="/upload-animation" method="post" + <form id="upload_animation_form_element" action="/upload-animation" method="post" enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);"> <div class="cms_title">Upload new animatoin</div> <p class="cms"> @@ -272,9 +271,9 @@ </p> <p class="cms"> Client:<br /> - <input type="text" id="upload_client" name="client" value="" /><br /> - <div id="upload_animation_client_select"> - </div> + <input type="text" id="upload_animation_client" name="client" value="" /><br /> + <span id="upload_animation_client_select"> + </span> </p> <p class="cms"> <input type="submit" name="upload" value="upload" /> @@ -289,8 +288,8 @@ <p class="cms"> Client:<br /> <input type="text" id="edit_client" name="client" value="" /><br /> - <div id="edit_client_select"> - </div> + <span id="edit_client_select"> + </span> 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/> @@ -368,7 +367,7 @@ </p> </div> - <div id="cue"><img src="/static/spinner.gif" width="16" height="16"/></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>

1 0

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

09 Sep '08

Revision: 3854 Author: hans URL: http://bknr.net/trac/changeset/3854 fix HTML validation errors. U trunk/projects/quickhoney/website/templates/frontpage.xml Modified: trunk/projects/quickhoney/website/templates/frontpage.xml =================================================================== --- trunk/projects/quickhoney/website/templates/frontpage.xml 2008-09-09 06:20:55 UTC (rev 3853) +++ trunk/projects/quickhoney/website/templates/frontpage.xml 2008-09-09 08:34:50 UTC (rev 3854) @@ -2,7 +2,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html - xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns="http://www.w3.org/1999/xhtml" xmlns:bknr="http://bknr.net" xmlns:quickhoney="http://quickhoney.com/" @@ -17,7 +16,7 @@ <body id="frontpage"> <p> - <img src="/image/startscreen" id="logo" border="0" width="438" height="67" /> + <img src="/image/startscreen" alt="" id="logo" border="0" width="438" height="67" /> </p> <div id="static-info"> <div>

1 0

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

09 Sep '08

Revision: 3853 Author: hans URL: http://bknr.net/trac/changeset/3853 Add dummy button for home page. U trunk/projects/quickhoney/src/handlers.lisp A trunk/projects/quickhoney/upgrade-stuff/button-dummy.png U trunk/projects/quickhoney/upgrade-stuff/import.lisp U trunk/projects/quickhoney/website/static/javascript.js Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-09-09 05:58:22 UTC (rev 3852) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-09-09 06:20:55 UTC (rev 3853) @@ -258,7 +258,7 @@ (warn "No images for ~A ~A found" category subcategory)) (encode-array-element type) (dolist (image (or images - (list (store-image-with-name "trans")))) + (list (store-image-with-name "button-dummy")))) (encode-array-element (store-object-id image)) (when (zerop (decf count)) (return))))))))))))) Added: trunk/projects/quickhoney/upgrade-stuff/button-dummy.png =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/button-dummy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-09-09 05:58:22 UTC (rev 3852) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-09-09 06:20:55 UTC (rev 3853) @@ -32,7 +32,7 @@ #P"contact-selected.png" #P"contact-unselected.png" #P"quickhoney.png" #P"quickhoney-black.png" #P"pixelcontact.gif" - #P"startscreen.png")) + #P"startscreen.png" #P"button-dummy.png")) (replace-image pathname)) (replace-image #p"news-sep.gif") Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 05:58:22 UTC (rev 3852) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 06:20:55 UTC (rev 3853) @@ -524,6 +524,8 @@ debug('show_page ' + pagename + ' subpath ' + subpath + ' current_directory ' + current_directory); + $('loading').style.display = 'none'; + /* workaround for IE, which does not display the overlapping menu items expectedly */ map(function (keyword) { $('m_' + keyword).style.zIndex = (keyword == pagename) ? 101 : 100; @@ -1156,8 +1158,6 @@ } function init() { - $('loading').style.display = 'none'; - if (navigator.userAgent.indexOf("Safari") != -1) { safari = true; safari_compatibility_hack();

1 0

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

09 Sep '08

Revision: 3852 Author: hans URL: http://bknr.net/trac/changeset/3852 Replace Javascript cue by a animated GIF spinner. U trunk/projects/quickhoney/website/static/index.css U trunk/projects/quickhoney/website/static/javascript.js A trunk/projects/quickhoney/website/static/spinner.gif 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-09 04:57:43 UTC (rev 3851) +++ trunk/projects/quickhoney/website/static/index.css 2008-09-09 05:58:22 UTC (rev 3852) @@ -316,10 +316,10 @@ position: absolute; visibility: hidden; left: 0px; - top: 0px; + background-color: white; + top: 8px; text-align: left; color: white; - background-color: red; padding: 0em 0.5em 0em 0.5em; } Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 04:57:43 UTC (rev 3851) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 05:58:22 UTC (rev 3852) @@ -411,32 +411,14 @@ display_path(); } -var display_cue = false; -var wait_count = 0; - -function animate_cue() { - - if (display_cue) { - $("cue").innerHTML = display_cue + ' ' + "-\\|/".charAt(wait_count++ % 4); - setTimeout("animate_cue()", 100); - } -} - function show_cue(text) { $("cue").style.visibility = 'visible'; $('footer').style.visibility = 'hidden'; - if (display_cue) { - display_cue = text; - } else { - display_cue = text; - animate_cue(); - } } function hide_cue() { $("cue").style.visibility = 'hidden'; $('footer').style.visibility = 'inherit'; - display_cue = false; } var db_cache = {}; Added: trunk/projects/quickhoney/website/static/spinner.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/website/static/spinner.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-09-09 04:57:43 UTC (rev 3851) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-09 05:58:22 UTC (rev 3852) @@ -368,9 +368,7 @@ </p> </div> - <div id="cue"> - query database - </div> + <div id="cue"><img 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>

1 0

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

09 Sep '08

Revision: 3851 Author: hans URL: http://bknr.net/trac/changeset/3851 make front page look nicer. U trunk/projects/quickhoney/upgrade-stuff/import.lisp A trunk/projects/quickhoney/upgrade-stuff/startscreen.png U trunk/projects/quickhoney/website/static/frontpage.css U trunk/projects/quickhoney/website/templates/frontpage.xml Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-09-09 04:21:45 UTC (rev 3850) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-09-09 04:57:43 UTC (rev 3851) @@ -11,7 +11,7 @@ (format t "~&; error importing ~S: ~A~%" pathname e)))) (dolist (name '(#p"type-news.png" #p"type-pixel.png" #p"type-shop.png" - #p"type-vector.png" #p"type-stuff.png" #p"type-pen.png" )) + #p"type-vector.png" #p"type-stuff.png" #p"type-pen.png")) (replace-image name :keywords '(:type))) (dolist (pathname '(#P"overlay-close.gif" @@ -31,7 +31,8 @@ #P"shop-selected.png" #P"shop-unselected.png" #P"contact-selected.png" #P"contact-unselected.png" #P"quickhoney.png" #P"quickhoney-black.png" - #P"pixelcontact.gif")) + #P"pixelcontact.gif" + #P"startscreen.png")) (replace-image pathname)) (replace-image #p"news-sep.gif") Added: trunk/projects/quickhoney/upgrade-stuff/startscreen.png =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/startscreen.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/projects/quickhoney/website/static/frontpage.css =================================================================== --- trunk/projects/quickhoney/website/static/frontpage.css 2008-09-09 04:21:45 UTC (rev 3850) +++ trunk/projects/quickhoney/website/static/frontpage.css 2008-09-09 04:57:43 UTC (rev 3851) @@ -1,8 +1,5 @@ #logo { - position: absolute; - right: 10px; - top: 10px; - z-index: 2; + margin: 5em 0em 5em 10em; } #frontpage p { Modified: trunk/projects/quickhoney/website/templates/frontpage.xml =================================================================== --- trunk/projects/quickhoney/website/templates/frontpage.xml 2008-09-09 04:21:45 UTC (rev 3850) +++ trunk/projects/quickhoney/website/templates/frontpage.xml 2008-09-09 04:57:43 UTC (rev 3851) @@ -12,27 +12,30 @@ <link rel="stylesheet" href="/static/quickhoney.css" /> <link rel="stylesheet" href="/static/frontpage.css" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="/rss/quickhoney" /> - <script src="/static/javascript.js" type="text/javascript"> - </script> <title>QuickHoney - Nana Rausch + Peter Stemmler</title> </head> <body id="frontpage"> <p> - <img src="/image/quickhoney-black" id="logo" border="0" width="442" height="70" /> + <img src="/image/startscreen" id="logo" border="0" width="438" height="67" /> </p> - <div> - <h1>QuickHoney Illustrations</h1> - <p>Studio for Illustration, New York</p> - <h1>Peter Stemmler</h1> - <p>Phone: 646.270.5562<br/>Email: p(a)quickhoney.com</p> - <h1>Nana Rausch</h1> - <p>Phone 646.270.5592<br/>Email: n(a)quickhoney.com</p> + <div id="static-info"> + <div> + <h1>QuickHoney Illustrations</h1> + <p>Studio for Illustration, New York</p> + <h1>Peter Stemmler</h1> + <p>Phone: 646.270.5562<br/>Email: p(a)quickhoney.com</p> + <h1>Nana Rausch</h1> + <p>Phone 646.270.5592<br/>Email: n(a)quickhoney.com</p> + </div> + <p> + This site requires Firefox, Safari or Internet Explorer and Javascript for full viewing pleasure. + </p> + <p>Enter our <a href="/image-browse">Image gallery</a> for basic view.</p> </div> - <p> - This site requires Firefox, Safari or Internet Explorer and Javascript for full viewing pleasure. - </p> - <p>Enter our <a href="/image-browse">Image gallery</a> for basic view.</p> + <div id="loading" style="display: none"> + Loading, please hold on... + </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")); @@ -42,6 +45,8 @@ pageTracker._trackPageview(); </script> <script type="text/javascript"> + document.getElementById('static-info').style.display = 'none'; + document.getElementById('loading').style.display = 'block'; document.location.href = '/index'; </script> </body>

1 0

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

09 Sep '08

Revision: 3850 Author: hans URL: http://bknr.net/trac/changeset/3850 Fix margin and font size of overlay title. U trunk/projects/quickhoney/website/static/index.css Modified: trunk/projects/quickhoney/website/static/index.css =================================================================== --- trunk/projects/quickhoney/website/static/index.css 2008-09-08 19:09:06 UTC (rev 3849) +++ trunk/projects/quickhoney/website/static/index.css 2008-09-09 04:21:45 UTC (rev 3850) @@ -477,6 +477,8 @@ } #overlay h1 { + font-size: 120%; + margin-top: 12px; padding-left: 10px; }

1 0

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

08 Sep '08

Revision: 3849 Author: hans URL: http://bknr.net/trac/changeset/3849 Change menu item positions so that no empty space is left for shop U trunk/projects/quickhoney/website/static/index.css Modified: trunk/projects/quickhoney/website/static/index.css =================================================================== --- trunk/projects/quickhoney/website/static/index.css 2008-09-08 16:43:45 UTC (rev 3848) +++ trunk/projects/quickhoney/website/static/index.css 2008-09-08 19:09:06 UTC (rev 3849) @@ -120,13 +120,21 @@ #menu.contact a#m_contact img.unselected { visibility: hidden } #m_home { top: 30px; left: 36px; } +/* #m_pixel { top: 36px; left: 247px; } #m_vector { top: 36px; left: 317px; } #m_pen { top: 36px; left: 398px; } #m_news { top: 36px; left: 450px; } #m_shop { top: 36px; left: 523px; } #m_contact { top: 36px; left: 586px; } +*/ +#m_pixel { top: 36px; left: 259px; } +#m_vector { top: 36px; left: 340px; } +#m_pen { top: 36px; left: 435px; } +#m_news { top: 36px; left: 500px; } +#m_contact { top: 36px; left: 586px; } + #menu img.selected { visibility: hidden; z-index: 110;

1 0

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

08 Sep '08

Revision: 3848 Author: hans URL: http://bknr.net/trac/changeset/3848 Change cutout button area for non-pixel pictures. U trunk/projects/quickhoney/src/imageproc.lisp Modified: trunk/projects/quickhoney/src/imageproc.lisp =================================================================== --- trunk/projects/quickhoney/src/imageproc.lisp 2008-09-08 16:30:08 UTC (rev 3847) +++ trunk/projects/quickhoney/src/imageproc.lisp 2008-09-08 16:43:45 UTC (rev 3848) @@ -74,9 +74,9 @@ (radius (parse-integer radius))) (copy-image input-image button-image (floor (- (image-width input-image) cutout-width) 2) - (if (eq :vector category) - 0 - (floor (- (image-height input-image) cutout-height) 2)) + (if (eq :pixel category) + (floor (- (image-height input-image) cutout-height) 2) + 0) 0 0 cutout-width cutout-height :resize t :resample t

1 0

[bknr-cvs] hans changed trunk/bknr/web/src/images/im
by BKNR Commits 08 Sep '08

08 Sep '08

Revision: 3847 Author: hans URL: http://bknr.net/trac/changeset/3847 Minor tweaks to image import handler. U trunk/bknr/web/src/images/image-handlers.lisp U trunk/bknr/web/src/images/image.lisp U trunk/bknr/web/src/images/import-images-handler.lisp Modified: trunk/bknr/web/src/images/image-handlers.lisp =================================================================== --- trunk/bknr/web/src/images/image-handlers.lisp 2008-09-08 16:29:10 UTC (rev 3846) +++ trunk/bknr/web/src/images/image-handlers.lisp 2008-09-08 16:30:08 UTC (rev 3847) @@ -156,7 +156,7 @@ ("/image-union" image-union-handler) ("/image-intersection" image-intersection-handler) ("/image" imageproc-handler) - ("/image-import" image-import-handler) + ("/import-images" import-images-handler) ("/session-image" session-image-handler) ("/xml-image-query" xml-image-query-handler) ("/xml-image-browser" xml-image-browser-handler)) Modified: trunk/bknr/web/src/images/image.lisp =================================================================== --- trunk/bknr/web/src/images/image.lisp 2008-09-08 16:29:10 UTC (rev 3846) +++ trunk/bknr/web/src/images/image.lisp 2008-09-08 16:30:08 UTC (rev 3847) @@ -153,7 +153,7 @@ args))))) (defun directory-recursive (pathname &key list-directories) - (loop for file in (directory pathname) + (loop for file in (directory (merge-pathnames #P"**/*.*" pathname)) when (pathname-name file) collect file unless (pathname-name file) Modified: trunk/bknr/web/src/images/import-images-handler.lisp =================================================================== --- trunk/bknr/web/src/images/import-images-handler.lisp 2008-09-08 16:29:10 UTC (rev 3846) +++ trunk/bknr/web/src/images/import-images-handler.lisp 2008-09-08 16:30:08 UTC (rev 3847) @@ -2,13 +2,13 @@ (enable-interpol-syntax) -(defclass image-import-handler (import-handler) +(defclass import-images-handler (import-handler) ()) -(defmethod import-handler-spool-files ((handler image-import-handler)) +(defmethod import-handler-spool-files ((handler import-images-handler)) (image-directory-recursive (import-handler-import-pathname handler))) -(defmethod handle-form ((handler image-import-handler) action) +(defmethod handle-form ((handler import-images-handler) action) (with-bknr-page (:title #?"image import directory") ((:form :method "post") ((:div :class "keyword-choose") @@ -25,11 +25,11 @@ "Set keywords from directory")) (:div (submit-button "import" "Import")))) ((:div :class "import-list") - (:h2 "Images present in import spool:") + (:h2 "Images present in import spool directory " (:b (:princ (import-handler-import-pathname handler)))) (loop for file in (import-handler-spool-files handler) do (html (:princ-safe (namestring file)) (:br)))))) -(defmethod import-handler-import-files ((handler image-import-handler)) +(defmethod import-handler-import-files ((handler import-images-handler)) (let* ((keywords (keywords-from-query-param-list (query-param-list "keyword"))) (spool-dir (import-handler-import-pathname handler)) (class-name (apply #'find-symbol (reverse (split "::?" (query-param "class-name")))))) @@ -40,7 +40,7 @@ :spool (import-handler-spool-dir handler) :keywords-from-dir (query-param "keyfromdir")))) -(defmethod handle-form ((handler image-import-handler) (action (eql :import))) +(defmethod handle-form ((handler import-images-handler) (action (eql :import))) (let* ((import-log (import-handler-import-files handler)) (successful-images (remove-if-not #'(lambda (element) (typep element 'store-image)) import-log

1 0

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

08 Sep '08

Revision: 3846 Author: hans URL: http://bknr.net/trac/changeset/3846 Add new "pen" category U trunk/projects/quickhoney/src/handlers.lisp U trunk/projects/quickhoney/src/tags.lisp U trunk/projects/quickhoney/src/webserver.lisp D trunk/projects/quickhoney/upgrade-stuff/contact-hover.png U trunk/projects/quickhoney/upgrade-stuff/contact-selected.png U trunk/projects/quickhoney/upgrade-stuff/contact-unselected.png U trunk/projects/quickhoney/upgrade-stuff/import.lisp D trunk/projects/quickhoney/upgrade-stuff/news-hover.png U trunk/projects/quickhoney/upgrade-stuff/news-selected.png U trunk/projects/quickhoney/upgrade-stuff/news-unselected.png A trunk/projects/quickhoney/upgrade-stuff/pen-selected.png A trunk/projects/quickhoney/upgrade-stuff/pen-unselected.png D trunk/projects/quickhoney/upgrade-stuff/pixel-hover.png U trunk/projects/quickhoney/upgrade-stuff/pixel-selected.png U trunk/projects/quickhoney/upgrade-stuff/pixel-unselected.png D trunk/projects/quickhoney/upgrade-stuff/shop-hover.png U trunk/projects/quickhoney/upgrade-stuff/shop-selected.png U trunk/projects/quickhoney/upgrade-stuff/shop-unselected.png A trunk/projects/quickhoney/upgrade-stuff/type-pen.png A trunk/projects/quickhoney/upgrade-stuff/type-stuff.png D trunk/projects/quickhoney/upgrade-stuff/vector-hover.png U trunk/projects/quickhoney/upgrade-stuff/vector-selected.png U trunk/projects/quickhoney/upgrade-stuff/vector-unselected.png A trunk/projects/quickhoney/website/static/cms.css 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/
by BKNR Commits 08 Sep '08

08 Sep '08

Revision: 3845 Author: ksprotte URL: http://bknr.net/trac/changeset/3845 exchanged bos headers we are now using: bilder/infosystem_header-{de,en}.gif images/site_header-{de,en}.gif A trunk/projects/bos/payment-website/infosystem/bilder/infosystem_header-de.gif A trunk/projects/bos/payment-website/infosystem/bilder/infosystem_header-en.gif U trunk/projects/bos/payment-website/infosystem/da/satellitenkarte.htm U trunk/projects/bos/payment-website/infosystem/de/satellitenkarte.htm U trunk/projects/bos/payment-website/infosystem/en/satellitenkarte.htm U trunk/projects/bos/payment-website/templates/da/quittung.xml U trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml U trunk/projects/bos/payment-website/templates/da/toplevel.xml U trunk/projects/bos/payment-website/templates/da/toplevel_main.xml U trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml U trunk/projects/bos/payment-website/templates/da/versand_info.xml U trunk/projects/bos/payment-website/templates/de/quittung.xml U trunk/projects/bos/payment-website/templates/de/sponsor_canceled.xml U trunk/projects/bos/payment-website/templates/de/toplevel.xml U trunk/projects/bos/payment-website/templates/de/toplevel_main.xml U trunk/projects/bos/payment-website/templates/de/toplevel_news.xml U trunk/projects/bos/payment-website/templates/de/versand_geschenk.xml U trunk/projects/bos/payment-website/templates/de/versand_info.xml U trunk/projects/bos/payment-website/templates/en/quittung.xml U trunk/projects/bos/payment-website/templates/en/sponsor_canceled.xml U trunk/projects/bos/payment-website/templates/en/toplevel.xml U trunk/projects/bos/payment-website/templates/en/toplevel_main.xml U trunk/projects/bos/payment-website/templates/en/versand_geschenk.xml U trunk/projects/bos/payment-website/templates/en/versand_info.xml Added: trunk/projects/bos/payment-website/infosystem/bilder/infosystem_header-de.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/bos/payment-website/infosystem/bilder/infosystem_header-de.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/projects/bos/payment-website/infosystem/bilder/infosystem_header-en.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/bos/payment-website/infosystem/bilder/infosystem_header-en.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/projects/bos/payment-website/infosystem/da/satellitenkarte.htm =================================================================== --- trunk/projects/bos/payment-website/infosystem/da/satellitenkarte.htm 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/infosystem/da/satellitenkarte.htm 2008-09-08 15:58:39 UTC (rev 3845) @@ -36,7 +36,7 @@ <body> <table width="740" height="500" border="0" cellpadding="0" cellspacing="0"> <tr> - <td height="50" colspan="3"><img src="../bilder/head.gif" width="740" height="50"/></td> + <td height="50" colspan="3"><img src="../bilder/infosystem_header-en.gif" width="740" height="76"/></td> </tr> <tr> <td height="20" class="BreadCrumbs"><img src="../bilder/spacer.gif" width="1" height="1"/></td> Modified: trunk/projects/bos/payment-website/infosystem/de/satellitenkarte.htm =================================================================== --- trunk/projects/bos/payment-website/infosystem/de/satellitenkarte.htm 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/infosystem/de/satellitenkarte.htm 2008-09-08 15:58:39 UTC (rev 3845) @@ -36,7 +36,7 @@ <body> <table width="740" height="500" border="0" cellpadding="0" cellspacing="0"> <tr> - <td height="50" colspan="3"><img src="../bilder/head.gif" width="740" height="50"/></td> + <td height="50" colspan="3"><img src="../bilder/infosystem_header-de.gif" width="740" height="76"/></td> </tr> <tr> <td height="20" class="BreadCrumbs"><img src="../bilder/spacer.gif" width="1" height="1"/></td> Modified: trunk/projects/bos/payment-website/infosystem/en/satellitenkarte.htm =================================================================== --- trunk/projects/bos/payment-website/infosystem/en/satellitenkarte.htm 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/infosystem/en/satellitenkarte.htm 2008-09-08 15:58:39 UTC (rev 3845) @@ -36,7 +36,7 @@ <body> <table width="740" height="500" border="0" cellpadding="0" cellspacing="0"> <tr> - <td height="50" colspan="3"><img src="../bilder/head.gif" width="740" height="50"/></td> + <td height="50" colspan="3"><img src="../bilder/infosystem_header-en.gif" width="740" height="76"/></td> </tr> <tr> <td height="20" class="BreadCrumbs"><img src="../bilder/spacer.gif" width="1" height="1"/></td> Modified: trunk/projects/bos/payment-website/templates/da/quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/quittung.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/da/quittung.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -17,7 +17,7 @@ <div id="menue_banner"> <a href="index"> - <img src="../images/header_ganzneu.gif" border="0"></img> + <img src="../images/site_header-en.gif" border="0" width="780" height="92"/> </a> </div> Modified: trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -17,7 +17,7 @@ <div id="menue_banner"> <a href="index"> - <img src="../images/header_ganzneu.gif" border="0"></img> + <img src="../images/site_header-en.gif" border="0" width="780" height="92"/> </a> </div> Modified: trunk/projects/bos/payment-website/templates/da/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/da/toplevel.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -19,7 +19,7 @@ <div id="menue_banner"> <a href="index"> - <img src="../images/header_ganzneu.gif" border="0"></img> + <img src="../images/site_header-en.gif" border="0" width="780" height="92"/> </a> </div> Modified: trunk/projects/bos/payment-website/templates/da/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel_main.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/da/toplevel_main.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -16,7 +16,7 @@ <div id="menue_banner"> <a href="index"> - <img src="../images/header_ganzneu.gif" border="0"></img> + <img src="../images/site_header-en.gif" border="0" width="780" height="92"/> </a> </div> Modified: trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -21,7 +21,7 @@  <div id="header"> <div id="menue_banner"> - <img src="../images/header_ganzneu.gif" border="0" /> + <img src="../images/site_header-en.gif" border="0" width="780" height="92"/> </div> <div id="menue_header_left"> Modified: trunk/projects/bos/payment-website/templates/da/versand_info.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/versand_info.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/da/versand_info.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -16,7 +16,7 @@ <div id="header"> <div id="menue_banner"> - <img src="../images/header_ganzneu.gif" border="0"></img> + <img src="../images/site_header-en.gif" border="0" width="780" height="92"/> </div> <div id="menue_header_left"> Modified: trunk/projects/bos/payment-website/templates/de/quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/quittung.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/de/quittung.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -23,7 +23,7 @@ <div id="menue_banner"> <a href="index"> - <img src="/images/header_ganzneu.gif" border="0" /> + <img src="../images/site_header-de.gif" border="0" width="780" height="92"/> </a> </div> Modified: trunk/projects/bos/payment-website/templates/de/sponsor_canceled.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/sponsor_canceled.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/de/sponsor_canceled.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -23,7 +23,7 @@ <div id="menue_banner"> <a href="index"> - <img src="/images/header_ganzneu.gif" border="0" /> + <img src="../images/site_header-de.gif" border="0" width="780" height="92"/> </a> </div> Modified: trunk/projects/bos/payment-website/templates/de/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/de/toplevel.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -22,7 +22,7 @@ <div id="menue_banner"> <a href="index"> - <img src="/images/header_ganzneu.gif" border="0" /> + <img src="../images/site_header-de.gif" border="0" width="780" height="92"/> </a> </div> Modified: trunk/projects/bos/payment-website/templates/de/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel_main.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/de/toplevel_main.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -22,7 +22,7 @@ <div id="menue_banner"> <a href="/de/index"> - <img src="/images/header_ganzneu.gif" border="0" /> + <img src="../images/site_header-de.gif" border="0" width="780" height="92"/> </a> </div> Modified: trunk/projects/bos/payment-website/templates/de/toplevel_news.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel_news.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/de/toplevel_news.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -20,7 +20,7 @@ <div id="menue_banner"> <a href="../index"> - <img src="/images/header_ganzneu.gif" border="0" /> + <img src="../images/site_header-de.gif" border="0" width="780" height="92"/> </a> </div> Modified: trunk/projects/bos/payment-website/templates/de/versand_geschenk.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/versand_geschenk.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/de/versand_geschenk.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -21,7 +21,7 @@  <div id="header"> <div id="menue_banner"> - <img src="/images/header_ganzneu.gif" border="0" /> + <img src="../images/site_header-de.gif" border="0" width="780" height="92"/> </div> <div id="menue_header_left"> Modified: trunk/projects/bos/payment-website/templates/de/versand_info.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/versand_info.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/de/versand_info.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -22,7 +22,7 @@ <div id="header"> <div id="menue_banner"> - <img src="/images/header_ganzneu.gif" border="0" /> + <img src="../images/site_header-de.gif" border="0" width="780" height="92"/> </div> <div id="menue_header_left"> Modified: trunk/projects/bos/payment-website/templates/en/quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/quittung.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/en/quittung.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -23,7 +23,7 @@ <div id="menue_banner"> <a href="index"> - <img src="../images/header_ganzneu.gif" border="0" /> + <img src="../images/site_header-en.gif" border="0" width="780" height="92"/> </a> </div> Modified: trunk/projects/bos/payment-website/templates/en/sponsor_canceled.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/sponsor_canceled.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/en/sponsor_canceled.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -23,7 +23,7 @@ <div id="menue_banner"> <a href="index"> - <img src="../images/header_ganzneu.gif" border="0" /> + <img src="../images/site_header-en.gif" border="0" width="780" height="92"/> </a> </div> Modified: trunk/projects/bos/payment-website/templates/en/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/toplevel.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/en/toplevel.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -24,7 +24,7 @@ <div id="menue_banner"> <a href="index"> - <img src="../images/header_ganzneu.gif" border="0" /> + <img src="../images/site_header-en.gif" border="0" width="780" height="92"/> </a> </div> Modified: trunk/projects/bos/payment-website/templates/en/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/toplevel_main.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/en/toplevel_main.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -21,7 +21,7 @@ <div id="menue_banner"> <a href="index"> - <img src="../images/header_ganzneu.gif" border="0" /> + <img src="../images/site_header-en.gif" border="0" width="780" height="92"/> </a> </div> Modified: trunk/projects/bos/payment-website/templates/en/versand_geschenk.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/versand_geschenk.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/en/versand_geschenk.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -21,7 +21,7 @@  <div id="header"> <div id="menue_banner"> - <img src="../images/header_ganzneu.gif" border="0" /> + <img src="../images/site_header-en.gif" border="0" width="780" height="92"/> </div> <div id="menue_header_left"> Modified: trunk/projects/bos/payment-website/templates/en/versand_info.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/versand_info.xml 2008-09-08 13:45:11 UTC (rev 3844) +++ trunk/projects/bos/payment-website/templates/en/versand_info.xml 2008-09-08 15:58:39 UTC (rev 3845) @@ -22,7 +22,7 @@ <div id="header"> <div id="menue_banner"> - <img src="../images/header_ganzneu.gif" border="0" /> + <img src="../images/site_header-en.gif" border="0" width="780" height="92"/> </div> <div id="menue_header_left">

1 0

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

08 Sep '08

Revision: 3844 Author: ksprotte URL: http://bknr.net/trac/changeset/3844 fixed: Infosystem: POI Picture Gallery is broken poi-image-handler should not have been removed in #3760 U trunk/projects/bos/web/poi-handlers.lisp U trunk/projects/bos/web/webserver.lisp Modified: trunk/projects/bos/web/poi-handlers.lisp =================================================================== --- trunk/projects/bos/web/poi-handlers.lisp 2008-09-08 13:12:50 UTC (rev 3843) +++ trunk/projects/bos/web/poi-handlers.lisp 2008-09-08 13:45:11 UTC (rev 3844) @@ -634,3 +634,23 @@ (with-element "Icon" (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-image-handler +(defclass poi-image-handler (object-handler) + () + (:default-initargs :object-class 'poi :query-function #'find-poi)) + +(defmethod handle-object ((handler poi-image-handler) (poi (eql nil))) + (error "poi not found")) + +(defmethod handle-object ((handler poi-image-handler) poi) + (destructuring-bind (poi-name image-index-string &rest imageproc-arguments) + (multiple-value-list (parse-handler-url handler)) + (declare (ignore poi-name)) + (let ((image-index (1- (parse-integer image-index-string)))) + (if (and (not (minusp image-index)) + (< image-index (length (poi-sat-images poi)))) + (redirect (format nil "/image/~D~@[~{/~a~}~]" + (store-object-id (nth image-index (poi-sat-images poi))) + imageproc-arguments)) + (error "image index ~a out of bounds for poi ~a" image-index poi))))) Modified: trunk/projects/bos/web/webserver.lisp =================================================================== --- trunk/projects/bos/web/webserver.lisp 2008-09-08 13:12:50 UTC (rev 3843) +++ trunk/projects/bos/web/webserver.lisp 2008-09-08 13:45:11 UTC (rev 3844) @@ -174,6 +174,7 @@ ("/complete-transfer" complete-transfer-handler) ("/edit-news" edit-news-handler) ("/make-poi" make-poi-handler) + ("/poi-image" poi-image-handler) ("/poi-xml" poi-xml-handler) ("/poi-kml-all" poi-kml-all-handler) ("/poi-kml" poi-kml-handler)

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/web/poi-handlers.lisp
by BKNR Commits 08 Sep '08

08 Sep '08

Revision: 3843 Author: ksprotte URL: http://bknr.net/trac/changeset/3843 fixed: bei den POIs gibt es eine komische graue fl?\195?\164che im menu U trunk/projects/bos/web/poi-handlers.lisp Modified: trunk/projects/bos/web/poi-handlers.lisp =================================================================== --- trunk/projects/bos/web/poi-handlers.lisp 2008-09-08 13:00:07 UTC (rev 3842) +++ trunk/projects/bos/web/poi-handlers.lisp 2008-09-08 13:12:50 UTC (rev 3843) @@ -591,6 +591,8 @@ (with-element "styleUrl" (text "#poiPlacemarkIcon")) (with-element "description" (cdata (poi-description-google-earth poi language))) + (with-element "Snippet" + (text (slot-string poi 'subtitle language))) (with-element "Point" (with-element "coordinates" (text (format nil "~{~,20F,~}0" (poi-center-lon-lat poi)))))))

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/web/kml-handlers.lisp
by BKNR Commits 08 Sep '08

08 Sep '08

Revision: 3842 Author: ksprotte URL: http://bknr.net/trac/changeset/3842 done: ge country-stats bei doppelclick abstand behalten damit man das ganze land sehen kann U trunk/projects/bos/web/kml-handlers.lisp Modified: trunk/projects/bos/web/kml-handlers.lisp =================================================================== --- trunk/projects/bos/web/kml-handlers.lisp 2008-09-08 12:51:00 UTC (rev 3841) +++ trunk/projects/bos/web/kml-handlers.lisp 2008-09-08 13:00:07 UTC (rev 3842) @@ -299,6 +299,10 @@ (with-element "name" (text (format nil "~A" (dictionary-entry (second (assoc country *country-english-names*)) lang)))) (with-element "styleUrl" (text "#countryStatsStyle")) + (with-element "LookAt" + (with-element "longitude" (text (format nil "~,20F" lat))) + (with-element "latitude" (text (format nil "~,20F" lon))) + (with-element "range" (text "1000000"))) (with-element "description" (text (format nil "<p>~A</p><table><tbody><tr><td>~A:</td><td>~D ~A</td></tr> <tr><td>~A:</td><td>~D m²</td></tr></tbody></table>"

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/web/kml-handlers.lisp
by BKNR Commits 08 Sep '08

08 Sep '08

Revision: 3841 Author: ksprotte URL: http://bknr.net/trac/changeset/3841 ge country-stats use shorter description in left panel by adding a kml "Snippet" U trunk/projects/bos/web/kml-handlers.lisp Modified: trunk/projects/bos/web/kml-handlers.lisp =================================================================== --- trunk/projects/bos/web/kml-handlers.lisp 2008-09-08 12:46:34 UTC (rev 3840) +++ trunk/projects/bos/web/kml-handlers.lisp 2008-09-08 12:51:00 UTC (rev 3841) @@ -311,6 +311,12 @@ (dictionary-entry "sponsors" lang)) (dictionary-entry "total contribution" lang) number-of-sold-m2s))) + (with-element "Snippet" + (text (format nil "~A ~A" + number-of-paying-sponsors + (if (= 1 number-of-paying-sponsors) + (dictionary-entry "sponsor" lang) + (dictionary-entry "sponsors" lang))))) (with-element "Point" (with-element "coordinates" (text (format nil "~,20F,~,20F,0" lat lon)))))))))))))))

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/web/kml-handlers.lisp
by BKNR Commits 08 Sep '08

08 Sep '08

Revision: 3840 Author: ksprotte URL: http://bknr.net/trac/changeset/3840 fixed: ge country-stats darf nicht [keine name] anzeigen. da soll der ganze l?\195?\164ndername stehen U trunk/projects/bos/web/kml-handlers.lisp Modified: trunk/projects/bos/web/kml-handlers.lisp =================================================================== --- trunk/projects/bos/web/kml-handlers.lisp 2008-09-08 12:23:52 UTC (rev 3839) +++ trunk/projects/bos/web/kml-handlers.lisp 2008-09-08 12:46:34 UTC (rev 3840) @@ -296,6 +296,8 @@ (multiple-value-bind (number-of-paying-sponsors number-of-sold-m2s) (contract-stats-for-country country) (with-element "Placemark" + (with-element "name" (text (format nil "~A" (dictionary-entry + (second (assoc country *country-english-names*)) lang)))) (with-element "styleUrl" (text "#countryStatsStyle")) (with-element "description" (text (format nil "<p>~A</p><table><tbody><tr><td>~A:</td><td>~D ~A</td></tr>

1 0