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

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

19 Sep '08

Revision: 3924 Author: hans URL: http://bknr.net/trac/changeset/3924 fix news styles 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-18 17:33:21 UTC (rev 3923) +++ trunk/projects/quickhoney/website/static/index.css 2008-09-19 06:16:37 UTC (rev 3924) @@ -346,7 +346,7 @@ } .newsentry h1 { - margin: 10px 0px 5px 0px; + margin: 10px 0px 10px 0px; font-size: 120%; font-weight: normal; color: #30be01 @@ -356,10 +356,6 @@ margin: 10px 0px 5px 0px; } -.newsentry .item-text { - margin-top: 1em; -} - .autonews { height: 106px; color: #000; border-width: 1px; border-style: solid

1 0

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

18 Sep '08

Revision: 3923 Author: hans URL: http://bknr.net/trac/changeset/3923 Fix for Opera and (hopefully) IE. 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-18 16:57:54 UTC (rev 3922) +++ trunk/projects/quickhoney/website/static/index.css 2008-09-18 17:33:21 UTC (rev 3923) @@ -595,11 +595,13 @@ .buttonbox .button-section-items a { padding: 0px 5px 0px 27px; - vertical-align: -3px; color: black; - line-height: 0; } +.buttonbox .button-section-items span { + vertical-align: -3px; +} + .buttonbox .button-section-items.last { border-bottom-width: 1px; } Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-18 16:57:54 UTC (rev 3922) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-18 17:33:21 UTC (rev 3923) @@ -1675,8 +1675,7 @@ function make_image_action_button(keyword, title, action) { var item = LI({ style: 'background-image: url(' + recolored_image_path(keyword) + ')' }, - A({ href: '#' }, - title)); + A({ href: '#' }, SPAN(null, title))); item.onclick = function() { action(); return false; }; return item; }

1 0

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

18 Sep '08

Revision: 3922 Author: hans URL: http://bknr.net/trac/changeset/3922 update page title to reflect current navigational position. 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-18 15:38:02 UTC (rev 3921) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-18 16:57:54 UTC (rev 3922) @@ -562,6 +562,8 @@ function show_page(pagename, subpath) { + document.title = "QuickHoney " + pagename + (subpath ? "/" + subpath : ''); + if (!pages[pagename]) { document.location.href = '/'; return false; @@ -1009,7 +1011,7 @@ index = index - 0; // ensure integer query_position = index; current_image = query_result[index]; - + log('display_image index ' + index); overlay_remove();

1 0

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

18 Sep '08

Revision: 3921 Author: ksprotte URL: http://bknr.net/trac/changeset/3921 /da/satmap.xml new text in danish U trunk/projects/bos/payment-website/templates/da/satmap.xml Modified: trunk/projects/bos/payment-website/templates/da/satmap.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/satmap.xml 2008-09-18 11:56:35 UTC (rev 3920) +++ trunk/projects/bos/payment-website/templates/da/satmap.xml 2008-09-18 15:38:02 UTC (rev 3921) @@ -16,7 +16,7 @@ <tr> <td colspan="2"> <span class="headline"> - Satellite Map + Satellit kort </span> </td> <td align="center" valign="top"> @@ -32,9 +32,9 @@ </tr> <tr> <td colspan="3"> - Take a look at our + Se vores <a shape="rect" title="Satellitenkarte" class="titlegreen" href="javascript:window_infosys()"> - Satellite Map</a>. + Satellit kort</a>. </td> </tr>  @@ -46,7 +46,7 @@ <tr> <td colspan="3"> <span class="headline"> - Visit Samboja Lestari in Google Earth + Besøg Samboja Lestari via Google Earth </span> </td> </tr> @@ -56,12 +56,13 @@ </tr> <tr> <td colspan="3"> - If the Google Earth Software + Når du har installeret Google Earths software <a href='http://earth.google.de/' target='_blank' shape='rect' class='titlegreen'>http://earth.google.de/</a> - is installed on your computer, you can view the project area with - satellite images from 2002 and 2007 plus a lot of additional - information. For an optimal viewing experience, you can also use the - above link to upgrade your Google Earth installation if needed. + på din computer, kan du se et + udvalg af satellitbilleder fra projektområdet fra perioden + 2000 til 2007 plus en masse ekstra information. For + optimale oplevelse kan du, om nødtvendigt, bruge + ovenstående link til at opgradere din Google Earth. </td> </tr> <tr> @@ -70,7 +71,8 @@ </tr> <tr> <td colspan="3"> - Your Google Earth application will be started via the following link: + Din Google Earth applikation vil starte ved hjælp af + flg. link: </td> </tr> <tr>

