From: Ant Zucaro <azucaro@gmail.com>
Date: Sun, 19 Apr 2015 12:35:24 +0000 (-0400)
Subject: Bundle in Luma.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8b42e9c50ecc13479b6ee29b1c2b3454327de089;p=xonotic%2Fxonstat.git

Bundle in Luma.
---

diff --git a/xonstat/templates/base.mako b/xonstat/templates/base.mako
index 1d20c76..11c3114 100644
--- a/xonstat/templates/base.mako
+++ b/xonstat/templates/base.mako
@@ -14,9 +14,12 @@
     <link rel="shortcut icon" href="/static/favicon.ico">
 
     <%block name="css">
-      <link href="/static/css/foundation.css" rel="stylesheet">
-      <link href="/static/css/font-awesome.min.css" rel="stylesheet">
-      <link href="/static/css/app.css" rel="stylesheet">
+      ### FOR DEVELOPMENT ONLY
+      ### <link href="/static/css/foundation.css" rel="stylesheet">
+      ### <link href="/static/css/font-awesome.min.css" rel="stylesheet">
+      ### <link href="/static/css/app.css" rel="stylesheet">
+      ### <link href="/static/css/luma.css" rel="stylesheet">
+      <link href="/static/css/xonstat.css" rel="stylesheet">
     </%block>
 
     <%block name="headjs">
diff --git a/xonstat/templates/game_finder.mako b/xonstat/templates/game_finder.mako
index e159bf3..9050af6 100644
--- a/xonstat/templates/game_finder.mako
+++ b/xonstat/templates/game_finder.mako
@@ -6,11 +6,6 @@
 ${nav.nav('games')}
 </%block>
 
-<%block name="css">
-    ${parent.css()}
-    <link href="/static/css/luma.css" rel="stylesheet">
-</%block>
-
 <%block name="title">
 Game Index
 </%block>
diff --git a/xonstat/templates/game_index.mako b/xonstat/templates/game_index.mako
index 5e2b4ee..d240d78 100644
--- a/xonstat/templates/game_index.mako
+++ b/xonstat/templates/game_index.mako
@@ -3,11 +3,6 @@
 <%namespace file="scoreboard.mako" import="scoreboard" />
 <%namespace file="navlinks.mako" import="navlinks" />
 
-<%block name="css">
-${parent.css()}
-<link href="/static/css/luma.css" rel="stylesheet">
-</%block>
-
 <%block name="navigation">
 ${nav.nav('games')}
 </%block>
diff --git a/xonstat/templates/game_info.mako b/xonstat/templates/game_info.mako
index e64a6e7..02e0b9e 100644
--- a/xonstat/templates/game_info.mako
+++ b/xonstat/templates/game_info.mako
@@ -7,11 +7,6 @@
   ${nav.nav('games')}
 </%block>
 
-<%block name="css">
-  ${parent.css()}
-  <link href="/static/css/luma.css" rel="stylesheet">
-</%block>
-
 <%block name="foundation">
   <script>
   $(document).foundation({
diff --git a/xonstat/templates/login.mako b/xonstat/templates/login.mako
new file mode 100644
index 0000000..3467eb1
--- /dev/null
+++ b/xonstat/templates/login.mako
@@ -0,0 +1,23 @@
+<%inherit file="base.mako"/>
+<%namespace name="nav" file="nav.mako" />
+
+<%block name="navigation">
+${nav.nav('players')}
+</%block>
+
+<%block name="js">
+${parent.js()}
+<script src="https://login.persona.org/include.js" type="text/javascript"></script>
+<script type="text/javascript">${request.persona_js}</script>
+</%block>
+
+<%block name="title">
+Login
+</%block>
+
+<div class="row">
+  <div class="span12">
+  Hello ${user}
+  ${request.persona_button}
+  </div>
+</div>
diff --git a/xonstat/templates/main_index.mako b/xonstat/templates/main_index.mako
index 642d44b..5f4fa79 100644
--- a/xonstat/templates/main_index.mako
+++ b/xonstat/templates/main_index.mako
@@ -4,11 +4,6 @@
   Leaderboard
 </%block>
 
-<%block name="css">
-  ${parent.css()}
-  <link href="/static/css/luma.css" rel="stylesheet">
-</%block>
-
 <%block name="hero_unit">
   <div class="text-center">
     <img src="/static/css/img/xonotic-logo.png" />
diff --git a/xonstat/templates/map_info.mako b/xonstat/templates/map_info.mako
index 0443a5d..6f29540 100644
--- a/xonstat/templates/map_info.mako
+++ b/xonstat/templates/map_info.mako
@@ -14,11 +14,6 @@
   ${parent.title()}
 </%block>
 
-<%block name="css">
-  ${parent.css()}
-  <link href="/static/css/luma.css" rel="stylesheet">
-</%block>
-
 % if gmap is None:
   <h2>Sorry, that map wasn't found!</h2>
 
diff --git a/xonstat/templates/player_game_index.mako b/xonstat/templates/player_game_index.mako
index b44cf3b..69dd9b2 100644
--- a/xonstat/templates/player_game_index.mako
+++ b/xonstat/templates/player_game_index.mako
@@ -2,11 +2,6 @@
 <%namespace name="nav" file="nav.mako" />
 <%namespace file="navlinks.mako" import="navlinks" />
 
-<%block name="css">
-  ${parent.css()}
-  <link href="/static/css/luma.css" rel="stylesheet">
-</%block>
-
 <%block name="navigation">
   ${nav.nav('games')}
 </%block>
diff --git a/xonstat/templates/player_hashkey_nicks_text.mako b/xonstat/templates/player_hashkey_nicks_text.mako
new file mode 100644
index 0000000..ecd4e27
--- /dev/null
+++ b/xonstat/templates/player_hashkey_nicks_text.mako
@@ -0,0 +1,3 @@
+% for nick in nicks:
+${nick.nick|n}
+% endfor
diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako
index 99d97f9..744ceea 100644
--- a/xonstat/templates/player_info.mako
+++ b/xonstat/templates/player_info.mako
@@ -11,7 +11,6 @@
 
 <%block name="css">
   ${parent.css()}
-  <link href="/static/css/luma.css" rel="stylesheet">
   <style>
     #damageChart, #accuracyChart {
       height: 250px;
diff --git a/xonstat/templates/player_merge.mako b/xonstat/templates/player_merge.mako
new file mode 100644
index 0000000..5e8a35a
--- /dev/null
+++ b/xonstat/templates/player_merge.mako
@@ -0,0 +1,16 @@
+<%inherit file="base.mako"/>
+<%namespace name="nav" file="nav.mako" />
+
+<%block name="navigation">
+${nav.nav('players')}
+</%block>
+
+<%block name="js">
+${parent.js()}
+<script src="https://login.persona.org/include.js" type="text/javascript"></script>
+<script type="text/javascript">${request.persona_js}</script>
+</%block>
+
+<%block name="title">
+Merge Players
+</%block>
diff --git a/xonstat/templates/server_info.mako b/xonstat/templates/server_info.mako
index 5c05e87..3dec86d 100644
--- a/xonstat/templates/server_info.mako
+++ b/xonstat/templates/server_info.mako
@@ -11,11 +11,6 @@
   % endif
 </%block>
 
-<%block name="css">
-  ${parent.css()}
-  <link href="/static/css/luma.css" rel="stylesheet">
-</%block>
-
 % if server is None:
   <h2>Sorry, that server wasn't found!</h2>