Fixed minor issues with survey list

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12185 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jan 24, 2012 · 8eeb72e · 8eeb72e
1 parent 03efad4
commit 8eeb72e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/application/views/admin/survey/listSurveys_view.php b/application/views/admin/survey/listSurveys_view.php
@@ -10,9 +10,9 @@
     var editUrl = "<?php echo $this->createUrl('/admin/survey/editSurvey_json'); ?>";
     var colNames = ["<?php $clang->eT("Status") ?>","<?php $clang->eT("SID") ?>","<?php $clang->eT("Survey") ?>","<?php $clang->eT("Date created") ?>","<?php $clang->eT("Owner") ?>","<?php $clang->eT("Access") ?>","<?php $clang->eT("Anonymized responses") ?>","<?php $clang->eT("Full") ?>","<?php $clang->eT("Partial") ?>","<?php $clang->eT("Total") ?>","<?php $clang->eT("Tokens available") ?>","<?php $clang->eT("Response rate") ?>"];
     var colModels = [{ "name":"status", "index":"status", "width":15, "align":"center", "sorttype":"string", "sortable": true, "editable":false},
-    { "name":"sid", "index":"sid", "sorttype":"int", "sortable": true, "width":25, "align":"center", "editable":false},
-    { "name":"survey", "index":"survey", "sorttype":"string", "sortable": true, "width":60, "align":"left", "editable":true},
-    { "name":"date_created", "index":"date_created", "sorttype":"string", "sortable": true,"width":40, "align":"center", "editable":false},
+    { "name":"sid", "index":"sid", "sorttype":"int", "sortable": true, "width":15, "align":"center", "editable":false},
+    { "name":"survey", "index":"survey", "sorttype":"string", "sortable": true, "width":100, "align":"left", "editable":true},
+    { "name":"date_created", "index":"date_created", "sorttype":"string", "sortable": true,"width":25, "align":"center", "editable":false},
     { "name":"owner", "index":"owner","align":"center","width":40, "sorttype":"string", "sortable": true, "editable":true},
     { "name":"access", "index":"access","align":"center","width":25,"sorttype":"string", "sortable": true, "editable":true, "edittype":"checkbox", "editoptions":{ "value":"Y:N"}},
     { "name":"anonymous", "index":"anonymous","align":"center", "sorttype":"string", "sortable": true,"width":25,"editable":true, "edittype":"checkbox", "editoptions":{ "value":"Y:N"}},

diff --git a/scripts/admin/listsurvey.js b/scripts/admin/listsurvey.js
@@ -99,16 +99,17 @@ $(document).ready(function(){
         colModel: returnColModel(),
         toppager: true,
         height: "100%",
-        width: "100%",
+        width: screen.width-20,
+        shrinkToFit: true,
         rowNum: 25,
         editable:true,
         scrollOffset:0,
-        autowidth: true,
         sortable : true,
+        hidegrid : false,
         sortname: 'sid',
         sortorder: 'asc',
         viewrecords : true,
-        rowList: [25,50,100,250,500,1000,5000,10000],
+        rowList: [25,50,100,250,500,1000],
         multiselect: true,
         loadonce : true,
         pager: "#pager",
@@ -142,6 +143,5 @@ $(document).ready(function(){
             });
         }
     });
-    $('.ui-jqgrid .ui-jqgrid-htable th div').css('white-space', 'normal');
-    $('.ui-jqgrid .ui-jqgrid-htable th div').css('height', 'auto');
+
 });
diff --git a/styles/admin/default/adminstyle.css b/styles/admin/default/adminstyle.css
@@ -1077,7 +1077,7 @@ textarea.updater-changelog {
 
 .form30newtabs li .warningtext,
 .form30 li .warningtext {
-	display: block;
+    display: block;
     margin: 3px 0 10px 30.5%;
     font-weight: bold;
     color: #EE0000;
@@ -1130,7 +1130,7 @@ textarea.updater-changelog {
 }
 
 .form30 ul.editor-parent {
-	min-width:1000px;
+    min-width:1000px;
 }
 
 #frmeditquestion li,
@@ -1464,10 +1464,10 @@ ol.organizer {
 }
 
 .textresponses {
-	text-align: center;
-	border: 1px solid #eee;
-	height: 200px;
-	overflow: auto;
+    text-align: center;
+    border: 1px solid #eee;
+    height: 200px;
+    overflow: auto;
 }
 
 .graphdisplay img {
@@ -1479,4 +1479,10 @@ ol.organizer {
     margin: auto;
     margin-top: 10px;
     margin-bottom: 10px;
+}
+
+#gview_displaysurveys th div{
+    white-space:normal;
+    height:auto;
+    font-size: 0.8em;
 }