1 0

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

18 Sep '08

Revision: 3920 Author: hans URL: http://bknr.net/trac/changeset/3920 Change image link to not include /index U trunk/projects/quickhoney/src/image.lisp Modified: trunk/projects/quickhoney/src/image.lisp =================================================================== --- trunk/projects/quickhoney/src/image.lisp 2008-09-18 10:25:17 UTC (rev 3919) +++ trunk/projects/quickhoney/src/image.lisp 2008-09-18 11:56:35 UTC (rev 3920) @@ -46,7 +46,7 @@ collect (cadr cat-sub))) (defmethod make-image-link ((image quickhoney-image) &key internal) - (format nil "~@[~A~]/index#~(~A~@[/~A~]~)/~A" + (format nil "~@[~A~]/#~(~A~@[/~A~]~)/~A" (unless internal (format nil "http://~A" (website-host))) (quickhoney-image-category image) (quickhoney-image-subcategory image) (store-image-name image)))

1 0

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

18 Sep '08

Revision: 3919 Author: hans URL: http://bknr.net/trac/changeset/3919 remove ffffound redirection again, as it does not work because of the caching. U trunk/projects/quickhoney/src/handlers.lisp Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-09-18 10:18:19 UTC (rev 3918) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-09-18 10:25:17 UTC (rev 3919) @@ -23,14 +23,6 @@ (header-out :cache-control) "max-age=15")) (call-next-method)) -;;; redirect users coming from ffffound to the image page. -(defmethod handle-object :before ((handler imageproc-handler) (image quickhoney-image)) - (when (cl-ppcre:scan "^http://ffffound.com/image/" (hunchentoot:header-in* :referer)) - (redirect (format nil "/~(~A/~A~)/~A" - (quickhoney-image-category image) - (quickhoney-image-subcategory image) - (store-image-name image))))) - (defclass random-image-handler (object-handler) ())

1 0

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

18 Sep '08

Revision: 3918 Author: hans URL: http://bknr.net/trac/changeset/3918 Simplify U trunk/projects/quickhoney/src/handlers.lisp Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-09-18 10:11:50 UTC (rev 3917) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-09-18 10:18:19 UTC (rev 3918) @@ -23,12 +23,8 @@ (header-out :cache-control) "max-age=15")) (call-next-method)) -(defclass quickhoney-image-handler (image-handler) - () - (:documentation "Application dependent image handler with specific - referer based actions.")) - -(defmethod handle-object :before ((handler quickhoney-image-handler) (image quickhoney-image)) +;;; redirect users coming from ffffound to the image page. +(defmethod handle-object :before ((handler imageproc-handler) (image quickhoney-image)) (when (cl-ppcre:scan "^http://ffffound.com/image/" (hunchentoot:header-in* :referer)) (redirect (format nil "/~(~A/~A~)/~A" (quickhoney-image-category image)

1 0

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

18 Sep '08

