Fixed issue #07150: Survey list table overflows window

Dev Set table width relative to window width
LimeSurvey · Jan 7, 2013 · 9797d6f · 9797d6f
1 parent 8e442f0
commit 9797d6f
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/scripts/admin/listsurvey.js b/scripts/admin/listsurvey.js
@@ -103,7 +103,7 @@ $(document).ready(function(){
         colModel: returnColModel(),
         toppager: true,
         height: "100%",
-        width: screen.width-20,
+        width: $(window).width()-4,
         shrinkToFit: true,
         ignoreCase: true,
         rowNum: 25,
@@ -118,7 +118,13 @@ $(document).ready(function(){
         multiselect: true,
         loadonce : true,
         pager: "#pager",
-        caption: sCaption
+        caption: sCaption,
+        loadComplete: function(data){
+            // Need this for vertical scrollbar 
+			$('#displaysurveys').setGridWidth($(window).width()-4);
+            $('.wrapper').width($('#displaysurveys').width()+4);
+            $('.footer').outerWidth($('#displaysurveys').outerWidth()+4).css({ 'margin':'0 auto' });
+        }
     });
     jQuery("#displaysurveys").jqGrid('navGrid','#pager',{ deltitle: sDelTitle, 
                                                           searchtitle: sSearchTitle,
@@ -166,8 +172,14 @@ $(document).ready(function(){
         }
     });
 
-	$('.wrapper').width($('#displaysurveys').width()*1.006);
-	$('.footer').width(($('#displaysurveys').width()*1.006)-10);
+	$('.wrapper').width($('#displaysurveys').width()+4);
+	$('.footer').outerWidth($('#displaysurveys').outerWidth()+4).css({ 'margin':'0 auto' });
+
+    $(window).bind('resize', function() {
+        $('#displaysurveys').setGridWidth($(window).width()-4);
+        $('.wrapper').width($('#displaysurveys').width()+4);
+        $('.footer').outerWidth($('#displaysurveys').outerWidth()+4).css({ 'margin':'0 auto' });
+    }).trigger('resize');
 
     /* Trigger the inline search when the status list changes */
     $('#gs_status_select').change(function() {