Gametype icons added

diff --git a/xonstat/static/css/style.css b/xonstat/static/css/style.css
index e0f1a5dde6ae6180899ce9aa9a0ceaa9b0f82b55..2f8d960986597d9b83d5a4166f0842a4528742d9 100755 (executable)
--- a/xonstat/static/css/style.css
+++ b/xonstat/static/css/style.css
@@ -79,6 +79,7 @@ td {
        border:1px solid #436688;
        font-size:10px;
        padding:4px;
+       vertical-align: middle;
 }
 blockquote {
        font-size:14px;
@@ -184,12 +185,12 @@ input { font-family: 'Xolonium', 'Arial', 'Helvetica'; }
 }
 
 /* drop-down navigation */
-.nav, .nav ul { 
+.nav, .nav ul {
        list-style: none;
        margin: 0;
        padding: 0;
 }
- 
+
 .nav {
   z-index: 100;
   position: relative;
@@ -206,13 +207,13 @@ input { font-family: 'Xolonium', 'Arial', 'Helvetica'; }
   padding: 0;
   text-decoration:none;
 }
- 
+
 .nav li a:hover {
        background-color:#111 !important;
        color:#fff !important;
        text-shadow:1px 1px 3px #5A8BBC !important;
 }
- 
+
 .nav ul {
   border-bottom: 1px solid #000;
   list-style: none;
@@ -327,7 +328,7 @@ input[type=text]:hover, .textbox:hover { background-position:-128px -32px; }
        padding-left: 40px;
        padding-top: 3px;
        margin: 5px;
-       height: 32px;   
+       height: 32px;
        display: inline-block;
        cursor:pointer;
 }
@@ -342,9 +343,9 @@ input[type=text]:hover, .textbox:hover { background-position:-128px -32px; }
        padding-left: 60px;
        padding-top: 3px;
        margin: 5px;
-       height: 64px;   
+       height: 64px;
        width: 64px;
-       display: block; 
+       display: block;
        float: left;
        cursor:pointer;
 }
@@ -425,11 +426,15 @@ tr.even.blue {
        box-shadow: 0 0 3px 1px;
        min-width:700px;
 }
