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

[bknr-cvs] hans changed trunk/bknr/web/src/bknr.web.asd
by BKNR Commits 24 Sep '08

24 Sep '08

Revision: 3960 Author: hans URL: http://bknr.net/trac/changeset/3960 Remove reference to :bknr.xml U trunk/bknr/web/src/bknr.web.asd Modified: trunk/bknr/web/src/bknr.web.asd =================================================================== --- trunk/bknr/web/src/bknr.web.asd 2008-09-24 16:16:41 UTC (rev 3959) +++ trunk/bknr/web/src/bknr.web.asd 2008-09-24 16:24:49 UTC (rev 3960) @@ -23,7 +23,6 @@ :cxml :unit-test :bknr.utils - :bknr.xml :hunchentoot :drakma :xhtmlgen

1 0

[bknr-cvs] hans changed trunk/bknr/datastore/src/bknr.xml.asd
by BKNR Commits 24 Sep '08

24 Sep '08

Revision: 3959 Author: hans URL: http://bknr.net/trac/changeset/3959 remove more. D trunk/bknr/datastore/src/bknr.xml.asd Deleted: trunk/bknr/datastore/src/bknr.xml.asd =================================================================== --- trunk/bknr/datastore/src/bknr.xml.asd 2008-09-24 15:54:34 UTC (rev 3958) +++ trunk/bknr/datastore/src/bknr.xml.asd 2008-09-24 16:16:41 UTC (rev 3959) @@ -1,21 +0,0 @@ -;; -*-Lisp-*- - -(in-package :cl-user) - -(defpackage :bknr.xml.system - (:use :cl :asdf)) - -(in-package :bknr.xml.system) - -(defsystem :bknr.xml - :name "baikonour" - :author "Hans Huebner <hans(a)huebner.org>" - :author "Manuel Odendahl <manuel(a)bl0rg.net>" - :version "0" - :maintainer "Manuel Odendahl <manuel(a)bl0rg.net>" - :licence "BSD" - :description "baikonour - launchpad for lisp satellites" - :depends-on (:cl-interpol :cxml) - :components ((:module "xml" :components ((:file "package") - (:file "xml" :depends-on ("package")))))) -

1 0

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

24 Sep '08

Revision: 3958 Author: hans URL: http://bknr.net/trac/changeset/3958 Remove XML import/export facility for now, as it is not maintained and does not work. D trunk/bknr/datastore/src/bknr.data.impex.asd D trunk/bknr/datastore/src/bknr.impex.asd D trunk/bknr/datastore/src/xml/ D trunk/bknr/datastore/src/xml-impex/ U trunk/bknr/web/src/bknr.web.asd Deleted: trunk/bknr/datastore/src/bknr.data.impex.asd =================================================================== --- trunk/bknr/datastore/src/bknr.data.impex.asd 2008-09-24 13:59:17 UTC (rev 3957) +++ trunk/bknr/datastore/src/bknr.data.impex.asd 2008-09-24 15:54:34 UTC (rev 3958) @@ -1,21 +0,0 @@ - -(in-package :cl-user) - -(defpackage :bknr.data.impex.system - (:use :cl :asdf)) - -(in-package :bknr.data.impex.system) - -(defsystem :bknr.data.impex - :name "baikonour datastore with xml impex" - :author "Hans Huebner <hans(a)huebner.org>" - :author "Manuel Odendahl <manuel(a)bl0rg.net>" - :version "0" - :maintainer "Manuel Odendahl <manuel(a)bl0rg.net>" - :licence "BSD" - :description "baikonour - launchpad for lisp satellites" - - :depends-on (:cl-interpol :unit-test :bknr.utils :bknr.indices - :bknr.datastore :bknr.impex) - - :components ((:module "data" :components ((:file "xml-object"))))) Deleted: trunk/bknr/datastore/src/bknr.impex.asd =================================================================== --- trunk/bknr/datastore/src/bknr.impex.asd 2008-09-24 13:59:17 UTC (rev 3957) +++ trunk/bknr/datastore/src/bknr.impex.asd 2008-09-24 15:54:34 UTC (rev 3958) @@ -1,28 +0,0 @@ -;;;; -*- Mode: LISP -*- - -(in-package :cl-user) - -(defpackage :bknr.impex.system - (:use :cl :asdf)) - -(in-package :bknr.impex.system) - -(defsystem :bknr.impex - :name "BKNR impex" - :author "Manuel Odendahl <manuel(a)bl0rg.net>" - :version "0" - :maintainer "Manuel Odendahl <manuel(a)bl0rg.net>" - :licence "BSD" - :description "BKNR XML import/export" - :long-description "" - - :depends-on (:cl-interpol :cxml :closer-mop :bknr.utils :bknr.xml :bknr.indices) - - :components ((:module "xml-impex" - :components - ((:file "package") - (:file "xml-class" :depends-on ("package")) - (:file "xml-import" - :depends-on ("package" "xml-class")) - (:file "xml-export" - :depends-on ("package" "xml-class")))))) Modified: trunk/bknr/web/src/bknr.web.asd =================================================================== --- trunk/bknr/web/src/bknr.web.asd 2008-09-24 13:59:17 UTC (rev 3957) +++ trunk/bknr/web/src/bknr.web.asd 2008-09-24 15:54:34 UTC (rev 3958) @@ -30,7 +30,6 @@ :puri :usocket :bknr.datastore - :bknr.data.impex :parenscript) :components ((:file "packages")

