From 9fe6875a43608e6abe3a545507afe16f87bde7ff Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Wed, 30 May 2012 09:45:19 +0000
Subject: [PATCH] Added War of the Ring block formats for league.

---
 .../src/main/resources/lotrFormats.json       | 30 ++++++++++++--
 .../src/main/webapp/leagueAdmin.html          | 41 ++++++++++---------
 2 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
index 71cec88a4..eb7593491 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
@@ -17,7 +17,7 @@
         "hall":false
     },
     {
-        "name":"Fellowship block - Sets 1&2",
+        "name":"Fellowship block - Sets 1-2",
         "code":"fotr2_block",
         "sites":"FELLOWSHIP",
         "cancelRingBearerSkirmish":true,
@@ -41,7 +41,7 @@
         "hall":false
     },
     {
-        "name":"Towers block - Sets 4&5",
+        "name":"Towers block - Sets 4-5",
         "code":"ttt2_block",
         "sites":"TWO_TOWERS",
         "cancelRingBearerSkirmish":true,
@@ -75,7 +75,7 @@
         "hall":false
     },
     {
-        "name":"Towers standard - Sets 1-6,9,14&16",
+        "name":"Towers standard - Sets 1-6,9,14,16",
         "code":"ts_reflections",
         "sites":"TWO_TOWERS",
         "cancelRingBearerSkirmish":false,
@@ -189,5 +189,29 @@
         "cancelRingBearerSkirmish":true,
         "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19],
         "hall":false
+    },
+    {
+        "name":"War of the Ring block - Set 11",
+        "code":"war_block11",
+        "sites":"SHADOWS",
+        "restricted":["11_132", "11_100"],
+        "set":[11],
+        "hall":false
+    },
+    {
+        "name":"War of the Ring block - Sets 11-12",
+        "code":"war_block12",
+        "sites":"SHADOWS",
+        "restricted":["11_132", "11_100"],
+        "set":[11, 12],
+        "hall":false
+    },
+    {
+        "name":"War of the Ring block - Sets 10-14",
+        "code":"war_block14",
+        "sites":"SHADOWS",
+        "restricted":["11_132", "11_100"],
+        "set":[10, 11, 12, 13, 14],
+        "hall":false
     }
 ]
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
index 395af8098..c02ee33a5 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
@@ -47,7 +47,7 @@
             var data = {};
 
             var inputs = $("input[type='text'], option:selected", formElem).each(
-                    function() {
+                    function () {
                         var input = $(this);
                         var name = null;
                         var value = null;
@@ -66,14 +66,14 @@
                     });
 
             $.ajax({
-                type: "POST",
-                url: url,
-                cache: false,
-                data: data,
-                traditional: true,
-                success: success,
-                error: error,
-                dataType: "xml"
+                type:"POST",
+                url:url,
+                cache:false,
+                data:data,
+                traditional:true,
+                success:success,
+                error:error,
+                dataType:"xml"
             });
         }
 
@@ -81,14 +81,14 @@
                 function () {
                     var previewDialog = $("<div></div>")
                             .dialog({
-                                autoOpen: false,
-                                closeOnEscape: true,
-                                resizable: true,
-                                modal: true,
-                                title: "Preview window"
+                                autoOpen:false,
+                                closeOnEscape:true,
+                                resizable:true,
+                                modal:true,
+                                title:"Preview window"
                             });
 
-                    var displayPreview = function(xml) {
+                    var displayPreview = function (xml) {
                         var root = xml.documentElement;
                         if (root.tagName == 'league') {
                             var league = root;
@@ -128,27 +128,27 @@
                         }
                     };
 
-                    var previewError = function() {
+                    var previewError = function () {
                         previewDialog.dialog("close");
                         alert("Invalid parameters specified");
                     };
 
                     $("#previewSealed").click(
-                            function() {
+                            function () {
                                 submitFormToAddress("/gemp-lotr-server/admin/previewSealedLeague", $("#addSealedForm").eq(0), displayPreview, previewError);
                                 previewDialog.html("");
                                 previewDialog.dialog("open");
                             });
 
                     $("#previewConstructed").click(
-                            function() {
+                            function () {
                                 submitFormToAddress("/gemp-lotr-server/admin/previewConstructedLeague", $("#addConstructedForm").eq(0), displayPreview, previewError);
                                 previewDialog.html("");
                                 previewDialog.dialog("open");
                             });
 
                     $("#addConstructedSerie").click(
-                            function() {
+                            function () {
                                 $(".serieData").last().clone().appendTo(".series");
                             });
                 });
@@ -209,6 +209,9 @@
                 <option value="movie8">Movie block - Sets 1-8</option>
                 <option value="movie9">Movie block - Sets 1-9</option>
                 <option value="war_block">War of the Ring block</option>
+                <option value="war_block11">War of the Ring block - Set 11</option>
+                <option value="war_block12">War of the Ring block - Sets 11-12</option>
+                <option value="war_block14">War of the Ring block - Sets 10-14</option>
                 <option value="war_standard">War of the Ring standard</option>
                 <option value="standard">Standard</option>
                 <option value="open">Open</option>