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

[bknr-cvs] hans changed trunk/thirdparty/yui/build/editor/assets/skins/sam/simpleeditor.css
by BKNR Commits 26 Sep '08

26 Sep '08

Revision: 3964 Author: hans URL: http://bknr.net/trac/changeset/3964 Update image paths U trunk/thirdparty/yui/build/editor/assets/skins/sam/simpleeditor.css Modified: trunk/thirdparty/yui/build/editor/assets/skins/sam/simpleeditor.css =================================================================== --- trunk/thirdparty/yui/build/editor/assets/skins/sam/simpleeditor.css 2008-09-26 15:03:28 UTC (rev 3963) +++ trunk/thirdparty/yui/build/editor/assets/skins/sam/simpleeditor.css 2008-09-26 15:11:35 UTC (rev 3964) @@ -4,4 +4,4 @@ http://developer.yahoo.net/yui/license.txt version: 2.5.2 */ -.yui-busy{cursor:wait !important;}.yui-toolbar-container fieldset{padding:0;margin:0;border:0;}.yui-toolbar-container legend{display:none;}.yui-toolbar-container .yui-toolbar-subcont{padding:.25em 0;zoom:1;}.yui-toolbar-container-collapsed .yui-toolbar-subcont{display:none;}.yui-toolbar-container .yui-toolbar-subcont:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-toolbar-container span.yui-toolbar-draghandle{cursor:move;border-left:1px solid #999;border-right:1px solid #999;overflow:hidden;text-indent:77777px;width:2px;height:20px;display:block;clear:none;float:left;margin:0 0 0 .2em;}.yui-toolbar-container .yui-toolbar-titlebar.draggable{cursor:move;}.yui-toolbar-container .yui-toolbar-titlebar{position:relative;}.yui-toolbar-container .yui-toolbar-titlebar h2{font-weight:bold;letter-spacing:0;border:none;color:#000;margin:0;padding:.2em;}.yui-toolbar-container .yui-toolbar-titlebar h2 a{text-decoration:none;color:#000;cursor:default;}.yui-toolbar-container.yui-toolbar-grouped span.yui-toolbar-draghandle{height:40px;}.yui-toolbar-container .yui-toolbar-group{float:left;zoom:1;}.yui-toolbar-container .yui-toolbar-group:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-toolbar-container .yui-toolbar-group h3{font-size:75%;padding:0 0 0 .25em;margin:0;}.yui-toolbar-container span.yui-toolbar-separator{width:2px;height:18px;margin:.2em 0 .2em .1em;display:block;clear:none;float:left;}.yui-toolbar-container.yui-toolbar-grouped span.yui-toolbar-separator{height:35px;}.yui-toolbar-container.yui-toolbar-grouped .yui-toolbar-group span.yui-toolbar-separator{height:18px;}.yui-toolbar-container ul li{margin:0;padding:0;list-style-type:none;}.yui-toolbar-container .yui-toolbar-nogrouplabels h3{display:none;}.yui-toolbar-container .yui-push-button,.yui-toolbar-container .yui-color-button,.yui-toolbar-container .yui-menu-button{position:relative;cursor:pointer;}.yui-toolbar-container .yui-button .first-child,.yui-toolbar-container .yui-button .first-child a{height:100%;width:100%;overflow:hidden;}.yui-toolbar-container .yui-button-disabled{cursor:default;}.yui-toolbar-container .yui-button-disabled .yui-toolbar-icon{opacity:.5;filter:alpha(opacity=50);}.yui-toolbar-container .yui-button-disabled .up,.yui-toolbar-container .yui-button-disabled .down{opacity:.5;filter:alpha(opacity=50);}.yui-toolbar-container .yui-button a{overflow:hidden;}.yui-toolbar-container .yui-toolbar-select .first-child a{cursor:pointer;}.yui-toolbar-fontname-arial{font-family:Arial;}.yui-toolbar-fontname-arial-black{font-family:Arial Black;}.yui-toolbar-fontname-comic-sans-ms{font-family:Comic Sans MS;}.yui-toolbar-fontname-courier-new{font-family:Courier New;}.yui-toolbar-fontname-times-new-roman{font-family:Times New Roman;}.yui-toolbar-fontname-verdana{font-family:Verdana;}.yui-toolbar-fontname-impact{font-family:Impact;}.yui-toolbar-fontname-lucida-console{font-family:Lucida Console;}.yui-toolbar-fontname-tahoma{font-family:Tahoma;}.yui-toolbar-fontname-trebuchet-ms{font-family:Trebuchet MS;}.yui-toolbar-container .yui-toolbar-spinbutton{position:relative;}.yui-toolbar-container .yui-toolbar-spinbutton .first-child a{z-index:0;opacity:1;}.yui-toolbar-container .yui-toolbar-spinbutton a.up,.yui-toolbar-container .yui-toolbar-spinbutton a.down{position:absolute;display:block right:0;cursor:pointer;z-index:1;padding:0;margin:0;}.yui-toolbar-container .yui-overlay{position:absolute;}.yui-toolbar-container .yui-overlay ul li{margin:0;list-style-type:none;}.yui-toolbar-container{z-index:1;}.yui-editor-container .yui-editor-editable-container{position:relative;z-index:0;width:100%;}.yui-editor-container .yui-editor-masked{background-color:#CCC;}.yui-editor-container iframe{border:0px;padding:0;margin:0;zoom:1;display:block;}.yui-editor-container .yui-editor-editable{padding:0;margin:0;}.yui-editor-container .dompath{font-size:85%;}.yui-editor-panel .hd{text-align:left;position:relative;}.yui-editor-panel .hd h3{font-weight:bold;padding:0.25em 0pt 0.25em 0.25em;margin:0;}.yui-editor-panel .bd{width:100%;zoom:1;position:relative;}.yui-editor-panel .bd div.yui-editor-body-cont{padding:.25em .1em;zoom:1;}.yui-editor-panel .bd .gecko form{overflow:auto;}.yui-editor-panel .bd div.yui-editor-body-cont:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-editor-panel .ft{text-align:right;width:99%;float:left;clear:both;}.yui-editor-panel .ft span.tip{display:block;position:relative;padding:.5em .5em .5em 23px;text-align:left;zoom:1;}.yui-editor-panel label{clear:both;float:left;padding:0;width:100%;text-align:left;zoom:1;}.yui-editor-panel .gecko label{overflow:auto;}.yui-editor-panel label strong{float:left;width:6em;}.yui-editor-panel .removeLink{width:80%;text-align:right;}.yui-editor-panel label input{margin-left:.25em;float:left;}.yui-editor-panel .yui-toolbar-group-padding{}.yui-editor-panel .yui-toolbar-group-border{}.yui-editor-panel .yui-toolbar-group-textflow{}.yui-editor-panel .height-width{float:left;}.yui-editor-panel .height-width h3{}.yui-editor-panel .height-width span{font-style:italic;display:block;float:left;overflow:visible;}.yui-editor-panel .height-width span.info{font-size:70%;margin-top:3px;}.yui-editor-panel .yui-toolbar-bordersize,.yui-editor-panel .yui-toolbar-bordertype{font-size:75%;}.yui-editor-panel .yui-toolbar-container span.yui-toolbar-separator{border:none;}.yui-editor-panel .yui-toolbar-bordersize span a span,.yui-editor-panel .yui-toolbar-bordertype span a span{display:block;height:8px;left:4px;position:absolute;top:3px;*top:-5px;width:24px;}.yui-editor-panel .yui-toolbar-bordertype span a span.yui-toolbar-bordertype-solid{border-bottom:1px solid black;}.yui-editor-panel .yui-toolbar-bordertype span a span.yui-toolbar-bordertype-dotted{border-bottom:1px dotted black;}.yui-editor-panel .yui-toolbar-bordertype span a span.yui-toolbar-bordertype-dashed{border-bottom:1px dashed black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-0{*top:0px;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-1{border-bottom:1px solid black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-2{border-bottom:2px solid black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-3{top:2px;*top:-5px;border-bottom:3px solid black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-4{top:1px;*top:-5px;border-bottom:4px solid black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-5{top:1px;*top:-5px;border-bottom:5px solid black;}.yui-toolbar-container .yui-toolbar-bordersize-menu,.yui-toolbar-container .yui-toolbar-bordertype-menu{width:95px !important;}.yui-toolbar-bordersize-menu .yuimenuitemlabel,.yui-toolbar-bordertype-menu .yuimenuitemlabel,.yui-toolbar-bordersize-menu .yuimenuitemlabel,.yui-toolbar-bordertype-menu .yuimenuitemlabel:hover{margin:0px 3px 7px 17px;}.yui-toolbar-bordersize-menu .yuimenuitemlabel .checkedindicator,.yui-toolbar-bordertype-menu .yuimenuitemlabel .checkedindicator{position:absolute;left:-12px;*top:14px;*left:0px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-1 a{border-bottom:1px solid black;height:14px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-2 a{border-bottom:2px solid black;height:14px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-3 a{border-bottom:3px solid black;height:14px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-4 a{border-bottom:4px solid black;height:14px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-5 a{border-bottom:5px solid black;height:14px;}.yui-toolbar-bordertype-menu li.yui-toolbar-bordertype-solid a{border-bottom:1px solid black;height:14px;}.yui-toolbar-bordertype-menu li.yui-toolbar-bordertype-dashed a{border-bottom:1px dashed black;height:14px;}.yui-toolbar-bordertype-menu li.yui-toolbar-bordertype-dotted a{border-bottom:1px dotted black;height:14px;}h2.yui-editor-skipheader,h3.yui-editor-skipheader{height:0;margin:0;padding:0;border:none;width:0;overflow:hidden;position:absolute;}.yui-toolbar-colors{width:133px;zoom:1;display:none;z-index:100;overflow:hidden;}.yui-toolbar-colors:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-toolbar-colors a{height:9px;width:9px;float:left;display:block;overflow:hidden;text-indent:999px;margin:0;cursor:pointer;border:1px solid #F6F7EE;}.yui-toolbar-colors a:hover{border:1px solid black;}.yui-color-button-menu{overflow:visible;background-color:transparent;}.yui-toolbar-colors span{position:relative;display:block;padding:3px;overflow:hidden;float:left;width:100%;zoom:1;}.yui-toolbar-colors span:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-toolbar-colors span em{height:35px;width:30px;float:left;display:block;overflow:hidden;text-indent:999px;margin:0.75px;border:1px solid black;}.yui-toolbar-colors span strong{font-weight:normal;padding-left:3px;display:block;font-size:85%;float:left;width:65%;}.yui-skin-sam .yui-editor-container{border:1px solid #808080;}.yui-skin-sam .yui-toolbar-container{zoom:1;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-titlebar{background:url(../../../../assets/skins/sam/sprite.png) repeat-x 0 -200px;position:relative;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-titlebar h2{color:#000000;font-weight:bold;margin:0;padding:0.3em 1em;font-size:100%;text-align:left;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-group h3{color:#808080;font-size:75%;margin:1em 0 0;padding-bottom:0;padding-left:0.25em;text-align:left;}.yui-toolbar-container span.yui-toolbar-separator{border:none;text-indent:33px;overflow:hidden;margin:0 .25em;}.yui-skin-sam .yui-toolbar-container{background-color:#F2F2F2;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-subcont{padding:0 1em 0.35em;border-bottom:1px solid #808080;}.yui-skin-sam .yui-toolbar-container-collapsed .yui-toolbar-titlebar{border-bottom:1px solid #808080;}.yui-skin-sam .yui-editor-container .visible .yui-menu-shadow,.yui-skin-sam .yui-editor-panel .visible .yui-menu-shadow{display:none;}.yui-skin-sam .yui-editor-container ul{list-style-type:none;margin:0;padding:0;}.yui-skin-sam .yui-editor-container ul li{list-style-type:none;margin:0;padding:0;}.yui-skin-sam .yui-toolbar-group ul li.yui-toolbar-groupitem{float:left;}.yui-skin-sam .yui-editor-container .dompath{background-color:#F2F2F2;border-top:1px solid #808080;color:#999;text-align:left;padding:0.25em;}.yui-skin-sam .yui-toolbar-container .collapse{background:url(../../../../assets/skins/sam/sprite.png) no-repeat 0 -400px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-titlebar span.collapse{cursor:pointer;position:absolute;top:4px;right:2px;display:block;overflow:hidden;height:15px;width:15px;text-indent:9999px;}.yui-skin-sam .yui-toolbar-container .yui-push-button,.yui-skin-sam .yui-toolbar-container .yui-color-button,.yui-skin-sam .yui-toolbar-container .yui-menu-button{background:url(../../../../assets/skins/sam/sprite.png) repeat-x 0 0;position:relative;display:block;height:22px;width:30px;margin:0;border-color:#808080;border-style:solid;border-width:1px 0;}.yui-skin-sam .yui-toolbar-container .yui-push-button a,.yui-skin-sam .yui-toolbar-container .yui-color-button a,.yui-skin-sam .yui-toolbar-container .yui-menu-button a{padding-left:35px;height:20px;text-decoration:none;font-size:93%;line-height:2;display:block;color:#000000;overflow:hidden;}.yui-skin-sam .yui-toolbar-container .yui-push-button .first-child,.yui-skin-sam .yui-toolbar-container .yui-color-button .first-child,.yui-skin-sam .yui-toolbar-container .yui-menu-button .first-child{border-color:#808080;border-style:solid;border-width:0 1px;margin:0 -1px;display:block;}.yui-skin-sam .yui-toolbar-container .yui-push-button-disabled .first-child,.yui-skin-sam .yui-toolbar-container .yui-color-button-disabled .first-child,.yui-skin-sam .yui-toolbar-container .yui-menu-button-disabled .first-child{border-color:#ccc;}.yui-skin-sam .yui-toolbar-container .yui-push-button-disabled a,.yui-skin-sam .yui-toolbar-container .yui-color-button-disabled a,.yui-skin-sam .yui-toolbar-container .yui-menu-button-disabled a{color:#A6A6A6;cursor:default;}.yui-skin-sam .yui-toolbar-container .yui-push-button-disabled,.yui-skin-sam .yui-toolbar-container .yui-color-button-disabled,.yui-skin-sam .yui-toolbar-container .yui-menu-button-disabled{border-color:#ccc;}.yui-skin-sam .yui-toolbar-container .yui-button .first-child{*left:0px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-fontname{width:135px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-heading{width:92px;}.yui-skin-sam .yui-toolbar-container .yui-button-hover{background:url(../../../../assets/skins/sam/sprite.png) repeat-x 0 -1300px;border-color:#808080;}.yui-skin-sam .yui-toolbar-container .yui-button-selected{background:url(../../../../assets/skins/sam/sprite.png) repeat-x 0 -1700px;border-color:#808080;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-nogrouplabels h3{display:none;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-nogrouplabels .yui-toolbar-group{margin-top:.75em;}.yui-skin-sam .yui-toolbar-container .yui-push-button span.yui-toolbar-icon,.yui-skin-sam .yui-toolbar-container .yui-color-button span.yui-toolbar-icon,.yui-skin-sam .yui-toolbar-container .yui-menu-button span.yui-toolbar-icon{display:block;position:absolute;top:2px;height:18px;width:18px;overflow:hidden;background:url(editor-sprite.gif) no-repeat 30px 30px;}.yui-skin-sam .yui-toolbar-container .yui-button-selected span.yui-toolbar-icon,.yui-skin-sam .yui-toolbar-container .yui-button-hover span.yui-toolbar-icon{background-image:url(editor-sprite-active.gif);}.yui-skin-sam .yui-toolbar-container .visible .yuimenuitemlabel{cursor:pointer;color:#000;*position:relative;}.yui-skin-sam .yui-toolbar-container .yui-button-menu{background-color:#fff;}.yui-skin-sam div.yuimenu li.selected{background-color:#B3D4FF;}.yui-skin-sam div.yuimenu li.selected a.selected{color:#000;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-bold span.yui-toolbar-icon{background-position:0 0;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-strikethrough span.yui-toolbar-icon{background-position:0 -108px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-italic span.yui-toolbar-icon{background-position:0 -36px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-underline span.yui-toolbar-icon{background-position:0 -72px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-subscript span.yui-toolbar-icon{background-position:0 -180px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-superscript span.yui-toolbar-icon{background-position:0 -144px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-forecolor span.yui-toolbar-icon{background-position:0 -216px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-backcolor span.yui-toolbar-icon{background-position:0 -288px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-justifyleft span.yui-toolbar-icon{background-position:0 -324px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-justifycenter span.yui-toolbar-icon{background-position:0 -360px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-justifyright span.yui-toolbar-icon{background-position:0 -396px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-justifyfull span.yui-toolbar-icon{background-position:0 -432px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-indent span.yui-toolbar-icon{background-position:0 -720px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-outdent span.yui-toolbar-icon{background-position:0 -684px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-createlink span.yui-toolbar-icon{background-position:0 -792px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-insertimage span.yui-toolbar-icon{background-position:1px -756px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-left span.yui-toolbar-icon{background-position:0 -972px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-right span.yui-toolbar-icon{background-position:0 -936px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-inline span.yui-toolbar-icon{background-position:0 -900px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-block span.yui-toolbar-icon{background-position:0 -864px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-bordercolor span.yui-toolbar-icon{background-position:0 -252px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-removeformat span.yui-toolbar-icon{background-position:0 -1080px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-hiddenelements span.yui-toolbar-icon{background-position:0 -1044px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-insertunorderedlist span.yui-toolbar-icon{background-position:0 -468px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-insertorderedlist span.yui-toolbar-icon{background-position:0 -504px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton,.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton .first-child{width:35px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton .first-child a{padding-left:2px;text-align:left;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton span.yui-toolbar-icon{display:none;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton a.up,.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton a.down{right:2px;background:url(editor-sprite.gif) no-repeat 0 -1222px;overflow:hidden;height:6px;width:7px;min-height:0;padding:0;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton a.up{top:2px;background-position:0 -1222px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton a.down{bottom:2px;background-position:0 -1187px;}.yui-skin-sam .yui-toolbar-container select{height:22px;border:1px solid #808080;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-select .first-child a{padding-left:5px;text-align:left;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-select span.yui-toolbar-icon{background:url( editor-sprite.gif ) no-repeat 0 -1144px;overflow:hidden;right:-2px;top:0px;height:20px;}.yui-skin-sam .yui-editor-panel .yui-color-button-menu .bd{background-color:transparent;border:none;width:135px;}.yui-skin-sam .yui-color-button-menu .yui-toolbar-colors{border:1px solid #808080;}.yui-skin-sam .yui-editor-panel{padding:0;margin:0;border:none;background-color:transparent;overflow:visible;}.yui-skin-sam .yui-editor-panel .hd{margin:10px 0 0;padding:0;border:none;}.yui-skin-sam .yui-editor-panel .hd h3{color:#000;border:1px solid #808080;background:url(../../../../assets/skins/sam/sprite.png) repeat-x 0 -200px;width:99%;position:relative;margin:0;padding:3px 0 0 0;font-size:93%;text-indent:5px;height:20px;}.yui-skin-sam .yui-editor-panel .bd{background-color:#F2F2F2;border-left:1px solid #808080;border-right:1px solid #808080;width:99%;margin:0;padding:0;overflow:visible;}.yui-skin-sam .yui-editor-panel ul{list-style-type:none;margin:0;padding:0;}.yui-skin-sam .yui-editor-panel ul li{margin:0;padding:0;}.yui-skin-sam .yui-editor-panel .yuimenu{}.yui-skin-sam .yui-editor-panel .yui-toolbar-container .yui-toolbar-subcont{padding:0;border:none;margin-top:0.35em;}.yui-skin-sam .yui-editor-panel .yui-toolbar-bordersize,.yui-skin-sam .yui-editor-panel .yui-toolbar-bordertype{width:50px;}.yui-skin-sam .yui-editor-panel label{display:block;float:none;padding:4px 0;margin-bottom:7px;}.yui-skin-sam .yui-editor-panel label strong{font-weight:normal;font-size:93%;text-align:right;padding-top:2px;}.yui-skin-sam .yui-editor-panel label input{width:75%;}.yui-skin-sam .yui-editor-panel .createlink_target,.yui-skin-sam .yui-editor-panel .insertimage_target{width:auto;margin-right:5px;}.yui-skin-sam .yui-editor-panel .removeLink{width:98%;}.yui-skin-sam .yui-editor-panel label input.warning{background-color:#FFEE69;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group h3{color:#000;float:left;font-weight:normal;font-size:93%;margin:5px 0 0 0;padding:0 3px 0 0;text-align:right;}.yui-skin-sam .yui-editor-panel .height-width h3{margin:3px 0 0 10px;}.yui-skin-sam .yui-editor-panel .height-width{margin:3px 0 0 35px;*margin-left:14px;width:42%;*width:44%;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group-border{width:190px;}.yui-skin-sam .yui-editor-panel .no-button .yui-toolbar-group-border{width:210px;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group-padding{width:203px;}.yui-skin-sam .yui-editor-panel .no-button .yui-toolbar-group-padding{width:172px;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group-padding h3{margin-left:25px;*margin-left:12px;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group-textflow{width:182px;}.yui-skin-sam .yui-editor-panel .hd{background:none;}.yui-skin-sam .yui-editor-panel .ft{background-color:#F2F2F2;border:1px solid #808080;border-top:none;padding:0;margin:0 0 2px 0;}.yui-skin-sam .yui-editor-panel .hd span.close{background:url(../../../../assets/skins/sam/sprite.png) no-repeat 0 -300px;cursor:pointer;display:block;height:16px;overflow:hidden;position:absolute;right:5px;text-indent:500px;top:2px;width:26px;}.yui-skin-sam .yui-editor-panel .ft span.tip{background-color:#EDF5FF;border-top:1px solid #808080;font-size:85%;}.yui-skin-sam .yui-editor-panel .ft span.tip strong{display:block;float:left;margin:0 2px 8px 0;}.yui-skin-sam .yui-editor-panel .ft span.tip span.icon{background:url( editor-sprite.gif ) no-repeat 0 -1260px;display:block;height:20px;left:2px;position:absolute;top:8px;width:20px;}.yui-skin-sam .yui-editor-panel .ft span.tip span.icon-info{background-position:2px -1260px;}.yui-skin-sam .yui-editor-panel .ft span.tip span.icon-warn{background-position:2px -1296px;}.yui-skin-sam .yui-editor-panel .hd span.knob{position:absolute;height:10px;width:28px;top:-10px;left:25px;text-indent:9999px;overflow:hidden;background:url( editor-knob.gif ) no-repeat 0 0;}.yui-skin-sam .yui-editor-panel .yui-toolbar-container{float:left;width:100%;background-image:none;border:none;}.yui-skin-sam .yui-editor-panel .yui-toolbar-container .bd{background-color:#ffffff;}.yui-editor-blankimage{background-image:url( blankimage.png );} +.yui-busy{cursor:wait !important;}.yui-toolbar-container fieldset{padding:0;margin:0;border:0;}.yui-toolbar-container legend{display:none;}.yui-toolbar-container .yui-toolbar-subcont{padding:.25em 0;zoom:1;}.yui-toolbar-container-collapsed .yui-toolbar-subcont{display:none;}.yui-toolbar-container .yui-toolbar-subcont:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-toolbar-container span.yui-toolbar-draghandle{cursor:move;border-left:1px solid #999;border-right:1px solid #999;overflow:hidden;text-indent:77777px;width:2px;height:20px;display:block;clear:none;float:left;margin:0 0 0 .2em;}.yui-toolbar-container .yui-toolbar-titlebar.draggable{cursor:move;}.yui-toolbar-container .yui-toolbar-titlebar{position:relative;}.yui-toolbar-container .yui-toolbar-titlebar h2{font-weight:bold;letter-spacing:0;border:none;color:#000;margin:0;padding:.2em;}.yui-toolbar-container .yui-toolbar-titlebar h2 a{text-decoration:none;color:#000;cursor:default;}.yui-toolbar-container.yui-toolbar-grouped span.yui-toolbar-draghandle{height:40px;}.yui-toolbar-container .yui-toolbar-group{float:left;zoom:1;}.yui-toolbar-container .yui-toolbar-group:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-toolbar-container .yui-toolbar-group h3{font-size:75%;padding:0 0 0 .25em;margin:0;}.yui-toolbar-container span.yui-toolbar-separator{width:2px;height:18px;margin:.2em 0 .2em .1em;display:block;clear:none;float:left;}.yui-toolbar-container.yui-toolbar-grouped span.yui-toolbar-separator{height:35px;}.yui-toolbar-container.yui-toolbar-grouped .yui-toolbar-group span.yui-toolbar-separator{height:18px;}.yui-toolbar-container ul li{margin:0;padding:0;list-style-type:none;}.yui-toolbar-container .yui-toolbar-nogrouplabels h3{display:none;}.yui-toolbar-container .yui-push-button,.yui-toolbar-container .yui-color-button,.yui-toolbar-container .yui-menu-button{position:relative;cursor:pointer;}.yui-toolbar-container .yui-button .first-child,.yui-toolbar-container .yui-button .first-child a{height:100%;width:100%;overflow:hidden;}.yui-toolbar-container .yui-button-disabled{cursor:default;}.yui-toolbar-container .yui-button-disabled .yui-toolbar-icon{opacity:.5;filter:alpha(opacity=50);}.yui-toolbar-container .yui-button-disabled .up,.yui-toolbar-container .yui-button-disabled .down{opacity:.5;filter:alpha(opacity=50);}.yui-toolbar-container .yui-button a{overflow:hidden;}.yui-toolbar-container .yui-toolbar-select .first-child a{cursor:pointer;}.yui-toolbar-fontname-arial{font-family:Arial;}.yui-toolbar-fontname-arial-black{font-family:Arial Black;}.yui-toolbar-fontname-comic-sans-ms{font-family:Comic Sans MS;}.yui-toolbar-fontname-courier-new{font-family:Courier New;}.yui-toolbar-fontname-times-new-roman{font-family:Times New Roman;}.yui-toolbar-fontname-verdana{font-family:Verdana;}.yui-toolbar-fontname-impact{font-family:Impact;}.yui-toolbar-fontname-lucida-console{font-family:Lucida Console;}.yui-toolbar-fontname-tahoma{font-family:Tahoma;}.yui-toolbar-fontname-trebuchet-ms{font-family:Trebuchet MS;}.yui-toolbar-container .yui-toolbar-spinbutton{position:relative;}.yui-toolbar-container .yui-toolbar-spinbutton .first-child a{z-index:0;opacity:1;}.yui-toolbar-container .yui-toolbar-spinbutton a.up,.yui-toolbar-container .yui-toolbar-spinbutton a.down{position:absolute;display:block right:0;cursor:pointer;z-index:1;padding:0;margin:0;}.yui-toolbar-container .yui-overlay{position:absolute;}.yui-toolbar-container .yui-overlay ul li{margin:0;list-style-type:none;}.yui-toolbar-container{z-index:1;}.yui-editor-container .yui-editor-editable-container{position:relative;z-index:0;width:100%;}.yui-editor-container .yui-editor-masked{background-color:#CCC;}.yui-editor-container iframe{border:0px;padding:0;margin:0;zoom:1;display:block;}.yui-editor-container .yui-editor-editable{padding:0;margin:0;}.yui-editor-container .dompath{font-size:85%;}.yui-editor-panel .hd{text-align:left;position:relative;}.yui-editor-panel .hd h3{font-weight:bold;padding:0.25em 0pt 0.25em 0.25em;margin:0;}.yui-editor-panel .bd{width:100%;zoom:1;position:relative;}.yui-editor-panel .bd div.yui-editor-body-cont{padding:.25em .1em;zoom:1;}.yui-editor-panel .bd .gecko form{overflow:auto;}.yui-editor-panel .bd div.yui-editor-body-cont:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-editor-panel .ft{text-align:right;width:99%;float:left;clear:both;}.yui-editor-panel .ft span.tip{display:block;position:relative;padding:.5em .5em .5em 23px;text-align:left;zoom:1;}.yui-editor-panel label{clear:both;float:left;padding:0;width:100%;text-align:left;zoom:1;}.yui-editor-panel .gecko label{overflow:auto;}.yui-editor-panel label strong{float:left;width:6em;}.yui-editor-panel .removeLink{width:80%;text-align:right;}.yui-editor-panel label input{margin-left:.25em;float:left;}.yui-editor-panel .yui-toolbar-group-padding{}.yui-editor-panel .yui-toolbar-group-border{}.yui-editor-panel .yui-toolbar-group-textflow{}.yui-editor-panel .height-width{float:left;}.yui-editor-panel .height-width h3{}.yui-editor-panel .height-width span{font-style:italic;display:block;float:left;overflow:visible;}.yui-editor-panel .height-width span.info{font-size:70%;margin-top:3px;}.yui-editor-panel .yui-toolbar-bordersize,.yui-editor-panel .yui-toolbar-bordertype{font-size:75%;}.yui-editor-panel .yui-toolbar-container span.yui-toolbar-separator{border:none;}.yui-editor-panel .yui-toolbar-bordersize span a span,.yui-editor-panel .yui-toolbar-bordertype span a span{display:block;height:8px;left:4px;position:absolute;top:3px;*top:-5px;width:24px;}.yui-editor-panel .yui-toolbar-bordertype span a span.yui-toolbar-bordertype-solid{border-bottom:1px solid black;}.yui-editor-panel .yui-toolbar-bordertype span a span.yui-toolbar-bordertype-dotted{border-bottom:1px dotted black;}.yui-editor-panel .yui-toolbar-bordertype span a span.yui-toolbar-bordertype-dashed{border-bottom:1px dashed black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-0{*top:0px;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-1{border-bottom:1px solid black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-2{border-bottom:2px solid black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-3{top:2px;*top:-5px;border-bottom:3px solid black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-4{top:1px;*top:-5px;border-bottom:4px solid black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-5{top:1px;*top:-5px;border-bottom:5px solid black;}.yui-toolbar-container .yui-toolbar-bordersize-menu,.yui-toolbar-container .yui-toolbar-bordertype-menu{width:95px !important;}.yui-toolbar-bordersize-menu .yuimenuitemlabel,.yui-toolbar-bordertype-menu .yuimenuitemlabel,.yui-toolbar-bordersize-menu .yuimenuitemlabel,.yui-toolbar-bordertype-menu .yuimenuitemlabel:hover{margin:0px 3px 7px 17px;}.yui-toolbar-bordersize-menu .yuimenuitemlabel .checkedindicator,.yui-toolbar-bordertype-menu .yuimenuitemlabel .checkedindicator{position:absolute;left:-12px;*top:14px;*left:0px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-1 a{border-bottom:1px solid black;height:14px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-2 a{border-bottom:2px solid black;height:14px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-3 a{border-bottom:3px solid black;height:14px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-4 a{border-bottom:4px solid black;height:14px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-5 a{border-bottom:5px solid black;height:14px;}.yui-toolbar-bordertype-menu li.yui-toolbar-bordertype-solid a{border-bottom:1px solid black;height:14px;}.yui-toolbar-bordertype-menu li.yui-toolbar-bordertype-dashed a{border-bottom:1px dashed black;height:14px;}.yui-toolbar-bordertype-menu li.yui-toolbar-bordertype-dotted a{border-bottom:1px dotted black;height:14px;}h2.yui-editor-skipheader,h3.yui-editor-skipheader{height:0;margin:0;padding:0;border:none;width:0;overflow:hidden;position:absolute;}.yui-toolbar-colors{width:133px;zoom:1;display:none;z-index:100;overflow:hidden;}.yui-toolbar-colors:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-toolbar-colors a{height:9px;width:9px;float:left;display:block;overflow:hidden;text-indent:999px;margin:0;cursor:pointer;border:1px solid #F6F7EE;}.yui-toolbar-colors a:hover{border:1px solid black;}.yui-color-button-menu{overflow:visible;background-color:transparent;}.yui-toolbar-colors span{position:relative;display:block;padding:3px;overflow:hidden;float:left;width:100%;zoom:1;}.yui-toolbar-colors span:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-toolbar-colors span em{height:35px;width:30px;float:left;display:block;overflow:hidden;text-indent:999px;margin:0.75px;border:1px solid black;}.yui-toolbar-colors span strong{font-weight:normal;padding-left:3px;display:block;font-size:85%;float:left;width:65%;}.yui-skin-sam .yui-editor-container{border:1px solid #808080;}.yui-skin-sam .yui-toolbar-container{zoom:1;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-titlebar{background:url(/static/icons/sprite.png) repeat-x 0 -200px;position:relative;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-titlebar h2{color:#000000;font-weight:bold;margin:0;padding:0.3em 1em;font-size:100%;text-align:left;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-group h3{color:#808080;font-size:75%;margin:1em 0 0;padding-bottom:0;padding-left:0.25em;text-align:left;}.yui-toolbar-container span.yui-toolbar-separator{border:none;text-indent:33px;overflow:hidden;margin:0 .25em;}.yui-skin-sam .yui-toolbar-container{background-color:#F2F2F2;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-subcont{padding:0 1em 0.35em;border-bottom:1px solid #808080;}.yui-skin-sam .yui-toolbar-container-collapsed .yui-toolbar-titlebar{border-bottom:1px solid #808080;}.yui-skin-sam .yui-editor-container .visible .yui-menu-shadow,.yui-skin-sam .yui-editor-panel .visible .yui-menu-shadow{display:none;}.yui-skin-sam .yui-editor-container ul{list-style-type:none;margin:0;padding:0;}.yui-skin-sam .yui-editor-container ul li{list-style-type:none;margin:0;padding:0;}.yui-skin-sam .yui-toolbar-group ul li.yui-toolbar-groupitem{float:left;}.yui-skin-sam .yui-editor-container .dompath{background-color:#F2F2F2;border-top:1px solid #808080;color:#999;text-align:left;padding:0.25em;}.yui-skin-sam .yui-toolbar-container .collapse{background:url(/static/icons/sprite.png) no-repeat 0 -400px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-titlebar span.collapse{cursor:pointer;position:absolute;top:4px;right:2px;display:block;overflow:hidden;height:15px;width:15px;text-indent:9999px;}.yui-skin-sam .yui-toolbar-container .yui-push-button,.yui-skin-sam .yui-toolbar-container .yui-color-button,.yui-skin-sam .yui-toolbar-container .yui-menu-button{background:url(/static/icons/sprite.png) repeat-x 0 0;position:relative;display:block;height:22px;width:30px;margin:0;border-color:#808080;border-style:solid;border-width:1px 0;}.yui-skin-sam .yui-toolbar-container .yui-push-button a,.yui-skin-sam .yui-toolbar-container .yui-color-button a,.yui-skin-sam .yui-toolbar-container .yui-menu-button a{padding-left:35px;height:20px;text-decoration:none;font-size:93%;line-height:2;display:block;color:#000000;overflow:hidden;}.yui-skin-sam .yui-toolbar-container .yui-push-button .first-child,.yui-skin-sam .yui-toolbar-container .yui-color-button .first-child,.yui-skin-sam .yui-toolbar-container .yui-menu-button .first-child{border-color:#808080;border-style:solid;border-width:0 1px;margin:0 -1px;display:block;}.yui-skin-sam .yui-toolbar-container .yui-push-button-disabled .first-child,.yui-skin-sam .yui-toolbar-container .yui-color-button-disabled .first-child,.yui-skin-sam .yui-toolbar-container .yui-menu-button-disabled .first-child{border-color:#ccc;}.yui-skin-sam .yui-toolbar-container .yui-push-button-disabled a,.yui-skin-sam .yui-toolbar-container .yui-color-button-disabled a,.yui-skin-sam .yui-toolbar-container .yui-menu-button-disabled a{color:#A6A6A6;cursor:default;}.yui-skin-sam .yui-toolbar-container .yui-push-button-disabled,.yui-skin-sam .yui-toolbar-container .yui-color-button-disabled,.yui-skin-sam .yui-toolbar-container .yui-menu-button-disabled{border-color:#ccc;}.yui-skin-sam .yui-toolbar-container .yui-button .first-child{*left:0px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-fontname{width:135px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-heading{width:92px;}.yui-skin-sam .yui-toolbar-container .yui-button-hover{background:url(/static/icons/sprite.png) repeat-x 0 -1300px;border-color:#808080;}.yui-skin-sam .yui-toolbar-container .yui-button-selected{background:url(/static/icons/sprite.png) repeat-x 0 -1700px;border-color:#808080;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-nogrouplabels h3{display:none;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-nogrouplabels .yui-toolbar-group{margin-top:.75em;}.yui-skin-sam .yui-toolbar-container .yui-push-button span.yui-toolbar-icon,.yui-skin-sam .yui-toolbar-container .yui-color-button span.yui-toolbar-icon,.yui-skin-sam .yui-toolbar-container .yui-menu-button span.yui-toolbar-icon{display:block;position:absolute;top:2px;height:18px;width:18px;overflow:hidden;background:url(/static/icons/editor-sprite.gif) no-repeat 30px 30px;}.yui-skin-sam .yui-toolbar-container .yui-button-selected span.yui-toolbar-icon,.yui-skin-sam .yui-toolbar-container .yui-button-hover span.yui-toolbar-icon{background-image:url(/static/icons/editor-sprite-active.gif);}.yui-skin-sam .yui-toolbar-container .visible .yuimenuitemlabel{cursor:pointer;color:#000;*position:relative;}.yui-skin-sam .yui-toolbar-container .yui-button-menu{background-color:#fff;}.yui-skin-sam div.yuimenu li.selected{background-color:#B3D4FF;}.yui-skin-sam div.yuimenu li.selected a.selected{color:#000;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-bold span.yui-toolbar-icon{background-position:0 0;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-strikethrough span.yui-toolbar-icon{background-position:0 -108px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-italic span.yui-toolbar-icon{background-position:0 -36px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-underline span.yui-toolbar-icon{background-position:0 -72px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-subscript span.yui-toolbar-icon{background-position:0 -180px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-superscript span.yui-toolbar-icon{background-position:0 -144px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-forecolor span.yui-toolbar-icon{background-position:0 -216px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-backcolor span.yui-toolbar-icon{background-position:0 -288px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-justifyleft span.yui-toolbar-icon{background-position:0 -324px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-justifycenter span.yui-toolbar-icon{background-position:0 -360px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-justifyright span.yui-toolbar-icon{background-position:0 -396px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-justifyfull span.yui-toolbar-icon{background-position:0 -432px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-indent span.yui-toolbar-icon{background-position:0 -720px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-outdent span.yui-toolbar-icon{background-position:0 -684px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-createlink span.yui-toolbar-icon{background-position:0 -792px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-insertimage span.yui-toolbar-icon{background-position:1px -756px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-left span.yui-toolbar-icon{background-position:0 -972px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-right span.yui-toolbar-icon{background-position:0 -936px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-inline span.yui-toolbar-icon{background-position:0 -900px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-block span.yui-toolbar-icon{background-position:0 -864px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-bordercolor span.yui-toolbar-icon{background-position:0 -252px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-removeformat span.yui-toolbar-icon{background-position:0 -1080px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-hiddenelements span.yui-toolbar-icon{background-position:0 -1044px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-insertunorderedlist span.yui-toolbar-icon{background-position:0 -468px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-insertorderedlist span.yui-toolbar-icon{background-position:0 -504px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton,.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton .first-child{width:35px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton .first-child a{padding-left:2px;text-align:left;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton span.yui-toolbar-icon{display:none;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton a.up,.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton a.down{right:2px;background:url(/static/icons/editor-sprite.gif) no-repeat 0 -1222px;overflow:hidden;height:6px;width:7px;min-height:0;padding:0;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton a.up{top:2px;background-position:0 -1222px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton a.down{bottom:2px;background-position:0 -1187px;}.yui-skin-sam .yui-toolbar-container select{height:22px;border:1px solid #808080;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-select .first-child a{padding-left:5px;text-align:left;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-select span.yui-toolbar-icon{background:url(/static/icons/editor-sprite.gif ) no-repeat 0 -1144px;overflow:hidden;right:-2px;top:0px;height:20px;}.yui-skin-sam .yui-editor-panel .yui-color-button-menu .bd{background-color:transparent;border:none;width:135px;}.yui-skin-sam .yui-color-button-menu .yui-toolbar-colors{border:1px solid #808080;}.yui-skin-sam .yui-editor-panel{padding:0;margin:0;border:none;background-color:transparent;overflow:visible;}.yui-skin-sam .yui-editor-panel .hd{margin:10px 0 0;padding:0;border:none;}.yui-skin-sam .yui-editor-panel .hd h3{color:#000;border:1px solid #808080;background:url(/static/icons/sprite.png) repeat-x 0 -200px;width:99%;position:relative;margin:0;padding:3px 0 0 0;font-size:93%;text-indent:5px;height:20px;}.yui-skin-sam .yui-editor-panel .bd{background-color:#F2F2F2;border-left:1px solid #808080;border-right:1px solid #808080;width:99%;margin:0;padding:0;overflow:visible;}.yui-skin-sam .yui-editor-panel ul{list-style-type:none;margin:0;padding:0;}.yui-skin-sam .yui-editor-panel ul li{margin:0;padding:0;}.yui-skin-sam .yui-editor-panel .yuimenu{}.yui-skin-sam .yui-editor-panel .yui-toolbar-container .yui-toolbar-subcont{padding:0;border:none;margin-top:0.35em;}.yui-skin-sam .yui-editor-panel .yui-toolbar-bordersize,.yui-skin-sam .yui-editor-panel .yui-toolbar-bordertype{width:50px;}.yui-skin-sam .yui-editor-panel label{display:block;float:none;padding:4px 0;margin-bottom:7px;}.yui-skin-sam .yui-editor-panel label strong{font-weight:normal;font-size:93%;text-align:right;padding-top:2px;}.yui-skin-sam .yui-editor-panel label input{width:75%;}.yui-skin-sam .yui-editor-panel .createlink_target,.yui-skin-sam .yui-editor-panel .insertimage_target{width:auto;margin-right:5px;}.yui-skin-sam .yui-editor-panel .removeLink{width:98%;}.yui-skin-sam .yui-editor-panel label input.warning{background-color:#FFEE69;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group h3{color:#000;float:left;font-weight:normal;font-size:93%;margin:5px 0 0 0;padding:0 3px 0 0;text-align:right;}.yui-skin-sam .yui-editor-panel .height-width h3{margin:3px 0 0 10px;}.yui-skin-sam .yui-editor-panel .height-width{margin:3px 0 0 35px;*margin-left:14px;width:42%;*width:44%;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group-border{width:190px;}.yui-skin-sam .yui-editor-panel .no-button .yui-toolbar-group-border{width:210px;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group-padding{width:203px;}.yui-skin-sam .yui-editor-panel .no-button .yui-toolbar-group-padding{width:172px;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group-padding h3{margin-left:25px;*margin-left:12px;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group-textflow{width:182px;}.yui-skin-sam .yui-editor-panel .hd{background:none;}.yui-skin-sam .yui-editor-panel .ft{background-color:#F2F2F2;border:1px solid #808080;border-top:none;padding:0;margin:0 0 2px 0;}.yui-skin-sam .yui-editor-panel .hd span.close{background:url(/static/icons/sprite.png) no-repeat 0 -300px;cursor:pointer;display:block;height:16px;overflow:hidden;position:absolute;right:5px;text-indent:500px;top:2px;width:26px;}.yui-skin-sam .yui-editor-panel .ft span.tip{background-color:#EDF5FF;border-top:1px solid #808080;font-size:85%;}.yui-skin-sam .yui-editor-panel .ft span.tip strong{display:block;float:left;margin:0 2px 8px 0;}.yui-skin-sam .yui-editor-panel .ft span.tip span.icon{background:url(/static/icons/editor-sprite.gif ) no-repeat 0 -1260px;display:block;height:20px;left:2px;position:absolute;top:8px;width:20px;}.yui-skin-sam .yui-editor-panel .ft span.tip span.icon-info{background-position:2px -1260px;}.yui-skin-sam .yui-editor-panel .ft span.tip span.icon-warn{background-position:2px -1296px;}.yui-skin-sam .yui-editor-panel .hd span.knob{position:absolute;height:10px;width:28px;top:-10px;left:25px;text-indent:9999px;overflow:hidden;background:url(/static/icons/editor-knob.gif ) no-repeat 0 0;}.yui-skin-sam .yui-editor-panel .yui-toolbar-container{float:left;width:100%;background-image:none;border:none;}.yui-skin-sam .yui-editor-panel .yui-toolbar-container .bd{background-color:#ffffff;}.yui-editor-blankimage{background-image:url(/static/icons/blankimage.png );}

