bknr-cvs

bknr-cvs@common-lisp.net

1964 discussions

[bknr-cvs] ksprotte changed trunk/projects/bos/m2/m2.lisp
by BKNR Commits 17 Jul '08

17 Jul '08

Revision: 3480 Author: ksprotte URL: http://bknr.net/trac/changeset/3480 oops, there was a bug in add-to-contract-stats U trunk/projects/bos/m2/m2.lisp Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-07-17 11:42:34 UTC (rev 3479) +++ trunk/projects/bos/m2/m2.lisp 2008-07-17 12:06:29 UTC (rev 3480) @@ -612,7 +612,9 @@ (when new-sponsor-p (incf paying-sponsors)) ;; country-sponsors - (let ((country-stat (gethash country country-sponsors (make-country-stat)))) + (let ((country-stat (gethash country country-sponsors))) + (unless country-stat + (setq country-stat (setf (gethash country country-sponsors) (make-country-stat)))) (when new-sponsor-p (incf (country-stat-paying-sponsors country-stat))) (incf (country-stat-sold-m2s country-stat) area))

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/m2/
by BKNR Commits 17 Jul '08

17 Jul '08

Revision: 3479 Author: ksprotte URL: http://bknr.net/trac/changeset/3479 added new cache contract-stats that allows for last-paid-contracts, but also new queries U trunk/projects/bos/m2/m2.lisp U trunk/projects/bos/m2/packages.lisp U trunk/projects/bos/m2/poi.lisp Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-07-17 09:08:08 UTC (rev 3478) +++ trunk/projects/bos/m2/m2.lisp 2008-07-17 11:42:34 UTC (rev 3479) @@ -295,7 +295,7 @@ (deftransaction contract-set-paidp (contract newval) (setf (contract-paidp contract) newval) (publish-contract-change contract) - (add-to-last-contracts-cache contract) + (add-to-contract-stats contract) (bknr.rss::add-item "news" contract)) (defmethod contract-price ((contract contract)) @@ -580,28 +580,67 @@ ;; use only CONTRACT-PAIDP, but mean CONTRACT-PUBLISHED-P (contract-paidp contract)) -(defvar *last-contracts-cache* nil) +;;; contract-stats (defconstant +last-contracts-cache-size+ 20) +(defvar *contract-stats*) -(defun last-paid-contracts () - (unless *last-contracts-cache* - (setf *last-contracts-cache* (subseq (append (sort (remove-if-not #'contract-paidp (class-instances 'contract)) - #'> :key #'contract-date) - (make-list +last-contracts-cache-size+)) - 0 +last-contracts-cache-size+))) - (remove-if #'object-destroyed-p *last-contracts-cache*)) +(defstruct country-stat + (sold-m2s 0) + (paying-sponsors 0)) -(defun add-to-last-contracts-cache (contract) - (last-paid-contracts) ; force cache initialization, should really be done by a eval-when - (push contract *last-contracts-cache*) - (setf (cdr (nthcdr (1- +last-contracts-cache-size+) *last-contracts-cache*)) nil)) +(defstruct contract-stats + (sold-m2s 0) + (paying-sponsors 0) + (country-sponsors (make-hash-table :test #'equal)) + (last-contracts (make-list +last-contracts-cache-size+))) +(defun initialize-contract-stats () + (setq *contract-stats* (make-contract-stats)) + (dolist (contract (class-instances 'contract)) + (add-to-contract-stats contract))) + +(defun add-to-contract-stats (contract) + (let* ((area (contract-area contract)) + (sponsor (contract-sponsor contract)) + (new-sponsor-p (alexandria:length= 1 (sponsor-contracts sponsor))) + (country (string-upcase (sponsor-country sponsor)))) + (with-slots (sold-m2s paying-sponsors country-sponsors last-contracts) + *contract-stats* + ;; sold-m2s + (incf sold-m2s area) + ;; paying-sponsors + (when new-sponsor-p + (incf paying-sponsors)) + ;; country-sponsors + (let ((country-stat (gethash country country-sponsors (make-country-stat)))) + (when new-sponsor-p + (incf (country-stat-paying-sponsors country-stat))) + (incf (country-stat-sold-m2s country-stat) area)) + ;; last-contracts + (setf last-contracts (nbutlast last-contracts)) + (push contract last-contracts)))) + (defun number-of-sold-sqm () - (let ((retval 0)) - (dolist (contract (remove-if-not #'contract-paidp (class-instances 'contract))) - (incf retval (length (contract-m2s contract)))) - retval)) + (contract-stats-sold-m2s *contract-stats*)) +(defun paying-sponsors () + (contract-stats-paying-sponsors *contract-stats*)) + +(defun contract-stats-for-country (country) + (let ((stat (gethash country (contract-stats-country-sponsors *contract-stats*)))) + (if stat + (values (country-stat-paying-sponsors stat) + (country-stat-sold-m2s stat)) + (values 0 0)))) + +(defun last-paid-contracts () + (remove-if (lambda (contract) + (or (null contract) + (object-destroyed-p contract))) + (contract-stats-last-contracts *contract-stats*))) + +(register-store-transient-init-function 'initialize-contract-stats) + (defun string-safe (string) (if string (escape-nl (arnesi:escape-as-html string)) Modified: trunk/projects/bos/m2/packages.lisp =================================================================== --- trunk/projects/bos/m2/packages.lisp 2008-07-17 09:08:08 UTC (rev 3478) +++ trunk/projects/bos/m2/packages.lisp 2008-07-17 11:42:34 UTC (rev 3479) @@ -165,8 +165,13 @@ #:contract-pdf-pathname #:contract-pdf-url #:contract-download-only-p + ;; contract-stats + #:number-of-sold-sqm + #:paying-sponsors + #:contract-stats-for-country + #:last-paid-contracts + #:make-m2-javascript - #:last-paid-contracts #:recolorize-contracts #:contracts-well-colored-p #:contract-published-p Modified: trunk/projects/bos/m2/poi.lisp =================================================================== --- trunk/projects/bos/m2/poi.lisp 2008-07-17 09:08:08 UTC (rev 3478) +++ trunk/projects/bos/m2/poi.lisp 2008-07-17 11:42:34 UTC (rev 3479) @@ -127,8 +127,8 @@ (defun make-poi-javascript (language) "Erzeugt das POI-Javascript für das Infosystem" (with-output-to-string (*standard-output*) - (format t "var anzahlSponsoren = ~D;~%" (length (remove-if-not #'(lambda (sponsor) (some #'contract-paidp (sponsor-contracts sponsor))) - (class-instances 'sponsor)))) + (format t "var anzahlSponsoren = ~D;~%" (count-if (lambda (sponsor) (some #'contract-paidp (sponsor-contracts sponsor))) + (class-instances 'sponsor))) (format t "var anzahlVerkauft = ~D;~%" (bos.m2::number-of-sold-sqm)) (format t "var pois = new Array;~%") (dolist (poi (sort (remove-if #'(lambda (poi) (or (not (poi-complete poi language))

