Merge branch '2.1' of github.com:LimeSurvey/LimeSurvey into 2.1

LimeSurvey · Mar 11, 2013 · baf6614 · baf6614
2 parents 091d59a + 1927710
commit baf6614
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/scripts/admin/attributeMap.js b/scripts/admin/attributeMap.js
@@ -14,6 +14,12 @@ $(document).ready(function(){
     $('#tokenattribute').css({'height' : height-200});
     $('#centralattribute').css({'height' : height-200});
     $('#newcreated').css({'height' : height-200});
+	var ncHeadingHeight = $('#newcreated .heading').outerHeight();
+	$('.newcreate').css({
+		'padding-bottom':0,
+		'min-height':$('#newcreated').height()-ncHeadingHeight-5
+	});
+
     $("#overwrite").click(function(){
         if($("#overwrite").is(':checked')) {attoverwrite=true;} else {attoverwrite=false;}
     });

diff --git a/scripts/admin/attributeMapToken.js b/scripts/admin/attributeMapToken.js
@@ -13,6 +13,16 @@ $(document).ready(function(){
     $('#tokenattribute').css({ 'height' : height-200});
     $('#centralattribute').css({ 'height' : height-200});
     $('#newcreated').css({ 'height' : height-200});
+	var ncHeadingHeight = $('#newcreated .heading').outerHeight();
+	$('.newcreate').css({
+		'padding-bottom':0,
+		'min-height':$('#newcreated').height()-ncHeadingHeight-5
+	});
+	var taHeadingHeight = $('#tokenattribute .heading').outerHeight();
+	$('#tokenatt').css({
+		'min-height':$('#tokenattribute').height()-taHeadingHeight-5
+	});
+
     $("#tokenatt").sortable({ connectWith:'.centralatt,.newcreate',helper: 'clone',appendTo: 'body'});
     $("ul.centralatt").sortable({
         helper: 'clone',