Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

LimeSurvey · Feb 16, 2016 · 1e553d5 · 1e553d5
2 parents 23214e1 + 8452b6e
commit 1e553d5
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 7 deletions.
diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -912,7 +912,7 @@ function _surveysidemenu($aData)
             {
                 foreach($aGroups as $group)
                 {
-                    $group->aQuestions = Question::model()->findAllByAttributes(array("sid"=>$iSurveyID, "gid"=>$group['gid'],"language"=>$sumresult1->defaultlanguage->surveyls_language));
+                    $group->aQuestions = Question::model()->findAllByAttributes(array("sid"=>$iSurveyID, "gid"=>$group['gid'],"language"=>$sumresult1->defaultlanguage->surveyls_language), array('order'=>'question_order ASC'));
                 }
             }
             $aData['aGroups'] = $aGroups;

diff --git a/templates/default/css/template.css b/templates/default/css/template.css
@@ -119,6 +119,9 @@ li.responsive-content
         display: block;
     }
 
+    .no-more-tables table.subquestions-list td {
+        text-align: left;
+    }
 
     /* Hide table headers (but not display: none;, for accessibility) */
     .no-more-tables thead tr {
@@ -142,7 +145,7 @@ li.responsive-content
         min-height: 2em;
         border: none;
         position: relative;
-        padding-left: 95%;
+        /*padding-left: 95%;*/
         padding-bottom: 1em;
         white-space: normal;
         text-align:left;
@@ -169,7 +172,7 @@ li.responsive-content
     /*
     Label the data
     */
-    .no-more-tables td:before { content: attr(data-title); }
+    /*.no-more-tables td:before { content: attr(data-title); }*/
 
     .no-more-tables-10-point tr{
         padding-bottom: 100px;

diff --git a/templates/default/scripts/template.js b/templates/default/scripts/template.js
@@ -75,6 +75,22 @@ function correctPNG() // correctly handle PNG transparency in Win IE 5.5 & 6.
 
 $(document).ready(function(){
 
+    if($(window).width() < 800)
+    {
+        if($('.no-more-tables').length > 0)
+        {
+            $('.no-more-tables').find('td').each(function(){
+                $that = $(this);
+                //$content = '<td>'+$that.data('title')+'</td>';
+                $label = $that.data('title');
+                $input = $that.find('input');
+
+                //$that.empty().prepend($content);
+                $that.find('label').prepend($label);
+            });
+        }
+    }
+
     var outerframeDistanceFromTop = 50;
     // Manage top container
     if(!$.trim($('#topContainer .container').html()))

diff --git a/templates/news_paper/css/template.css b/templates/news_paper/css/template.css
@@ -119,6 +119,9 @@ li.responsive-content
         display: block;
     }
 
+    .no-more-tables table.subquestions-list td {
+        text-align: left;
+    }
 
     /* Hide table headers (but not display: none;, for accessibility) */
     .no-more-tables thead tr {
@@ -142,7 +145,7 @@ li.responsive-content
         min-height: 2em;
         border: none;
         position: relative;
-        padding-left: 95%;
+        /*padding-left: 95%;*/
         padding-bottom: 1em;
         white-space: normal;
         text-align:left;
@@ -169,7 +172,7 @@ li.responsive-content
     /*
     Label the data
     */
-    .no-more-tables td:before { content: attr(data-title); }
+    /*.no-more-tables td:before { content: attr(data-title); }*/
 
     .no-more-tables-10-point tr{
         padding-bottom: 100px;

diff --git a/templates/news_paper/scripts/template.js b/templates/news_paper/scripts/template.js
@@ -75,6 +75,22 @@ function correctPNG() // correctly handle PNG transparency in Win IE 5.5 & 6.
 
 $(document).ready(function(){
 
+    if($(window).width() < 800)
+    {
+        if($('.no-more-tables').length > 0)
+        {
+            $('.no-more-tables').find('td').each(function(){
+                $that = $(this);
+                //$content = '<td>'+$that.data('title')+'</td>';
+                $label = $that.data('title');
+                $input = $that.find('input');
+
+                //$that.empty().prepend($content);
+                $that.find('label').prepend($label);
+            });
+        }
+    }
+
     var outerframeDistanceFromTop = 50;
     // Manage top container
     if(!$.trim($('#topContainer .container').html()))

diff --git a/templates/ubuntu_orange/css/template.css b/templates/ubuntu_orange/css/template.css
@@ -119,6 +119,9 @@ li.responsive-content
         display: block;
     }
 
+    .no-more-tables table.subquestions-list td {
+        text-align: left;
+    }
 
     /* Hide table headers (but not display: none;, for accessibility) */
     .no-more-tables thead tr {
@@ -142,7 +145,7 @@ li.responsive-content
         min-height: 2em;
         border: none;
         position: relative;
-        padding-left: 95%;
+        /*padding-left: 95%;*/
         padding-bottom: 1em;
         white-space: normal;
         text-align:left;
@@ -169,7 +172,7 @@ li.responsive-content
     /*
     Label the data
     */
-    .no-more-tables td:before { content: attr(data-title); }
+    /*.no-more-tables td:before { content: attr(data-title); }*/
 
     .no-more-tables-10-point tr{
         padding-bottom: 100px;

diff --git a/templates/ubuntu_orange/scripts/template.js b/templates/ubuntu_orange/scripts/template.js
@@ -75,6 +75,22 @@ function correctPNG() // correctly handle PNG transparency in Win IE 5.5 & 6.
 
 $(document).ready(function(){
 
+    if($(window).width() < 800)
+    {
+        if($('.no-more-tables').length > 0)
+        {
+            $('.no-more-tables').find('td').each(function(){
+                $that = $(this);
+                //$content = '<td>'+$that.data('title')+'</td>';
+                $label = $that.data('title');
+                $input = $that.find('input');
+
+                //$that.empty().prepend($content);
+                $that.find('label').prepend($label);
+            });
+        }
+    }
+
     var outerframeDistanceFromTop = 50;
     // Manage top container
     if(!$.trim($('#topContainer .container').html()))