1 0

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

26 Sep '08

Revision: 3963 Author: hans URL: http://bknr.net/trac/changeset/3963 News item editing support. U trunk/projects/quickhoney/src/handlers.lisp U trunk/projects/quickhoney/src/webserver.lisp A trunk/projects/quickhoney/website/static/icons/blankimage.png A trunk/projects/quickhoney/website/static/icons/editor-knob.gif A trunk/projects/quickhoney/website/static/icons/editor-sprite-active.gif A trunk/projects/quickhoney/website/static/icons/editor-sprite.gif A trunk/projects/quickhoney/website/static/icons/sprite.png U trunk/projects/quickhoney/website/static/javascript.js A trunk/projects/quickhoney/website/static/simpleeditor.css U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-09-24 16:51:13 UTC (rev 3962) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-09-26 15:03:28 UTC (rev 3963) @@ -153,7 +153,6 @@ (defmethod handle-object-form ((handler json-edit-image-handler) (action (eql :edit)) image) (with-query-params (client spider-keywords) - (format t "editing image ~A client ~A spider-keywords ~A~%" image client spider-keywords) (with-transaction (:edit-image) (setf (quickhoney-image-client image) client (quickhoney-image-spider-keywords image) spider-keywords @@ -169,6 +168,19 @@ (with-json-response () (encode-object-element "result" "deleted"))) +(defclass json-edit-news-item-handler (json-edit-image-handler) + () + (:default-initargs :object-class 'quickhoney-news-item)) + +(defmethod handle-object-form ((handler json-edit-news-item-handler) (action (eql :edit)) item) + (with-query-params (title text) + (with-transaction (:edit-news-item) + (setf (quickhoney-news-item-title item) title + (quickhoney-news-item-text item) text))) + (setf *last-image-upload-timestamp* (get-universal-time)) + (with-json-response () + (encode-object-element "result" "edited"))) + (defclass digg-image-handler (object-handler) () (:default-initargs :object-class 'quickhoney-image)) @@ -373,8 +385,8 @@ :dest-width +news-image-width+ :dest-height scaled-height) (cl-gd:destroy-image uploaded-image) (setf uploaded-image scaled-image))) - (let* ((title (normalize-news-title title)) - (item (make-store-image :name title + (let* ((name (normalize-news-title title)) + (item (make-store-image :name name :image uploaded-image :type (if (cl-gd:true-color-p uploaded-image) :jpg :png) :class-name 'quickhoney-news-item @@ -385,7 +397,7 @@ :owner (bknr-session-user))))) (declare (ignore item)) ; for now (twitter:update-status (bknr-session-user) - (format nil "Posted news item: http://quickhoney.com/news/~A" title)) + (format nil "Posted news item: http://quickhoney.com/news/~A" name)) (with-http-response () (with-http-body () (html (:html Modified: trunk/projects/quickhoney/src/webserver.lisp =================================================================== --- trunk/projects/quickhoney/src/webserver.lisp 2008-09-24 16:51:13 UTC (rev 3962) +++ trunk/projects/quickhoney/src/webserver.lisp 2008-09-26 15:03:28 UTC (rev 3963) @@ -28,6 +28,7 @@ ("/json-clients" json-clients-handler) ("/json-buttons" json-buttons-handler) ("/json-edit-image" json-edit-image-handler) + ("/json-edit-news" json-edit-news-item-handler) ("/upload-image" upload-image-handler) ("/upload-animation" upload-animation-handler) ("/upload-button" upload-button-handler) Added: trunk/projects/quickhoney/website/static/icons/blankimage.png =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/website/static/icons/blankimage.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/projects/quickhoney/website/static/icons/editor-knob.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/website/static/icons/editor-knob.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/projects/quickhoney/website/static/icons/editor-sprite-active.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/website/static/icons/editor-sprite-active.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/projects/quickhoney/website/static/icons/editor-sprite.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/website/static/icons/editor-sprite.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/projects/quickhoney/website/static/icons/sprite.png =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/website/static/icons/sprite.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-24 16:51:13 UTC (rev 3962) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-26 15:03:28 UTC (rev 3963) @@ -15,6 +15,38 @@ pen: ['portraits', 'nudes', 'stuff'] }; +/* rich text editor toolbar configuration */ + +var editorToolbarConfig = { + collapse: false, + draggable: false, + buttons: [ + { group: 'textstyle', label: 'Font Style', + buttons: [ + { type: 'push', label: 'Bold CTRL + SHIFT + B', value: 'bold' }, + { type: 'push', label: 'Italic CTRL + SHIFT + I', value: 'italic' }, + { type: 'push', label: 'Underline CTRL + SHIFT + U', value: 'underline' }, + { type: 'separator' }, + { type: 'color', label: 'Font Color', value: 'forecolor', disabled: true }, + { type: 'color', label: 'Background Color', value: 'backcolor', disabled: true } + ] + }, + { type: 'separator' }, + { group: 'indentlist', label: 'Lists', + buttons: [ + { type: 'push', label: 'Create an Unordered List', value: 'insertunorderedlist' }, + { type: 'push', label: 'Create an Ordered List', value: 'insertorderedlist' } + ] + }, + { type: 'separator' }, + { group: 'insertitem', label: 'Insert Item', + buttons: [ + { type: 'push', label: 'HTML Link CTRL + SHIFT + L', value: 'createlink', disabled: true } + ] + } + ] +}; + /* safari global variable - used to trigger some compatibility hacks */ var safari = false; @@ -40,6 +72,8 @@ /* login status */ +var news_editor; + function login_status(json_result) { log('login_status, admin: ' + json_result.admin + ' login: ' + json_result.login); @@ -49,6 +83,8 @@ if (logged_in) { replaceChildNodes("username", json_result.login); $("login_status").style.visibility = 'visible'; + news_editor = new YAHOO.widget.SimpleEditor('news_editor', { toolbar: editorToolbarConfig }); + news_editor.render(); show_cms_window(); } } @@ -148,9 +184,24 @@ } show_cms_window("image_edited_form"); setTimeout("show_cms_window('edit_form')", 2000); - // reload_clients(); } +function image_edited(json_data) { + if (json_data.result == 'error') { + alert(json_data.message); + } + show_cms_window("image_edited_form"); + setTimeout("show_cms_window('edit_form')", 2000); +} + +function news_edited(json_data) { + if (json_data.result == 'error') { + alert(json_data.message); + } + show_cms_window("image_edited_form"); + setTimeout("show_cms_window('edit_news')", 2000); +} + function do_delete() { if (confirm('delete this image?')) { @@ -221,6 +272,7 @@ /* news */ +var current_news_item; var month_names = [ 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' ]; @@ -284,6 +336,8 @@ return false; } } + var text_div = DIV({ 'class': 'item-text' }); + text_div.innerHTML = item.text; return DIV({ 'class': 'newsentry' }, IMG({ src: "/image/" + encodeURI(item.name) + '/news-article-cutout' }), DIV(null, @@ -291,11 +345,11 @@ item.date, ' by ', item.owner, ' | ', permalink('news/' + item.name), BR(), - DIV({ 'class': 'item-text' }, item.text), + text_div, delete_button)); } -function load_news(data) +function load_news(single_entry, data) { try { if (data.items.length > max_news_items) { @@ -310,6 +364,23 @@ wait_for_images(function () { hide_cue(); $('newsentries').style.visibility = 'inherit' }); + current_news_item = null; + if (logged_in) { + current_news_item = data.items[0]; + if (single_entry) { + $('news_title').value = current_news_item.title; + news_editor.setEditorHTML(current_news_item.text); + $('news_editor').value = current_news_item.text; + $('edit_news_action').value = 'edit'; + $('edit_image_upload_row').style.visibility = 'hidden'; + } else { + $('edit_news_form').reset(); + news_editor.setEditorHTML(""); + $('edit_news_action').value = 'create'; + $('edit_image_upload_row').style.visibility = 'inherit'; + } + } + display_cms_window(); } catch (e) { @@ -342,8 +413,11 @@ show_cue(); $('newsentries').style.visibility = 'hidden'; loadJSONDoc('/json-news/' + subpath) - .addCallbacks(load_news, alert); + .addCallbacks(partial(load_news, true), alert); + $('edit_news_form').reset(); + replaceChildNodes('edit_news_title', 'Edit News Item'); + } else { var args = subpath.split('/'); @@ -358,8 +432,11 @@ show_cue(); $('newsentries').style.visibility = 'hidden'; loadJSONDoc('/json-news/quickhoney' + (month ? ('?month=' + subpath) : '')) - .addCallbacks(load_news, alert); + .addCallbacks(partial(load_news, false), alert); } + + $('edit_news_form').reset(); + replaceChildNodes('edit_news_title', 'Create News Item'); } } @@ -1130,6 +1207,29 @@ detail_window.focus(); } +function upload_news (target) { + var edit_mode = $('edit_news_action').value == 'edit'; + + if (!edit_mode && $('news_file').value == '') { + alert('Please upload an image!'); + return false; + } + if ($('news_title').value == '') { + alert('Please enter a title for the news item!'); + $('news_title').focus(); + return false; + } + news_editor.saveHTML(); // update editor's value from html + + if (edit_mode) { + show_cms_window('saving_edits_form'); // hide edit window until server replies + submit_json('/json-edit-news/' + current_news_item.id + '?action=edit', 'edit_news_form', news_edited); + return false; + } else { + do_upload(target); + return true; + } +} /* open the upload window */ function do_upload(target) { Added: trunk/projects/quickhoney/website/static/simpleeditor.css =================================================================== --- trunk/projects/quickhoney/website/static/simpleeditor.css (rev 0) +++ trunk/projects/quickhoney/website/static/simpleeditor.css 2008-09-26 15:03:28 UTC (rev 3963) @@ -0,0 +1,7 @@ +/* +Copyright (c) 2008, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 2.5.2 +*/ +.yui-busy{cursor:wait !important;}.yui-toolbar-container fieldset{padding:0;margin:0;border:0;}.yui-toolbar-container legend{display:none;}.yui-toolbar-container .yui-toolbar-subcont{padding:.25em 0;zoom:1;}.yui-toolbar-container-collapsed .yui-toolbar-subcont{display:none;}.yui-toolbar-container .yui-toolbar-subcont:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-toolbar-container span.yui-toolbar-draghandle{cursor:move;border-left:1px solid #999;border-right:1px solid #999;overflow:hidden;text-indent:77777px;width:2px;height:20px;display:block;clear:none;float:left;margin:0 0 0 .2em;}.yui-toolbar-container .yui-toolbar-titlebar.draggable{cursor:move;}.yui-toolbar-container .yui-toolbar-titlebar{position:relative;}.yui-toolbar-container .yui-toolbar-titlebar h2{font-weight:bold;letter-spacing:0;border:none;color:#000;margin:0;padding:.2em;}.yui-toolbar-container .yui-toolbar-titlebar h2 a{text-decoration:none;color:#000;cursor:default;}.yui-toolbar-container.yui-toolbar-grouped span.yui-toolbar-draghandle{height:40px;}.yui-toolbar-container .yui-toolbar-group{float:left;zoom:1;}.yui-toolbar-container .yui-toolbar-group:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-toolbar-container .yui-toolbar-group h3{font-size:75%;padding:0 0 0 .25em;margin:0;}.yui-toolbar-container span.yui-toolbar-separator{width:2px;height:18px;margin:.2em 0 .2em .1em;display:block;clear:none;float:left;}.yui-toolbar-container.yui-toolbar-grouped span.yui-toolbar-separator{height:35px;}.yui-toolbar-container.yui-toolbar-grouped .yui-toolbar-group span.yui-toolbar-separator{height:18px;}.yui-toolbar-container ul li{margin:0;padding:0;list-style-type:none;}.yui-toolbar-container .yui-toolbar-nogrouplabels h3{display:none;}.yui-toolbar-container .yui-push-button,.yui-toolbar-container .yui-color-button,.yui-toolbar-container .yui-menu-button{position:relative;cursor:pointer;}.yui-toolbar-container .yui-button .first-child,.yui-toolbar-container .yui-button .first-child a{height:100%;width:100%;overflow:hidden;}.yui-toolbar-container .yui-button-disabled{cursor:default;}.yui-toolbar-container .yui-button-disabled .yui-toolbar-icon{opacity:.5;filter:alpha(opacity=50);}.yui-toolbar-container .yui-button-disabled .up,.yui-toolbar-container .yui-button-disabled .down{opacity:.5;filter:alpha(opacity=50);}.yui-toolbar-container .yui-button a{overflow:hidden;}.yui-toolbar-container .yui-toolbar-select .first-child a{cursor:pointer;}.yui-toolbar-fontname-arial{font-family:Arial;}.yui-toolbar-fontname-arial-black{font-family:Arial Black;}.yui-toolbar-fontname-comic-sans-ms{font-family:Comic Sans MS;}.yui-toolbar-fontname-courier-new{font-family:Courier New;}.yui-toolbar-fontname-times-new-roman{font-family:Times New Roman;}.yui-toolbar-fontname-verdana{font-family:Verdana;}.yui-toolbar-fontname-impact{font-family:Impact;}.yui-toolbar-fontname-lucida-console{font-family:Lucida Console;}.yui-toolbar-fontname-tahoma{font-family:Tahoma;}.yui-toolbar-fontname-trebuchet-ms{font-family:Trebuchet MS;}.yui-toolbar-container .yui-toolbar-spinbutton{position:relative;}.yui-toolbar-container .yui-toolbar-spinbutton .first-child a{z-index:0;opacity:1;}.yui-toolbar-container .yui-toolbar-spinbutton a.up,.yui-toolbar-container .yui-toolbar-spinbutton a.down{position:absolute;display:block right:0;cursor:pointer;z-index:1;padding:0;margin:0;}.yui-toolbar-container .yui-overlay{position:absolute;}.yui-toolbar-container .yui-overlay ul li{margin:0;list-style-type:none;}.yui-toolbar-container{z-index:1;}.yui-editor-container .yui-editor-editable-container{position:relative;z-index:0;width:100%;}.yui-editor-container .yui-editor-masked{background-color:#CCC;}.yui-editor-container iframe{border:0px;padding:0;margin:0;zoom:1;display:block;}.yui-editor-container .yui-editor-editable{padding:0;margin:0;}.yui-editor-container .dompath{font-size:85%;}.yui-editor-panel .hd{text-align:left;position:relative;}.yui-editor-panel .hd h3{font-weight:bold;padding:0.25em 0pt 0.25em 0.25em;margin:0;}.yui-editor-panel .bd{width:100%;zoom:1;position:relative;}.yui-editor-panel .bd div.yui-editor-body-cont{padding:.25em .1em;zoom:1;}.yui-editor-panel .bd .gecko form{overflow:auto;}.yui-editor-panel .bd div.yui-editor-body-cont:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-editor-panel .ft{text-align:right;width:99%;float:left;clear:both;}.yui-editor-panel .ft span.tip{display:block;position:relative;padding:.5em .5em .5em 23px;text-align:left;zoom:1;}.yui-editor-panel label{clear:both;float:left;padding:0;width:100%;text-align:left;zoom:1;}.yui-editor-panel .gecko label{overflow:auto;}.yui-editor-panel label strong{float:left;width:6em;}.yui-editor-panel .removeLink{width:80%;text-align:right;}.yui-editor-panel label input{margin-left:.25em;float:left;}.yui-editor-panel .yui-toolbar-group-padding{}.yui-editor-panel .yui-toolbar-group-border{}.yui-editor-panel .yui-toolbar-group-textflow{}.yui-editor-panel .height-width{float:left;}.yui-editor-panel .height-width h3{}.yui-editor-panel .height-width span{font-style:italic;display:block;float:left;overflow:visible;}.yui-editor-panel .height-width span.info{font-size:70%;margin-top:3px;}.yui-editor-panel .yui-toolbar-bordersize,.yui-editor-panel .yui-toolbar-bordertype{font-size:75%;}.yui-editor-panel .yui-toolbar-container span.yui-toolbar-separator{border:none;}.yui-editor-panel .yui-toolbar-bordersize span a span,.yui-editor-panel .yui-toolbar-bordertype span a span{display:block;height:8px;left:4px;position:absolute;top:3px;*top:-5px;width:24px;}.yui-editor-panel .yui-toolbar-bordertype span a span.yui-toolbar-bordertype-solid{border-bottom:1px solid black;}.yui-editor-panel .yui-toolbar-bordertype span a span.yui-toolbar-bordertype-dotted{border-bottom:1px dotted black;}.yui-editor-panel .yui-toolbar-bordertype span a span.yui-toolbar-bordertype-dashed{border-bottom:1px dashed black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-0{*top:0px;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-1{border-bottom:1px solid black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-2{border-bottom:2px solid black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-3{top:2px;*top:-5px;border-bottom:3px solid black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-4{top:1px;*top:-5px;border-bottom:4px solid black;}.yui-editor-panel .yui-toolbar-bordersize span a span.yui-toolbar-bordersize-5{top:1px;*top:-5px;border-bottom:5px solid black;}.yui-toolbar-container .yui-toolbar-bordersize-menu,.yui-toolbar-container .yui-toolbar-bordertype-menu{width:95px !important;}.yui-toolbar-bordersize-menu .yuimenuitemlabel,.yui-toolbar-bordertype-menu .yuimenuitemlabel,.yui-toolbar-bordersize-menu .yuimenuitemlabel,.yui-toolbar-bordertype-menu .yuimenuitemlabel:hover{margin:0px 3px 7px 17px;}.yui-toolbar-bordersize-menu .yuimenuitemlabel .checkedindicator,.yui-toolbar-bordertype-menu .yuimenuitemlabel .checkedindicator{position:absolute;left:-12px;*top:14px;*left:0px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-1 a{border-bottom:1px solid black;height:14px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-2 a{border-bottom:2px solid black;height:14px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-3 a{border-bottom:3px solid black;height:14px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-4 a{border-bottom:4px solid black;height:14px;}.yui-toolbar-bordersize-menu li.yui-toolbar-bordersize-5 a{border-bottom:5px solid black;height:14px;}.yui-toolbar-bordertype-menu li.yui-toolbar-bordertype-solid a{border-bottom:1px solid black;height:14px;}.yui-toolbar-bordertype-menu li.yui-toolbar-bordertype-dashed a{border-bottom:1px dashed black;height:14px;}.yui-toolbar-bordertype-menu li.yui-toolbar-bordertype-dotted a{border-bottom:1px dotted black;height:14px;}h2.yui-editor-skipheader,h3.yui-editor-skipheader{height:0;margin:0;padding:0;border:none;width:0;overflow:hidden;position:absolute;}.yui-toolbar-colors{width:133px;zoom:1;display:none;z-index:100;overflow:hidden;}.yui-toolbar-colors:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-toolbar-colors a{height:9px;width:9px;float:left;display:block;overflow:hidden;text-indent:999px;margin:0;cursor:pointer;border:1px solid #F6F7EE;}.yui-toolbar-colors a:hover{border:1px solid black;}.yui-color-button-menu{overflow:visible;background-color:transparent;}.yui-toolbar-colors span{position:relative;display:block;padding:3px;overflow:hidden;float:left;width:100%;zoom:1;}.yui-toolbar-colors span:after{display:block;clear:both;visibility:hidden;content:'.';height:0;}.yui-toolbar-colors span em{height:35px;width:30px;float:left;display:block;overflow:hidden;text-indent:999px;margin:0.75px;border:1px solid black;}.yui-toolbar-colors span strong{font-weight:normal;padding-left:3px;display:block;font-size:85%;float:left;width:65%;}.yui-skin-sam .yui-editor-container{border:1px solid #808080;}.yui-skin-sam .yui-toolbar-container{zoom:1;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-titlebar{background:url(../../../../assets/skins/sam/sprite.png) repeat-x 0 -200px;position:relative;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-titlebar h2{color:#000000;font-weight:bold;margin:0;padding:0.3em 1em;font-size:100%;text-align:left;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-group h3{color:#808080;font-size:75%;margin:1em 0 0;padding-bottom:0;padding-left:0.25em;text-align:left;}.yui-toolbar-container span.yui-toolbar-separator{border:none;text-indent:33px;overflow:hidden;margin:0 .25em;}.yui-skin-sam .yui-toolbar-container{background-color:#F2F2F2;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-subcont{padding:0 1em 0.35em;border-bottom:1px solid #808080;}.yui-skin-sam .yui-toolbar-container-collapsed .yui-toolbar-titlebar{border-bottom:1px solid #808080;}.yui-skin-sam .yui-editor-container .visible .yui-menu-shadow,.yui-skin-sam .yui-editor-panel .visible .yui-menu-shadow{display:none;}.yui-skin-sam .yui-editor-container ul{list-style-type:none;margin:0;padding:0;}.yui-skin-sam .yui-editor-container ul li{list-style-type:none;margin:0;padding:0;}.yui-skin-sam .yui-toolbar-group ul li.yui-toolbar-groupitem{float:left;}.yui-skin-sam .yui-editor-container .dompath{background-color:#F2F2F2;border-top:1px solid #808080;color:#999;text-align:left;padding:0.25em;}.yui-skin-sam .yui-toolbar-container .collapse{background:url(../../../../assets/skins/sam/sprite.png) no-repeat 0 -400px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-titlebar span.collapse{cursor:pointer;position:absolute;top:4px;right:2px;display:block;overflow:hidden;height:15px;width:15px;text-indent:9999px;}.yui-skin-sam .yui-toolbar-container .yui-push-button,.yui-skin-sam .yui-toolbar-container .yui-color-button,.yui-skin-sam .yui-toolbar-container .yui-menu-button{background:url(../../../../assets/skins/sam/sprite.png) repeat-x 0 0;position:relative;display:block;height:22px;width:30px;margin:0;border-color:#808080;border-style:solid;border-width:1px 0;}.yui-skin-sam .yui-toolbar-container .yui-push-button a,.yui-skin-sam .yui-toolbar-container .yui-color-button a,.yui-skin-sam .yui-toolbar-container .yui-menu-button a{padding-left:35px;height:20px;text-decoration:none;font-size:93%;line-height:2;display:block;color:#000000;overflow:hidden;}.yui-skin-sam .yui-toolbar-container .yui-push-button .first-child,.yui-skin-sam .yui-toolbar-container .yui-color-button .first-child,.yui-skin-sam .yui-toolbar-container .yui-menu-button .first-child{border-color:#808080;border-style:solid;border-width:0 1px;margin:0 -1px;display:block;}.yui-skin-sam .yui-toolbar-container .yui-push-button-disabled .first-child,.yui-skin-sam .yui-toolbar-container .yui-color-button-disabled .first-child,.yui-skin-sam .yui-toolbar-container .yui-menu-button-disabled .first-child{border-color:#ccc;}.yui-skin-sam .yui-toolbar-container .yui-push-button-disabled a,.yui-skin-sam .yui-toolbar-container .yui-color-button-disabled a,.yui-skin-sam .yui-toolbar-container .yui-menu-button-disabled a{color:#A6A6A6;cursor:default;}.yui-skin-sam .yui-toolbar-container .yui-push-button-disabled,.yui-skin-sam .yui-toolbar-container .yui-color-button-disabled,.yui-skin-sam .yui-toolbar-container .yui-menu-button-disabled{border-color:#ccc;}.yui-skin-sam .yui-toolbar-container .yui-button .first-child{*left:0px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-fontname{width:135px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-heading{width:92px;}.yui-skin-sam .yui-toolbar-container .yui-button-hover{background:url(../../../../assets/skins/sam/sprite.png) repeat-x 0 -1300px;border-color:#808080;}.yui-skin-sam .yui-toolbar-container .yui-button-selected{background:url(../../../../assets/skins/sam/sprite.png) repeat-x 0 -1700px;border-color:#808080;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-nogrouplabels h3{display:none;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-nogrouplabels .yui-toolbar-group{margin-top:.75em;}.yui-skin-sam .yui-toolbar-container .yui-push-button span.yui-toolbar-icon,.yui-skin-sam .yui-toolbar-container .yui-color-button span.yui-toolbar-icon,.yui-skin-sam .yui-toolbar-container .yui-menu-button span.yui-toolbar-icon{display:block;position:absolute;top:2px;height:18px;width:18px;overflow:hidden;background:url(editor-sprite.gif) no-repeat 30px 30px;}.yui-skin-sam .yui-toolbar-container .yui-button-selected span.yui-toolbar-icon,.yui-skin-sam .yui-toolbar-container .yui-button-hover span.yui-toolbar-icon{background-image:url(editor-sprite-active.gif);}.yui-skin-sam .yui-toolbar-container .visible .yuimenuitemlabel{cursor:pointer;color:#000;*position:relative;}.yui-skin-sam .yui-toolbar-container .yui-button-menu{background-color:#fff;}.yui-skin-sam div.yuimenu li.selected{background-color:#B3D4FF;}.yui-skin-sam div.yuimenu li.selected a.selected{color:#000;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-bold span.yui-toolbar-icon{background-position:0 0;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-strikethrough span.yui-toolbar-icon{background-position:0 -108px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-italic span.yui-toolbar-icon{background-position:0 -36px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-underline span.yui-toolbar-icon{background-position:0 -72px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-subscript span.yui-toolbar-icon{background-position:0 -180px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-superscript span.yui-toolbar-icon{background-position:0 -144px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-forecolor span.yui-toolbar-icon{background-position:0 -216px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-backcolor span.yui-toolbar-icon{background-position:0 -288px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-justifyleft span.yui-toolbar-icon{background-position:0 -324px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-justifycenter span.yui-toolbar-icon{background-position:0 -360px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-justifyright span.yui-toolbar-icon{background-position:0 -396px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-justifyfull span.yui-toolbar-icon{background-position:0 -432px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-indent span.yui-toolbar-icon{background-position:0 -720px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-outdent span.yui-toolbar-icon{background-position:0 -684px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-createlink span.yui-toolbar-icon{background-position:0 -792px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-insertimage span.yui-toolbar-icon{background-position:1px -756px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-left span.yui-toolbar-icon{background-position:0 -972px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-right span.yui-toolbar-icon{background-position:0 -936px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-inline span.yui-toolbar-icon{background-position:0 -900px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-block span.yui-toolbar-icon{background-position:0 -864px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-bordercolor span.yui-toolbar-icon{background-position:0 -252px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-removeformat span.yui-toolbar-icon{background-position:0 -1080px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-hiddenelements span.yui-toolbar-icon{background-position:0 -1044px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-insertunorderedlist span.yui-toolbar-icon{background-position:0 -468px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-insertorderedlist span.yui-toolbar-icon{background-position:0 -504px;left:5px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton,.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton .first-child{width:35px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton .first-child a{padding-left:2px;text-align:left;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton span.yui-toolbar-icon{display:none;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton a.up,.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton a.down{right:2px;background:url(editor-sprite.gif) no-repeat 0 -1222px;overflow:hidden;height:6px;width:7px;min-height:0;padding:0;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton a.up{top:2px;background-position:0 -1222px;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-spinbutton a.down{bottom:2px;background-position:0 -1187px;}.yui-skin-sam .yui-toolbar-container select{height:22px;border:1px solid #808080;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-select .first-child a{padding-left:5px;text-align:left;}.yui-skin-sam .yui-toolbar-container .yui-toolbar-select span.yui-toolbar-icon{background:url( editor-sprite.gif ) no-repeat 0 -1144px;overflow:hidden;right:-2px;top:0px;height:20px;}.yui-skin-sam .yui-editor-panel .yui-color-button-menu .bd{background-color:transparent;border:none;width:135px;}.yui-skin-sam .yui-color-button-menu .yui-toolbar-colors{border:1px solid #808080;}.yui-skin-sam .yui-editor-panel{padding:0;margin:0;border:none;background-color:transparent;overflow:visible;}.yui-skin-sam .yui-editor-panel .hd{margin:10px 0 0;padding:0;border:none;}.yui-skin-sam .yui-editor-panel .hd h3{color:#000;border:1px solid #808080;background:url(../../../../assets/skins/sam/sprite.png) repeat-x 0 -200px;width:99%;position:relative;margin:0;padding:3px 0 0 0;font-size:93%;text-indent:5px;height:20px;}.yui-skin-sam .yui-editor-panel .bd{background-color:#F2F2F2;border-left:1px solid #808080;border-right:1px solid #808080;width:99%;margin:0;padding:0;overflow:visible;}.yui-skin-sam .yui-editor-panel ul{list-style-type:none;margin:0;padding:0;}.yui-skin-sam .yui-editor-panel ul li{margin:0;padding:0;}.yui-skin-sam .yui-editor-panel .yuimenu{}.yui-skin-sam .yui-editor-panel .yui-toolbar-container .yui-toolbar-subcont{padding:0;border:none;margin-top:0.35em;}.yui-skin-sam .yui-editor-panel .yui-toolbar-bordersize,.yui-skin-sam .yui-editor-panel .yui-toolbar-bordertype{width:50px;}.yui-skin-sam .yui-editor-panel label{display:block;float:none;padding:4px 0;margin-bottom:7px;}.yui-skin-sam .yui-editor-panel label strong{font-weight:normal;font-size:93%;text-align:right;padding-top:2px;}.yui-skin-sam .yui-editor-panel label input{width:75%;}.yui-skin-sam .yui-editor-panel .createlink_target,.yui-skin-sam .yui-editor-panel .insertimage_target{width:auto;margin-right:5px;}.yui-skin-sam .yui-editor-panel .removeLink{width:98%;}.yui-skin-sam .yui-editor-panel label input.warning{background-color:#FFEE69;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group h3{color:#000;float:left;font-weight:normal;font-size:93%;margin:5px 0 0 0;padding:0 3px 0 0;text-align:right;}.yui-skin-sam .yui-editor-panel .height-width h3{margin:3px 0 0 10px;}.yui-skin-sam .yui-editor-panel .height-width{margin:3px 0 0 35px;*margin-left:14px;width:42%;*width:44%;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group-border{width:190px;}.yui-skin-sam .yui-editor-panel .no-button .yui-toolbar-group-border{width:210px;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group-padding{width:203px;}.yui-skin-sam .yui-editor-panel .no-button .yui-toolbar-group-padding{width:172px;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group-padding h3{margin-left:25px;*margin-left:12px;}.yui-skin-sam .yui-editor-panel .yui-toolbar-group-textflow{width:182px;}.yui-skin-sam .yui-editor-panel .hd{background:none;}.yui-skin-sam .yui-editor-panel .ft{background-color:#F2F2F2;border:1px solid #808080;border-top:none;padding:0;margin:0 0 2px 0;}.yui-skin-sam .yui-editor-panel .hd span.close{background:url(../../../../assets/skins/sam/sprite.png) no-repeat 0 -300px;cursor:pointer;display:block;height:16px;overflow:hidden;position:absolute;right:5px;text-indent:500px;top:2px;width:26px;}.yui-skin-sam .yui-editor-panel .ft span.tip{background-color:#EDF5FF;border-top:1px solid #808080;font-size:85%;}.yui-skin-sam .yui-editor-panel .ft span.tip strong{display:block;float:left;margin:0 2px 8px 0;}.yui-skin-sam .yui-editor-panel .ft span.tip span.icon{background:url( editor-sprite.gif ) no-repeat 0 -1260px;display:block;height:20px;left:2px;position:absolute;top:8px;width:20px;}.yui-skin-sam .yui-editor-panel .ft span.tip span.icon-info{background-position:2px -1260px;}.yui-skin-sam .yui-editor-panel .ft span.tip span.icon-warn{background-position:2px -1296px;}.yui-skin-sam .yui-editor-panel .hd span.knob{position:absolute;height:10px;width:28px;top:-10px;left:25px;text-indent:9999px;overflow:hidden;background:url( editor-knob.gif ) no-repeat 0 0;}.yui-skin-sam .yui-editor-panel .yui-toolbar-container{float:left;width:100%;background-image:none;border:none;}.yui-skin-sam .yui-editor-panel .yui-toolbar-container .bd{background-color:#ffffff;}.yui-editor-blankimage{background-image:url( blankimage.png );} Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-09-24 16:51:13 UTC (rev 3962) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-26 15:03:28 UTC (rev 3963) @@ -7,13 +7,13 @@ xmlns:quickhoney="http://quickhoney.com/"> <head> <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="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css,yui/fonts/fonts-min.css,yui/editor/assets/skins/sam/simpleeditor.css,quickhoney.css,index.css,ydsf.css" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="/rss/quickhoney" /> - <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> + <script src="/static/detectplugins.js,AC_QuickTime.js,MochiKit/MochiKit.js,yui/yahoo-dom-event/yahoo-dom-event.js,yui/animation/animation-min.js,yui/element/element-beta-min.js,yui/container/container_core-min.js,yui/editor/simpleeditor-beta-min.js,javascript.js" type="text/javascript"> </script> <title>QuickHoney</title> </head> - <body id="body" class="loading"> + <body id="body" class="loading yui-skin-sam"> <div id="overlay" class="page"> </div> @@ -271,27 +271,27 @@ </div> <div id="edit_news" class="cms_form"> - <div class="cms_title">Create news entry</div> + <div class="cms_title" id="edit_news_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);"> + enctype="multipart/form-data" target="upload_result" onsubmit="return upload_news(this.target);"> <table class="cms"> <tbody> - <tr> + <tr id="edit_image_upload_row"> <td>Image:</td> - <td><input type="file" name="image-file" /></td> + <td><input id="news_file" type="file" name="image-file" /></td> </tr> <tr> <td>Title:</td> - <td><input name="title" size="60"/></td> + <td><input id="news_title" name="title" size="60"/></td> </tr> <tr> <td>Text:</td> - <td><textarea class="mce_editor" name="text" cols="60" rows="10"> </textarea></td> + <td><textarea id="news_editor" name="text" cols="80" rows="10"> </textarea></td> </tr> </tbody> </table> <p class="cms"> - <input type="submit" name="action" value="upload" /> + <input type="submit" name="action" id="edit_news_action" value="create" /> </p> </form> </div> @@ -306,7 +306,7 @@ <div id="image_edited_form" class="cms_form"> <div class="cms_title">Edits saved</div> <p class="cms"> - Your image edits have been saved. + Your edits have been saved. </p> </div>