1 0

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

24 Sep '08

Revision: 3957 Author: hans URL: http://bknr.net/trac/changeset/3957 Prepare "send image by imail". Avoid errors when the user blocks Google Analytics. Remove /MochiKit handler U trunk/projects/quickhoney/src/webserver.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/webserver.lisp =================================================================== --- trunk/projects/quickhoney/src/webserver.lisp 2008-09-24 13:45:25 UTC (rev 3956) +++ trunk/projects/quickhoney/src/webserver.lisp 2008-09-24 13:59:17 UTC (rev 3957) @@ -43,8 +43,6 @@ ("/static" directory-handler :destination ,(merge-pathnames #p"static/" *website-directory*) :filename-separator #\,) - ("/MochiKit" directory-handler - :destination ,(merge-pathnames #p"static/MochiKit/" *website-directory*)) ("/favicon.ico" file-handler :destination ,(merge-pathnames #p"static/favicon.ico" *website-directory*) :content-type "application/x-icon") Modified: trunk/projects/quickhoney/website/static/index.css =================================================================== --- trunk/projects/quickhoney/website/static/index.css 2008-09-24 13:45:25 UTC (rev 3956) +++ trunk/projects/quickhoney/website/static/index.css 2008-09-24 13:59:17 UTC (rev 3957) @@ -502,7 +502,7 @@ padding: 10px 15px 10px 10px; } -#overlay #hey #hey_from, #overlay #hey textarea { +#overlay #hey #hey_from, #overlay #hey #hey_to, #overlay #hey textarea { width: 100%; } Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-24 13:45:25 UTC (rev 3956) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-24 13:59:17 UTC (rev 3957) @@ -1116,7 +1116,7 @@ var d = doXHR("/digg-image/" + current_image.id, { method: 'POST', headers: {"Content-Type":"application/x-www-form-urlencoded"}, - sendContent: queryString({ from: $('hey_from').value, text: $('hey_text').value }) }) + sendContent: queryString({ from: $('hey_from').value, to: $('hey_to').value, text: $('hey_text').value }) }) .addCallback(overlay_remove); make_overlay('send-comment', 'Sending your comment', 300); return false; @@ -1228,12 +1228,14 @@ function poll_path() { var url_path = (document.location.href + "#").split("#")[1]; if (url_path && (url_path != document.current_path)) { - try { - pageTracker._trackPageview(document.location.href.replace("#", "/").replace(/^[^\/]+:\/\/[^\/]+/, "")); + if (pageTracker) { + try { + pageTracker._trackPageview(document.location.href.replace("#", "/").replace(/^[^\/]+:\/\/[^\/]+/, "")); + } + catch (e) { + log("tracking failed: " + e); + } } - catch (e) { - log("tracking failed: " + e); - } jump_to(url_path); } @@ -1286,6 +1288,27 @@ overlay.style.visibility = 'inherit'; } +function make_post_mail_form() { + var subject = 'Send image ' + current_image.name + ' by email'; + make_overlay('hey', 'Comment', 320, + FORM({ method: 'POST', action: '#' }, + 'your email', + BR(), + INPUT({ type: 'text', id: 'hey_from', value: '' }), + BR(), + 'receipient email', + BR(), + INPUT({ type: 'text', id: 'hey_to', value: '' }), + BR(), + BR(), + 'comment', + BR(), + TEXTAREA({ name: 'text', id: 'hey_text', rows: 4, columns: 40 }, ''), + BR(), + INPUT({ type: 'submit', id: 'hey_send', value: 'Send' }))); + $('hey_send').onclick = hey_send; +} + function make_comment_form() { var subject = 'Comment on ' + current_image.name; make_overlay('hey', 'Comment', 320, @@ -1293,6 +1316,7 @@ 'email', BR(), INPUT({ type: 'text', id: 'hey_from', value: '' }), + INPUT({ type: 'hidden', id: 'hey_to', value: '' }), BR(), BR(), 'comment', Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-09-24 13:45:25 UTC (rev 3956) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-24 13:59:17 UTC (rev 3957) @@ -326,14 +326,16 @@ <div id="cue"><img alt="" src="/static/spinner.gif" width="16" height="16"/></div> -<script type="text/javascript"> -var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); -document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); -</script> -<script type="text/javascript"> -var pageTracker = _gat._getTracker("UA-3432041-5"); -pageTracker._trackPageview(); -</script> + <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")); + </script> + <script type="text/javascript"> + if (typeof(_gat) == 'object') { + var pageTracker = _gat._getTracker("UA-3432041-5"); + pageTracker._trackPageview(); + } + </script> <script language="javascript" type="text/javascript"> init(); </script>

