From 39ce9c613fabfb2c1e5d64c74b9c172bbada7bd1 Mon Sep 17 00:00:00 2001
From: Ari Timonen <arit@fastmail.com>
Date: Thu, 2 Apr 2020 05:50:54 +0300
Subject: [PATCH] Random view updates

---
 .gitignore                                    |  1 +
 .../themes/default/pages/_files.scss          |  9 ++++++++-
 .../themes/flat/components/_gather.scss       | 12 +++++++++---
 .../stylesheets/themes/flat/pages/_files.scss |  9 ++++++++-
 app/views/about/staff.html.erb                |  1 +
 app/views/application/_navigation.html.erb    |  1 +
 app/views/gathers/show.html.erb               | 19 ++++++++-----------
 7 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 74663c1..2b9f7c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ db_data/*
 db/data/
 !db/data/.placeholder
 db/initdb.d/*
+!db/initdb.d/*setup.sql
 !db/initdb.d/.placeholder
 *.sql*
 
diff --git a/app/assets/stylesheets/themes/default/pages/_files.scss b/app/assets/stylesheets/themes/default/pages/_files.scss
index 30d2479..97203af 100644
--- a/app/assets/stylesheets/themes/default/pages/_files.scss
+++ b/app/assets/stylesheets/themes/default/pages/_files.scss
@@ -71,7 +71,7 @@ table.movie {
     display: none;
   }
 
-  #player {
+  .player {
     display: block;
     position: relative;
     width: 100%;
@@ -80,6 +80,13 @@ table.movie {
     padding-top: 50px;
     margin-bottom: 20px;
 
+    video {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      top: 0;
+    }
+
     object {
       position: absolute;
       width: 100%;
diff --git a/app/assets/stylesheets/themes/flat/components/_gather.scss b/app/assets/stylesheets/themes/flat/components/_gather.scss
index 810f13e..2dc1983 100644
--- a/app/assets/stylesheets/themes/flat/components/_gather.scss
+++ b/app/assets/stylesheets/themes/flat/components/_gather.scss
@@ -63,6 +63,7 @@
 #gather-info {
   @include span-columns(12);
   margin: 20px 0;
+  padding-left: 30px;
   border-bottom: 2px solid $light-gray;
 
   .info {
@@ -79,10 +80,14 @@
 
   ul {
     list-style-type: disc;
+  }
 
-    li {
-      margin-left: 20px;
-    }
+  ol {
+    list-style-type: decimal;
+  }
+
+  li {
+    margin-left: 20px;
   }
 
   .hide {
@@ -134,6 +139,7 @@
     }
 
     ul {
+      list-style-type: none;
       margin-bottom: 10px;
     }
   }
diff --git a/app/assets/stylesheets/themes/flat/pages/_files.scss b/app/assets/stylesheets/themes/flat/pages/_files.scss
index 30d2479..97203af 100644
--- a/app/assets/stylesheets/themes/flat/pages/_files.scss
+++ b/app/assets/stylesheets/themes/flat/pages/_files.scss
@@ -71,7 +71,7 @@ table.movie {
     display: none;
   }
 
-  #player {
+  .player {
     display: block;
     position: relative;
     width: 100%;
@@ -80,6 +80,13 @@ table.movie {
     padding-top: 50px;
     margin-bottom: 20px;
 
+    video {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      top: 0;
+    }
+
     object {
       position: absolute;
       width: 100%;
diff --git a/app/views/about/staff.html.erb b/app/views/about/staff.html.erb
index 683de57..779b168 100644
--- a/app/views/about/staff.html.erb
+++ b/app/views/about/staff.html.erb
@@ -10,6 +10,7 @@
     <li>Join our official <%= link_to 'discord', 'https://discord.gg/Bvs3KjX' %></li>
     <li>Send email to the head admin from list below (some email adresses are not shown due to privacy settings)</li>
     <li>Contact other staff members directly, check below and click profile for contact details</li>
+    <li><strong>NOTE:</strong> Please contact the right person. Eg don't talk to webmaster about league issues.</li>
   </ol>
 </p>
 
diff --git a/app/views/application/_navigation.html.erb b/app/views/application/_navigation.html.erb
index 1f4e713..c49e5d0 100644
--- a/app/views/application/_navigation.html.erb
+++ b/app/views/application/_navigation.html.erb
@@ -79,6 +79,7 @@
           <li><%= link_to "Teams", teams_path %></li>
           <li><%= link_to "Staff", about_staff_path %></li>
           <li><%= link_to "Bans", bans_url %></li>
+          <li><%= link_to "Servers", servers_url %></li>
           <li><%= link_to "Contact", new_issue_path %></li>
         </ul>
       </li>
diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb
index 904d405..c596914 100644
--- a/app/views/gathers/show.html.erb
+++ b/app/views/gathers/show.html.erb
@@ -150,6 +150,14 @@
 
   <% if @gather and @gather.status != Gather::STATE_FINISHED %>
     <div id="gather-info">
+      <div class="info">
+        <h6>Follow these steps to play</h6>
+        <ol>
+          <li><%= link_to "Instructions", article_path(1086) %></li>
+          <li><%= link_to "Join the discord", "https://discord.gg/a8dT2cn" %></li>
+          <li><%= link_to "Connect to game server", "steam://connect/51.15.77.137:27015/europe// -noforcemparms" %></li>
+        </ol>
+      </div>
       <div class="info">
         <h6>Requirements</h6>
         <ul>
@@ -158,7 +166,6 @@
           <li>Remove yourself if you leave</li>
         </ul>
       </div>
-
       <div class="info">
         <h6>Captains</h6>
         <ul>
@@ -167,16 +174,6 @@
           <li>Captain 2 = 1st most voted</li>
         </ul>
       </div>
-
-      <div class="info">
-        <h6>Gather Info</h6>
-        <ul>
-          <li><%= link_to "Gather topic (all info)", "https://www.ensl.org/topics/1897" %></li>
-          <li><%= link_to "Join the discord", "https://discord.gg/a8dT2cn" %></li>
-          <li><%= link_to "Connect to game server", "steam://connect/51.15.77.137:27015/europe// -noforcemparms" %></li>
-        </ul>
-      </div>
-
       <div class="info">
         <h6>Voice Communication</h6>
         <ul>