Revision: 3917 Author: hans URL: http://bknr.net/trac/changeset/3917 Redirect visitors coming to an image from ffffound to the image HTML page. U trunk/projects/quickhoney/src/handlers.lisp U trunk/projects/quickhoney/src/webserver.lisp Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-09-18 06:12:23 UTC (rev 3916) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-09-18 10:11:50 UTC (rev 3917) @@ -5,7 +5,7 @@ (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) +(defclass quickhoney-image-dependent-handler (page-handler) () (:documentation "Mixin for handlers whose response only depend on quickhoney images. The HANDLE :AROUND method of this handler @@ -16,13 +16,25 @@ single-object handlers. Deletion is not properly handled presently.")) -(defmethod handle :around ((handler quickhoney-image-handler)) +(defmethod handle :around ((handler quickhoney-image-dependent-handler)) (let ((time (last-image-upload-timestamp))) (handle-if-modified-since time) (setf (header-out :last-modified) (rfc-1123-date time) (header-out :cache-control) "max-age=15")) (call-next-method)) +(defclass quickhoney-image-handler (image-handler) + () + (:documentation "Application dependent image handler with specific + referer based actions.")) + +(defmethod handle-object :before ((handler quickhoney-image-handler) (image quickhoney-image)) + (when (cl-ppcre:scan "^http://ffffound.com/image/" (hunchentoot:header-in* :referer)) + (redirect (format nil "/~(~A/~A~)/~A" + (quickhoney-image-category image) + (quickhoney-image-subcategory image) + (store-image-name image))))) + (defclass random-image-handler (object-handler) ()) @@ -41,7 +53,7 @@ (blob-to-stream (quickhoney-animation-image-animation animation) (send-headers))))) -(defclass json-image-info-handler (object-handler quickhoney-image-handler) +(defclass json-image-info-handler (object-handler quickhoney-image-dependent-handler) () (:default-initargs :query-function #'store-image-with-name)) @@ -74,7 +86,7 @@ (with-object-element ("image") (image-to-json image)))) -(defclass json-image-query-handler (object-handler quickhoney-image-handler) +(defclass json-image-query-handler (object-handler quickhoney-image-dependent-handler) ()) (defun images-in-category-sorted-by-time (cat-sub) @@ -216,7 +228,7 @@ (blob-to-stream image s))))) t t)))) -(defclass json-buttons-handler (prefix-handler quickhoney-image-handler) +(defclass json-buttons-handler (prefix-handler quickhoney-image-dependent-handler) ()) (defun preproduced-buttons (category subcategory) Modified: trunk/projects/quickhoney/src/webserver.lisp =================================================================== --- trunk/projects/quickhoney/src/webserver.lisp 2008-09-18 06:12:23 UTC (rev 3916) +++ trunk/projects/quickhoney/src/webserver.lisp 2008-09-18 10:11:50 UTC (rev 3917) @@ -38,6 +38,7 @@ ("/json-news-archive" json-news-archive-handler) ("/json-news" json-news-handler) ("/shutdown" shutdown-handler) + ("/image" quickhoney-image-handler) user images ("/static" directory-handler

1 0

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

18 Sep '08

Revision: 3916 Author: hans URL: http://bknr.net/trac/changeset/3916 When an image is being served unprocessed, send the blob data instead of instantiating the image into memory and then serving it. This way, the original picture quality will be preserved. U trunk/bknr/web/src/images/imageproc-handler.lisp Modified: trunk/bknr/web/src/images/imageproc-handler.lisp =================================================================== --- trunk/bknr/web/src/images/imageproc-handler.lisp 2008-09-17 20:32:10 UTC (rev 3915) +++ trunk/bknr/web/src/images/imageproc-handler.lisp 2008-09-18 06:12:23 UTC (rev 3916) @@ -171,8 +171,13 @@ (error-404)) (defmethod handle-object ((page-handler imageproc-handler) image) - (with-http-response (:content-type (image-content-type (image-type-keyword image))) - (handle-if-modified-since (blob-timestamp image)) - (setf (header-out "Last-Modified") (rfc-1123-date (blob-timestamp image))) - (imageproc image (cdr (decoded-handler-path page-handler))))) + (handle-if-modified-since (blob-timestamp image)) + (setf (header-out :last-modified) (rfc-1123-date (blob-timestamp image))) + (let ((operations (cdr (decoded-handler-path page-handler)))) + (if operations + (imageproc image operations) + (with-http-response (:content-type (image-content-type (image-type-keyword image))) + (setf (header-out :content-length) (blob-size image)) + (with-open-file (blob-data (blob-pathname image) :element-type '(unsigned-byte 8)) + (copy-stream blob-data (send-headers) '(unsigned-byte 8)))))))

1 0

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

17 Sep '08

Revision: 3915 Author: hans URL: http://bknr.net/trac/changeset/3915 Make spider keywords entry field larger. 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-17 20:20:54 UTC (rev 3914) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-17 20:32:10 UTC (rev 3915) @@ -191,7 +191,7 @@ </span> <br /> Keywords:<br /> - <input type="text" id="upload_keywords" name="spider-keywords" value="" /><br /> + <input type="text" id="upload_keywords" name="spider-keywords" value="" size="60" /><br /> <input type="checkbox" id="explicit" name="explicit" value="1" /> Explicit<br/> <!-- shop disabled for now <input type="checkbox" name="buy-file" value="1"/> Sell as file<br/> @@ -262,7 +262,7 @@ </span> <br /> Keywords:<br /> - <input type="text" id="edit_keywords" name="spider-keywords" value="" /><br /> + <input type="text" id="edit_keywords" name="spider-keywords" value="" size="60" /><br /> <input type="checkbox" id="edit_explicit" name="explicit" value="1" /> Explicit<br/> <!-- shop disabled for now <input type="checkbox" id="edit_buy-file" name="buy-file" value="1"/> Sell as file<br/>

1 0