Merge of zykure's player_info JSON object plus a few bugfixes.
authorAnt Zucaro <azucaro@gmail.com>
Sun, 16 Sep 2012 03:48:08 +0000 (23:48 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Sun, 16 Sep 2012 03:48:08 +0000 (23:48 -0400)
1  2 
xonstat/templates/base.mako

index b9b00f73f5a92309cddc63a5b780c512ef22f332,3947174e39183162305ea6e070d6377563167c99..c935dc6563011b5f250928319c479f69c3ceb735
        <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">
      <link type="images/vnd.microsoft.icon" rel="shortcut icon" href="/static/favicon.ico">
      </%block>
+     
+     <script src="/static/js/jquery-1.7.1.min.js"></script>
    </head>
  
    <body>
@@@ -30,7 -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 -->