Merge branch 'master' of ssh://github.com/Team254/cheesy-arena

setup_schedule_test.go

@@ -44,7 +44,7 @@ func TestSetupSchedule(t *testing.T) {
 	recorder = postHttpResponse("/setup/schedule/save", "")
 	matches, err := db.GetMatchesByType("qualification")
 	assert.Equal(t, 500, recorder.Code)
-	assert.Contains(t, recorder.Body.String(), "Failed to publish matches")
+	assert.Contains(t, recorder.Body.String(), "Failed to delete published matches")
 	assert.Nil(t, err)
 	assert.Equal(t, 64, len(matches))
 	assert.Equal(t, int64(1388595600), matches[0].Time.Unix())

static/css/audience_display.css

@@ -21,8 +21,8 @@ html {
   margin: 0 auto;
   height: 104px;
   background-color: #fff;
-  border: 1px solid #000;
-  color: #000;
+  border: 1px solid #222;
+  color: #222;
   font-size: 22px;
 }
 .teams {
@@ -39,11 +39,11 @@ html {
 }
 #redTeams {
   float: left;
-  border-right: 1px solid #000;
+  border-right: 1px solid #222;
 }
 #blueTeams {
   float: right;
-  border-left: 1px solid #000;
+  border-left: 1px solid #222;
 }
 .score {
   width: 0px;
@@ -61,12 +61,13 @@ html {
 #eventMatchInfo {
   display: none;
   position: absolute;
-  width: 100%;
+  right: -1px;
+  left: -1px;
   height: 30px;
   bottom: 0px;
   line-height: 30px;
   background-color: #444;
-  border: 1px solid #000;
+  border: 1px solid #222;
   padding: 0px 5px;
   font-family: "FuturaLT";
   font-size: 15px;
@@ -82,7 +83,7 @@ html {
   width: 150px;
   height: 150px;
   background-color: #fff;
-  border: 1px solid #000;
+  border: 1px solid #222;
 }
 .score-number {
   width: 60%;
@@ -121,7 +122,7 @@ html {
   position: relative;
   top: 18px;
   height: 60px;
-  color: #000;
+  color: #222;
   font-family: "FuturaLTBold";
   font-size: 32px;
   opacity: 0;
@@ -255,7 +256,7 @@ html {
   display: table;
   text-align: center;
   background-color: #fff;
-  color: #000;
+  color: #222;
   font-family: "FuturaLT";
   font-size: 24px;
 }
@@ -326,22 +327,26 @@ html {
 }
 #allianceSelectionCentering {
   position: absolute;
-  left: 50%;
   height: 100%;
-  display: table;
+  right: 3em;
 }
 #allianceSelection {
-  position: relative;
-  left: -50%;
   display: table-cell;
   vertical-align: middle;
 }
 #allianceSelectionTable {
-  background-color: #006;
-  border-radius: 20px;
+  background-color: #fff;
+  border: 2px solid #222;
   text-align: center;
-  font-family: "FuturaLTBold";
-  font-size: 70px;
+  font-family: "FuturaLT";
+  font-size: 3.5em;
+}
+#allianceSelectionTable img {
+  width: 3em;
+  margin: 0.75em;
+}
+#allianceSelectionTable tr:nth-child(even) {
+  background-color: #eee;
 }
 .alliance-cell {
   padding: 0px 40px;
@@ -349,8 +354,8 @@ html {
   color: #999;
 }
 .selection-cell {
-  width: 250px;
-  color: #fff;
+  width: 3.4em;
+  color: #222;
 }
 #lowerThird {
   display: none;
@@ -358,8 +363,8 @@ html {
   left: -1000px;
   bottom: 100px;
   background-color: #fff;
-  border: 1px solid #000;
-  color: #000;
+  border: 1px solid #222;
+  color: #222;
   font-size: 30px;
   width: 800px;
   height: 87px;
@@ -386,4 +391,4 @@ html {
   display: none;
   font-family: "FuturaLTBold";
   line-height: 87px;
-}
+}

static/js/audience_display.js

@@ -232,17 +232,12 @@ var transitionScoreToBlank = function(callback) {
 }
 
 var transitionBlankToAllianceSelection = function(callback) {
-  $("#allianceSelectionCentering").show();
-  if (callback) {
-    callback();
-  }
+  $('#allianceSelectionCentering').css("right","-60em").show();
+  $('#allianceSelectionCentering').transition({queue: false, right: "3em"}, 500, "ease", callback);
 };
 
 var transitionAllianceSelectionToBlank = function(callback) {
-  $("#allianceSelectionCentering").hide();
-  if (callback) {
-    callback();
-  }
+  $('#allianceSelectionCentering').transition({queue: false, right: "-60em"}, 500, "ease", callback);
 };
 
 var transitionBlankToLowerThird = function(callback) {

tba.go

@@ -16,7 +16,7 @@ import (
 )
 
 // Distinct endpoints are necessary for testing.
-var tbaBaseUrl = "http://www.thebluealliance.com"
+var tbaBaseUrl = "https://www.thebluealliance.com"
 var tbaTeamBaseUrl = tbaBaseUrl
 var tbaTeamRobotsBaseUrl = tbaBaseUrl
 var tbaTeamAwardsBaseUrl = tbaBaseUrl

templates/audience_display.html

@@ -109,6 +109,11 @@
     </div>
     <script id="allianceSelectionTemplate" type="text/x-handlebars-template">
       <table id="allianceSelectionTable">
+        <tr>
+          <td colspan="4">
+            <img src="/static/img/game-logo.png" alt="logo" />
+          </td
+        </tr>
         {{"{{#each this}}"}}
           <tr>
             <td class="alliance-cell">{{"{{Index}}"}}</td>