adapted z's search engine hints and header

Merge remote-tracking branch 'z/master'

Conflicts:
	xonstat/static/css/style.css
	xonstat/templates/base.mako

diff --git a/xonstat/static/css/style.css b/xonstat/static/css/style.css
index 077fc031f9a68ee4fc80e36020deb30d9416b969..ffc7d24bb2937e7bfac571e06e9d33dce8c73ffe 100755 (executable)
--- a/xonstat/static/css/style.css
+++ b/xonstat/static/css/style.css
@@ -3425,6 +3425,22 @@ a.thumbnail:hover {
 #navsearch select {
   width: 80px;
 }
+
+header {
+  height:0;
+}
+header a {
+  position:absolute;
+  top:20px;
+  left:180px;
+  display:block;
+  height:210px;
+  width:0;
+  padding-left:660px;
+  overflow:hidden;
+}
+header h2 { display:none; }
+
 /* Game scoreboard */
 .game {
   background-image: -moz-linear-gradient(center bottom , #062C52, #041B33);

diff --git a/xonstat/templates/nav.mako b/xonstat/templates/nav.mako
index 288fd2e23434d1e62eac364f888edabef584325a..3e10e673d5a468230729a82f8e4a8493313242b5 100755 (executable)
--- a/xonstat/templates/nav.mako
+++ b/xonstat/templates/nav.mako
@@ -7,7 +7,13 @@
             <span class="i-bar"></span>
             <span class="i-bar"></span>
           </a>
-          <a class="brand" href="${request.route_url('main_index')}"><img src="/static/css/img/Xonotic_icon.png" /></a>
+          <header>
+            <a class="brand" href="${request.route_url('main_index')}">
+             <img src="/static/css/img/Xonotic_icon.png" />
+             <h1>Xonotic Game Statistics</h1>
+            </a>
+            <h2>Xonotic is a fast-paced open-source GPL first person shooter</h2>
+          </header>
           <div class="nav-collapse">
             <ul class="nav">
               <li