Change titles, rank by alivetime for active players.

diff --git a/xonstat/templates/main_index.mako b/xonstat/templates/main_index.mako
index 88fe8ca515e669beda135fff86126c2d370331eb..b482efafab9575aab7d581de0b8030498209de00 100755 (executable)
--- a/xonstat/templates/main_index.mako
+++ b/xonstat/templates/main_index.mako
@@ -58,18 +58,18 @@ Main Page - ${parent.title()}
 \r
 ##### TOP PLAYERS #####\r
 <div class="table_block">\r
-<h2>Top Players</h2>\r
+<h2>Most Active Players</h2>\r
 <table id="top-players">\r
        <thead>\r
                <tr>\r
                        <th>#</th>\r
                        <th>Nick</th>\r
-                       <th>Score</th>\r
+                       <th>Playing Time</th>\r
                </tr>\r
        </thead>\r
        <tbody>\r
        <% i = 1 %>\r
-       % for (player_id, nick, score) in top_players:\r
+       % for (player_id, nick, alivetime) in top_players:\r
                <tr>\r
                        <td>${i}</td>\r
                        % if player_id != '-':\r
@@ -77,7 +77,7 @@ Main Page - ${parent.title()}
                        % else:\r
                        <td>${nick}</td>\r
                        % endif\r
-                       <td>${score}</td>\r
+                       <td>${alivetime}</td>\r
                </tr>\r
                <% i = i+1 %>\r
        % endfor\r
@@ -87,13 +87,13 @@ Main Page - ${parent.title()}
 \r
 ##### TOP SERVERS #####\r
 <div class="table_block">\r
-<h2>Top Servers</h2>\r
+<h2>Most Active Servers</h2>\r
 <table id="top-servers">\r
        <thead>\r
                <tr>\r
                        <th>#</th>\r
                        <th>Server</th>\r
-                       <th>Games</th>\r
+                       <th># Games</th>\r
                </tr>\r
        </thead>\r
        <tbody>\r
@@ -116,13 +116,13 @@ Main Page - ${parent.title()}
 \r
 ##### TOP MAPS #####\r
 <div class="table_block">\r
-<h2>Top Maps</h2>\r
+<h2>Most Active Maps</h2>\r
 <table id="top-maps">\r
        <thead>\r
                <tr>\r
                        <th>#</th>\r
                        <th>Map</th>\r
-                       <th>Times Played</th>\r
+                       <th># Games</th>\r
                </tr>\r
        </thead>\r
        <tbody>\r

diff --git a/xonstat/views/main.py b/xonstat/views/main.py
index 1b36ad6b16dc589ccd397e9be76eb143e32eb2eb..d81487c16a11488a1ac4880a34624e3feb195068 100755 (executable)
--- a/xonstat/views/main.py
+++ b/xonstat/views/main.py
@@ -20,14 +20,14 @@ def main_index(request):
     leaderboard_count = 10
     recent_games_count = 20
 
-    # top players by score
+    # top players by playing time
     top_players = DBSession.query(Player.player_id, Player.nick, 
-            func.sum(PlayerGameStat.score)).\
+            func.sum(PlayerGameStat.alivetime)).\
             filter(Player.player_id == PlayerGameStat.player_id).\
             filter(Player.player_id > 2).\
             filter(PlayerGameStat.create_dt > 
                     (datetime.now() - timedelta(days=leaderboard_lifetime))).\
-            order_by(expr.desc(func.sum(PlayerGameStat.score))).\
+            order_by(expr.desc(func.sum(PlayerGameStat.alivetime))).\
             group_by(Player.nick).\
             group_by(Player.player_id).all()[0:10]