1 0

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

24 Sep '08

Revision: 3962 Author: hans URL: http://bknr.net/trac/changeset/3962 Put bknr.impex and bknr.xml back in. They are used, contrary to what I believed. A trunk/bknr/datastore/src/bknr.data.impex.asd A trunk/bknr/datastore/src/bknr.impex.asd A trunk/bknr/datastore/src/bknr.xml.asd A trunk/bknr/datastore/src/xml/ A trunk/bknr/datastore/src/xml-impex/ U trunk/bknr/web/src/bknr.web.asd U trunk/bknr/web/src/packages.lisp Copied: trunk/bknr/datastore/src/bknr.data.impex.asd (from rev 3957, trunk/bknr/datastore/src/bknr.data.impex.asd) =================================================================== --- trunk/bknr/datastore/src/bknr.data.impex.asd (rev 0) +++ trunk/bknr/datastore/src/bknr.data.impex.asd 2008-09-24 16:51:13 UTC (rev 3962) @@ -0,0 +1,21 @@ + +(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"))))) Copied: trunk/bknr/datastore/src/bknr.impex.asd (from rev 3957, trunk/bknr/datastore/src/bknr.impex.asd) =================================================================== --- trunk/bknr/datastore/src/bknr.impex.asd (rev 0) +++ trunk/bknr/datastore/src/bknr.impex.asd 2008-09-24 16:51:13 UTC (rev 3962) @@ -0,0 +1,28 @@ +;;;; -*- 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")))))) Copied: trunk/bknr/datastore/src/bknr.xml.asd (from rev 3957, trunk/bknr/datastore/src/bknr.xml.asd) =================================================================== --- trunk/bknr/datastore/src/bknr.xml.asd (rev 0) +++ trunk/bknr/datastore/src/bknr.xml.asd 2008-09-24 16:51:13 UTC (rev 3962) @@ -0,0 +1,21 @@ +;; -*-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")))))) + Copied: trunk/bknr/datastore/src/xml (from rev 3957, trunk/bknr/datastore/src/xml) Copied: trunk/bknr/datastore/src/xml-impex (from rev 3957, trunk/bknr/datastore/src/xml-impex) Modified: trunk/bknr/web/src/bknr.web.asd =================================================================== --- trunk/bknr/web/src/bknr.web.asd 2008-09-24 16:32:08 UTC (rev 3961) +++ trunk/bknr/web/src/bknr.web.asd 2008-09-24 16:51:13 UTC (rev 3962) @@ -23,12 +23,14 @@ :cxml :unit-test :bknr.utils + :bknr.xml :hunchentoot :drakma :xhtmlgen :puri :usocket :bknr.datastore + :bknr.data.impex :parenscript) :components ((:file "packages") Modified: trunk/bknr/web/src/packages.lisp =================================================================== --- trunk/bknr/web/src/packages.lisp 2008-09-24 16:32:08 UTC (rev 3961) +++ trunk/bknr/web/src/packages.lisp 2008-09-24 16:51:13 UTC (rev 3962) @@ -19,7 +19,7 @@ #:start-cron)) (defpackage :bknr.rss - (:use :cl :cl-user :cl-ppcre :bknr.utils :puri :hunchentoot :bknr.datastore :bknr.indices :cxml) + (:use :cl :cl-user :cl-ppcre :bknr.utils :bknr.xml :puri :hunchentoot :bknr.datastore :bknr.indices :cxml) (:export ;; channel #:rss-channel @@ -158,6 +158,7 @@ :bknr.indices :bknr.impex :bknr.utils + :bknr.xml :bknr.events :bknr.user) (:shadowing-import-from :cl-interpol #:quote-meta-chars)

