Merge a461722 into a83d6de

Thor77 · Mar 9, 2017 · 90d4fbd · 90d4fbd
2 parents a83d6de + a461722
commit 90d4fbd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/tsstats/templates/index.jinja2 b/tsstats/templates/index.jinja2
@@ -3,14 +3,11 @@
 <head>
   <title>{{ title }}</title>
   <meta charset="utf-8">
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/hint.css/2.4.1/hint.min.css" integrity="sha256-7KczUWqIa/6KaIKtNfG18eilVQR4vJ4S9SSiDAplUwc=" crossorigin="anonymous">
   <meta name="referrer" content="no-referrer">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <style type="text/css">
-    body {
-      padding-top: 50px;
-    }
     a {
       color: inherit;
     }
@@ -28,21 +25,24 @@
 </head>
 <body>
 <div class="container-fluid">
-  <nav class="navbar navbar-default navbar-fixed-top"><div class="container-fluid">
-    <div class="navbar-header">
-      <a class="navbar-brand" href="#">{{ title }}</a>
+  <nav class="navbar navbar-toggleable-md navbar-light bg-faded sticky-top">
+    <a class="navbar-brand" href="#">{{ title }}</a>
+
+    <div class="collapse navbar-collapse">
+      <ul class="navbar-nav mr-auto">
+        {% for sid, _ in servers %}
+          <li class="nav-item">
+            <a class="nav-link" href="#sid{{ sid }}">Server {{ sid }}</a>
+          </li>
+        {% endfor %}
+      </ul>
+      {% if debug %}
+      <span class="navbar-text" style="color: red">debug mode</span>
+      {% endif %}
     </div>
-    <ul class="nav navbar-nav">
-      {% for sid, _ in servers %}
-        <li><a href="#sid{{ sid }}">Server {{ sid }}</a></li>
-      {% endfor %}
-     </ul>
-     {% if debug %}
-     <p class="navbar-text navbar-right" style="color: red; padding-right: 10px;">debug mode</p>
-     {% endif %}
-  </div></nav>
+  </nav>
   {% for server in servers %}
-    <h1 class="page-header" id="sid{{ server.sid }}">
+    <h1 class="display-4" id="sid{{ server.sid }}">
       <a href="#sid{{ server.sid }}">Server {{ server.sid }}</a>
     </h1>
     {% include 'stats.jinja2' %}

diff --git a/tsstats/templates/stats.jinja2 b/tsstats/templates/stats.jinja2
@@ -9,12 +9,12 @@
   {% if clients|length > 0 %}
   {% set headline_id = [server.sid, headline|lower|replace(' ', '_')]|join('.') %}
   <h2><a href="#{{ headline_id }}">{{ headline }}</a></h2>
-  <ul class="list-group" id="{{ headline_id }}">
+  <ul class="list-group my-3" id="{{ headline_id }}">
     {% for client, value in clients %}
     {% set id = [headline_id, client.nick|striptags]|join('.') %}
-    <li id="{{ id }}" class="list-group-item{{ ' list-group-item-success' if client.connected else loop.cycle('" style="background-color: #eee;', '') }}">
+    <li id="{{ id }}" class="list-group-item justify-content-between{{ ' list-group-item-success' if client.connected else loop.cycle('" style="background-color: #eee;', '') }}">
       <span class="hint--right hint--medium--xs" data-hint="{{ client.nick_history|join(', ') }}"><a href="#{{ id }}">{{ client.nick }}{{ " (" + client.identifier + ")" if debug }}</a></span>
-      <span class="badge"><div{% if not client.connected and headline == 'Onlinetime' %} class="hint--left" data-hint="{{ client.last_seen|frmttime }}"{% endif %}>{{ value }}</div></span>
+      <span class="badge badge-default badge-pill"><div{% if not client.connected and headline == 'Onlinetime' %} class="hint--left" data-hint="{{ client.last_seen|frmttime }}"{% endif %}>{{ value }}</div></span>
     </li>
     {% endfor %}
   </ul>

diff --git a/tsstats/tests/test_template.py b/tsstats/tests/test_template.py
@@ -35,7 +35,7 @@ def test_debug(output):
     logger.setLevel(logging.INFO)
     soup = BeautifulSoup(open(output_path), 'html.parser')
     # check debug-label presence
-    assert soup.find_all(style='color: red; padding-right: 10px;')
+    assert soup.find('nav').find('span').text == 'debug mode'
     for client_item in soup.find('ul', id='1.onlinetime').find_all('li'):
         nick = client_item.find('span').text
         # check for right identifier