1 0

[bknr-cvs] hans changed trunk/projects/bos/
by BKNR Commits 17 Jul '08

17 Jul '08

Revision: 3478 Author: hans URL: http://bknr.net/trac/changeset/3478 Get PDF generation with M2 icon to work. U trunk/projects/bos/Makefile U trunk/projects/bos/m2/cert-daemon.lisp U trunk/projects/bos/m2/m2-pdf.lisp Modified: trunk/projects/bos/Makefile =================================================================== --- trunk/projects/bos/Makefile 2008-07-17 09:02:14 UTC (rev 3477) +++ trunk/projects/bos/Makefile 2008-07-17 09:08:08 UTC (rev 3478) @@ -2,7 +2,7 @@ .PHONY: all bos.core: build.lisp - sbcl --load build.lisp --eval '(sb-ext:save-lisp-and-die "bos.core")' + env LANG=en_US.UTF-8 sbcl --load build.lisp --eval '(sb-ext:save-lisp-and-die "bos.core")' # various cleaning stuff .PHONY: cleancore Modified: trunk/projects/bos/m2/cert-daemon.lisp =================================================================== --- trunk/projects/bos/m2/cert-daemon.lisp 2008-07-17 09:02:14 UTC (rev 3477) +++ trunk/projects/bos/m2/cert-daemon.lisp 2008-07-17 09:08:08 UTC (rev 3478) @@ -1,19 +1,13 @@ (in-package :bos.m2.cert-generator) -(defun run-tool (program &optional program-args &rest args) - (let* ((process (apply #'run-program program program-args :search t :output :stream args)) - (error-message (unless (zerop (process-exit-code process)) - (with-output-to-string (*standard-output*) - (with-open-stream (output-stream (process-output process)) - (princ (read-line output-stream nil))))))) - (process-close process) - (unless (zerop (process-exit-code process)) - (error "Error executing ~A - Exit code ~D~%Error message: ~A" - (format nil "\"~A~{ ~A~}\"" program program-args) (process-exit-code process) error-message)))) +(defun run-tool (program &rest args) + (let ((asdf::*verbose-out* t)) + (apply #'asdf:run-shell-command "~S ~{~S ~}" program args))) (defun fill-form (fdf-pathname pdf-pathname m2-pdf-pathname output-pathname) (handler-case - (with-temporary-file (temporary-pdf-pathname :defaults #P"/tmp/.pdf") + (with-temporary-file (temporary-pdf-pathname :defaults (make-pathname :directory '(:absolute "tmp") + :type "pdf")) (cond ((namestring pdf-pathname) (run-tool "pdftk" (list (namestring pdf-pathname) @@ -42,7 +36,7 @@ country)) template-pathname)) (m2-pdf-pathname (merge-pathnames - (make-pathname :name (format nil "~A-m2s" id)) + (make-pathname :name (format nil "~A-m2s" id) :type "pdf") fdf-pathname)) (output-pathname (merge-pathnames (make-pathname :name id :type "pdf") fdf-pathname))) (fill-form fdf-pathname Modified: trunk/projects/bos/m2/m2-pdf.lisp =================================================================== --- trunk/projects/bos/m2/m2-pdf.lisp 2008-07-17 09:02:14 UTC (rev 3477) +++ trunk/projects/bos/m2/m2-pdf.lisp 2008-07-17 09:08:08 UTC (rev 3478) @@ -58,7 +58,10 @@ (pdf:line-to x y) (pdf:close-fill-and-stroke))))))) - (with-open-file (f (contract-m2-pdf-pathname contract :print print) :direction :output :if-exists :supersede) + (with-open-file (f (contract-m2-pdf-pathname contract :print print) + :direction :output + :if-exists :supersede + :external-format :iso-8859-1) ;; cl-pdf does not really handle non-ascii characters in a very ;; usable manner. In order to avoid having to deal with ;; embedding fonts and encoding, just work around the issue:

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/m2/m2.lisp
by BKNR Commits 17 Jul '08

