<%block name="title">XonStat - The Xonotic Statistics Database</%block>

From: Ant Zucaro Date: Wed, 25 May 2011 16:39:42 +0000 (-0400) Subject: Structure the static directory. Add Xolonium font. Use that font for nicks. X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cc7fb7cb9c7850f9b66a57959c7d57901f89dca2;p=xonotic%2Fxonstat.git Structure the static directory. Add Xolonium font. Use that font for nicks. --- diff --git a/xonstat/static/css/style.css b/xonstat/static/css/style.css new file mode 100755 index 0000000..5226d5b --- /dev/null +++ b/xonstat/static/css/style.css @@ -0,0 +1,15 @@ +@font-face { + font-family: 'Xolonium'; + src: url('/static/css/xolonium-webfont.eot'); + src: url('/static/css/xolonium-webfont.eot?#iefix') format('embedded-opentype'), + url('/static/css/xolonium-webfont.woff') format('woff'), + url('/static/css/xolonium-webfont.ttf') format('truetype'), + url('/static/css/xolonium-webfont.svg#Xolonium') format('svg'); + font-weight: normal; + font-style: normal; +} + +.nick { + font-family: 'Xolonium', 'Arial', 'Helvetica'; + font-size: 14px; +} diff --git a/xonstat/static/css/xolonium-webfont.eot b/xonstat/static/css/xolonium-webfont.eot new file mode 100755 index 0000000..80179b2 Binary files /dev/null and b/xonstat/static/css/xolonium-webfont.eot differ diff --git a/xonstat/static/css/xolonium-webfont.svg b/xonstat/static/css/xolonium-webfont.svg new file mode 100755 index 0000000..09f41d2 --- /dev/null +++ b/xonstat/static/css/xolonium-webfont.svg @@ -0,0 +1,226 @@ + + + \ No newline at end of file diff --git a/xonstat/static/css/xolonium-webfont.ttf b/xonstat/static/css/xolonium-webfont.ttf new file mode 100755 index 0000000..4e8e4ae Binary files /dev/null and b/xonstat/static/css/xolonium-webfont.ttf differ diff --git a/xonstat/static/css/xolonium-webfont.woff b/xonstat/static/css/xolonium-webfont.woff new file mode 100755 index 0000000..ab7d537 Binary files /dev/null and b/xonstat/static/css/xolonium-webfont.woff differ diff --git a/xonstat/static/footerbg.png b/xonstat/static/footerbg.png deleted file mode 100644 index 1fbc873..0000000 Binary files a/xonstat/static/footerbg.png and /dev/null differ diff --git a/xonstat/static/headerbg.png b/xonstat/static/headerbg.png deleted file mode 100644 index 0596f20..0000000 Binary files a/xonstat/static/headerbg.png and /dev/null differ diff --git a/xonstat/static/ie6.css b/xonstat/static/ie6.css deleted file mode 100644 index b7c8493..0000000 --- a/xonstat/static/ie6.css +++ /dev/null @@ -1,8 +0,0 @@ -* html img, -* html .png{position:relative;behavior:expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none", -this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "',sizingMethod='image')", -this.src = "static/transparent.gif"):(this.origBg = this.origBg? this.origBg :this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''), -this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "',sizingMethod='crop')", -this.runtimeStyle.backgroundImage = "none")),this.pngSet=true) -);} -#wrap{display:table;height:100%} diff --git a/xonstat/static/images/crylink.png b/xonstat/static/images/crylink.png new file mode 100755 index 0000000..cdf646f Binary files /dev/null and b/xonstat/static/images/crylink.png differ diff --git a/xonstat/static/images/electro.png b/xonstat/static/images/electro.png new file mode 100755 index 0000000..e318000 Binary files /dev/null and b/xonstat/static/images/electro.png differ diff --git a/xonstat/static/images/fireball.png b/xonstat/static/images/fireball.png new file mode 100755 index 0000000..934d14c Binary files /dev/null and b/xonstat/static/images/fireball.png differ diff --git a/xonstat/static/images/grenadelauncher.png b/xonstat/static/images/grenadelauncher.png new file mode 100755 index 0000000..cec1b89 Binary files /dev/null and b/xonstat/static/images/grenadelauncher.png differ diff --git a/xonstat/static/images/hagar.png b/xonstat/static/images/hagar.png new file mode 100755 index 0000000..6866c24 Binary files /dev/null and b/xonstat/static/images/hagar.png differ diff --git a/xonstat/static/images/hlac.png b/xonstat/static/images/hlac.png new file mode 100755 index 0000000..a870108 Binary files /dev/null and b/xonstat/static/images/hlac.png differ diff --git a/xonstat/static/images/hook.png b/xonstat/static/images/hook.png new file mode 100755 index 0000000..31e9867 Binary files /dev/null and b/xonstat/static/images/hook.png differ diff --git a/xonstat/static/images/laser.png b/xonstat/static/images/laser.png new file mode 100755 index 0000000..8e1ac77 Binary files /dev/null and b/xonstat/static/images/laser.png differ diff --git a/xonstat/static/images/minelayer.png b/xonstat/static/images/minelayer.png new file mode 100755 index 0000000..ddffdfc Binary files /dev/null and b/xonstat/static/images/minelayer.png differ diff --git a/xonstat/static/images/minstanex.png b/xonstat/static/images/minstanex.png new file mode 100755 index 0000000..008e723 Binary files /dev/null and b/xonstat/static/images/minstanex.png differ diff --git a/xonstat/static/images/nex.png b/xonstat/static/images/nex.png new file mode 100755 index 0000000..95fc631 Binary files /dev/null and b/xonstat/static/images/nex.png differ diff --git a/xonstat/static/images/porto.png b/xonstat/static/images/porto.png new file mode 100755 index 0000000..432c265 Binary files /dev/null and b/xonstat/static/images/porto.png differ diff --git a/xonstat/static/images/rifle.png b/xonstat/static/images/rifle.png new file mode 100755 index 0000000..71041ef Binary files /dev/null and b/xonstat/static/images/rifle.png differ diff --git a/xonstat/static/images/rocketlauncher.png b/xonstat/static/images/rocketlauncher.png new file mode 100755 index 0000000..a64c111 Binary files /dev/null and b/xonstat/static/images/rocketlauncher.png differ diff --git a/xonstat/static/images/seeker.png b/xonstat/static/images/seeker.png new file mode 100755 index 0000000..9102d54 Binary files /dev/null and b/xonstat/static/images/seeker.png differ diff --git a/xonstat/static/images/shotgun.png b/xonstat/static/images/shotgun.png new file mode 100755 index 0000000..5476c70 Binary files /dev/null and b/xonstat/static/images/shotgun.png differ diff --git a/xonstat/static/images/tuba.png b/xonstat/static/images/tuba.png new file mode 100755 index 0000000..68f6505 Binary files /dev/null and b/xonstat/static/images/tuba.png differ diff --git a/xonstat/static/images/uzi.png b/xonstat/static/images/uzi.png new file mode 100755 index 0000000..9204426 Binary files /dev/null and b/xonstat/static/images/uzi.png differ diff --git a/xonstat/static/middlebg.png b/xonstat/static/middlebg.png deleted file mode 100644 index 2369cfb..0000000 Binary files a/xonstat/static/middlebg.png and /dev/null differ diff --git a/xonstat/static/pylons.css b/xonstat/static/pylons.css deleted file mode 100644 index fd1914d..0000000 --- a/xonstat/static/pylons.css +++ /dev/null @@ -1,65 +0,0 @@ -html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-size:100%;/* 16px */ -vertical-align:baseline;background:transparent;} -body{line-height:1;} -ol,ul{list-style:none;} -blockquote,q{quotes:none;} -blockquote:before,blockquote:after,q:before,q:after{content:'';content:none;} -:focus{outline:0;} -ins{text-decoration:none;} -del{text-decoration:line-through;} -table{border-collapse:collapse;border-spacing:0;} -sub{vertical-align:sub;font-size:smaller;line-height:normal;} -sup{vertical-align:super;font-size:smaller;line-height:normal;} -ul,menu,dir{display:block;list-style-type:disc;margin:1em 0;padding-left:40px;} -ol{display:block;list-style-type:decimal-leading-zero;margin:1em 0;padding-left:40px;} -li{display:list-item;} -ul ul,ul ol,ul dir,ul menu,ul dl,ol ul,ol ol,ol dir,ol menu,ol dl,dir ul,dir ol,dir dir,dir menu,dir dl,menu ul,menu ol,menu dir,menu menu,menu dl,dl ul,dl ol,dl dir,dl menu,dl dl{margin-top:0;margin-bottom:0;} -ol ul,ul ul,menu ul,dir ul,ol menu,ul menu,menu menu,dir menu,ol dir,ul dir,menu dir,dir dir{list-style-type:circle;} -ol ol ul,ol ul ul,ol menu ul,ol dir ul,ol ol menu,ol ul menu,ol menu menu,ol dir menu,ol ol dir,ol ul dir,ol menu dir,ol dir dir,ul ol ul,ul ul ul,ul menu ul,ul dir ul,ul ol menu,ul ul menu,ul menu menu,ul dir menu,ul ol dir,ul ul dir,ul menu dir,ul dir dir,menu ol ul,menu ul ul,menu menu ul,menu dir ul,menu ol menu,menu ul menu,menu menu menu,menu dir menu,menu ol dir,menu ul dir,menu menu dir,menu dir dir,dir ol ul,dir ul ul,dir menu ul,dir dir ul,dir ol menu,dir ul menu,dir menu menu,dir dir menu,dir ol dir,dir ul dir,dir menu dir,dir dir dir{list-style-type:square;} -.hidden{display:none;} -p{line-height:1.5em;} -h1{font-size:1.75em;line-height:1.7em;font-family:helvetica,verdana;} -h2{font-size:1.5em;line-height:1.7em;font-family:helvetica,verdana;} -h3{font-size:1.25em;line-height:1.7em;font-family:helvetica,verdana;} -h4{font-size:1em;line-height:1.7em;font-family:helvetica,verdana;} -html,body{width:100%;height:100%;} -body{margin:0;padding:0;background-color:#ffffff;position:relative;font:16px/24px "Nobile","Lucida Grande",Lucida,Verdana,sans-serif;} -a{color:#1b61d6;text-decoration:none;} -a:hover{color:#e88f00;text-decoration:underline;} -body h1, -body h2, -body h3, -body h4, -body h5, -body h6{font-family:"Neuton","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;} -#wrap{min-height:100%;} -#header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;vertical-align:middle;} -#header{background:#000000;top:0;font-size:14px;} -#footer{bottom:0;background:#000000 url(footerbg.png) repeat-x 0 top;position:relative;margin-top:-40px;clear:both;} -.header,.footer{width:750px;margin-right:auto;margin-left:auto;} -.wrapper{width:100%} -#top,#top-small,#bottom{width:100%;} -#top{color:#000000;height:230px;background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;} -#top-small{color:#000000;height:60px;background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;} -#bottom{color:#222;background-color:#ffffff;} -.top,.top-small,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;} -.top{padding-top:40px;} -.top-small{padding-top:10px;} -#middle{width:100%;height:100px;background:url(middlebg.png) repeat-x;border-top:2px solid #ffffff;border-bottom:2px solid #b2b2b2;} -.app-welcome{margin-top:25px;} -.app-name{color:#000000;font-weight:bold;} -.bottom{padding-top:50px;} -#left{width:350px;float:left;padding-right:25px;} -#right{width:350px;float:right;padding-left:25px;} -.align-left{text-align:left;} -.align-right{text-align:right;} -.align-center{text-align:center;} -ul.links{margin:0;padding:0;} -ul.links li{list-style-type:none;font-size:14px;} -form{border-style:none;} -fieldset{border-style:none;} -input{color:#222;border:1px solid #ccc;font-family:sans-serif;font-size:12px;line-height:16px;} -input[type=text],input[type=password]{width:205px;} -input[type=submit]{background-color:#ddd;font-weight:bold;} -/*Opera Fix*/ -body:before{content:"";height:100%;float:left;width:0;margin-top:-32767px;} diff --git a/xonstat/static/pyramid-small.png b/xonstat/static/pyramid-small.png deleted file mode 100644 index a5bc0ad..0000000 Binary files a/xonstat/static/pyramid-small.png and /dev/null differ diff --git a/xonstat/static/pyramid.png b/xonstat/static/pyramid.png deleted file mode 100644 index 347e055..0000000 Binary files a/xonstat/static/pyramid.png and /dev/null differ diff --git a/xonstat/static/transparent.gif b/xonstat/static/transparent.gif deleted file mode 100644 index 0341802..0000000 Binary files a/xonstat/static/transparent.gif and /dev/null differ diff --git a/xonstat/templates/base.mako b/xonstat/templates/base.mako old mode 100644 new mode 100755 index 59ba3f7..d3bd783 --- a/xonstat/templates/base.mako +++ b/xonstat/templates/base.mako @@ -1,7 +1,9 @@ <%block name="title">XonStat - The Xonotic Statistics Database</%block> - <%block name="css"/> + <%block name="css"> + + <%block name="js"/> diff --git a/xonstat/templates/scoreboard.mako b/xonstat/templates/scoreboard.mako old mode 100644 new mode 100755 index 3b5518e..effa26e --- a/xonstat/templates/scoreboard.mako +++ b/xonstat/templates/scoreboard.mako @@ -21,10 +21,10 @@ % if pgstat.player_id > 2: - ${pgstat.nick_html_colors()} + ${pgstat.nick_html_colors()} % else: - ${pgstat.nick_html_colors()} + ${pgstat.nick_html_colors()} % endif