+
+.game img {
+  float: left;
+}
 .game h3 {
        color:#93B1CF;
        text-shadow:1px 1px 2px #000;
        padding:4px 4px 8px;
-       margin:0;
+       margin: 20px 0 0 0;
 }
 .game h3 a {
        color:#C5DCF3;

diff --git a/xonstat/static/images/icons/24x24/arena.png b/xonstat/static/images/icons/24x24/arena.png
new file mode 100644 (file)
index 0000000..efbaee3
Binary files /dev/null and b/xonstat/static/images/icons/24x24/arena.png differ

diff --git a/xonstat/static/images/icons/24x24/assault.png b/xonstat/static/images/icons/24x24/assault.png
new file mode 100644 (file)
index 0000000..abff88c
Binary files /dev/null and b/xonstat/static/images/icons/24x24/assault.png differ

diff --git a/xonstat/static/images/icons/24x24/ca.png b/xonstat/static/images/icons/24x24/ca.png
new file mode 100644 (file)
index 0000000..6ddfd56
Binary files /dev/null and b/xonstat/static/images/icons/24x24/ca.png differ

diff --git a/xonstat/static/images/icons/24x24/ctf.png b/xonstat/static/images/icons/24x24/ctf.png
new file mode 100644 (file)
index 0000000..22160a8
Binary files /dev/null and b/xonstat/static/images/icons/24x24/ctf.png differ

diff --git a/xonstat/static/images/icons/24x24/cts.png b/xonstat/static/images/icons/24x24/cts.png
new file mode 100644 (file)
index 0000000..ef879a2
Binary files /dev/null and b/xonstat/static/images/icons/24x24/cts.png differ

diff --git a/xonstat/static/images/icons/24x24/dm.png b/xonstat/static/images/icons/24x24/dm.png
new file mode 100644 (file)
index 0000000..bd51dfb
Binary files /dev/null and b/xonstat/static/images/icons/24x24/dm.png differ

diff --git a/xonstat/static/images/icons/24x24/dom.png b/xonstat/static/images/icons/24x24/dom.png
new file mode 100644 (file)
index 0000000..5a3dd45
Binary files /dev/null and b/xonstat/static/images/icons/24x24/dom.png differ

diff --git a/xonstat/static/images/icons/24x24/duel.png b/xonstat/static/images/icons/24x24/duel.png
new file mode 100644 (file)
index 0000000..c7a28d2
Binary files /dev/null and b/xonstat/static/images/icons/24x24/duel.png differ

diff --git a/xonstat/static/images/icons/24x24/freezetag.png b/xonstat/static/images/icons/24x24/freezetag.png
new file mode 100644 (file)
index 0000000..d7b08a6
Binary files /dev/null and b/xonstat/static/images/icons/24x24/freezetag.png differ

diff --git a/xonstat/static/images/icons/24x24/ka.png b/xonstat/static/images/icons/24x24/ka.png
new file mode 100644 (file)
index 0000000..3fcba9e
Binary files /dev/null and b/xonstat/static/images/icons/24x24/ka.png differ

diff --git a/xonstat/static/images/icons/24x24/kh.png b/xonstat/static/images/icons/24x24/kh.png
new file mode 100644 (file)
index 0000000..9f32a79
Binary files /dev/null and b/xonstat/static/images/icons/24x24/kh.png differ

diff --git a/xonstat/static/images/icons/24x24/lms.png b/xonstat/static/images/icons/24x24/lms.png
new file mode 100644 (file)
index 0000000..6cafc44
Binary files /dev/null and b/xonstat/static/images/icons/24x24/lms.png differ

diff --git a/xonstat/static/images/icons/24x24/nexball.png b/xonstat/static/images/icons/24x24/nexball.png
new file mode 100644 (file)
index 0000000..e663d35
Binary files /dev/null and b/xonstat/static/images/icons/24x24/nexball.png differ

diff --git a/xonstat/static/images/icons/24x24/ons.png b/xonstat/static/images/icons/24x24/ons.png
new file mode 100644 (file)
index 0000000..af1c093
Binary files /dev/null and b/xonstat/static/images/icons/24x24/ons.png differ

diff --git a/xonstat/static/images/icons/24x24/rc.png b/xonstat/static/images/icons/24x24/rc.png
new file mode 100644 (file)
index 0000000..7b1cab4
Binary files /dev/null and b/xonstat/static/images/icons/24x24/rc.png differ

diff --git a/xonstat/static/images/icons/24x24/rune.png b/xonstat/static/images/icons/24x24/rune.png
new file mode 100644 (file)
index 0000000..521bce8
Binary files /dev/null and b/xonstat/static/images/icons/24x24/rune.png differ

diff --git a/xonstat/static/images/icons/24x24/tdm.png b/xonstat/static/images/icons/24x24/tdm.png
new file mode 100644 (file)
index 0000000..5743085
Binary files /dev/null and b/xonstat/static/images/icons/24x24/tdm.png differ

diff --git a/xonstat/static/images/icons/48x48/arena.png b/xonstat/static/images/icons/48x48/arena.png
new file mode 100644 (file)
index 0000000..6095f04
Binary files /dev/null and b/xonstat/static/images/icons/48x48/arena.png differ

diff --git a/xonstat/static/images/icons/48x48/assault.png b/xonstat/static/images/icons/48x48/assault.png
new file mode 100644 (file)
index 0000000..d5ff856
Binary files /dev/null and b/xonstat/static/images/icons/48x48/assault.png differ

diff --git a/xonstat/static/images/icons/48x48/ca.png b/xonstat/static/images/icons/48x48/ca.png
new file mode 100644 (file)
index 0000000..878d07b
Binary files /dev/null and b/xonstat/static/images/icons/48x48/ca.png differ

diff --git a/xonstat/static/images/icons/48x48/ctf.png b/xonstat/static/images/icons/48x48/ctf.png
new file mode 100644 (file)
index 0000000..ed35456
Binary files /dev/null and b/xonstat/static/images/icons/48x48/ctf.png differ

diff --git a/xonstat/static/images/icons/48x48/cts.png b/xonstat/static/images/icons/48x48/cts.png
new file mode 100644 (file)
index 0000000..60d08ad
Binary files /dev/null and b/xonstat/static/images/icons/48x48/cts.png differ

diff --git a/xonstat/static/images/icons/48x48/dm.png b/xonstat/static/images/icons/48x48/dm.png
new file mode 100644 (file)
index 0000000..f50548f
Binary files /dev/null and b/xonstat/static/images/icons/48x48/dm.png differ

diff --git a/xonstat/static/images/icons/48x48/dom.png b/xonstat/static/images/icons/48x48/dom.png
new file mode 100644 (file)
index 0000000..ed82ae2
Binary files /dev/null and b/xonstat/static/images/icons/48x48/dom.png differ

diff --git a/xonstat/static/images/icons/48x48/duel.png b/xonstat/static/images/icons/48x48/duel.png
new file mode 100644 (file)
index 0000000..a15d57c
Binary files /dev/null and b/xonstat/static/images/icons/48x48/duel.png differ

diff --git a/xonstat/static/images/icons/48x48/freezetag.png b/xonstat/static/images/icons/48x48/freezetag.png
new file mode 100644 (file)
index 0000000..402d7b4
Binary files /dev/null and b/xonstat/static/images/icons/48x48/freezetag.png differ

diff --git a/xonstat/static/images/icons/48x48/ka.png b/xonstat/static/images/icons/48x48/ka.png
new file mode 100644 (file)
index 0000000..4647c4a
Binary files /dev/null and b/xonstat/static/images/icons/48x48/ka.png differ

diff --git a/xonstat/static/images/icons/48x48/kh.png b/xonstat/static/images/icons/48x48/kh.png
new file mode 100644 (file)
index 0000000..3a10111
Binary files /dev/null and b/xonstat/static/images/icons/48x48/kh.png differ

diff --git a/xonstat/static/images/icons/48x48/lms.png b/xonstat/static/images/icons/48x48/lms.png
new file mode 100644 (file)
index 0000000..78f47d9
Binary files /dev/null and b/xonstat/static/images/icons/48x48/lms.png differ

diff --git a/xonstat/static/images/icons/48x48/nexball.png b/xonstat/static/images/icons/48x48/nexball.png
new file mode 100644 (file)
index 0000000..5ebe4df
Binary files /dev/null and b/xonstat/static/images/icons/48x48/nexball.png differ

diff --git a/xonstat/static/images/icons/48x48/ons.png b/xonstat/static/images/icons/48x48/ons.png
new file mode 100644 (file)
index 0000000..2abc901
Binary files /dev/null and b/xonstat/static/images/icons/48x48/ons.png differ

diff --git a/xonstat/static/images/icons/48x48/rc.png b/xonstat/static/images/icons/48x48/rc.png
new file mode 100644 (file)
index 0000000..64c0255
Binary files /dev/null and b/xonstat/static/images/icons/48x48/rc.png differ

diff --git a/xonstat/static/images/icons/48x48/rune.png b/xonstat/static/images/icons/48x48/rune.png
new file mode 100644 (file)
index 0000000..c474b8c
Binary files /dev/null and b/xonstat/static/images/icons/48x48/rune.png differ

diff --git a/xonstat/static/images/icons/48x48/tdm.png b/xonstat/static/images/icons/48x48/tdm.png
new file mode 100644 (file)
index 0000000..53a12b5
Binary files /dev/null and b/xonstat/static/images/icons/48x48/tdm.png differ

diff --git a/xonstat/templates/game_index.mako b/xonstat/templates/game_index.mako
index d43798280f85d27a323f663182b034f457660420..7bf9a5458e5cb7fe717dc64028abe98251907bc5 100755 (executable)
--- a/xonstat/templates/game_index.mako
+++ b/xonstat/templates/game_index.mako
@@ -31,7 +31,7 @@ Game Index - ${parent.title()}
        <h2>Recent Games</h2>\r
        % for (game, server, map) in games:\r
        <div class="game">\r
-               <h3><a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for ${map.name}">${map.name}</a> on <a href="${request.route_url("server_info", id=server.server_id)}" name="Server info page for ${server.name}">${server.name}</a> <span class="permalink">(<a href="${request.route_url('game_info', id=game.game_id)}" name="Permalink for game #${game.game_id}">permalink</a>)</span></h3>\r
+               <img src="/static/images/icons/48x48/${game.game_type_cd}.png"/><h3><a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for ${map.name}">${map.name}</a> on <a href="${request.route_url("server_info", id=server.server_id)}" name="Server info page for ${server.name}">${server.name}</a> <span class="permalink">(<a href="${request.route_url('game_info', id=game.game_id)}" name="Permalink for game #${game.game_id}">permalink</a>)</span></h3>\r
        ## show scoreboard using a def from another file\r
        ${scoreboard(game.game_type_cd, pgstats[game.game_id])}\r
        </div>\r

diff --git a/xonstat/templates/main_index.mako b/xonstat/templates/main_index.mako
index 04e510b47c68594556dbaab4b30113bb69c074e3..f0190e0e32a130019c4ac448f6109efc96316bad 100755 (executable)
--- a/xonstat/templates/main_index.mako
+++ b/xonstat/templates/main_index.mako
@@ -108,7 +108,7 @@ Main Page - ${parent.title()}
                % if game != '-':\r
                <tr>\r
                        <td><a href="${request.route_url('game_info', id=game.game_id)}" title="View detailed information about this game">${game.game_id}</a></td>\r
-                       <td>${game.game_type_cd}</td>\r
+                       <td><img title="${game.game_type_cd}" src="/static/images/icons/24x24/${game.game_type_cd}.png" alt="${game.game_type_cd}" /></td>\r
                        <td><a href="${request.route_url('server_info', id=server.server_id)}" title="Go to the detail page for this server">${server.name}</a></td>\r
                        <td><a href="${request.route_url('map_info', id=map.map_id)}" title="Go to the map detail page for this map">${map.name}</a></td>\r
                        <td>${game.start_dt.strftime('%m/%d/%Y %H:%M')}</td>\r

diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako
index f4a718d51f9021695144b84347ac190e33a30fab..fe583df2f2983c9e7ccad1be0a75f3281fda47e5 100755 (executable)
--- a/xonstat/templates/player_info.mako
+++ b/xonstat/templates/player_info.mako
@@ -13,7 +13,7 @@ ${parent.js()}
 
 <%block name="title">
 % if player:
-Player Information for ${player.nick_strip_colors()} - 
+Player Information for ${player.nick_strip_colors()} -
 % endif
 
 ${parent.title()}
@@ -102,7 +102,7 @@ ${accuracy(weapon_stats)}
        <tbody>
        % for (gamestat, game, server, map) in recent_games:
                <tr>
-                  <td>${game.game_type_cd}</td>
+                  <td><img title="${game.game_type_cd}" src="/static/images/icons/24x24/${game.game_type_cd}.png" alt="${game.game_type_cd}" /></td>
                   <td>${map.name}</td>
                   <td>
                   % if gamestat.team != None and gamestat.team == game.winner: