Merge of zykure's player_info JSON object plus a few bugfixes.

diff --git a/xonstat/static/css/img/web_background_3.jpg b/xonstat/static/css/img/web_background_3.jpg
new file mode 100644 (file)
index 0000000..a73edb0
Binary files /dev/null and b/xonstat/static/css/img/web_background_3.jpg differ

diff --git a/xonstat/static/css/style.css b/xonstat/static/css/style.css
index d87b5bf5b43d0309645839d5bb4b0462706dde4f..a24f6a004c2475fe661a6306886a15a4617fd5c7 100755 (executable)
--- a/xonstat/static/css/style.css
+++ b/xonstat/static/css/style.css
@@ -106,9 +106,12 @@ textarea {
   vertical-align: top;
 }
 body {
+  background: url('img/web_background_3.jpg') no-repeat center center fixed;
   background-color: #000000;
-  background:#000 url('img/web_background_2.jpg') 0 0 no-repeat;
-  background-size: 100%;
+  -webkit-background-size: cover; /*for webKit*/
+  -moz-background-size: cover; /*Mozilla*/
+  -o-background-size: cover; /*opera*/
+  background-size: cover; /*generic*/
   color: #d0d0d0;
   font-family: "XoloniumNormal", "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 11px;
@@ -3388,6 +3391,12 @@ a.thumbnail:hover {
 .invisible {
   visibility: hidden;
 }
+
+/* Custom Stuff */
+table {
+  background: rgb(0, 0, 0); /* IE Fallback */
+  background: none repeat scroll 0 0 rgba(0, 0, 0, 0.7);
+}
 #statline {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 12px;
@@ -3396,15 +3405,14 @@ a.thumbnail:hover {
 }
 #xonborder {
   background: rgb(0, 0, 0); /* IE Fallback */
-  background: none repeat scroll 0 0 rgba(0, 0, 0, 0.4);
-  border-radius: 6px 6px 6px 6px;
+  background: none repeat scroll 0 0 rgba(0, 0, 0, 0.5);
+  border-radius: 15px 15px 15px 15px;
   margin-bottom: 30px;
   padding: 20px;
 }
 #title {
     color: #0088CC;
     font-size: 30px;
-    font-style: italic;
     margin-bottom: 25px;
     position: relative;
     text-align: center;

diff --git a/xonstat/templates/base.mako b/xonstat/templates/base.mako
index 3947174e39183162305ea6e070d6377563167c99..c935dc6563011b5f250928319c479f69c3ceb735 100644 (file)
--- a/xonstat/templates/base.mako
+++ b/xonstat/templates/base.mako
@@ -11,13 +11,6 @@
       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
 
-    <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
-      }
-    </style>
-
     <%block name="css">
     <!-- <link href="/static/css/style.min.css" rel="stylesheet"> -->
     <link href="/static/css/style.css" rel="stylesheet">
@@ -39,7 +32,7 @@
 
       <div class="row">
         <div class="span12" id="xonborder">
-          <div id="title"><%block name="title"></%block>&nbsp;</div>
+          <div id="title"><%block name="title"></%block></div>
             ${self.body()}
         </div> <!-- /xonborder -->
       </div> <!-- /main row -->

diff --git a/xonstat/templates/nav.mako b/xonstat/templates/nav.mako
index 57eab80b025cdfd9f7da1abdae7f2490fab98661..568ddae8efbde724c0bb75d629ce5e85788b2f33 100644 (file)
--- a/xonstat/templates/nav.mako
+++ b/xonstat/templates/nav.mako
@@ -1,5 +1,5 @@
 <%def name="nav(active)">
-    <div class="navbar navbar-fixed-top">
+    <div class="navbar navbar-top">
       <div class="navbar-inner">
         <div class="container">
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">

diff --git a/xonstat/templates/rank_index.mako b/xonstat/templates/rank_index.mako
index 47a2d065630b82e789ab08dcc05beb5b84c9649c..2a72a9483044d7a2629a14b277e9527807e69e36 100644 (file)
--- a/xonstat/templates/rank_index.mako
+++ b/xonstat/templates/rank_index.mako
@@ -2,25 +2,21 @@
 <%namespace file="navlinks.mako" import="navlinks" />
 
 <%block name="title">
-Rank Index - ${parent.title()}
-</%block>
-
-% if not ranks:
-<h2>Sorry, no ranks yet. Get some buddies together and start playing!</h2>
-
-% else:
-<h2>
 % if game_type_cd == 'dm':
-Deathmatch 
+Deathmatch Rank Index
 % elif game_type_cd == 'duel':
-Duel 
+Duel Rank Index
 % elif game_type_cd == 'tdm':
-Team Deathmatch 
+Team Deathmatch Rank Index
 % elif game_type_cd == 'ctf':
-Capture The Flag 
+Capture The Flag Rank Index
 % endif
+</%block>
 
-Rank Index</h2>
+% if not ranks:
+<h2>Sorry, no ranks yet. Get some buddies together and start playing!</h2>
+
+% else:
 <table id="rank-index-table" border="1">
   <tr>
     <th>Rank</th>