1 0

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

24 Sep '08

Revision: 3961 Author: hans URL: http://bknr.net/trac/changeset/3961 remove (hopefully) last reference to bknr.xml U trunk/bknr/web/src/packages.lisp Modified: trunk/bknr/web/src/packages.lisp =================================================================== --- trunk/bknr/web/src/packages.lisp 2008-09-24 16:24:49 UTC (rev 3960) +++ trunk/bknr/web/src/packages.lisp 2008-09-24 16:32:08 UTC (rev 3961) @@ -19,7 +19,7 @@ #:start-cron)) (defpackage :bknr.rss - (:use :cl :cl-user :cl-ppcre :bknr.utils :bknr.xml :puri :hunchentoot :bknr.datastore :bknr.indices :cxml) + (:use :cl :cl-user :cl-ppcre :bknr.utils :puri :hunchentoot :bknr.datastore :bknr.indices :cxml) (:export ;; channel #:rss-channel @@ -158,7 +158,6 @@ :bknr.indices :bknr.impex :bknr.utils - :bknr.xml :bknr.events :bknr.user) (:shadowing-import-from :cl-interpol #:quote-meta-chars)

1 0

[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

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

23 Sep '08

Revision: 3950 Author: hans URL: http://bknr.net/trac/changeset/3950 Make it possible to restore datastores when packages have been deleted which are referenced by objects in the store. U trunk/bknr/datastore/src/data/encoding.lisp U trunk/bknr/datastore/src/data/object-tests.lisp U trunk/bknr/datastore/src/data/object.lisp U trunk/bknr/datastore/src/indices/indices.lisp Modified: trunk/bknr/datastore/src/data/encoding.lisp =================================================================== --- trunk/bknr/datastore/src/data/encoding.lisp 2008-09-23 19:26:10 UTC (rev 3949) +++ trunk/bknr/datastore/src/data/encoding.lisp 2008-09-23 19:27:58 UTC (rev 3950) @@ -355,12 +355,42 @@ (assert (= n (read-sequence buffer stream))) (octets-to-string buffer)))) -(defun %decode-symbol (stream) - (let ((p (%decode-string stream)) - (n (%decode-string stream))) - (intern n (or (find-package p) - (error "package ~A for symbol ~A not found" p n))))) +(defun find-symbol-in-all-packages (name) + (let (symbols) + (do-all-symbols (symbol symbols) + (when (string-equal symbol name) + (pushnew symbol symbols))))) +(defun find-symbol-interactively (package-name symbol-name usage) + (let ((keyword (string-equal package-name "KEYWORD"))) + (restart-case + (multiple-value-bind (symbol status) + (funcall (if keyword + #'intern + #'find-symbol) + symbol-name + (or (find-package package-name) + (error "package ~A for symbol ~A~@[ naming ~A~] not found" package-name symbol-name usage))) + (if (or keyword status) + symbol + (error "symbol ~A~@[ naming ~A~] not found in package ~A" symbol-name usage package-name))) + (use-other-symbol (new-symbol) + :interactive (lambda () + (format t "Enter symbol~@[ (homonyms: ~{~S~^, ~})~]: " (find-symbol-in-all-packages symbol-name)) + (let ((new-symbol (ignore-errors (read)))) + (list new-symbol))) + :report (lambda (stream) (format stream "Use another symbol~@[, homonyms: ~S~]" (find-symbol-in-all-packages symbol-name))) + new-symbol) + (read-as-nil () + :report "Read symbol as NIL" + nil)))) + +(defun %decode-symbol (stream &key (intern t) usage) + (let ((package-name (%decode-string stream)) + (symbol-name (%decode-string stream))) + (when intern + (find-symbol-interactively package-name symbol-name usage)))) + (defun %decode-list (stream) (let* ((n (%decode-integer stream)) (result (loop repeat n collect (decode stream))) @@ -370,7 +400,7 @@ result)) (defun %decode-hash-table (stream) - (let* ((test (%decode-symbol stream)) + (let* ((test (%decode-symbol stream :usage "hash table test")) (rehash-size (%decode-double-float stream)) (n (%decode-integer stream)) (result (make-hash-table :test test :size n :rehash-size rehash-size))) @@ -408,7 +438,7 @@ (%decode-uint32 stream))) (defun %decode-array (stream) - (let* ((element-type (%decode-symbol stream)) + (let* ((element-type (%decode-symbol stream :usage "array element type")) (flags (read-byte stream)) (vectorp (logbitp 0 flags)) (adjustablep (logbitp 1 flags)) Modified: trunk/bknr/datastore/src/data/object-tests.lisp =================================================================== --- trunk/bknr/datastore/src/data/object-tests.lisp 2008-09-23 19:26:10 UTC (rev 3949) +++ trunk/bknr/datastore/src/data/object-tests.lisp 2008-09-23 19:27:58 UTC (rev 3950) @@ -278,9 +278,7 @@ (test-equal o1 (parent-child o2)))) (defdstest abort-anonymous-transaction () - (let (parent) - (with-transaction (:initial) - (setf parent (make-instance 'parent :child nil))) + (let ((parent (make-instance 'parent :child nil))) (ignore-errors (with-transaction (:abort) (setf (parent-child parent) (make-instance 'child)) Modified: trunk/bknr/datastore/src/data/object.lisp =================================================================== --- trunk/bknr/datastore/src/data/object.lisp 2008-09-23 19:26:10 UTC (rev 3949) +++ trunk/bknr/datastore/src/data/object.lisp 2008-09-23 19:27:58 UTC (rev 3950) @@ -459,10 +459,12 @@ (defun snapshot-read-layout (stream layouts) (let* ((id (%decode-integer stream)) - (class-name (%decode-symbol stream)) + (class-name (%decode-symbol stream :usage "class")) (nslots (%decode-integer stream)) (class (find-class-with-interactive-renaming class-name)) - (slot-names (loop repeat nslots collect (%decode-symbol stream))) + (slot-names (loop repeat nslots collect (%decode-symbol stream + :intern (not (null class)) + :usage "slot"))) (slots (if class (find-class-slots-with-interactive-renaming class slot-names) slot-names))) Modified: trunk/bknr/datastore/src/indices/indices.lisp =================================================================== --- trunk/bknr/datastore/src/indices/indices.lisp 2008-09-23 19:26:10 UTC (rev 3949) +++ trunk/bknr/datastore/src/indices/indices.lisp 2008-09-23 19:27:58 UTC (rev 3950) @@ -295,7 +295,7 @@ (defmethod index-values ((index array-index)) (error "An ARRAY-INDEX cannot enumerate its values.")) -(defmethod index-mapvalues ((index array-index) fun) +(defmethod index-mapvalues ((index array-index) (fun function)) (error "An ARRAY-INDEX cannot enumerate its values.")) (defmethod index-reinitialize ((new-index array-index) (old-index array-index))

1 0

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

23 Sep '08

Revision: 3949 Author: hans URL: http://bknr.net/trac/changeset/3949 Implement :filename-separator for directory-handler. If specified, the handler can concatenate multiple files. The file names need to be separated by the given separator (string or character). The handler requires that all files are of the same type (as determined by pathname-type). The last-modified HTTP header will be set to the maximum file-write-date of the files concatenated. All files specified must exist, otherwise the handler will generate an error. The path may never contain ".." as a security measure. This is meant to be used to concatenate Javascript and CSS files in order to minimize the number of browser-server interactions. U trunk/bknr/web/src/web/handlers.lisp U trunk/projects/quickhoney/src/webserver.lisp U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/bknr/web/src/web/handlers.lisp =================================================================== --- trunk/bknr/web/src/web/handlers.lisp 2008-09-22 23:41:05 UTC (rev 3948) +++ trunk/bknr/web/src/web/handlers.lisp 2008-09-23 19:26:10 UTC (rev 3949) @@ -447,27 +447,78 @@ (defclass directory-handler (cachable-handler prefix-handler) ((destination :initarg :destination - :reader page-handler-destination)) + :reader page-handler-destination) + (filename-separator :initarg :filename-separator + :reader directory-handler-filename-separator + :initform nil)) (:documentation "Handler for a directory in the file system. Publishes all files -in the directory DESTINATION under their relative path name.")) +in the directory DESTINATION under their relative path name. Multiple +files can be served in one request by separating their relative file +names using the ampersand sign.")) -(defgeneric request-relative-pathname (directory-handler) - (:documentation "Return the relative pathname for the current -request as determined by DIRECTORY-HANDLER.") - (:method ((handler directory-handler)) - (or (aux-request-value 'request-relative-pathname) - (setf (aux-request-value 'request-relative-pathname) - (pathname (subseq (script-name*) (1+ (length (page-handler-prefix handler))))))))) +(define-condition directory-handler-error (error) + ((pathnames-argument :initarg :pathnames-argument)) + (:report (lambda (e stream) + (format stream "~A while processing pathnames argument ~A" + (class-name (class-of e)) (slot-value e 'pathnames-argument))))) +(define-condition invalid-pathname-syntax (directory-handler-error) ()) +(define-condition non-matching-filetypes-in-combination (directory-handler-error) ()) +(define-condition files-not-found (directory-handler-error) + ((files :initarg :files)) + (:report (lambda (e stream) + (format stream "~A while processing pathnames argument ~A, file~:P ~S could not be found" + (class-name (class-of e)) + (slot-value e 'pathnames-argument) + (slot-value e 'files))))) + +(defun request-relative-pathnames (handler) + "Return the relative pathnames for the current request as determined +by DIRECTORY-HANDLER. Caches the list of validated relative pathnames +in the aux-request-value 'request-relative-pathnames." + (or (aux-request-value 'request-relative-pathnames) + (setf (aux-request-value 'request-relative-pathnames) + (let* ((pathnames-argument (subseq (script-name*) (1+ (length (page-handler-prefix handler)))))) + (when (or (search ".." pathnames-argument) + (eql #\/ (aref pathnames-argument 0))) + (error 'invalid-pathname-syntax :pathnames-argument pathnames-argument)) + (let* ((*default-pathname-defaults* (page-handler-destination handler)) + (filenames (if (directory-handler-filename-separator handler) + (mapcar #'pathname (split (directory-handler-filename-separator handler) + pathnames-argument)) + pathnames-argument)) + (types (mapcar #'pathname-type filenames))) + (unless (every #'equal types (cdr types)) + (error 'non-matching-filetypes-in-combination :pathnames-argument pathnames-argument)) + (unless (every #'probe-file filenames) + (error 'files-not-found + :pathnames-argument pathnames-argument + :files (remove-if #'probe-file filenames))) + filenames))))) + (defmethod handler-matches-p ((handler directory-handler)) (and (call-next-method) - (probe-file (merge-pathnames (request-relative-pathname handler) - (page-handler-destination handler))))) + (let ((*default-pathname-defaults* (page-handler-destination handler))) + (some #'probe-file (request-relative-pathnames handler))))) (defmethod handle ((handler directory-handler)) - (handle-static-file (merge-pathnames (request-relative-pathname handler) - (page-handler-destination handler)))) + (let* ((*default-pathname-defaults* (page-handler-destination handler)) + (last-modified (reduce #'max (mapcar #'file-write-date (request-relative-pathnames handler))))) + (handle-if-modified-since last-modified) + (let (open-files) + (unwind-protect + (progn + (dolist (pathname (request-relative-pathnames handler)) + (push (open pathname :element-type '(unsigned-byte 8)) open-files)) + (setf (header-out :content-type) (or (mime-type (first (request-relative-pathnames handler))) + "application/octet-stream") + (header-out :last-modified) (rfc-1123-date last-modified) + (header-out :content-length) (reduce #'+ (mapcar #'file-length open-files))) + (let ((out (send-headers))) + (dolist (open-file (nreverse open-files)) + (copy-stream open-file out)))) + (mapcar #'close open-files))))) (defclass file-handler (page-handler) ((destination :initarg :destination @@ -538,6 +589,7 @@ (handle-object-form handler action object))) (defmethod handle-object-form ((handler edit-object-handler) action (object (eql nil))) + (declare (ignore action)) (with-bknr-page (:title "No such object") (html "No such object, ieeeh"))) @@ -573,6 +625,7 @@ (defgeneric object-date-list-handler-date (handler object) (:method ((handler object-date-list-handler) object) + (declare (ignore object)) (with-query-params (date) (get-daytime (if date (or (parse-integer date :junk-allowed t) Modified: trunk/projects/quickhoney/src/webserver.lisp =================================================================== --- trunk/projects/quickhoney/src/webserver.lisp 2008-09-22 23:41:05 UTC (rev 3948) +++ trunk/projects/quickhoney/src/webserver.lisp 2008-09-23 19:26:10 UTC (rev 3949) @@ -41,7 +41,8 @@ user images ("/static" directory-handler - :destination ,(merge-pathnames #p"static/" *website-directory*)) + :destination ,(merge-pathnames #p"static/" *website-directory*) + :filename-separator #\,) ("/MochiKit" directory-handler :destination ,(merge-pathnames #p"static/MochiKit/" *website-directory*)) ("/favicon.ico" file-handler Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-09-22 23:41:05 UTC (rev 3948) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-23 19:26:10 UTC (rev 3949) @@ -7,17 +7,9 @@ xmlns:quickhoney="http://quickhoney.com/"> <head> <meta name="verify-v1" content="0lfE42KxaTLpCzUEkuTA7V2a9Ojdwk9BG2XSaZGPaoA=" /> - <link rel="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css" /> - <link rel="stylesheet" href="/static/quickhoney.css" /> - <link rel="stylesheet" href="/static/index.css" /> - <link rel="stylesheet" href="/static/ydsf.css" /> + <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="/static/detectplugins.js" type="text/javascript"> </script> - <script src="/static/AC_QuickTime.js" type="text/javascript"> </script> - <script src="/MochiKit/MochiKit.js" type="text/javascript"> </script> - <script src="/static/javascript.js" type="text/javascript"> </script> - <script src="/static/yui/yahoo-dom-event/yahoo-dom-event.js" type="text/javascript"> </script> - <script src="/static/yui/animation/animation-min.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>

1 0

[bknr-cvs] hans changed trunk/thirdparty/cl-stm/
by BKNR Commits 22 Sep '08

22 Sep '08

Revision: 3948 Author: hans URL: http://bknr.net/trac/changeset/3948 Add cl-stm for inspection. A trunk/thirdparty/cl-stm/ A trunk/thirdparty/cl-stm/COPYING A trunk/thirdparty/cl-stm/TODO A trunk/thirdparty/cl-stm/_darcs/ A trunk/thirdparty/cl-stm/_darcs/checkpoints/ A trunk/thirdparty/cl-stm/_darcs/inventories/ A trunk/thirdparty/cl-stm/_darcs/inventory A trunk/thirdparty/cl-stm/_darcs/patches/ A trunk/thirdparty/cl-stm/_darcs/patches/20060525085930-887f0-f1ca2a57340cdad7d57a5c5e5f65d7fe0d590c0b.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060605062803-887f0-f92b40055ef77b281af0f23cd06378da264eb780.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060605063115-887f0-cfb45d6a9d663ffedb3bec9b76941e0f705a7a59.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060606121117-887f0-2aecd22c34db5a485390d6af6dbfef099a95fa7a.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060606121553-887f0-57d7807b66aa852b1029cff69da19614d0289d80.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060608014330-887f0-c627e0dc8a590e9c155705791af86d688a2bf838.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060611082147-887f0-7e815b28a2355fd5e3b8a9da64fd97f71ca870e9.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060611083324-887f0-502c135f5463dcbe6618999b635b71c7b01a4901.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060611090727-887f0-ef36bd11b2781a5176d1aea12aa21f7b38463f06.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060611102340-887f0-52a483ff7f42a76c3ecf6769b795f538a9c514b5.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060611102438-887f0-5a0ec969ff770ebec6b79f8291eb90f320a9b894.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060611233628-887f0-0687e19fb9bd6a33d98093aaa81d47f49ef2a917.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060612061922-887f0-ac10eb1e2b13922662c48a7ab745c0568ce7d1c1.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060612061959-887f0-c18682047a7b32ed6106a669f0cc035a1575727e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060612135017-887f0-d4ddeb96f4e8f2f11c9461b5ec0ac07ea818abd6.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060612135103-887f0-0150ea3ec6472709e70822668c04e23513ff907e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060613093335-887f0-5f96e5eb4c94777ea4ab34ff5ac319b46ff6bdef.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060613145038-887f0-d3300b840152a3162b33beef7f83885e30584122.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060613145917-887f0-7b9146b2305976b51657ad950f4c64254562372c.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060613150053-887f0-108f6a0703db9adcc6d57aec2b29d8c9958098c4.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060614034557-887f0-740a6de60e0bec9673fe78d8faca7a19dc310b93.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060614035441-887f0-f39b12b232278aadb79e7de902e4796e1b3a545e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060614041736-887f0-91baf136bc9848b2ce2fa428ba91e9a6628525a6.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060614074234-887f0-b8bef8854d188844534af98183a303362f33a1ef.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060614080057-887f0-f02e339a777d86bcb34d7e1a9689384cacd5cf9c.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060614081054-887f0-4532226ff6ab62e950f69659841400e8e5c404c3.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060614090359-887f0-2bedc502a788d53fa19a56022e0a542ff650c10b.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060614121824-887f0-3f663a0a9908c75e2be1af27385752c7b5861f0c.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060614121848-887f0-c2120ddc2fb2511fbf556b0fe96bc5cfa76a5466.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060615032236-887f0-5791988ed6db931b4cde9862f411914d7f690cb9.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060615033024-887f0-0e4c3959b9c283aff805855af33a6c0c79897161.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060616033827-887f0-bec6b904bb2d15502b54eb0fafd315db512b69bf.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060616033859-887f0-f10a99b565962dd22be3f416bd34980fdff291d6.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060616043113-887f0-8ecb8c368365376553d66e0fefa89afacd193c90.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060620004637-887f0-445c5008319896162ffe7392bc29404268d468f5.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060620092352-887f0-aefbeaf58a65033e6b64228f5d3e7cbb5e55ad36.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060620102003-887f0-233c6a8f955081728a90db19ab5cd541fb88c518.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060620102121-887f0-75c3a319baeb6c1e34a64657370584c22be77f8e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060620112131-887f0-198f4c806eb72a10e9ef89afc3d7added375a611.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060620112149-887f0-2f24e7b0a6e915e938e0e44825b5ee0651124d70.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060620115200-887f0-f19b4dfe8ee2f32fc88cf2db976662d8e74d3a8f.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060620115217-887f0-22477409325859ac1bec4268c0d82dd72a1cce79.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060620121215-887f0-a4b7ad2040b6b8d8a6e9a7786966601f6b356990.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060620235502-887f0-661da96177b3b66178620477e2299e01ff3e74ad.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060620235754-887f0-f164ebcefc9263873724d7406067e5fc56f5a2b6.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060620235909-887f0-f9aa798bf0d507373a81fa44829d6fe7e28dc5c0.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060621001936-887f0-1675325f7c398f5a1ea79a9ba9568fdfbfda6e40.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060621002407-887f0-00bc86652964ae9e3cc509d980a3593d2178dd62.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060621052447-887f0-df7bdffa4d364562ef4cb299eea81029f2ebce8c.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060621052848-887f0-c567f7471218f28c11fff5069c5e8d5cb7d85b3e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060621054005-887f0-b537bd00ba49da31b242ce48f23795257509e459.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060621090431-887f0-e32ac370d599986cee36bf6606d65950b3124caf.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060621114449-887f0-9da0f3f74f98472fb5e7fd9f04a2124b625a4b18.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060622010216-887f0-23a1570e6c26caae9188489a96cf72d1edd6a57b.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060622031011-887f0-107444680f84ca277daa07ec24f7638a80af8933.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060622231126-887f0-0019f626e695386cf9142bb752378003ae6bce6c.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060623002506-887f0-92a1eeae478dd7f9e59ea360b26a44b63f2e3204.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060623002936-887f0-84b579e3c9c2eaf23c2b866165c8a512018ba155.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060623003857-887f0-15e337a7386ea5e1f74a26129a0dec8f34637c1c.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060625051949-887f0-7387c9db48ca532147d6112798d80a14724604b5.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060625052744-887f0-c0cc07b79ed15b48ecd01810f0f4cbb852bf2f25.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060625054154-887f0-93e59b474bdd158779d5f825b74386535c1f6560.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060625062327-887f0-d752935f44beae267c066d573614413d4e442b3b.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060625234412-887f0-6b11824312f926c53a3aa4cb12434d0c45434aa9.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060626033014-887f0-d452ed856d7800e7dfa0ccd74c46345464d8e414.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060626034417-887f0-eaaf0ad8dec689357079cd6e3362dc5658a8f20e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060626034849-887f0-e8cdd99ccc0116e2a5844b6763d5d8c5d4294e5e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060626035234-887f0-db97af260071bb82bdb0f8a1c0723b5b969db2da.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060626035413-887f0-249dd21135dd8e4b4689958151bfa448cc4331f4.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060626044040-887f0-861494154b9db188398ec0123da6e1528a6b3393.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628040610-887f0-caa06ad4ecf2ccf7f4da0af103f7a19879278561.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628040753-887f0-beb47e0db03908ffd6eac1ee8abac95614ea7abc.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628041135-887f0-c49b85364cc94136f3aa68843d42dd724a2ac81a.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628041428-887f0-265128ed1952f15a542ca0d5580cdf3a8dad0a30.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628042032-887f0-3bcf1c663595f73a9b8892405e0f991e3a5eaa65.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628042230-887f0-871135f290dfa77ab5c323204c7438b0b3cf2672.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628042450-887f0-2668df00f742779b618bf9f06c4471fa0f14186e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628043331-887f0-feeda5d9d1a03d83ecf02a40b477180f69d5137a.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628043402-887f0-176106f5b5d76d519c4996b435ff78193655638d.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628043415-887f0-58e4a21cb2854dff00405c4d0570cc1ca586cb60.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628043819-887f0-9451ddac08c34644b2edd5269d045689c396252b.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628043925-887f0-2d1d139e3e147f5c2e159839f9121122584cf61a.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628044219-887f0-5393206b4db1d63f426031d37ebf08b88f4c9209.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628044719-887f0-9f6c84b17ab09d0dddaaa0932537054cf57599b1.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628044837-887f0-2c03b0321cb00e4885e3843d0d103e038f715715.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628045145-887f0-7f83017eee8131e1f719d4a65b2ad4795b0f1d64.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628045248-887f0-5cfb77efd76e60534757ef0179e988a39bdf3d15.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628050122-887f0-19126e6ca4222ac8fdd5d0cb6c1f21cf690f1f56.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628050456-887f0-b7539b5a4063dd3e6da9c5903044f4c1c369dcdc.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628051711-887f0-62081ea902c3c12457f7a3706aab4ebdc9de0c17.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628051723-887f0-5dd66fa238b6dedb236e6319218cc8fd1e8e533d.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628053032-887f0-7ecfd22f1b802fc53534bad3ac08a7c904bceeb3.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628053203-887f0-2a172b56337d6a06efcdc4d1719e8ebe4c1500a4.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628053324-887f0-ed2aa3b8dd0a6382f7140baacee113c9549f8a8f.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628053428-887f0-e867fe3082b4507a5555ad20ede707ab67307b8e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628053711-887f0-a26335e1f24c68ae9e4f3c6e522ec106e30a88bd.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628053731-887f0-0f0e141bbd5bb092da69d11a8ab76fb6fe690ea7.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628053752-887f0-b4b8e6c74e06d6a1033b06c7822bd5620fa666b2.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628053907-887f0-660499286324c97f3335690f6a34a868c95dd67b.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628054302-887f0-8bef225922a2e8d8cee102f286f2b5d15de673c7.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628054419-887f0-d4f1f239b66fff7bc79445929dd20043fce553f5.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628054555-887f0-51596393c4d45a21cf5e627ded88045e441d4fc2.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628054823-887f0-3b5854cb3373e07cc1c5939300fd7c806daf575f.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628064906-887f0-20f892d8df8cfafb66e32bd7f0b70c206ae7ede2.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628071341-887f0-4272118e65442e22d96ecfe6d0c0742b1eca70b0.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628072114-887f0-69d1b1b946e62528cc9f61f808c091bc0083daf5.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628072250-887f0-a108c2c932b90134f46d4a84e6a920d7fc0fd405.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628072338-887f0-c42af9e9652e8f14e4d65275611ac88419ca683c.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628072738-887f0-0e08e77cc6e7e21a86357e6c3e8c874f955d3bf6.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628072823-887f0-d55cacbf3e8bf7cb7a19fad743584e476d778baa.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628073153-887f0-cf01b56dd29fad6fcd11be446719ec60ba089527.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628073718-887f0-c6d06f42abdc917cbc66a9bcf05654e0f78865fd.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628074411-887f0-7897081617f3a7385eb4e491aa8d766ebe80d1e0.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628074513-887f0-ab9c28532a5826d4a32bec238384115b13585b4b.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628074543-887f0-ef64b8abcfcfad8546606183b77941920ae89ae3.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628074554-887f0-ad96431c49ededdfe3cfe3e36b75f5da0f5d673a.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628075108-887f0-32b86e7981c8fd9fea7f9720626ed8c8adc66804.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628075455-887f0-7a21a3fb8f179701fd43f029f81c5fa42ae5cb40.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628132633-887f0-160c13f0812a8b63120a29def095a52de2096fd3.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628132723-887f0-cd37a0e871973f5054fcb5ff05745d08619c1671.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628133801-887f0-748df9a485036bc9629a8e20ce4da798a35325be.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060628135954-887f0-4a43ca10268fd86c2a00427904ce3f19974cfe8d.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060630072155-887f0-d5ff33947ab7ffb3329e4576521097d71aff7ea4.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060630094743-887f0-c6990c51a387504f69ddb7416c8722d693a03d50.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060630103744-887f0-682f9f3538e037f30d3fe4339c0fe6af9fdac419.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060701011258-887f0-ed80dda5e1f4cc3c70e9c186dc4ec186db4cf7ca.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060701011356-887f0-319c8da4cab143818d93be6beb7d0fa43ef95578.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060701011402-887f0-52ed770dcd15bfaa6123675e81050dc1953c77fe.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060701032123-887f0-7d9555215ba4af7e9ed7bb0d6b9a6bc18ccba40f.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060701032324-887f0-e959db2b2f5646deac5131c101cac861cbc076c1.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060701034031-887f0-2c8d853f5b84d7e5cc1d536576ad9fa5bf19b35d.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060701034046-887f0-1fae69e8d8eb7788aede7ecabd085c501d16e0fe.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060701035129-887f0-98edbae8800ec34b9f8359a55b409cbe3bda812e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060701084522-887f0-8ac9eaa9339cbc6878e1abfc2a38cead0fd29520.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060701101133-887f0-9e3257c54f27c5ff3b4197b1703b4f507b40ba30.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060701233154-887f0-63fecf920221926360fe6653da1baa0305ab1b47.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060702024405-887f0-d98b24083614f71a6669fb2552de743949811d76.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060702024455-887f0-f65c27591a95ab9cda7cdb0177efd8a70b83bd2d.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060703001920-887f0-fc947a24b2e9676625527f2714aa8e12ab24db69.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060703005814-887f0-d9752c9fb2597fe8703f4c0f1dbf94850404abe8.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060703010129-887f0-bbdb4dd83bb8d25d52e717f53079cf3a4c1ee1ca.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060703112056-887f0-358e92f41a7955a4f8f03088c141013fb1218366.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060703112105-887f0-c7a4d9fe823e4744177744ec6761f8aeb81374aa.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060704104623-887f0-e10c299018161b410a6ba18cfaef97ec7bcaee72.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060704104659-887f0-d6a19d0d86c9fd7ccf58dbffc43584322a9cf59f.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060705014424-887f0-d15c292ba6a73f3ba1cfc325e4e5a36b77d188b6.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060705015011-887f0-a403bd565642f4e843bea1bc14356e476e7430cf.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060710092538-887f0-dcc30e91894943d3b09cb6ef3b929c8ac27ce416.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060710094057-887f0-ea2a9bb2c64c3dd0471e96b2fe337af00b449d8e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060710105343-887f0-8df6eda66802981c9e42cb6d7fdc3d1177b13426.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060710105402-887f0-79849d781f4e042b565d3e1c94d78cd1d99b5648.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060716035440-887f0-2ddf232fbbc58ce94d67dcec381506c94ca4fac0.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060716035501-887f0-f513f4c0cf5c7f14f22b08291de5e9deb8a780fd.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060716050340-887f0-861abeb76611342f7d40dddec17f0854304550fb.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060716050408-887f0-03009e417e0fbff15132c89b89f3096b1a81597e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060717021616-887f0-efd23eda01bd9c0ddba4db0a73b14f6ee725f9ce.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060717042043-887f0-c9340f08a6c5c925c706fb46e0b638984c2b88fc.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060717042546-887f0-7d83f5f228197159843cc4eb291215f8875742d5.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060717044426-887f0-29641eadfb4b69ac691558cb5f252775c110ba21.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060717044855-887f0-3c96b54f4104d21a6bcf5d0a74bcd2d847058f2c.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060717044907-887f0-53f2d21914393031cb82a358733cde3d685eeedc.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060718064247-887f0-e31e5c8fa2a0c6d30331b9bba8a1bcafaf9d14a5.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060718234843-887f0-26eb696a26392717e6feac4bd71292496ee68241.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060718234902-887f0-5544950010c2406790713c9d42e4ee885f90de51.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060718234920-887f0-1226c7207c3c402edc5a20cdc89e80eb556e127b.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060719002015-887f0-3ea4984b0d36e7d4eac310d87622cdde9bafbce5.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060719005614-887f0-10c5f9c64a50fa8127135033919cc9fabcaab502.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060719011146-887f0-787e8fcb83eb80200cdd91d51234d3df763ad08e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060719011225-887f0-cfd9223baa1589eedd18f548f6fdeee01221e910.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060719012925-887f0-da7ce1d0bad46e797a8c92cc15e5a23f9eb1fb2a.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060719015459-887f0-69c00c3ffc2fab04030bc2c1611448990d4fd73a.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060719015610-887f0-45f78f333b17cc9e7c607d4febfdeef3c69d461f.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060719015655-887f0-d255e144650ec7054f0f66b37d4ba432813a770d.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060719020321-887f0-9562bb53afabb7d92440bd60e2c22f738e1bc056.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060719020346-887f0-892fb281e79978db9334aa6d46b5ced8a1253ddc.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060724224032-887f0-a37f2aa81e7822584fd19cb53ab90d33678bc990.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060724235132-887f0-7abbb717573401df9fefd3c7f57706f810b4bdec.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060725005309-887f0-3ac756b543bc828cf6580d282ebf77d109f7c5c1.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060725012346-887f0-bab30698890edaf279ca4e7cf59c1c32337d2e58.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060725020044-887f0-69ed502c6bf9d3c0013adb0a6c6551269311bfe2.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060725020657-887f0-48cf7ec6805c36e68754d1406b1247d9e4a240f6.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060725021532-887f0-5261498f05dbdc851be856d8a7bf1df2b599646e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060725022701-887f0-315a4f93e6e0cb2e681d11036d8b2fef113b567e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060725023205-887f0-588625b7e3cda97888f22e291dd81505bdc34ead.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060725023901-887f0-7b4a256d540bf0b2b38ffe475c9de39f3599ac24.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060725024053-887f0-80b09eba2cd7af41490e49a84d802f11e5151ce6.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060725025039-887f0-3ea02eceb8667253d7ab127bed1ac819ca68e89e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060725025447-887f0-f86ff7e1c94dc0b53cb2588557eb0b2ae7ac0281.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060725025715-887f0-736bf48daefe935def9dac8a75b9f2ab00e44760.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060725034236-887f0-c10b819e97e661c18e1ba6465e9ed8511d5bf3d4.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060725041904-887f0-542d6a189eb0964ec864d8fc4f463ed31abb2e15.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060726044955-887f0-4413d7e100f4d999ae7a0f3b4275ba9273f378bd.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060726083834-887f0-6f20a89e8617c82fa7047e54a81a42575196506c.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060726085035-887f0-92441b6550a2e09fda5ee84ee7e4af64d73d4ec8.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060726085827-887f0-f747a3d1266847a7fc225534db1b6454bf2c0d4b.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060726091805-887f0-c55274c6dd7734f9263ac1f4deae1c9d41548abb.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060726091844-887f0-32b2d97adc0c578f76f179946375dd611de027f9.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060726092036-887f0-407b847943bc432a3712e431ff20107e679e8acf.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060726100812-887f0-3287a9f9725a02c6b322e28c1ba675f46e25fd95.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729000823-887f0-09482529956e9baa35bf45a7956c2052afdb8fae.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729001851-887f0-367922b7993487bce0547044a4daff97af1a3734.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729002646-887f0-deaf5c6b2780299eebcf6c42ba78c461b8a755c4.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729005214-887f0-16f5062033dc645843b9bf4485c54b0f673fce42.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729010532-887f0-61328412a115578dc717632e38ecd3c617593d8a.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729011324-887f0-012a4eb295567e431031d8349df0120177cf74d7.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729011357-887f0-6a08f7e7619185e71dc01b246f4feb93408487ab.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729013259-887f0-79c13a835a922016d5c425d88e96eedf804d8aba.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729013847-887f0-d1b7c77047984e0b98fd561ce69dfa6529fb75f7.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729014343-887f0-f54e99ec23c9be6727ab5af90631c88b39115f80.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729014605-887f0-59bcf9898bab531edb1d5427f3c2cf8b32bbd2fb.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729015401-887f0-1cb9ade300c72fcd93aa53a29d89b55ea01b8744.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729015519-887f0-2fdf8f1bb9cf8354255f74920273459788874bc0.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729022028-887f0-479022f2c98e4d893252377d2621c488372d2e8e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729022542-887f0-4429e68eca60b55b366dff3b7c69f18c8827c43e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729023027-887f0-079af49ade9ef20c8180734eb006138a68239a94.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729024502-887f0-1c8f01ac4bb86f0029978554d4dc2be88bf54105.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729024858-887f0-1efd494103c37ebd20f8cd9801017e5fc8f7f7c0.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729025658-887f0-1d279e9ef48c52e8d0fca72ed721600786bfe53d.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729030040-887f0-602d67de4a5fc97a98ee90745b22be755f940822.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729030248-887f0-756b7e827493f856129764457e6db46976b9ca54.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729030607-887f0-8d2b2bc1f4c015368bec8ceef7aabe1bbbf721ee.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729031525-887f0-eab5507aa890807c112151742925c079c42fe006.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729031623-887f0-25e187b0dee1270002de1fe903cf7cea6c444934.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729221418-887f0-113f32040fc2f70a44bd6fe2ea2ad57738cb92b8.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060729221715-887f0-0c0c551d00ba598f9c82a087deb4668945c58533.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730002630-887f0-cdfc09aa46131842781d0e6da1c1e91bfc245585.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730003407-887f0-a7ba70ff332a903b278b9335631e4d12f9a8a861.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730012337-887f0-e500eecebcd3b473f433e7f1d1fe658f57b691b7.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730012445-887f0-84bfde9456fc42fe3e50b8f84aac4bf28fc34adf.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730013259-887f0-d2a3e103206cca617b9e7e0a1a946182a8380fa9.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730014000-887f0-76affaadce265ccbce45ffa537be7299f263a25a.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730014024-887f0-60c0a1b37bc85cce81b070bc0fb1a18c97a9c407.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730014139-887f0-01f42209983ac5c260d9ed9818e2082f98b5fe4e.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730220955-887f0-a6a4291097c036e98e12b09ab57af67ef4cd70bc.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730221308-887f0-d257bc36762f1062c149a2f663138ad77a5d6c01.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730221928-887f0-24af4e81b044463f078bcd24dd3c96689de180ba.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730222026-887f0-c9bb261c391f63ba4436604af2e2a0e9736da8d4.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730225423-887f0-2e94e5742874b5d361ee4e81927eca87ecc9a121.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730225624-887f0-652beee89d50810eed3c63248c761cd65635173a.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730225643-887f0-7ec80b11de672ffc9add594fcc1d9640b7a2ba4f.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060730225912-887f0-525e2aa2a90849afd3113e0747af9d718eda7bb4.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060731010821-887f0-6d1573bb89e89cc89d527d5a3be7c412339f53b4.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060731011956-887f0-44dee08428ebb337568c3961e8e7a4c5c1548edf.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060731012153-887f0-a1bfd32c0cf974dd5b56e4997d358373e81820c8.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060731233658-887f0-6f9f45f9dcdf4cc690de85159a4fc1354086f25b.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060801003510-887f0-a6f212ece8dc128e829ebd6dee44f9861067ad1c.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060801010433-887f0-b3b4d0b60ddf9a2ca8a76be271a193a9a5988d20.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060802012655-887f0-f8729f863cf341d2454aee0c52e054e07f1f70d8.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060802012740-887f0-66ceafed592d52aecef2f8559b6648b38483ee93.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060809103058-887f0-dbac62f68c308912a8b1c03b1a8241b13fe89ed3.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060809103141-887f0-526ba166c3c77899f4552a6df79f595052f3238a.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060809230238-887f0-a87e6199ef48b3d6a5634cdf7bfbcec0230371ab.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060810002140-887f0-6a6510a58cd582e6828d1b26d7cf5e435e262c3d.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060812012506-887f0-99123ad1377c2ef8eb70eb7b21960a094dc27f2b.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060812012804-887f0-336d15573eaa85fc18b52e96fdb9cebc7d3fc7ba.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060812023722-887f0-40f63f327b7551df24f870488c5fd25187d3b676.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060812024155-887f0-e506b2555bb6e927d4cb8bfb4ee0b1d4d63799ff.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060817222347-887f0-7a195f6e43b5526af837e733201799d0f9ea4881.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060817230529-887f0-5f652cf10f570861b7b130275569a30322cc06c2.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060817230559-887f0-ac436777d01e29ad00377d1c984db6b4ddcdc67c.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060818012331-887f0-e39033ca98e82cb42a576f14e594b39cbcdd6432.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060818013515-887f0-5c66f49f00fdb9fd696b4176fe0f472428b3b253.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060818013552-887f0-2a1e9bf230e046b12a2eea79f19f1c0ce9978849.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060818044157-887f0-7600dc1499d1bec21770910f4a123e32854ed631.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060818055419-887f0-a86b102318ec01c99b7dda776a173d68e8a2d0dd.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060818060851-887f0-48875255e5eb847baff1528d882658dc63713452.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819022143-887f0-5e6d2d600bcb7d87374f06b913f626b154cf5d15.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819022411-887f0-281cdec19a82de7e0f7162e8c86934052cc661aa.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819022525-887f0-3566c36ecb0a8424819f529defe387fe7a65565f.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819024520-887f0-37bfc98bf5b4fe09e59ca17edf211274962313f6.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819050157-887f0-14af06c69deef4c76a78ab3aded064da521b4c4f.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819051401-887f0-ac39c0904ee1a196db3689ced99d7e248d30ccb2.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819052137-887f0-935f0bdf4e20c46eb110af537af9eba4f2a278d9.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819052758-887f0-fb4c77b5d730ee6c6fa2c4231c51a983b5a64313.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819054242-887f0-86a613b969e7da791c02b3dd25225914fc2eb426.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819061256-887f0-ccd3c96fc0cc3cfcdf37f857fa451147110ceb67.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819061704-887f0-1041628545ea44196d78659195f58137dc7d691c.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819061947-887f0-c482866ea7234024ec275e2e7c0745d7fb7e0346.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819062021-887f0-56bb802ef028753151fc842368809fb1bf7d1015.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819062051-887f0-a9b5e32327e9b2bf5ba080da58c49a9e352d5843.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060819080936-887f0-f192924da9b96e0517b1df09712ae3e0583e3217.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060820003028-887f0-bebb35a9abe19807a35f859b25c05559e3714000.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060820003115-887f0-9c02119be112e21a54e78e4f057a7fdeafb960ef.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060820014322-887f0-0a7ea789ef31ac8674cbdb20aa979696b62dea3f.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060825073842-887f0-72a1873b7c6f651841d163d3c8c52b857e373e23.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060825073911-887f0-57722f8b9f9a52a5e0db583fe0c9332aed9d7e64.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060825075102-887f0-1185ac6bba70e068436775a1fc5701db7579d77f.gz A trunk/thirdparty/cl-stm/_darcs/patches/20060825101321-887f0-feaa2be83341a9240670af63f68bfcf8e8d69e2c.gz A trunk/thirdparty/cl-stm/_darcs/patches/20070112104808-887f0-1bef049e0c98cd398a3508fdbeea898563fe84b6.gz A trunk/thirdparty/cl-stm/_darcs/prefs/ A trunk/thirdparty/cl-stm/_darcs/prefs/binaries A trunk/thirdparty/cl-stm/_darcs/prefs/boring A trunk/thirdparty/cl-stm/_darcs/prefs/defaultrepo A trunk/thirdparty/cl-stm/_darcs/prefs/motd A trunk/thirdparty/cl-stm/_darcs/prefs/repos A trunk/thirdparty/cl-stm/_darcs/pristine/ A trunk/thirdparty/cl-stm/_darcs/pristine/COPYING A trunk/thirdparty/cl-stm/_darcs/pristine/TODO A trunk/thirdparty/cl-stm/_darcs/pristine/cl-stm.asd A trunk/thirdparty/cl-stm/_darcs/pristine/doc/ A trunk/thirdparty/cl-stm/_darcs/pristine/doc/tutorial.html A trunk/thirdparty/cl-stm/_darcs/pristine/examples/ A trunk/thirdparty/cl-stm/_darcs/pristine/examples/cell.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/examples/chan.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/examples/counter.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/examples/queue.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/examples/utils.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/index.html A trunk/thirdparty/cl-stm/_darcs/pristine/src/ A trunk/thirdparty/cl-stm/_darcs/pristine/src/interface.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/src/loggers.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/src/packages.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/src/protocol.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/src/standard-tlog.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/src/standard-transaction.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/src/transactional-class.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/src/walker.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/style.css A trunk/thirdparty/cl-stm/_darcs/pristine/test/ A trunk/thirdparty/cl-stm/_darcs/pristine/test/standard-tlog.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/test/suite.lisp A trunk/thirdparty/cl-stm/_darcs/pristine/test/walker.lisp A trunk/thirdparty/cl-stm/cl-stm.asd A trunk/thirdparty/cl-stm/doc/ A trunk/thirdparty/cl-stm/doc/tutorial.html A trunk/thirdparty/cl-stm/examples/ A trunk/thirdparty/cl-stm/examples/cell.lisp A trunk/thirdparty/cl-stm/examples/chan.lisp A trunk/thirdparty/cl-stm/examples/counter.lisp A trunk/thirdparty/cl-stm/examples/queue.lisp A trunk/thirdparty/cl-stm/examples/utils.lisp A trunk/thirdparty/cl-stm/index.html A trunk/thirdparty/cl-stm/src/ A trunk/thirdparty/cl-stm/src/interface.lisp A trunk/thirdparty/cl-stm/src/loggers.lisp A trunk/thirdparty/cl-stm/src/packages.lisp A trunk/thirdparty/cl-stm/src/protocol.lisp A trunk/thirdparty/cl-stm/src/standard-tlog.lisp A trunk/thirdparty/cl-stm/src/standard-transaction.lisp A trunk/thirdparty/cl-stm/src/transactional-class.lisp A trunk/thirdparty/cl-stm/src/walker.lisp A trunk/thirdparty/cl-stm/style.css A trunk/thirdparty/cl-stm/test/ A trunk/thirdparty/cl-stm/test/standard-tlog.lisp A trunk/thirdparty/cl-stm/test/suite.lisp A trunk/thirdparty/cl-stm/test/walker.lisp Change set too large, please see URL above

1 0

[bknr-cvs] hans changed buildbot/master/master.cfg
by BKNR Commits 22 Sep '08

22 Sep '08

Revision: 3947 Author: hans URL: http://bknr.net/trac/changeset/3947 remove bos builder. U buildbot/master/master.cfg Modified: buildbot/master/master.cfg =================================================================== --- buildbot/master/master.cfg 2008-09-22 22:24:04 UTC (rev 3946) +++ buildbot/master/master.cfg 2008-09-22 23:04:02 UTC (rev 3947) @@ -31,7 +31,6 @@ "bknr-fbsd-sbcl-i386", "bknr-linux-sbcl-i386", "bknr-darwin-ccl-ppc", - "bos", #"bknr-linux-cmucl-i386", #"bknr-fbsd-cmucl-i386", ])) @@ -56,13 +55,6 @@ description=["test"])) return f -def make_bos_factory(): - f = factory.BuildFactory() - f.addStep(source.SVN(svnurl="svn://bknr.net/svn/branches/bos")) - f.addStep(shell.ShellCommand(command="cd projects/bos ; lisp -batch -quiet -load ../../thirdparty/asdf/asdf.lisp -load ../../tools/make-core.lisp", description=["make-core"])) - f.addStep(shell.ShellCommand(command="cd projects/bos ; ./build.sh -batch -quiet", description=["build"])) - return f - c['builders'] = [ {'name': "bknr-fbsd-ccl-amd64", 'slavename': "paracetamol", @@ -89,11 +81,6 @@ 'builddir': "bknr-darwin-ccl-ppc", 'factory': make_bknr_factory("trunk", "ccl"), }, - {'name': "bos", - 'slavename': "test.createrainforest.org", - 'builddir': "bos", - 'factory': make_bos_factory(), - }, ]

1 0

[bknr-cvs] hans changed trunk/bknr/datastore/src/data/
by BKNR Commits 22 Sep '08

22 Sep '08

Revision: 3946 Author: hans URL: http://bknr.net/trac/changeset/3946 Implement rollback for anonymous transactions. All slot changes made in a transaction will be undone when an error is signalled from within the transaction. As changes to the ID slots of created objects are undone as well, objects created in the transaction will be removed from their indices and eventually garbage collected. U trunk/bknr/datastore/src/data/object-tests.lisp U trunk/bknr/datastore/src/data/object.lisp U trunk/bknr/datastore/src/data/txn.lisp Modified: trunk/bknr/datastore/src/data/object-tests.lisp =================================================================== --- trunk/bknr/datastore/src/data/object-tests.lisp 2008-09-22 19:18:24 UTC (rev 3945) +++ trunk/bknr/datastore/src/data/object-tests.lisp 2008-09-22 22:24:04 UTC (rev 3946) @@ -277,5 +277,16 @@ (o2 (make-instance 'inherit-multiple :child o1))) (test-equal o1 (parent-child o2)))) +(defdstest abort-anonymous-transaction () + (let (parent) + (with-transaction (:initial) + (setf parent (make-instance 'parent :child nil))) + (ignore-errors + (with-transaction (:abort) + (setf (parent-child parent) (make-instance 'child)) + (error "abort"))) + (test-equal nil (parent-child parent)) + (test-equal nil (class-instances 'child)))) + (defun run-datastore-test (name) (unit-test:run-test (gethash name *tests*))) Modified: trunk/bknr/datastore/src/data/object.lisp =================================================================== --- trunk/bknr/datastore/src/data/object.lisp 2008-09-22 19:18:24 UTC (rev 3945) +++ trunk/bknr/datastore/src/data/object.lisp 2008-09-22 22:24:04 UTC (rev 3946) @@ -101,6 +101,11 @@ another persistent object and the pointed-to object is deleted, slot reads will return nil.")) +(defun undo-set-slot (object slot-name value) + (if (eq value 'unbound) + (slot-makunbound object slot-name) + (setf (slot-value object slot-name) value))) + (defmethod (setf slot-value-using-class) :before ((newval t) (class persistent-class) object @@ -110,6 +115,14 @@ (unless (or (in-transaction-p) (member slot-name '(last-change id))) (error 'persistent-slot-modified-outside-of-transaction :slot-name slot-name :object object)) + (when (in-anonymous-transaction-p) + (push (list #'undo-set-slot + object + (slot-definition-name slotd) + (if (slot-boundp object (slot-definition-name slotd)) + (slot-value object (slot-definition-name slotd)) + 'unbound)) + (anonymous-transaction-undo-log *current-transaction*))) (when (and (not (eq :restore (store-state *store*))) (not (member slot-name '(last-change id)))) (setf (slot-value object 'last-change) (current-transaction-timestamp)))))) Modified: trunk/bknr/datastore/src/data/txn.lisp =================================================================== --- trunk/bknr/datastore/src/data/txn.lisp 2008-09-22 19:18:24 UTC (rev 3945) +++ trunk/bknr/datastore/src/data/txn.lisp 2008-09-22 22:24:04 UTC (rev 3946) @@ -64,10 +64,10 @@ (:documentation "Signaled when WITH-TRANSACTION forms are nested.")) -(define-condition anonymous-transaction-in-named-transaction (store-error) +(define-condition anonymous-transaction-in-transaction (store-error) () (:documentation - "Signaled when an anonymous transaction is started from within a named transaction.")) + "Signaled when an anonymous transaction is started from within another transaction, transactions do not nest.")) (define-condition no-subsystems (store-error) () @@ -555,7 +555,9 @@ :initform (error "missing label in anonymous transaction definition")) (log-buffer :initarg :log-buffer :accessor anonymous-transaction-log-buffer - :initform (flex:make-in-memory-output-stream)))) + :initform (flex:make-in-memory-output-stream)) + (undo-log :initform nil + :accessor anonymous-transaction-undo-log))) (defmethod print-object ((transaction anonymous-transaction) stream) (print-unreadable-object (transaction stream :type t) @@ -592,14 +594,38 @@ :label label :log-buffer (flex:make-in-memory-input-stream buffer)))) +(define-condition rollback-failed (error) + ((transaction :initarg transaction) + (original-error :initarg :original-error)) + (:report (lambda (e stream) + (with-slots (transaction original-error) e + (format stream "Rollback of transaction ~A failed: ~A" transaction original-error))))) + +(defun anonymous-transaction-undo (transaction) + (handler-case + (dolist (command (anonymous-transaction-undo-log transaction)) + (apply (car command) (cdr command))) + (error (e) + (error 'rollback-failed + :transaction transaction + :original-error e)))) + +(defun do-with-transaction (label thunk) + (when (in-transaction-p) + (error 'anonymous-transaction-in-transaction)) + (let ((txn (make-instance 'anonymous-transaction :label label)) + (next-object-id (next-object-id (store-object-subsystem)))) + (with-transaction-log (txn) + (handler-case + (funcall thunk) + (error (e) + (setf (next-object-id (store-object-subsystem)) next-object-id) + (anonymous-transaction-undo txn) + (error e)))))) + (defmacro with-transaction ((&optional label) &body body) - (let ((txn (gensym))) - `(progn - (when (in-transaction-p) - (error 'anonymous-transaction-in-named-transaction)) - (let ((,txn (make-instance 'anonymous-transaction :label ,(if (symbolp label) (symbol-name label) label)))) - (with-transaction-log (,txn) - ,@body))))) + `(do-with-transaction ,(if (symbolp label) (symbol-name label) label) + (lambda () ,@body))) (defmethod execute-unlogged ((transaction anonymous-transaction)) ;; EXECUTE-UNLOGGED is called for anonymous transactions only when

1 0

[bknr-cvs] hans changed trunk/bknr/datastore/src/indices/indices.lisp
by BKNR Commits 22 Sep '08

22 Sep '08

Revision: 3945 Author: hans URL: http://bknr.net/trac/changeset/3945 make hash tables thread safe for sbcl U trunk/bknr/datastore/src/indices/indices.lisp Modified: trunk/bknr/datastore/src/indices/indices.lisp =================================================================== --- trunk/bknr/datastore/src/indices/indices.lisp 2008-09-22 18:53:45 UTC (rev 3944) +++ trunk/bknr/datastore/src/indices/indices.lisp 2008-09-22 19:18:24 UTC (rev 3945) @@ -27,7 +27,7 @@ (unless (= (length slots) 1) (error "Exactly one slot name in :SLOTS initarg required to create a SLOT-INDEX")) (with-slots (hash-table slot-name) index - (setf hash-table (make-hash-table :test test) + (setf hash-table (make-hash-table :test test #+sbcl #+sbcl :synchronized t) slot-name (first slots) (slot-value index 'index-nil) index-nil))) @@ -65,7 +65,7 @@ (defmethod index-clear ((index slot-index)) (with-slots (hash-table) index - (setf hash-table (make-hash-table :test (hash-table-test hash-table))))) + (setf hash-table (make-hash-table :test (hash-table-test hash-table) #+sbcl #+sbcl :synchronized t)))) (defmethod index-reinitialize ((new-index slot-index) (old-index slot-index)) @@ -110,7 +110,7 @@ (defmethod initialize-instance :after ((index string-unique-index) &key (test #'equal)) (with-slots (hash-table) index - (setf hash-table (make-hash-table :test test)))) + (setf hash-table (make-hash-table :test test #+sbcl #+sbcl :synchronized t)))) (defmethod index-add :around ((index string-unique-index) object) (unless (slot-boundp object (slot-index-slot-name index)) @@ -421,7 +421,7 @@ (unless (<= (length slots) 1) (error "Can not create slot-index with more than one slot.")) (with-slots (hash-table slot-name) index - (setf hash-table (make-hash-table :test test) + (setf hash-table (make-hash-table :test test #+sbcl #+sbcl :synchronized t) slot-name (first slots) (slot-value index 'index-superclasses) index-superclasses))) @@ -490,7 +490,7 @@ (defmethod index-clear ((index class-skip-index)) (with-slots (hash-table) index - (setf hash-table (make-hash-table :test (hash-table-test hash-table))))) + (setf hash-table (make-hash-table :test (hash-table-test hash-table) #+sbcl #+sbcl :synchronized t)))) (defmethod index-keys ((index class-skip-index)) (loop for key being the hash-keys of (class-skip-index-hash-table index)

1 0

[bknr-cvs] hans changed branches/anon-transaction-fixes/
by BKNR Commits 22 Sep '08

22 Sep '08

Revision: 3944 Author: hans URL: http://bknr.net/trac/changeset/3944 Remove obsolete branch D branches/anon-transaction-fixes/

1 0

[bknr-cvs] hans changed branches/anon-transaction-fixes-2/
by BKNR Commits 22 Sep '08

22 Sep '08

Revision: 3943 Author: hans URL: http://bknr.net/trac/changeset/3943 Remove obsolete branch D branches/anon-transaction-fixes-2/

1 0

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

22 Sep '08

Revision: 3942 Author: hans URL: http://bknr.net/trac/changeset/3942 Merge from anon-transaction-fixes-2 branch. This changeset removes make-object and initialize-persistent-instance, makes the allocation of object IDs simpler and more safe and removes several relicts from previous refactoring iterations. Also, the store tests have been extended significantly to test pathological cases and create objects from multiple threads. U trunk/bknr/datastore/src/bknr.datastore.asd U trunk/bknr/datastore/src/data/blob.lisp U trunk/bknr/datastore/src/data/object-tests.lisp U trunk/bknr/datastore/src/data/object.lisp U trunk/bknr/datastore/src/data/package.lisp U trunk/bknr/datastore/src/data/tests.lisp U trunk/bknr/datastore/src/data/tutorial.lisp U trunk/bknr/datastore/src/data/txn.lisp U trunk/bknr/datastore/src/data/xml-object.lisp U trunk/bknr/datastore/src/indices/indexed-class.lisp U trunk/bknr/datastore/src/indices/indices.lisp U trunk/bknr/datastore/src/utils/class.lisp U trunk/bknr/modules/bknr.modules.asd U trunk/bknr/modules/bug/bug-handlers.lisp U trunk/bknr/modules/comics/comics.lisp U trunk/bknr/modules/feed/edit-feed-handler.lisp U trunk/bknr/modules/feed/feed.lisp U trunk/bknr/modules/imagemap/imagemap.lisp U trunk/bknr/modules/mail/import-yahoo-group.lisp U trunk/bknr/modules/mail/mail.lisp U trunk/bknr/modules/mail/mailinglist-handlers.lisp U trunk/bknr/modules/mail/mailinglist.lisp U trunk/bknr/modules/mail/register-handler.lisp U trunk/bknr/modules/mail/registration.lisp U trunk/bknr/modules/quizz/edit-quizz-handlers.lisp U trunk/bknr/modules/stats/stats.lisp U trunk/bknr/modules/text/article-handlers.lisp U trunk/bknr/modules/text/article.lisp U trunk/bknr/modules/text/billboard-handlers.lisp U trunk/bknr/modules/text/billboard.lisp U trunk/bknr/modules/text/blog-handlers.lisp U trunk/bknr/modules/text/paste-handlers.lisp U trunk/bknr/modules/text/wiki-handlers.lisp U trunk/bknr/modules/track/track.lisp U trunk/bknr/modules/url/cached-url-handlers.lisp U trunk/bknr/modules/url/edit-url-handlers.lisp U trunk/bknr/web/src/images/image.lisp U trunk/bknr/web/src/rss/rss.lisp U trunk/bknr/web/src/sysclasses/cron.lisp U trunk/bknr/web/src/sysclasses/event.lisp U trunk/bknr/web/src/sysclasses/sysparam.lisp U trunk/bknr/web/src/sysclasses/user.lisp U trunk/bknr/web/src/web/host.lisp U trunk/projects/bknr-website/src/init.lisp U trunk/projects/bos/m2/allocation.lisp U trunk/projects/bos/m2/m2.lisp U trunk/projects/bos/m2/map.lisp U trunk/projects/bos/m2/news.lisp U trunk/projects/bos/m2/poi.lisp U trunk/projects/bos/web/daily.lisp U trunk/projects/bos/web/kml-handlers.lisp U trunk/projects/bos/web/languages-handler.lisp U trunk/projects/bos/web/poi-handlers.lisp U trunk/projects/bos/web/sat-tree.lisp U trunk/projects/hello-web/src/news.lisp U trunk/projects/lisp-ecoop/src/handlers.lisp U trunk/projects/lisp-ecoop/src/participant.lisp U trunk/projects/lisp-ecoop/src/tags.lisp U trunk/projects/quickhoney/src/daily.lisp U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/scrabble/src/game.lisp U trunk/projects/scrabble/src/rules.lisp U trunk/projects/scrabble/src/start-webserver.lisp U trunk/projects/unmaintained/eboy/src/dynasite-tags.lisp U trunk/projects/unmaintained/eboy/src/item-handlers.lisp U trunk/projects/unmaintained/gpn/gpn-user.lisp U trunk/projects/unmaintained/gpn/gpn-web.lisp U trunk/projects/unmaintained/gpn/zeitplan-handlers.lisp U trunk/projects/unmaintained/raw-data/mcp/bluetooth.lisp U trunk/projects/unmaintained/raw-data/mcp/isdn-operator.lisp U trunk/projects/unmaintained/raw-data/mcp/sensors.lisp U trunk/projects/unmaintained/saugnapf/src/saugnapf.lisp Change set too large, please see URL above

1 0

[bknr-cvs] hans changed branches/anon-transaction-fixes-2/
by BKNR Commits 22 Sep '08

22 Sep '08

Revision: 3941 Author: hans URL: http://bknr.net/trac/changeset/3941 Merged revisions 3937 via svnmerge from svn+ssh://bknr.net/svn/trunk ........ r3937 | hans | 2008-09-22 17:51:49 +0200 (Mon, 22 Sep 2008) | 2 lines copy js2 to trunk ........ _U branches/anon-transaction-fixes-2/ Property changes on: branches/anon-transaction-fixes-2 ___________________________________________________________________ Name: svnmerge-integrated - /trunk:1-3928 + /trunk:1-3940

1 0

[bknr-cvs] hans changed branches/anon-transaction-fixes-2/bknr/datastore/src/data/object
by BKNR Commits 22 Sep '08

22 Sep '08

Revision: 3940 Author: hans URL: http://bknr.net/trac/changeset/3940 Store next object id to use in snapshot file. This removes the previous buggy behaviour that the store would re-use an object IDs of objects deleted right before the snapshot has been written. U branches/anon-transaction-fixes-2/bknr/datastore/src/data/object-tests.lisp U branches/anon-transaction-fixes-2/bknr/datastore/src/data/object.lisp Modified: branches/anon-transaction-fixes-2/bknr/datastore/src/data/object-tests.lisp =================================================================== --- branches/anon-transaction-fixes-2/bknr/datastore/src/data/object-tests.lisp 2008-09-22 18:31:17 UTC (rev 3939) +++ branches/anon-transaction-fixes-2/bknr/datastore/src/data/object-tests.lisp 2008-09-22 18:33:13 UTC (rev 3940) @@ -54,15 +54,19 @@ (defvar *tests* (make-hash-table)) (defun do-run-test (thunk) - (let ((bknr.datastore::*store-verbose* nil) - initial-objects) + "Run the test in THUNK, then verify that the store contains the +`same' objects after a restore and after snapshot and a restore." + (let ((bknr.datastore::*store-verbose* nil) initial-objects) (funcall thunk) - (setf initial-objects (object-classes-and-ids)) - (restore) - (test-equal initial-objects (object-classes-and-ids)) - (snapshot) - (restore) - (test-equal initial-objects (object-classes-and-ids)))) + (let ((next-object-id (bknr.datastore::next-object-id (bknr.datastore::store-object-subsystem)))) + (setf initial-objects (object-classes-and-ids)) + (restore) + (test-equal initial-objects (object-classes-and-ids)) + (test-equal next-object-id (bknr.datastore::next-object-id (bknr.datastore::store-object-subsystem))) + (snapshot) + (restore) + (test-equal initial-objects (object-classes-and-ids)) + (test-equal next-object-id (bknr.datastore::next-object-id (bknr.datastore::store-object-subsystem)))))) (defmacro defdstest (name args &body body) (when args @@ -150,6 +154,13 @@ (time (map-store-objects #'delete-object)) (test-equal (all-store-objects) nil))) +(defdstest holes-test () + (dotimes (i +stress-size+) + (let ((delete (zerop (random 2)))) + (with-transaction (:foo) + (funcall (if delete #'delete-object #'identity) + (make-instance 'store-object)))))) + (defdstest make-instance-in-anon-txn () (with-transaction () (make-instance 'store-object)) @@ -228,14 +239,7 @@ (restore) (test-assert (< object-id (store-object-id (make-instance 'store-object)))))) -#+(or) (defdstest delete-object-and-check-object-id-of-next-3 () -;; This test currently fails: The store has no explicit knowledge of -;; the object ID that it created. Instead, the next free object ID is -;; determined during restore by looking at the IDs of the objects -;; being restored. If the last object that has been created is -;; deleted right before the snapshot is written, the next object after -;; a restore will receive the same ID. (let (object-id) (with-transaction (:make) (let ((object (make-instance 'store-object))) Modified: branches/anon-transaction-fixes-2/bknr/datastore/src/data/object.lisp =================================================================== --- branches/anon-transaction-fixes-2/bknr/datastore/src/data/object.lisp 2008-09-22 18:31:17 UTC (rev 3939) +++ branches/anon-transaction-fixes-2/bknr/datastore/src/data/object.lisp 2008-09-22 18:33:13 UTC (rev 3940) @@ -498,7 +498,8 @@ (when class (let ((object (allocate-instance class))) (setf (slot-value object 'id) object-id - (next-object-id (store-object-subsystem)) (1+ object-id)) + (next-object-id (store-object-subsystem)) (max (1+ object-id) + (next-object-id (store-object-subsystem)))) (dolist (index (class-slot-indices class 'id)) (index-add index object))))))) @@ -590,6 +591,10 @@ id slot-name (type-of container) (if container (store-object-id container) "unknown object")))))) +(defun encode-current-object-id (stream) + (%write-tag #\I stream) + (%encode-integer (next-object-id (store-object-subsystem)) stream)) + (defmethod snapshot-subsystem ((store store) (subsystem store-object-subsystem)) (let ((snapshot (store-subsystem-snapshot-pathname store subsystem))) (with-open-file (s snapshot @@ -600,6 +605,7 @@ (let ((class-layouts (make-hash-table))) (with-transaction (:prepare-for-snapshot) (map-store-objects #'prepare-for-snapshot)) + (encode-current-object-id s) (map-store-objects (lambda (object) (when (subtypep (type-of object) 'store-object) (encode-create-object class-layouts object s)))) (map-store-objects (lambda (object) (when (subtypep (type-of object) 'store-object) @@ -644,10 +650,11 @@ (report-progress "~A of ~A objects initialized.~%" read-slots created-objects) (force-output)) (let ((char (%read-tag s nil nil))) - (unless (member char '(#\O #\L #\S nil)) + (unless (member char '(#\I #\L #\O #\S nil)) (error "unknown char ~A at offset ~A~%" char (file-position s))) (ecase char ((nil) (return)) + (#\I (setf (next-object-id (store-object-subsystem)) (%decode-integer s))) (#\L (snapshot-read-layout s class-layouts)) (#\O (snapshot-read-object s class-layouts) (incf created-objects)) (#\S (snapshot-read-slots s class-layouts) (incf read-slots))))))

1 0