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

[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

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

08 Sep '08

Revision: 3839 Author: ksprotte URL: http://bknr.net/trac/changeset/3839 fixed: Infosystem: "Logout"-Link auf der Startseite ist defekt 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 Modified: trunk/projects/bos/payment-website/infosystem/da/satellitenkarte.htm =================================================================== --- trunk/projects/bos/payment-website/infosystem/da/satellitenkarte.htm 2008-09-08 09:37:34 UTC (rev 3838) +++ trunk/projects/bos/payment-website/infosystem/da/satellitenkarte.htm 2008-09-08 12:23:52 UTC (rev 3839) @@ -122,7 +122,7 @@ </tr> </table> <div id="SponsorInfoInhalt" style="position:absolute; width:138px; z-index:20; left: 0px; top: 50px; visibility: inherit;"> - <form id="form1" name="form1" action="/infosystem" method="post"> + <form id="form1" name="form1" action="/logout?url=/infosystem/da/satellitenkarte.htm" method="post"> <input name="logout" type="hidden" value="1"/> <table width="138" border="0" cellspacing="0" cellpadding="0"> <tr> @@ -464,4 +464,4 @@ </div> <script language="JavaScript">init();</script> </body> -</html> \ No newline at end of file +</html> Modified: trunk/projects/bos/payment-website/infosystem/de/satellitenkarte.htm =================================================================== --- trunk/projects/bos/payment-website/infosystem/de/satellitenkarte.htm 2008-09-08 09:37:34 UTC (rev 3838) +++ trunk/projects/bos/payment-website/infosystem/de/satellitenkarte.htm 2008-09-08 12:23:52 UTC (rev 3839) @@ -122,7 +122,7 @@ </tr> </table> <div id="SponsorInfoInhalt" style="position:absolute; width:138px; z-index:20; left: 0px; top: 50px; visibility: inherit;"> - <form id="form1" name="form1" action="/infosystem" method="post"> + <form id="form1" name="form1" action="/logout?url=/infosystem/de/satellitenkarte.htm" method="post"> <input name="logout" type="hidden" value="1"/> <table width="138" border="0" cellspacing="0" cellpadding="0"> <tr> @@ -464,4 +464,4 @@ </div> <script language="JavaScript">init();</script> </body> -</html> \ No newline at end of file +</html> Modified: trunk/projects/bos/payment-website/infosystem/en/satellitenkarte.htm =================================================================== --- trunk/projects/bos/payment-website/infosystem/en/satellitenkarte.htm 2008-09-08 09:37:34 UTC (rev 3838) +++ trunk/projects/bos/payment-website/infosystem/en/satellitenkarte.htm 2008-09-08 12:23:52 UTC (rev 3839) @@ -122,7 +122,7 @@ </tr> </table> <div id="SponsorInfoInhalt" style="position:absolute; width:138px; z-index:20; left: 0px; top: 50px; visibility: inherit;"> - <form id="form1" name="form1" action="/infosystem" method="post"> + <form id="form1" name="form1" action="/logout?url=/infosystem/en/satellitenkarte.htm" method="post"> <input name="logout" type="hidden" value="1"/> <table width="138" border="0" cellspacing="0" cellpadding="0"> <tr> @@ -464,4 +464,4 @@ </div> <script language="JavaScript">init();</script> </body> -</html> \ No newline at end of file +</html>

1 0

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

08 Sep '08

Revision: 3838 Author: ksprotte URL: http://bknr.net/trac/changeset/3838 more work on satmap text en/de U trunk/projects/bos/payment-website/templates/da/satmap.xml U trunk/projects/bos/payment-website/templates/en/satmap.xml Modified: trunk/projects/bos/payment-website/templates/da/satmap.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/satmap.xml 2008-09-08 09:24:45 UTC (rev 3837) +++ trunk/projects/bos/payment-website/templates/da/satmap.xml 2008-09-08 09:37:34 UTC (rev 3838) @@ -16,13 +16,13 @@ <tr> <td colspan="2"> <span class="headline"> - Satellitenkarte + Satellite Map </span> </td> <td align="center" valign="top"> <img src="../images/pfeil_back.gif" width="10" height="9" alt="" /> <a href="javascript:history.back()" class="titlegray"> - zurück + back </a> </td> </tr> @@ -32,9 +32,9 @@ </tr> <tr> <td colspan="3"> - Verschaffen Sie sich einen Überblick auf unserer + Take a look at our <a shape="rect" title="Satellitenkarte" class="titlegreen" href="javascript:window_infosys()"> - Satellitenkarte</a>. + Satellite Map</a>. </td> </tr>  @@ -46,7 +46,7 @@ <tr> <td colspan="3"> <span class="headline"> - Besuchen Sie Samboja Lestari in Google Earth + Visit Samboja Lestari in Google Earth </span> </td> </tr> @@ -70,7 +70,7 @@ </tr> <tr> <td colspan="3"> - Über diesen Link wird sich direkt Ihre Google Earth Applikation öffnen: + Your Google Earth application will be started via the following link: </td> </tr> <tr> @@ -81,7 +81,7 @@ <td colspan="3"> <img alt="" height="9" width="10" src="/images/pfeil_link_on.gif"/> <a shape="rect" class="more" href="/kml-root?lang=da"> - zu Google Earth + to Google Earth </a> </td> </tr> Modified: trunk/projects/bos/payment-website/templates/en/satmap.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/satmap.xml 2008-09-08 09:24:45 UTC (rev 3837) +++ trunk/projects/bos/payment-website/templates/en/satmap.xml 2008-09-08 09:37:34 UTC (rev 3838) @@ -16,13 +16,13 @@ <tr> <td colspan="2"> <span class="headline"> - Satellitenkarte + Satellite Map </span> </td> <td align="center" valign="top"> <img src="../images/pfeil_back.gif" width="10" height="9" alt="" /> <a href="javascript:history.back()" class="titlegray"> - zurück + back </a> </td> </tr> @@ -32,9 +32,9 @@ </tr> <tr> <td colspan="3"> - Verschaffen Sie sich einen Überblick auf unserer + Take a look at our <a shape="rect" title="Satellitenkarte" class="titlegreen" href="javascript:window_infosys()"> - Satellitenkarte</a>. + Satellite Map</a>. </td> </tr>  @@ -46,7 +46,7 @@ <tr> <td colspan="3"> <span class="headline"> - Besuchen Sie Samboja Lestari in Google Earth + Visit Samboja Lestari in Google Earth </span> </td> </tr> @@ -70,7 +70,7 @@ </tr> <tr> <td colspan="3"> - Über diesen Link wird sich direkt Ihre Google Earth Applikation öffnen: + Your Google Earth application will be started via the following link: </td> </tr> <tr> @@ -81,7 +81,7 @@ <td colspan="3"> <img alt="" height="9" width="10" src="/images/pfeil_link_on.gif"/> <a shape="rect" class="more" href="/kml-root?lang=en"> - zu Google Earth + to Google Earth </a> </td> </tr>

1 0

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

08 Sep '08

Revision: 3837 Author: ksprotte URL: http://bknr.net/trac/changeset/3837 done: Frontend: Google Earth Logo rechts unten auf die Homepage A trunk/projects/bos/payment-website/static/google_earth_logo.png U trunk/projects/bos/payment-website/static/toplevel_style.css U trunk/projects/bos/payment-website/templates/da/index.xml U trunk/projects/bos/payment-website/templates/de/index.xml U trunk/projects/bos/payment-website/templates/en/index.xml Added: trunk/projects/bos/payment-website/static/google_earth_logo.png =================================================================== (Binary files differ) Property changes on: trunk/projects/bos/payment-website/static/google_earth_logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/projects/bos/payment-website/static/toplevel_style.css =================================================================== --- trunk/projects/bos/payment-website/static/toplevel_style.css 2008-09-08 08:07:06 UTC (rev 3836) +++ trunk/projects/bos/payment-website/static/toplevel_style.css 2008-09-08 09:24:45 UTC (rev 3837) @@ -316,6 +316,18 @@ background-color : White; } +#google_earth_logo +{ + position: relative; + top: 200px; + text-align: center; +} + +#google_earth_logo img +{ + border: none; +} + #helpbox { position: relative; Modified: trunk/projects/bos/payment-website/templates/da/index.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/index.xml 2008-09-08 08:07:06 UTC (rev 3836) +++ trunk/projects/bos/payment-website/templates/da/index.xml 2008-09-08 09:24:45 UTC (rev 3837) @@ -105,7 +105,10 @@ <input type="text" class="form_big" name="email" size="20" maxlength="40" value=""></input> <input value="GO" class="form_big" name="action" type="submit" onclick="return send_info_request();"></input> </form> - </div> + </div> + <div id="google_earth_logo"> + <a href="/da/satmap"><img src="/static/google_earth_logo.png" width="80" height="72"/></a> + </div> </div> </bknr:toplevel> Modified: trunk/projects/bos/payment-website/templates/de/index.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/index.xml 2008-09-08 08:07:06 UTC (rev 3836) +++ trunk/projects/bos/payment-website/templates/de/index.xml 2008-09-08 09:24:45 UTC (rev 3837) @@ -119,6 +119,9 @@ <input type="text" class="form_big" name="email" size="20" maxlength="40" value="" /> <input value="ja" class="form_big" name="action" type="submit" onclick="return send_info_request();" /> </form> - </div> + </div> + <div id="google_earth_logo"> + <a href="/de/satmap"><img src="/static/google_earth_logo.png" width="80" height="72"/></a> + </div> </div> </bknr:toplevel> Modified: trunk/projects/bos/payment-website/templates/en/index.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/index.xml 2008-09-08 08:07:06 UTC (rev 3836) +++ trunk/projects/bos/payment-website/templates/en/index.xml 2008-09-08 09:24:45 UTC (rev 3837) @@ -111,6 +111,9 @@ <input type="text" class="form_big" name="email" size="20" maxlength="40" value="" /> <input value="GO" class="form_big" name="action" type="submit" onclick="return send_info_request();" /> </form> - </div> + </div> + <div id="google_earth_logo"> + <a href="/en/satmap"><img src="/static/google_earth_logo.png" width="80" height="72"/></a> + </div> </div> </bknr:toplevel>

1 0

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

08 Sep '08

Revision: 3836 Author: hans URL: http://bknr.net/trac/changeset/3836 Only send path information to GA, not the full URL 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-07 21:47:13 UTC (rev 3835) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-08 08:07:06 UTC (rev 3836) @@ -1199,7 +1199,7 @@ var url_path = (document.location.href + "#").split("#")[1]; if (url_path && (url_path != document.current_path)) { try { - pageTracker._trackPageview(document.location.href.replace("#", "/")); + pageTracker._trackPageview(document.location.href.replace("#", "/").replace(/^[^\/]+:\/\/[^\/]+/, "")); } catch (e) { log("tracking failed: " + e);

1 0

[bknr-cvs] hans changed trunk/bknr/datastore/doc/
by BKNR Commits 07 Sep '08

07 Sep '08

Revision: 3835 Author: hans URL: http://bknr.net/trac/changeset/3835 Re-establish manual auto-generation. _U trunk/bknr/datastore/doc/ U trunk/bknr/datastore/doc/Makefile D trunk/bknr/datastore/doc/datastore.tex D trunk/bknr/datastore/doc/impex.tex D trunk/bknr/datastore/doc/indices.tex Change set too large, please see URL above

1 0

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

07 Sep '08

Revision: 3834 Author: hans URL: http://bknr.net/trac/changeset/3834 fix mail sending. U trunk/projects/quickhoney/src/handlers.lisp Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-09-07 19:17:25 UTC (rev 3833) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-09-07 20:25:57 UTC (rev 3834) @@ -168,9 +168,9 @@ (with-query-params (from text) (cl-smtp:with-smtp-mail (smtp "localhost" "webserver(a)quickhoney.com" - (remove-duplicates (mapcar #'user-email - (or (owned-object-owner image) - (list (find-user "n") (find-user "p")))))) + (if (owned-object-owner image) + (list (user-email (owned-object-owner image))) + (mapcar (alexandria:compose #'user-email #'find-user) (list "n" "p")))) (cl-mime:print-mime smtp (make-instance

1 0

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

07 Sep '08

Revision: 3833 Author: hans URL: http://bknr.net/trac/changeset/3833 Finishing touches before calling it "beta". U trunk/projects/quickhoney/src/handlers.lisp U trunk/projects/quickhoney/src/imageproc.lisp U trunk/projects/quickhoney/upgrade-stuff/import.lisp U trunk/projects/quickhoney/website/static/index.css U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-09-07 16:10:38 UTC (rev 3832) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-09-07 19:17:25 UTC (rev 3833) @@ -2,6 +2,9 @@ (enable-interpol-syntax) +(defparameter *editable-keywords* '(:explicit :buy-file :buy-print :buy-t-shirt) + "List of keywords that are image keywords which can be edited through the CMS") + (defclass quickhoney-image-handler (page-handler) () (:documentation "Mixin for handlers whose response only depend on @@ -72,9 +75,6 @@ (defclass json-image-query-handler (object-handler quickhoney-image-handler) ()) -(defparameter *editable-keywords* '(:explicit :buy-file :buy-print :buy-t-shirt) - "List of keywords that are image keywords which can be edited through the CMS") - (defun images-in-category-sorted-by-time (cat-sub) (sort (copy-list (images-in-category cat-sub)) #'> :key #'blob-timestamp)) @@ -255,7 +255,8 @@ (newest-images category subcategory) (warn "No images for ~A ~A found" category subcategory)) (encode-array-element type) - (dolist (image images) + (dolist (image (or images + (list (store-image-with-name "trans")))) (encode-array-element (store-object-id image)) (when (zerop (decf count)) (return))))))))))))) Modified: trunk/projects/quickhoney/src/imageproc.lisp =================================================================== --- trunk/projects/quickhoney/src/imageproc.lisp 2008-09-07 16:10:38 UTC (rev 3832) +++ trunk/projects/quickhoney/src/imageproc.lisp 2008-09-07 19:17:25 UTC (rev 3833) @@ -36,9 +36,9 @@ (unless corner-color (setf (save-alpha-p) t corner-color (if (true-color-p) #x7f000000 - (or (transparent-color) - (allocate-color 255 255 255 :alpha 127) - (error "can't allocate transparent color for button"))) + (or (transparent-color) + (allocate-color 255 255 255 :alpha 127) + (error "can't allocate transparent color for button"))) (transparent-color) corner-color)) (let ((coords (corner-cutout-coords (image-width) (image-height) radius))) (destructuring-bind (x-tx y-tx) (car coords) @@ -59,7 +59,6 @@ (button-height "208") (radius "8") category) - (declare (ignore background-color)) (let* ((button-width (parse-integer button-width)) (button-height (parse-integer button-height)) (button-image (create-image button-width button-height t)) @@ -92,7 +91,9 @@ 0 0 (image-width type-image) (image-height type-image))))) (unless (zerop radius) - (corner-image :image button-image :radius radius)) + (corner-image :image button-image + :radius radius + :corner-color (parse-color background-color :image button-image))) button-image)) (define-imageproc-handler center-thumbnail (input-image width height) Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-09-07 16:10:38 UTC (rev 3832) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-09-07 19:17:25 UTC (rev 3833) @@ -65,6 +65,10 @@ (:pixel (find-user "n")) (t (find-user "hans")))))) +(with-transaction (:initialize-shop) + (dolist (image (images-in-category '(:shop))) + (setf (slot-value image 'cat-sub) '(:shop :shop)))) + (with-transaction (:initialize-news) (setf (slot-value (find-rss-channel "quickhoney") 'bknr.rss::items) (sort (remove-if (lambda (image) @@ -73,8 +77,3 @@ #'> :key #'blob-timestamp))) -(dolist (image (class-instances 'quickhoney-image)) - (unless (and (quickhoney-image-category image) - (quickhoney-image-subcategory image)) - (format t "~A ~A~%" (store-image-name image) (store-image-keywords image)))) - Modified: trunk/projects/quickhoney/website/static/index.css =================================================================== --- trunk/projects/quickhoney/website/static/index.css 2008-09-07 16:10:38 UTC (rev 3832) +++ trunk/projects/quickhoney/website/static/index.css 2008-09-07 19:17:25 UTC (rev 3833) @@ -14,6 +14,11 @@ padding-top: 116px; } +body.loading #loading { + display: block; + visibility: inherit; +} + body.home #home { display: block; visibility: inherit; @@ -605,3 +610,7 @@ float: left; } +#loading h1 { + text-align: center; + margin: 5em 0em 5em 0em; +} \ No newline at end of file Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-07 16:10:38 UTC (rev 3832) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-07 19:17:25 UTC (rev 3833) @@ -1166,6 +1166,8 @@ } function init() { + $('loading').style.display = 'none'; + if (navigator.userAgent.indexOf("Safari") != -1) { safari = true; safari_compatibility_hack(); Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-09-07 16:10:38 UTC (rev 3832) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-07 19:17:25 UTC (rev 3833) @@ -22,7 +22,7 @@ <title>QuickHoney</title> </head> - <body id="body"> + <body id="body" class="loading"> <div id="overlay" class="page"> </div> @@ -60,6 +60,10 @@ <div id="version" class="text"><quickhoney:version-and-last-change /></div> </div> + <div id="loading" class="page"> + <h1>Loading site...</h1> + </div> + <div id="home" class="page"> <div> <a href="#pixel" class="home_button">

1 0

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

07 Sep '08

Revision: 3832 Author: hans URL: http://bknr.net/trac/changeset/3832 Fix REMOVE-ITEM so that it operates on the 'ITEMS slot value, not the result of RSS-CHANNEL-ITEMS. U trunk/bknr/web/src/rss/rss.lisp Modified: trunk/bknr/web/src/rss/rss.lisp =================================================================== --- trunk/bknr/web/src/rss/rss.lisp 2008-09-07 15:25:32 UTC (rev 3831) +++ trunk/bknr/web/src/rss/rss.lisp 2008-09-07 16:10:38 UTC (rev 3832) @@ -168,7 +168,7 @@ (:documentation "Remove ITEM from CHANNEL. May only be called within transaction context.") (:method ((channel rss-channel) item) - (setf (slot-value channel 'items) (remove item (rss-channel-items channel)))) + (setf (slot-value channel 'items) (remove item (slot-value channel 'items)))) (:method ((channel string) item) (aif (find-rss-channel channel) (remove-item it item)))

1 0

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

07 Sep '08

Revision: 3831 Author: hans URL: http://bknr.net/trac/changeset/3831 Fix to import :shopping photos to :shop category for now. U trunk/projects/quickhoney/upgrade-stuff/import.lisp Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-09-07 14:49:19 UTC (rev 3830) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-09-07 15:25:32 UTC (rev 3831) @@ -41,7 +41,7 @@ (mapc #'delete-object (get-keywords-intersection-store-images '(:upload :home :button))) (mapc #'delete-object (get-keywords-intersection-store-images '(:clients :nicejobs))) -(defparameter *category-keywords* '(:pixel :vector :news :contact)) +(defparameter *category-keywords* '(:pixel :vector :news :contact :shop)) (defparameter *other-keywords* '(:published :upload :import :buy-file :buy-t-shirt :buy-print :explicit :hans :bw)) (with-transaction (:initialize-cat-sub)

1 0