Move award tracker controls

package.nw/gt_roster.html

@@ -105,18 +105,42 @@
 
           <div id="scriptIcon" style="display: none; padding: 0; margin: 0"></div>
 
-        </div>
-
-        <div id="SecondaryRosterControls">
-
-          <div id="AwardTrackerControls" class="secondaryControlGroup">
-            <h3>Awards</h3>
-
+          <div id="AwardTrackerControls">
             <div id="AwardWantedList"></div>
 
             <div class="button" onclick="openAwardPopup()">Add Awards</div>
+
+            <div id="awardHunterDiv" style="display: none;">
+              <table style="padding: 15px">
+                <tr>
+                  <th align="center">New Award Tracker</th>
+                </tr>
+                <tr>
+                  <td align="left">
+                    <select id="awardSponsor" onchange="awardSponsorChanged();">
+                      <option value="" disabled selected>Sponsor</option>
+                    </select>
+                  </td>
+                </tr>
+                <tr>
+                  <td align="left">
+                    <select id="awardName" onchange="awardNameChanged();">
+                      <option value="" disabled selected>Name</option>
+                    </select>
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center">
+                    <div class="button" style="margin: 3px" onclick="closeAwardPopup()">Done</div>
+                  </td>
+                </tr>
+              </table>
+            </div>
           </div>
 
+        </div>
+
+        <div id="SecondaryRosterControls">
           <div id="huntingMatrixDiv" class="secondaryControlGroup" style="border: 1px solid #066">
             <h3>Wanted</h3>
 
@@ -350,43 +374,5 @@
       <div class="button" style="margin-top: 5px" onclick="closeEditIgnores()">Close</div>
     </div>
 
-    <div
-      id="awardHunterDiv"
-      class="mapItem"
-      style="
-        background-color: black;
-        display: block;
-        position: absolute;
-        z-index: -499;
-        top: 10px;
-        left: 10px;
-        margin: auto;
-      "
-    >
-      <table style="padding: 15px">
-        <tr>
-          <th align="center">New Award Tracker</th>
-        </tr>
-        <tr>
-          <td align="left">
-            <select id="awardSponsor" onchange="awardSponsorChanged();">
-              <option value="" disabled selected>Sponsor</option>
-            </select>
-          </td>
-        </tr>
-        <tr>
-          <td align="left">
-            <select id="awardName" onchange="awardNameChanged();">
-              <option value="" disabled selected>Name</option>
-            </select>
-          </td>
-        </tr>
-        <tr>
-          <td align="center">
-            <div class="button" style="margin: 3px" onclick="closeAwardPopup()">Done</div>
-          </td>
-        </tr>
-      </table>
-    </div>
   </body>
 </html>

package.nw/lib/roster.js

@@ -2763,13 +2763,13 @@ function resetAwardAdd()
 
 function openAwardPopup()
 {
-  awardHunterDiv.style.zIndex = 100;
+  awardHunterDiv.style.display = "";
   resetAwardAdd();
 }
 
 function closeAwardPopup()
 {
-  awardHunterDiv.style.zIndex = -1;
+  awardHunterDiv.style.display = "none";
   resetAwardAdd();
 }
 

package.nw/lib/style_roster.css

@@ -248,6 +248,19 @@ body.roster {
   }
 }
 
+#RosterControls.normal #AwardTrackerControls {
+  display: none !important;
+}
+
+#RosterControls.extended #AwardTrackerControls {
+  margin-left: 8px;
+  width: 100%;
+}
+
+#awardTable {
+  width: 100%;
+}
+
 #RosterControls.extended #ShowFewerControlsLink {
   display: block;
 }