Merge pull request #60 from PhlexPlexico/development

Development

README.md

@@ -1,18 +1,18 @@
-# get5-web BETA
+# get5-web
 
-Development
-[![Build Status](https://travis-ci.org/PhlexPlexico/get5-web.svg?branch=development)](https://travis-ci.org/PhlexPlexico/get5-web)
+Development: [![Build Status](https://travis-ci.org/PhlexPlexico/get5-web.svg?branch=development)](https://travis-ci.org/PhlexPlexico/get5-web)
 
-Master
-[![Build Status](https://travis-ci.org/PhlexPlexico/get5-web.svg?branch=master)](https://travis-ci.org/PhlexPlexico/get5-web)
+Master: [![Build Status](https://travis-ci.org/PhlexPlexico/get5-web.svg?branch=master)](https://travis-ci.org/PhlexPlexico/get5-web)
+
+Total Downloads: [![GitHub Downloads](https://img.shields.io/github/downloads/phlexplexico/get5-web/total.svg?label=Total%20Downloads)](https://github.com/phlexplexico/get5-web/releases/latest)
 
 **Status: Third Party Supported**
 
 This is an **experimental** web panel meant to be used in conjunction with the [get5](https://github.com/splewis/get5) CS:GO server plugin. It provides a more convenient way of managing matches and match servers.
 
 This fork of get5-web will probably be updated as more features are required for my use case (running a small league). Bugs will be fixed as I come across them, or based on priority (i.e. does it break everything for me). If you have any bugs you'd like to report, please create an issue. I'll try my best to help solve the issue, but I am still new to learning flask as well.
 
-**WARNING**: THIS BUILD OF THE WEB-PANEL IS UNDER DEVELOPMENT AND IS STARTING TO USE MODIFIED GET5 MATERIAL, SUCH AS THE API_STATS PLUGIN. IF YOU HAVE ANY ISSUES WITH THE VETO PROCESS, OR ANY NEW IMPLEMENTATIONS, PLEASE REPORT IT HERE. 
+**WARNING**: THIS BUILD OF THE WEB-PANEL IS UNDER DEVELOPMENT AND IS STARTING TO USE MODIFIED GET5 MATERIAL, SUCH AS THE API_STATS PLUGIN. IF YOU HAVE ANY ISSUES WITH THE VETO PROCESS, OR ANY NEW IMPLEMENTATIONS, PLEASE REPORT IT HERE. IF THERE ARE ANY PROBLEMS YOU HAVE USING THIS WEBPANEL WITH GET5, REPORT THEM HERE AS IT IS MOST LIKELY A PROBLEM WITH THIS, AND NOT GET5 ITSELF.
 
 ## How to use it:
 

get5/stats.py

@@ -14,6 +14,7 @@ def get_user_stats(steamid):
     all_stats = PlayerStats.query.filter_by(steam_id=steamid)
     if all_stats.count() == 0:
         abort(404)
+    steam_url = all_stats.first().get_steam_url()
     kills=sum(c.kills for c in all_stats)
     deaths=sum(c.deaths for c in all_stats)
     kdr=mean(c.get_kdr() for c in all_stats)
@@ -39,4 +40,4 @@ def get_user_stats(steamid):
     user_1v1=v1, user_1v2=v2, user_1v3=v3,
     user_1v4=v4, user_1v5=v5, user_rating=hltvrating,
     user_headshot=hsp, user_totalrounds=total_rounds, user_fbAssists=flashbang_assists,
-    user_name=name)
+    user_name=name, steam_url=steam_url)

get5/templates/match.html

@@ -19,7 +19,7 @@
 {% for player in map_stats.player_stats.filter_by(team_id=team.id)|sort(attribute='kills', reverse=True) %}
 {% if player.roundsplayed > 0 %}
 <tr>
-  <td> <a href="{{player.get_steam_url()}}"> {{ player.get_player_name() }} </a></td>
+  <td> <a href="/stats/{{player.steam_id}}"> {{ player.get_player_name() }} </a></td>
   <td class="text-center"> {{ player.kills }} </td>
   <td class="text-center"> {{ player.deaths }} </td>
   <td class="text-center"> {{ player.assists }} </td>

get5/templates/stats.html

@@ -4,7 +4,7 @@
 
 
 <div id="content">
-    <h1>Player Stats for {{ user_name }}</h1>
+    <h1>Player Stats for <a href="{{ steam_url }}">{{ user_name }}</a></h1>
     <div class="container">
         <table class="table table-hover">
             <thead>
@@ -13,7 +13,7 @@ <h1>Player Stats for {{ user_name }}</h1>
                 <th class="text-center">Deaths</th>
                 <th class="text-center">Assists</th>
                 <th class="text-center"><acronym title="Flashbang Assists">FBA</acronym></th>
-                <th class="text-center"><acronym title="Kill Death Ratio">KDR</acronym></th>
+                <th class="text-center"><acronym title="Kill/Death Average">KDA</acronym></th>
                 <th class="text-center"><acronym title="Average damage per round">ADR</acronym></th>
                 <th class="text-center">3K</th>
                 <th class="text-center">4K</th>
@@ -23,7 +23,7 @@ <h1>Player Stats for {{ user_name }}</h1>
                 <th class="text-center">1v3</th>
                 <th class="text-center">1v4</th>
                 <th class="text-center">1v5</th>
-                <th class="text-center"><acronym title="Headshot percentage">HSP</acronym></th>
+                <th class="text-center"><acronym title="Average Headshot Percentage">AHSP</acronym></th>
                 <th class="text-center"><acronym title="Total Rounds Played">TRP</acronym></th>
                 <th class="text-center">Rating</th>
               </tr>