1 0

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

24 Sep '08

Revision: 3956 Author: hans URL: http://bknr.net/trac/changeset/3956 Do not display :nudes or :explicit images on home page U trunk/projects/quickhoney/src/handlers.lisp Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-09-24 11:01:30 UTC (rev 3955) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-09-24 13:45:25 UTC (rev 3956) @@ -61,7 +61,8 @@ (encode-object-element "height" (store-image-height image)) (encode-object-element "client" (or (quickhoney-image-client image) "")) (when (typep image 'quickhoney-animation-image) - (encode-object-element "animation_type" (image-content-type (blob-mime-type (quickhoney-animation-image-animation image))))) + (encode-object-element "animation_type" + (image-content-type (blob-mime-type (quickhoney-animation-image-animation image))))) (when (quickhoney-image-spider-keywords image) (encode-object-element "spider_keywords" (quickhoney-image-spider-keywords image))) (with-object-element ("keywords") @@ -173,12 +174,16 @@ (:default-initargs :object-class 'quickhoney-image)) (defmethod handle-object ((handler digg-image-handler) (image quickhoney-image)) - (with-query-params (from text) + (with-query-params (from to text) (cl-smtp:with-smtp-mail (smtp "localhost" "webserver(a)quickhoney.com" - (if (owned-object-owner image) - (list (user-email (owned-object-owner image))) - (mapcar (alexandria:compose #'user-email #'find-user) (list "n" "p")))) + (cond + ((and to (length to)) + (list to)) + ((owned-object-owner image) + (list (user-email (owned-object-owner image)))) + (t + (mapcar (alexandria:compose #'user-email #'find-user) (list "n" "p"))))) (cl-mime:print-mime smtp (make-instance @@ -233,7 +238,10 @@ (defun newest-images (category subcategory) (let ((images (if (eq :home category) - (images-in-all-subcategories-sorted-by-time subcategory) + (remove-if (lambda (image) + (or (eq :nudes (quickhoney-image-subcategory image)) + (find :explicit (store-image-keywords image)))) + (images-in-all-subcategories-sorted-by-time subcategory)) (images-in-category-sorted-by-time (list category subcategory))))) (when images (cons :images (loop with since = (- (get-universal-time) (* 60 60 24 14))

1 0

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

24 Sep '08

Revision: 3955 Author: hans URL: http://bknr.net/trac/changeset/3955 Revive login window after file combine handler changes. U trunk/projects/quickhoney/website/templates/image-full.xml U trunk/projects/quickhoney/website/templates/login.xml Modified: trunk/projects/quickhoney/website/templates/image-full.xml =================================================================== --- trunk/projects/quickhoney/website/templates/image-full.xml 2008-09-23 23:49:28 UTC (rev 3954) +++ trunk/projects/quickhoney/website/templates/image-full.xml 2008-09-24 11:01:30 UTC (rev 3955) @@ -6,8 +6,7 @@ xmlns:bknr="http://bknr.net" > <head> - <link rel="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css" /> - <link rel="stylesheet" href="/static/image-full.css" /> + <link rel="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css,image-full.css" /> <script src="/static/image-full.js" type="text/javascript"> </script> <title>QuickHoney image</title> </head> Modified: trunk/projects/quickhoney/website/templates/login.xml =================================================================== --- trunk/projects/quickhoney/website/templates/login.xml 2008-09-23 23:49:28 UTC (rev 3954) +++ trunk/projects/quickhoney/website/templates/login.xml 2008-09-24 11:01:30 UTC (rev 3955) @@ -9,8 +9,7 @@ <head> <link rel="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css" /> <link rel="stylesheet" href="/static/login.css" /> - <script src="/MochiKit/MochiKit.js" type="text/javascript"> </script> - <script src="/static/login.js" type="text/javascript"> </script> + <script src="/static/MochiKit/MochiKit.js,login.js" type="text/javascript"> </script> <title>QuickHoney CMS Login</title> </head>

1 0

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

23 Sep '08

