js/rsh.compressed.js player/images/buttons.gif player/images/dev/back_off.gif player/images/dev/back_on.gif player/images/dev/board-19.psd player/images/dev/circle.gif player/images/dev/current.gif player/images/dev/ex.gif player/images/dev/first_off.gif player/images/dev/first_on.gif player/images/dev/forward_off.gif player/images/dev/forward_on.gif player/images/dev/last_off.gif player/images/dev/last_on.gif player/images/dev/markers.psd player/images/dev/pass_off.gif player/images/dev/pass_on.gif player/images/dev/square.gif player/images/dev/territory-black.gif player/images/dev/territory-white.gif player/images/dev/triangle.gif player/images/markers.gif @@ -12,7 +12,7 @@ body { margin: 0 auto; } #header { - background: #eee url(images/header_bg.png) repeat-x; + background: #eee url(../images/header_bg.png) repeat-x; padding: 5px 0 0 0; } #content { @@ -20,7 +20,7 @@ body { } #text-content { background: #eee; - background: #eee url(images/content_bg.png) repeat-x; + background: #eee url(../images/content_bg.png) repeat-x; padding: 0 20px 20px 20px; border: 3px solid #444; } css/site-style.css @@ -1,5 +1,6 @@ planned for 1.0 - change show prefs to hide prefs (show by default), add hideComments +- auto-detect player path - finish i18n (+ copy to player/i18n/en.js) - hyperlink title - add source SGF for Kin's site doc/todo.txt @@ -1,6 +1,6 @@ <?php include("header.phtml"); ?> -<script type="text/javascript" src="js/rsh.js"></script> +<script type="text/javascript" src="js/rsh.compressed.js"></script> <div id="player-container"></div> index.phtml @@ -23,82 +23,56 @@ padding-left: 2px; } .eidogo-player .controls .control { - margin: 5px 8px 0px 8px; + margin: 5px 8px 5px 8px; user-select: none; -khtml-user-select: none; -moz-user-select: none; cursor: default; -} -.eidogo-player .controls .back { width: 88px; height: 38px; background-repeat: no-repeat; background-position: 22px 9px; background-color: #8aa; - background-image: url(../images/back_off.gif); float: left; + background: url(../images/buttons.gif) no-repeat top left; +} +.eidogo-player .controls .back { + background-position: 0 -30px; } .eidogo-player .controls .back-on { - background-image: url(../images/back_on.gif); + background-position: 0 -79px; cursor: pointer; } .eidogo-player .controls .forward { - width: 88px; - height: 38px; - background-repeat: no-repeat; - background-position: 22px 9px; - background-color: #8aa; - background-image: url(../images/forward_off.gif); - float: left; + background-position: 0 -226px; } .eidogo-player .controls .forward-on { - background-image: url(../images/forward_on.gif); + background-position: 0 -275px; cursor: pointer; } .eidogo-player .controls .first { - width: 88px; - height: 38px; - background-repeat: no-repeat; - background-position: 22px 9px; - background-color: #8aa; - background-image: url(../images/first_off.gif); - float: left; - margin-bottom: 5px; + background-position: 0 -128px; } .eidogo-player .controls .first-on { - background-image: url(../images/first_on.gif); + background-position: 0 -177px; cursor: pointer; } .eidogo-player .controls .last { - width: 88px; - height: 38px; - background-repeat: no-repeat; - background-position: 22px 9px; - background-color: #8aa; - background-image: url(../images/last_off.gif); - cursor: default; - float: left; - margin-bottom: 5px; + background-position: 0 -324px; } .eidogo-player .controls .last-on { - background-image: url(../images/last_on.gif); + background-position: 0 -373px; cursor: pointer; } .eidogo-player .controls .pass { float: right; - width: 88px; - height: 38px; - background-repeat: no-repeat; - background-position: 22px 9px; - background-color: #8aa; - background-image: url(../images/pass_off.gif); + background-position: 0 -422px; margin-right: 11px; margin-bottom: 10px; - display: inline; cursor: pointer; } .eidogo-player .controls .pass-on { - background-image: url(../images/pass_on.gif); + background-position: 0 -471px; cursor: pointer; } .eidogo-player .move-number { @@ -352,11 +326,11 @@ .eidogo-player .board .point.stone.white { background: url(../images/w.png); } -.eidogo-player .board .point.marker.current { - background: url(../images/current.gif); -} .eidogo-player .board .point.marker { z-index: 2; + width: 19px; + height: 19px; + background: url(../images/markers.gif) no-repeat top left; } .eidogo-player .board .point.marker.label { color: #f00; @@ -385,23 +359,26 @@ -moz-user-select: none; z-index: 3; } +.eidogo-player .board .point.marker.current { + background-position: 0 -79px; +} .eidogo-player .board .point.marker.triangle { - background: url(../images/triangle.gif); + background-position: 0 -324px; } .eidogo-player .board .point.marker.square { - background: url(../images/square.gif); + background-position: 0 -177px; } .eidogo-player .board .point.marker.circle { - background: url(../images/circle.gif); + background-position: 0 -30px; } .eidogo-player .board .point.marker.ex { - background: url(../images/ex.gif); + background-position: 0 -128px; } .eidogo-player .board .point.marker.territory-white { - background: url(../images/territory-white.gif); + background-position: 0 -275px; } .eidogo-player .board .point.marker.territory-black { - background: url(../images/territory-black.gif); + background-position: 0 -226px; } .eidogo-player .board-hover-move { position: absolute; @@ -444,14 +421,16 @@ border-top: 1px solid #999; height: 14px; padding: 4px 3px 3px 20px; - background: #555 url(../images/territory-white.gif) no-repeat; + background: #555 url(../images/markers.gif) no-repeat top left; + background-position: 0 -275px; } .eidogo-player .info .players .player.black .name { font-size: 13px; border-top: 1px solid #999; height: 14px; padding: 4px 3px 3px 20px; - background: #555 url(../images/territory-black.gif) no-repeat; + background: #555 url(../images/markers.gif) no-repeat top left; + background-position: 0 -226px; } .eidogo-player .info .players .player .captures { float: left; player/css/player-iphone.css @@ -36,66 +36,52 @@ padding-left: 2px; } .eidogo-player .controls .control { - margin: 5px 0 0px 3px; + margin: 5px 0 5px 3px; user-select: none; -khtml-user-select: none; -moz-user-select: none; cursor: default; -} -.eidogo-player .controls .back { width: 44px; height: 19px; - background: url(../images/back_off.gif); float: left; + background: url(../images/buttons.gif) no-repeat top left; +} +.eidogo-player .controls .back { + background-position: 0 -30px; } .eidogo-player .controls .back-on { - background: url(../images/back_on.gif); + background-position: 0 -79px; cursor: pointer; } .eidogo-player .controls .forward { - width: 44px; - height: 19px; - background: url(../images/forward_off.gif); - float: left; + background-position: 0 -226px; } .eidogo-player .controls .forward-on { - background: url(../images/forward_on.gif); + background-position: 0 -275px; cursor: pointer; } .eidogo-player .controls .first { - width: 44px; - height: 19px; - background: url(../images/first_off.gif); - float: left; - margin-bottom: 5px; + background-position: 0 -128px; } .eidogo-player .controls .first-on { - background: url(../images/first_on.gif); + background-position: 0 -177px; cursor: pointer; } .eidogo-player .controls .last { - width: 44px; - height: 19px; - background: url(../images/last_off.gif); - cursor: default; - float: left; - margin-bottom: 5px; + background-position: 0 -324px; } .eidogo-player .controls .last-on { - background: url(../images/last_on.gif); + background-position: 0 -373px; cursor: pointer; } .eidogo-player .controls .pass { float: right; - width: 44px; - height: 19px; - background: url(../images/pass_off.gif); + background-position: 0 -422px; margin-right: 5px; - display: inline; cursor: pointer; } .eidogo-player .controls .pass-on { - background: url(../images/pass_on.gif); + background-position: 0 -471px; cursor: pointer; } .eidogo-player .move-number { @@ -352,11 +338,11 @@ .eidogo-player .board .point.stone.white { background: url(../images/w.png); } -.eidogo-player .board .point.marker.current { - background: url(../images/current.gif); -} .eidogo-player .board .point.marker { z-index: 2; + width: 19px; + height: 19px; + background: url(../images/markers.gif) no-repeat top left; } .eidogo-player .board .point.marker.label { color: #f00; @@ -369,6 +355,7 @@ user-select: none; -khtml-user-select: none; -moz-user-select: none; + background: none; } .eidogo-player .board .point.marker.variation { color: #831; @@ -384,27 +371,31 @@ -khtml-user-select: none; -moz-user-select: none; z-index: 3; + background: none; +} +.eidogo-player .board .point.marker.current { + background-position: 0 -79px; } .eidogo-player .board .point.marker.triangle { - background: url(../images/triangle.gif); + background-position: 0 -324px; } .eidogo-player .board .point.marker.square { - background: url(../images/square.gif); + background-position: 0 -177px; } .eidogo-player .board .point.marker.circle { - background: url(../images/circle.gif); + background-position: 0 -30px; } .eidogo-player .board .point.marker.ex { - background: url(../images/ex.gif); + background-position: 0 -128px; } .eidogo-player .board .point.marker.territory-white { - background: url(../images/territory-white.gif); + background-position: 0 -275px; } .eidogo-player .board .point.marker.territory-black { - background: url(../images/territory-black.gif); + background-position: 0 -226px; } .eidogo-player .board .point.marker.dim { - background: url(../images/dim.png); + background-image: url(../images/dim.png); } .eidogo-player .board-hover-move { position: absolute; @@ -448,13 +439,15 @@ border-top: 1px solid #999; height: 11px; padding: 4px 3px 3px 20px; - background: #555 url(../images/territory-white.gif) no-repeat; + background: #555 url(../images/markers.gif) no-repeat top left; + background-position: 0 -275px; } .eidogo-player .info .players .player.black .name { border-top: 1px solid #999; height: 11px; padding: 4px 3px 3px 20px; - background: #555 url(../images/territory-black.gif) no-repeat; + background: #555 url(../images/markers.gif) no-repeat top left; + background-position: 0 -226px; } .eidogo-player .info .players .player .captures { float: left; player/css/player.css @@ -2420,6 +2420,8 @@ this.pointHeight=0; this.margin=0; var _26=this.renderStone({x:0,y:0},"black"); this.pointWidth=this.pointHeight=_26.offsetWidth; +this.renderStone({x:0,y:0},"white"); +this.renderMarker({x:0,y:0},"current"); this.clear(); this.margin=(this.domNode.offsetWidth-(this.boardSize*this.pointWidth))/2; },clear:function(){ @@ -3911,11 +3913,13 @@ this.croaked=true; (function(){ var _1=window.eidogoConfig||{}; var _2=(_1.playerPath||"player").replace(/\/$/); +if(!_1.skipCss){ eidogo.util.addStyleSheet(_2+"/css/player.css"); var _3=false; if(_3){ eidogo.util.addStyleSheet(_2+"/css/player-ie6.css"); } +} eidogo.util.addEvent(window,"load",function(){ eidogo.autoPlayers=[]; var _4=eidogo.util.byClass("eidogo-player-auto"); player/js/all.compressed.js @@ -199,6 +199,8 @@ eidogo.BoardRendererHtml.prototype = { this.margin = 0; var stone = this.renderStone({x:0,y:0}, "black"); this.pointWidth = this.pointHeight = stone.offsetWidth; + this.renderStone({x:0,y:0}, "white"); // just for image caching + this.renderMarker({x:0,y:0}, "current"); // just for image caching this.clear(); this.margin = (this.domNode.offsetWidth - (this.boardSize * this.pointWidth)) / 2; }, player/js/board.js @@ -5,7 +5,7 @@ DEST="releases/$1" mkdir -p $DEST/sgf cp -r player $DEST find $DEST -name .svn | xargs rm -rf -find $DEST -name '*.psd' | xargs rm -rf +rm -rf $DESV/player/images/dev rm $DEST/player/custom_rhino.jar cp sgf/example.sgf $DEST/sgf cp sgf/test.sgf $DEST/sgf release.sh player/images/back_off.gif player/images/back_on.gif player/images/board-19.psd player/images/circle.gif player/images/current.gif player/images/ex.gif player/images/first_off.gif player/images/first_on.gif player/images/forward_off.gif player/images/forward_on.gif player/images/last_off.gif player/images/last_on.gif player/images/markers.psd player/images/pass_off.gif player/images/pass_on.gif player/images/square.gif player/images/territory-black.gif player/images/territory-white.gif player/images/triangle.gif e3ccb6086ab1c20eda547e42a6c55583038442af jkkramer jkkramer@3a017fa3-8d26-0410-b3dd-4f2ae428da9e http://github.com/jkk/eidogo/commit/544ce7250b470b0e76c5ec913abb0595a1edfb01 544ce7250b470b0e76c5ec913abb0595a1edfb01 2007-11-16T11:15:37-08:00 2007-11-16T11:15:37-08:00 consolidated images into css sprites git-svn-id: https://eidogo.googlecode.com/svn/trunk@67 3a017fa3-8d26-0410-b3dd-4f2ae428da9e 2ea9e385d39860b3dacbbac355dec1e9f7dc861f jkkramer jkkramer@3a017fa3-8d26-0410-b3dd-4f2ae428da9e