17 Jul '08

Revision: 3477 Author: ksprotte URL: http://bknr.net/trac/changeset/3477 renamed add-contract-to-cache -> add-to-last-contracts-cache U trunk/projects/bos/m2/m2.lisp Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-07-17 07:45:32 UTC (rev 3476) +++ trunk/projects/bos/m2/m2.lisp 2008-07-17 09:02:14 UTC (rev 3477) @@ -295,7 +295,7 @@ (deftransaction contract-set-paidp (contract newval) (setf (contract-paidp contract) newval) (publish-contract-change contract) - (add-contract-to-cache contract) + (add-to-last-contracts-cache contract) (bknr.rss::add-item "news" contract)) (defmethod contract-price ((contract contract)) @@ -591,7 +591,7 @@ 0 +last-contracts-cache-size+))) (remove-if #'object-destroyed-p *last-contracts-cache*)) -(defun add-contract-to-cache (contract) +(defun add-to-last-contracts-cache (contract) (last-paid-contracts) ; force cache initialization, should really be done by a eval-when (push contract *last-contracts-cache*) (setf (cdr (nthcdr (1- +last-contracts-cache-size+) *last-contracts-cache*)) nil))

1 0

[bknr-cvs] ksprotte changed trunk/build.lisp
by BKNR Commits 17 Jul '08

