Projector friendly scoreboard.

exhuma · Apr 26, 2015 · aac1411 · aac1411
1 parent ebc66ae
commit aac1411
Show file tree

Hide file tree

Showing 7 changed files with 128 additions and 68 deletions.
diff --git a/lost_tracker/static/style.css b/lost_tracker/static/style.css
@@ -442,6 +442,64 @@ TR.completed {
 
 }
 
+TABLE#scoreboard TR:nth-child(2n-1) TD {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+TABLE#scoreboard {
+    width: 100%;
+    max-width: 100%;
+    margin: 0 0;
+    border: 0;
+}
+
+TABLE#scoreboard TD {
+    border: 0;
+}
+
+.position_1 {
+    font-size: 200%;
+    line-height: 200%;
+}
+
+.position_2 {
+    font-size: 180%;
+    line-height: 180%;
+}
+
+.position_3 {
+    font-size: 160%;
+    line-height: 160%;
+}
+
+.position_4 {
+    font-size: 140%;
+    line-height: 140%;
+}
+
+.position_5 {
+    font-size: 120%;
+    line-height: 120%;
+}
+
+TABLE#scoreboard TD.position,
+TABLE#scoreboard TD.score,
+TABLE#scoreboard TD.name {
+    padding: 0.4em 20px;
+}
+
+TABLE#scoreboard TD.position {
+    text-align: left;
+}
+
+TABLE#scoreboard TD.name {
+    text-align: center;
+}
+
+TABLE#scoreboard TD.score {
+    text-align: right;
+}
+
 /* {{{ Modal Dialogs */
 .modal-dialog {
     max-width: 30em;

diff --git a/lost_tracker/templates/master.html b/lost_tracker/templates/master.html
@@ -28,63 +28,13 @@
       $SCRIPT_ROOT = {{request.script_root|tojson|safe}};
     </script>
 
-    <div id="menu">
-      <span id="#mainmenu">
-        <a href="{{url_for('index')}}"><strong>Lost.lu</strong></a> |
-        <a href="{{url_for('where')}}">{{_('Where is this?')}}</a> |
-        {% if registration_open %}
-          <a href="{{url_for('register')}}">{{_('Register')}}</a> |
-        {% endif %}
-        <a href="{{url_for('photo_gallery')}}">{{_('Pictures')}}</a> |
-        <a href="{{url_for('scoreboard')}}">{{_('Scoreboard')}}</a> |
-        <a href="{{url_for('misc')}}">{{_('Anything else?')}}</a>
-      </span>
+    {% block mainmenu %}{% endblock %}
 
-      <span id="flags">
-        <a href="{{request.path}}?lang=en"><img src="{{url_for('static', filename='flags/gb.png')}}" /></a>&nbsp;
-        <a href="{{request.path}}?lang=de"><img src="{{url_for('static', filename='flags/de.png')}}" /></a>&nbsp;
-        <a href="{{request.path}}?lang=lu"><img src="{{url_for('static', filename='flags/lu.png')}}" /></a>
-      </span>
-
-      <span id="auth">
-        {% if current_user.is_authenticated() %}
-        {{_('Logged in as:')}} {{current_user.name}}{{'*' if current_user.admin else ''}} |
-          <a href="{{url_for('group_list')}}">{{_('List')}}</a> |
-          <a href="{{url_for('matrix')}}">{{_('Matrix')}}</a> |
-          <a href="{{url_for('manage')}}">{{_('Slot Editor')}}</a> |
-          <a href="{{url_for('tabularadmin', table='group')}}">{{_('Manager')}}</a> |
-          <a href="{{url_for('logout')}}">{{_('Logout')}}</a>
-        {% else %}
-          <a href="{{url_for('login')}}">{{_('Login')}}</a>
-        {% endif %}
-      </span>
-    </div>
-
-    {% block submenu %}{% endblock %}
+    <br />
+    {% block logo %}{% endblock %}
 
     <div id="{% block wrapperid %}{% endblock %}">
-
-      {% if not disable_logo %}
-        <div id="logo">
-          <img src="{{url_for('static', filename='images/logo2014.png')}}" />
-          {% if localconf.get('app', 'shout', default=None) %}
-            <h2>{{localconf.get('app', 'shout')}}</h2>
-          {% endif %}
-        </div>
-      {% endif %}
-
-      {% with messages = get_flashed_messages(with_categories=True) %}
-          {% if messages %}
-          <div id="flashes">
-              {% for category, message in messages %}
-                  <div class="{{category}}">{{ message }}</div>
-              {% endfor %}
-          </div>
-          {% endif %}
-      {% endwith %}
-
       {% block content %}{% endblock %}
-
       <img id="combilogo" src="{{url_for('static', filename="images/combilogo.jpg")}}" />
     </div>
 

diff --git a/lost_tracker/templates/master_framed.html b/lost_tracker/templates/master_framed.html
@@ -0,0 +1,58 @@
+{% extends "master.html" %}
+
+{% block mainmenu %}
+    <div id="menu">
+      <span id="#mainmenu">
+        <a href="{{url_for('index')}}"><strong>Lost.lu</strong></a> |
+        <a href="{{url_for('where')}}">{{_('Where is this?')}}</a> |
+        {% if registration_open %}
+          <a href="{{url_for('register')}}">{{_('Register')}}</a> |
+        {% endif %}
+        <a href="{{url_for('photo_gallery')}}">{{_('Pictures')}}</a> |
+        <a href="{{url_for('scoreboard')}}">{{_('Scoreboard')}}</a> |
+        <a href="{{url_for('misc')}}">{{_('Anything else?')}}</a>
+      </span>
+
+      <span id="flags">
+        <a href="{{request.path}}?lang=en"><img src="{{url_for('static', filename='flags/gb.png')}}" /></a>&nbsp;
+        <a href="{{request.path}}?lang=de"><img src="{{url_for('static', filename='flags/de.png')}}" /></a>&nbsp;
+        <a href="{{request.path}}?lang=lu"><img src="{{url_for('static', filename='flags/lu.png')}}" /></a>
+      </span>
+
+      <span id="auth">
+        {% if current_user.is_authenticated() %}
+        {{_('Logged in as:')}} {{current_user.name}}{{'*' if current_user.admin else ''}} |
+          <a href="{{url_for('group_list')}}">{{_('List')}}</a> |
+          <a href="{{url_for('matrix')}}">{{_('Matrix')}}</a> |
+          <a href="{{url_for('manage')}}">{{_('Slot Editor')}}</a> |
+          <a href="{{url_for('tabularadmin', table='group')}}">{{_('Manager')}}</a> |
+          <a href="{{url_for('logout')}}">{{_('Logout')}}</a>
+        {% else %}
+          <a href="{{url_for('login')}}">{{_('Login')}}</a>
+        {% endif %}
+      </span>
+    </div>
+{% endblock %}
+
+{% block submenu %}{% endblock %}
+
+{% block logo %}
+      {% if not disable_logo %}
+        <div id="logo">
+          <img src="{{url_for('static', filename='images/logo2014.png')}}" />
+          {% if localconf.get('app', 'shout', default=None) %}
+            <h2>{{localconf.get('app', 'shout')}}</h2>
+          {% endif %}
+        </div>
+      {% endif %}
+
+      {% with messages = get_flashed_messages(with_categories=True) %}
+          {% if messages %}
+          <div id="flashes">
+              {% for category, message in messages %}
+                  <div class="{{category}}">{{ message }}</div>
+              {% endfor %}
+          </div>
+          {% endif %}
+      {% endwith %}
+{% endblock %}
diff --git a/lost_tracker/templates/master_mobile.html b/lost_tracker/templates/master_mobile.html
@@ -1,4 +1,4 @@
-{% extends "master.html" %}
+{% extends "master_framed.html" %}
 
 {% block head %}
     <link rel="stylesheet" href="{{url_for('static', filename='style_mobile.css')}}" />

diff --git a/lost_tracker/templates/master_narrow.html b/lost_tracker/templates/master_narrow.html
@@ -1,3 +1,3 @@
-{% extends "master.html" %}
+{% extends "master_framed.html" %}
 
 {% block wrapperid %}content-narrow{% endblock %}
diff --git a/lost_tracker/templates/master_wide.html b/lost_tracker/templates/master_wide.html
@@ -1,3 +1,3 @@
-{% extends "master.html" %}
+{% extends "master_framed.html" %}
 
 {% block wrapperid %}content-wide{% endblock %}
diff --git a/lost_tracker/templates/scoreboard.html b/lost_tracker/templates/scoreboard.html
@@ -1,4 +1,4 @@
-{% extends "master_narrow.html" %}
+{% extends "master.html" %}
 
 {% block title %}{{_('Scoreboard')}}{% endblock %}
 
@@ -11,19 +11,13 @@ <h1>{{_("Scoreboard")}}</h1>
 <h3>({{_("Current score")}})</h3>
 
 <br>
-<table border="0" width="100%">
-    <tr>
-      <th align="left">{{_("Position")}}</th>
-      <th align="left">{{_("Group")}}</th>
-      <th align="left">{{_("Score")}}</th>
-    </tr>
+<table id="scoreboard" border="0" width="100%">
     {% for row in scores %}
-    <tr class="{{'completed' if row[3] else ''}}">
-        <td align="left">{{row[0]}}</td>
-        <td align="left">{{row[1]}}</td>
-        <td align="left">{{row[2]}}</td>
+    <tr class="{{'completed' if row[3] else ''}} position_{{row[0]}}">
+        <td class="position">{{row[0]}}</td>
+        <td class="name">{{row[1]}}</td>
+        <td class="score">{{row[2]}}</td>
     </tr>
     {% endfor %}
 </table>
 {% endblock %}
-