From c98ebe8b3ac45e68702ccd07bdabf5bf8a5a805d Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Sun, 21 Feb 2016 13:43:09 -0500
Subject: [PATCH] Improve Formats dropdown in Watch Battle

---
 js/client-mainmenu.js | 2 +-
 js/client-rooms.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/client-mainmenu.js b/js/client-mainmenu.js
index 3bd1686d4..5c67526ae 100644
--- a/js/client-mainmenu.js
+++ b/js/client-mainmenu.js
@@ -922,7 +922,7 @@
 				var $teamButton = this.sourceEl.closest('form').find('button[name=team]');
 				if ($teamButton.length) $teamButton.replaceWith(app.rooms[''].renderTeams(format));
 			}
-			this.sourceEl.val(format).html(Tools.escapeFormat(format));
+			this.sourceEl.val(format).html(Tools.escapeFormat(format) || '(Select a format)');
 
 			this.close();
 		}
diff --git a/js/client-rooms.js b/js/client-rooms.js
index b8ce20925..52242b7ad 100644
--- a/js/client-rooms.js
+++ b/js/client-rooms.js
@@ -120,7 +120,7 @@
 			this.$el.addClass('ps-room-light').addClass('scrollable');
 			var buf = '<div class="pad"><button class="button" style="float:right;font-size:10pt;margin-top:3px" name="close"><i class="fa fa-times"></i> Close</button><div class="roomlist"><p><button class="button" name="refresh"><i class="fa fa-refresh"></i> Refresh</button> <span style="' + Tools.getPokemonIcon('meloetta-pirouette') + ';display:inline-block;vertical-align:middle" class="picon" title="Meloetta is PS\'s mascot! The Pirouette forme is Fighting-type, and represents our battles."></span></p>';
 
-			buf += '<p><label>Format:</label><br /><button class="select formatselect" name="selectFormat">(All formats)</button></p>';
+			buf += '<p><label class="label">Format:</label><button class="select formatselect" name="selectFormat">(All formats)</button></p>';
 			buf += '<div class="list"><p>Loading...</p></div>';
 			buf += '</div></div>';