17 Jul '08

Revision: 3476 Author: ksprotte URL: http://bknr.net/trac/changeset/3476 dont run :bos.test on darwin U trunk/build.lisp Modified: trunk/build.lisp =================================================================== --- trunk/build.lisp 2008-07-17 06:11:30 UTC (rev 3475) +++ trunk/build.lisp 2008-07-17 07:45:32 UTC (rev 3476) @@ -199,7 +199,7 @@ (unit-test:run-all-tests) (rt:do-tests) (fiveam-run-no-failures-p :bknr.datastore) - (fiveam-run-no-failures-p :bos.test) + #-darwin (fiveam-run-no-failures-p :bos.test) (progn #+(or) (fiveam-run-no-failures-p :it.bese.FiveAM) (warn "skipping :it.bese.FiveAM tests") t)

1 0

[bknr-cvs] hans changed trunk/projects/bos/m2/allocation.lisp
by BKNR Commits 17 Jul '08

17 Jul '08

Revision: 3475 Author: hans URL: http://bknr.net/trac/changeset/3475 updates to transient slots no longer update LAST-CHANGE, so revert 3469 U trunk/projects/bos/m2/allocation.lisp Modified: trunk/projects/bos/m2/allocation.lisp =================================================================== --- trunk/projects/bos/m2/allocation.lisp 2008-07-17 06:09:00 UTC (rev 3474) +++ trunk/projects/bos/m2/allocation.lisp 2008-07-17 06:11:30 UTC (rev 3475) @@ -164,12 +164,11 @@ (defmethod allocation-area-bounding-box ((allocation-area allocation-area)) (with-slots (left top width height bounding-box) allocation-area (unless (slot-boundp allocation-area 'bounding-box) - (with-transaction ("setf allocation-area bounding-box") - (setf bounding-box (coerce (list (cons left top) - (cons (+ left width) top) - (cons (+ left width) (+ top height)) - (cons left (+ top height))) - 'vector)))) + (setf bounding-box (coerce (list (cons left top) + (cons (+ left width) top) + (cons (+ left width) (+ top height)) + (cons left (+ top height))) + 'vector))) bounding-box)) (defmethod allocation-area-bounding-box2 ((allocation-area allocation-area))

1 0

[bknr-cvs] hans changed trunk/bknr/datastore/src/data/object.lisp
by BKNR Commits 17 Jul '08

17 Jul '08

Revision: 3474 Author: hans URL: http://bknr.net/trac/changeset/3474 Only update LAST-CHANGE slot if another persistent slot is changed. U trunk/bknr/datastore/src/data/object.lisp Modified: trunk/bknr/datastore/src/data/object.lisp =================================================================== --- trunk/bknr/datastore/src/data/object.lisp 2008-07-16 18:11:24 UTC (rev 3473) +++ trunk/bknr/datastore/src/data/object.lisp 2008-07-17 06:09:00 UTC (rev 3474) @@ -89,8 +89,9 @@ (not (in-transaction-p))) (error "Attempt to set persistent slot ~A of ~A outside of a transaction" slot-name object)) - (unless (or (eq :restore (store-state *store*)) - (eq 'last-change slot-name)) + (when (and (persistent-slot-p slotd) + (not (eq :restore (store-state *store*))) + (not (eq 'last-change slot-name))) (setf (slot-value object 'last-change) (current-transaction-timestamp))))) (defmethod (setf slot-value-using-class) :after (newval (class persistent-class) object slotd)

