Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0

src/Umbraco.Tests/PluginManagerTests.cs

@@ -271,7 +271,7 @@ namespace Umbraco.Tests
         public void Resolves_Assigned_Mappers()
         {
             var foundTypes1 = PluginManager.Current.ResolveAssignedMapperTypes();
-            Assert.AreEqual(21, foundTypes1.Count());
+            Assert.AreEqual(22, foundTypes1.Count());
         }
 
         [Test]

src/Umbraco.Web.UI/umbraco_client/Dialogs/AssignDomain2.js

@@ -8,7 +8,7 @@
         _opts: null,
         
         _isRepeated: function (element) {
-            var inputs = $('#form1 input.domain');
+            var inputs = $('form input.domain');
             var elementName = element.attr('name');
             var repeated = false;
             inputs.each(function() {
@@ -65,22 +65,22 @@
                 duplicate: { duplicate: true }
             });
 
-            $('#form1').validate({
+            $('form').validate({
                 debug: true,
                 focusCleanup: true,
                 onkeyup: false
             });
 
-            $('#form1 input.domain').live('focus', function(event) {
+            $('form input.domain').live('focus', function(event) {
                 if (event.type != 'focusin') return;
                 $(this).nextAll('input').val(0);
             });
             
             // force validation *now*
-            $('#form1').valid();
+            $('form').valid();
 
             $('#btnSave').click(function () {
-                if (!$('#form1').valid())
+                if (!$('form').valid())
                     return false;
                 
                 var mask = $('#komask');
@@ -97,7 +97,7 @@
                         UmbClientMgr.closeModalWindow();
                     }
                     else {
-                        var inputs = $('#form1 input.domain');
+                        var inputs = $('form input.domain');
                         inputs.each(function() { $(this).nextAll('input').val(0); });
                         for (var i = 0; i < json.Domains.length; i++) {
                             var d = json.Domains[i];
@@ -108,7 +108,7 @@
                                         input.nextAll('input').val(1);
                                 });
                         }
-                        $('#form1').valid();
+                        $('form').valid();
                     }
                 })
                 .fail(function (xhr, textStatus, errorThrown) {
@@ -127,4 +127,4 @@
         contentType: 'application/json; charset=utf-8'
     });
     
-})(jQuery);
+})(jQuery);

src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx

@@ -3,8 +3,7 @@
 
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <asp:Content ContentPlaceHolderID="body" runat="server">
-    <cc1:UmbracoPanel ID="Panel1" runat="server" Width="608px" Height="336px" hasMenu="true"
-        Style="text-align: center">
+    <cc1:UmbracoPanel ID="Panel1" runat="server" Width="608px" Height="336px" hasMenu="true">
         <cc1:Pane ID="Pane7" runat="server">
             <cc1:PropertyPanel runat="server" ID="pp_language">
                 <asp:DropDownList ID="Cultures" runat="server">