Revision: 3954 Author: hans URL: http://bknr.net/trac/changeset/3954 Back out GA experiments 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-23 23:41:14 UTC (rev 3953) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-23 23:49:28 UTC (rev 3954) @@ -326,11 +326,14 @@ <div id="cue"><img alt="" src="/static/spinner.gif" width="16" height="16"/></div> - <script src="http://www.google-analytics.com/ga.js" type="text/javascript"> </script> - <script type="text/javascript"> - var pageTracker = _gat._getTracker("UA-3432041-5"); - pageTracker._trackPageview(); - </script> +<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")); +</script> +<script type="text/javascript"> +var pageTracker = _gat._getTracker("UA-3432041-5"); +pageTracker._trackPageview(); +</script> <script language="javascript" type="text/javascript"> init(); </script>

1 0

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

23 Sep '08

Revision: 3953 Author: hans URL: http://bknr.net/trac/changeset/3953 try something else with GA 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-23 23:35:25 UTC (rev 3952) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-23 23:41:14 UTC (rev 3953) @@ -9,7 +9,6 @@ <meta name="verify-v1" content="0lfE42KxaTLpCzUEkuTA7V2a9Ojdwk9BG2XSaZGPaoA=" /> <link rel="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css,quickhoney.css,index.css,ydsf.css" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="/rss/quickhoney" /> - <script src="http://www.google-analytics.com/ga.js" type="text/javascript"> </script> <script src="/static/detectplugins.js,AC_QuickTime.js,MochiKit/MochiKit.js,yui/yahoo-dom-event/yahoo-dom-event.js,yui/animation/animation-min.js,javascript.js" type="text/javascript"> </script> <title>QuickHoney</title> </head> @@ -327,6 +326,7 @@ <div id="cue"><img alt="" src="/static/spinner.gif" width="16" height="16"/></div> + <script src="http://www.google-analytics.com/ga.js" type="text/javascript"> </script> <script type="text/javascript"> var pageTracker = _gat._getTracker("UA-3432041-5"); pageTracker._trackPageview();

1 0

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

23 Sep '08

Revision: 3952 Author: hans URL: http://bknr.net/trac/changeset/3952 Try something with GA 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-23 23:20:10 UTC (rev 3951) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-23 23:35:25 UTC (rev 3952) @@ -9,6 +9,7 @@ <meta name="verify-v1" content="0lfE42KxaTLpCzUEkuTA7V2a9Ojdwk9BG2XSaZGPaoA=" /> <link rel="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css,quickhoney.css,index.css,ydsf.css" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="/rss/quickhoney" /> + <script src="http://www.google-analytics.com/ga.js" type="text/javascript"> </script> <script src="/static/detectplugins.js,AC_QuickTime.js,MochiKit/MochiKit.js,yui/yahoo-dom-event/yahoo-dom-event.js,yui/animation/animation-min.js,javascript.js" type="text/javascript"> </script> <title>QuickHoney</title> </head> @@ -326,14 +327,10 @@ <div id="cue"><img alt="" src="/static/spinner.gif" width="16" height="16"/></div> -<script type="text/javascript"> -var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); -document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); -</script> -<script type="text/javascript"> -var pageTracker = _gat._getTracker("UA-3432041-5"); -pageTracker._trackPageview(); -</script> + <script type="text/javascript"> + var pageTracker = _gat._getTracker("UA-3432041-5"); + pageTracker._trackPageview(); + </script> <script language="javascript" type="text/javascript"> init(); </script>

1 0

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

23 Sep '08

Revision: 3951 Author: hans URL: http://bknr.net/trac/changeset/3951 Improve digging. 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-23 19:27:58 UTC (rev 3950) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-23 23:20:10 UTC (rev 3951) @@ -1354,7 +1354,7 @@ { icon: 'digg.png', width: 16, height: 14, name: 'Digg', url: 'http://www.digg.com', - action: 'http://digg.com/submit?phase=2&url=%URL%'}, + action: 'http://digg.com/submit?phase=2&url=%IMAGEURL%&title=%TITLE%&media=image&top…'}, { icon: 'fark.gif', width: 15, height: 18, name: 'Fark', url: 'http://www.fark.com'}, @@ -1465,6 +1465,13 @@ return window.location.href.replace("#", ""); } +function current_image_url() +{ + return document.location.protocol + + '//' + document.location.host + (document.location.port ? ':' + document.location.port : '') + + '/image/' + current_image.name; +} + function make_shout_form() { function bookmark_link(image, action) { @@ -1474,6 +1481,7 @@ function submit_bookmark(site) { var url = site.action; + url = url.replace("%IMAGEURL%", encodeURIComponent(current_image_url())); url = url.replace("%URL%", encodeURIComponent(current_url())); url = url.replace("%TITLE%", encodeURIComponent(compute_title())); window.open(url,

1 0