1 0

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

16 Jul '08

Revision: 3473 Author: hans URL: http://bknr.net/trac/changeset/3473 Snapshot U trunk/projects/quickhoney/src/init.lisp A trunk/projects/quickhoney/upgrade-stuff/QH_Layout_Overlay_01.png A trunk/projects/quickhoney/upgrade-stuff/QH_Layout_Pixel_06_1_floating_flat.png A trunk/projects/quickhoney/upgrade-stuff/button-bottom.gif A trunk/projects/quickhoney/upgrade-stuff/buy.gif A trunk/projects/quickhoney/upgrade-stuff/hey.gif U trunk/projects/quickhoney/upgrade-stuff/import.lisp A trunk/projects/quickhoney/upgrade-stuff/overlay-close.gif U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/quickhoney/website/static/styles.css U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/projects/quickhoney/src/init.lisp =================================================================== --- trunk/projects/quickhoney/src/init.lisp 2008-07-16 15:17:06 UTC (rev 3472) +++ trunk/projects/quickhoney/src/init.lisp 2008-07-16 18:11:24 UTC (rev 3473) @@ -1,22 +1,33 @@ (in-package :quickhoney) +(defvar *dumped-image* nil) + +(defun dump-executable () + #+openmcl + (ccl:save-application "quickhoney" :prepend-kernel t)) + (defun startup () - (setq cxml::*default-catalog* '("/home/hans/share/xml/catalog")) - (setf *hunchentoot-default-external-format* (flex:make-external-format :utf-8 :eol-style :lf)) - (close-store) - (make-instance 'store - :directory *store-directory* - :subsystems (list (make-instance 'store-object-subsystem) - (make-instance 'blob-subsystem - :n-blobs-per-directory 1000))) + (cond + (*dumped-image* + (asdf:oos 'asdf:load-op :quickhoney) + (format t "; starting from dumped image, skipping store initialization~%")) + (t + (setq cxml::*default-catalog* '("/home/hans/share/xml/catalog")) + (setf *hunchentoot-default-external-format* (flex:make-external-format :utf-8 :eol-style :lf)) + (close-store) + (make-instance 'store + :directory *store-directory* + :subsystems (list (make-instance 'store-object-subsystem) + (make-instance 'blob-subsystem + :n-blobs-per-directory 1000))) - (unless (class-instances 'bknr.cron::cron-job) - (bknr.cron:make-cron-job "daily statistics" 'make-yesterdays-statistics 1 0 :every :every) - (bknr.cron:make-cron-job "snapshot" 'snapshot-store 0 5 :every :every)) - (unless (class-instances 'rss-channel) - (make-rss-channel "quickhoney" "QuickHoney" "QuickHoney Illustrations" "rss/quickhoney" - :items (class-instances 'quickhoney-image))) - (cl-gd::load-gd-glue) + (unless (class-instances 'bknr.cron::cron-job) + (bknr.cron:make-cron-job "daily statistics" 'make-yesterdays-statistics 1 0 :every :every) + (bknr.cron:make-cron-job "snapshot" 'snapshot-store 0 5 :every :every)) + (unless (class-instances 'rss-channel) + (make-rss-channel "quickhoney" "QuickHoney" "QuickHoney Illustrations" "rss/quickhoney" + :items (class-instances 'quickhoney-image))) + (cl-gd::load-gd-glue))) #+cmu (actor-start (make-instance 'cron-actor)) (publish-quickhoney) Added: trunk/projects/quickhoney/upgrade-stuff/QH_Layout_Overlay_01.png =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/QH_Layout_Overlay_01.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/projects/quickhoney/upgrade-stuff/QH_Layout_Pixel_06_1_floating_flat.png =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/QH_Layout_Pixel_06_1_floating_flat.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/projects/quickhoney/upgrade-stuff/button-bottom.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/button-bottom.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/projects/quickhoney/upgrade-stuff/buy.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/buy.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/projects/quickhoney/upgrade-stuff/hey.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/hey.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-07-16 15:17:06 UTC (rev 3472) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-07-16 18:11:24 UTC (rev 3473) @@ -3,4 +3,7 @@ (dolist (name '(#p"type-news.png" #p"type-pixel.png" #p"type-shop.png" #p"type-vector.png")) (import-image name :keywords '(:type))) +(dolist (name '(#P"overlay-close.gif" #P"hey.gif" #P"buy.gif" #P"button-bottom.gif")) + (import-image name)) + (import-image #p"news-sep.png") \ No newline at end of file Added: trunk/projects/quickhoney/upgrade-stuff/overlay-close.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/overlay-close.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-07-16 15:17:06 UTC (rev 3472) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-07-16 18:11:24 UTC (rev 3473) @@ -49,7 +49,7 @@ for (var i = 0; i < arguments.length; i++) { message += arguments[i]; } - if (window.console.log) { + if (window.console && window.console.log) { window.console.log(message); } if (want_debugger) { @@ -869,10 +869,10 @@ footer_hide(); display_path(); make_images_navbar(); + make_image_action_buttons(); $("results").style.visibility = 'hidden'; $("browse").style.visibility = 'visible'; - $("digg_picture_name").innerHTML = current_image.name; var ratio = 1 / Math.max(current_image.width / 648, current_image.height / 648); var imageproc_ops = ""; @@ -972,13 +972,14 @@ } } -function digg_send() +function hey_send() { var d = doXHR("/digg-image/" + current_image.id, { method: 'POST', headers: {"Content-Type":"application/x-www-form-urlencoded"}, - sendContent: queryString({ from: $('digg_from').value, text: $('digg_text').value }) }) - .addCallback(function () { alert('sent'); }); + sendContent: queryString({ from: $('hey_from').value, text: $('hey_text').value }) }) + .addCallback(hide_overlay); + make_overlay('send-comment', 'Sending your comment', 300); return false; } @@ -1144,3 +1145,78 @@ { document.location.href = document.location.href.replace(/\/image-browse.*/, "index#"); } + +function hide_overlay() +{ + $('overlay').style.visibility = 'hidden'; + return false; +} + +/* make_overlay() opens an overlay window with the given title. + * Additional arguments passed are assumed to be DOM child nodes and + * are added to the overlay window. + */ + +function make_overlay(id, title, width) +{ + var overlay = $('overlay'); + overlay.className = current_directory; + replaceChildNodes(overlay, + H1(null, title), + IMG({ src: '/image/overlay-close/color,000000,' + pages[current_directory].colors[2], + id: 'close', width: 13, height: 13})); + overlay.style.width = width + 'px'; + $('close').style.left = (width - 23) + 'px'; + $('close').onclick = hide_overlay; + var elements = []; + for (var i = 3; i < arguments.length; i++) { + elements.push(arguments[i]); + } + appendChildNodes(overlay, DIV({id: id}, elements)); + overlay.style.visibility = 'inherit'; +} + +function make_hey_form() +{ + var subject = 'Comment on ' + current_image.name; + make_overlay('hey', 'Comment', 320, + FORM({ method: 'POST', action: '#' }, + 'email', + BR(), + INPUT({ type: 'text', id: 'hey_from', 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_buy_form() +{ +} + +function recolored_image_path(name) +{ + return '/image/' + name + '/color,000000,' + pages[current_directory].colors[2]; +} + +function make_image_action_button(name, action) +{ + var div = DIV(null, IMG({ src: recolored_image_path(name), width: 60, height: 23 })); + div.onclick = function() { action(); return false; }; + return div; +} + +function make_image_action_buttons() +{ + var buttons = []; + if (1 || current_image.download_product) { + buttons.push(make_image_action_button('buy', make_buy_form)); + } + buttons.push(make_image_action_button('hey', make_hey_form)); + buttons.push(DIV(null, IMG({ src: recolored_image_path('button-bottom'), width: 60, height: 1 }))); + replaceChildNodes('image_action_buttons', buttons); +} \ No newline at end of file Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2008-07-16 15:17:06 UTC (rev 3472) +++ trunk/projects/quickhoney/website/static/styles.css 2008-07-16 18:11:24 UTC (rev 3473) @@ -377,17 +377,6 @@ z-index: 1; } -/* digg form */ - -div#digg { - position: absolute; - left: 700px; - top: 500px; - z-index: 10; - background-color: #eee; - padding: 10px; -} - /* news styles */ div#news_page { @@ -495,3 +484,48 @@ #frontpage div p { margin: 2em; } + +#overlay { + z-index: 100; + position: absolute; + background: white; + border: 1px solid #000000; + margin: 0px; + padding: 0px; +} + +#overlay #close { + position: absolute; + top: 12px; +} + +#overlay h1 { + margin-left: 10px; +} + +#overlay.pixel h1, #overlay.pixel h2 { + color: #ff00ff; +} + +#overlay.vector h1, #overlay.vector h2 { + color: #00ccff; +} + +#image_action_buttons { + position: absolute; + left: 584px; + top: 32px; + z-index: 100; +} + +#overlay #hey { + padding: 10px 15px 10px 10px; +} + +#overlay #hey #hey_from, #overlay #hey textarea { + width: 100%; +} + +#overlay #hey #hey_send { + margin-top: 5px; +} \ No newline at end of file Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-07-16 15:17:06 UTC (rev 3472) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-07-16 18:11:24 UTC (rev 3473) @@ -24,6 +24,9 @@ <body id="body"> + <div id="overlay"> + </div> + <div id="menu"> <a onclick="show_page('home')" href="#home"> <img alt="home" class="menu" id="m_home" src="/image/quickhoney" /> @@ -108,6 +111,9 @@ </span> </span> + <div id="image_action_buttons"> + </div> + <div id="image_detail"> </div> @@ -175,18 +181,6 @@ </div> </div> - <div id="digg"> - <form id="digg_form" method="post" action="#"> - From: <input type="text" id="digg_from" value=""/> - <br/> - Your comment on <b id="digg_picture_name"> </b>: - <br/> - <textarea name="text" id="digg_text" rows="10" cols="60"> </textarea> - <br/> - <button type="submit" onclick="return digg_send();">send</button> - </form> - </div> -  <div id="cms">

1 0

[bknr-cvs] hans changed trunk/bknr/LICENSE
by BKNR Commits 16 Jul '08

16 Jul '08

Revision: 3472 Author: hans URL: http://bknr.net/trac/changeset/3472 update LICENSE U trunk/bknr/LICENSE Modified: trunk/bknr/LICENSE =================================================================== --- trunk/bknr/LICENSE 2008-07-16 15:14:37 UTC (rev 3471) +++ trunk/bknr/LICENSE 2008-07-16 15:17:06 UTC (rev 3472) @@ -1,4 +1,5 @@ -Copyright (c) 2003,2004,2005, BKNR (Hans Hübner, Manuel Odendahl) +Copyright (c) 2003-2008 BKNR (Hans Hübner, Manuel Odendahl, +David Lichteblau, Kilian Sprotte) All rights reserved. Redistribution and use in source and binary forms, with or without

1 0

[bknr-cvs] hans changed buildbot/master/Makefile
by BKNR Commits 16 Jul '08

16 Jul '08

Revision: 3471 Author: hans URL: http://bknr.net/trac/changeset/3471 dummy change to trigger update U buildbot/master/Makefile Modified: buildbot/master/Makefile =================================================================== --- buildbot/master/Makefile 2008-07-16 15:05:15 UTC (rev 3470) +++ buildbot/master/Makefile 2008-07-16 15:14:37 UTC (rev 3471) @@ -20,3 +20,4 @@ update: svn update +

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

bknr-cvs