Dev Fixed some minor display issues

LimeSurvey · Sep 26, 2012 · 76509b8 · 76509b8
1 parent 4a814fe
commit 76509b8
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 58 deletions.
diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -332,7 +332,7 @@ function _questionbar($iSurveyID, $gid, $qid, $action = null)
         $sqrq = Questions::model()->findAllByAttributes(array('parent_qid' => $qid, 'language' => $baselang));
         $aData['sqct'] = $sqct = count($sqrq);
 
-        $qrresult = Questions::model()->findAllByAttributes(array('qid' => $qid, 'gid' => $gid, 'sid' => $iSurveyID, 'language' => $baselang));
+        $qrrow = Questions::model()->findByAttributes(array('qid' => $qid, 'gid' => $gid, 'sid' => $iSurveyID, 'language' => $baselang));
 
         $questionsummary = "<div class='menubar'>\n";
 
@@ -349,68 +349,65 @@ function _questionbar($iSurveyID, $gid, $qid, $action = null)
         $surveyinfo = array_map('flattenText', $surveyinfo);
         $aData['activated'] = $surveyinfo['active'];
 
-        foreach ($qrresult as $qrrow)
+        $qrrow = $qrrow->attributes;
+        if (hasSurveyPermission($iSurveyID, 'surveycontent', 'read'))
         {
-            $qrrow = $qrrow->attributes;
-            if (hasSurveyPermission($iSurveyID, 'surveycontent', 'read'))
-            {
-                if (count(Survey::model()->findByPk($iSurveyID)->additionalLanguages) != 0)
-                {
-                    Yii::app()->loadHelper('surveytranslator');
-                    $tmp_survlangs = Survey::model()->findByPk($iSurveyID)->additionalLanguages;
-                    $baselang = Survey::model()->findByPk($iSurveyID)->language;
-                    $tmp_survlangs[] = $baselang;
-                    rsort($tmp_survlangs);
-                    $aData['tmp_survlangs'] = $tmp_survlangs;
-                }
-            }
-            $aData['qtypes'] = $qtypes = getQuestionTypeList('', 'array');
-            if ($action == 'editansweroptions' || $action == "editsubquestions" || $action == "editquestion" || $action == "editdefaultvalues" || $action =="editdefaultvalues" || $action == "copyquestion")
+            if (count(Survey::model()->findByPk($iSurveyID)->additionalLanguages) != 0)
             {
-                $qshowstyle = "style='display: none'";
+                Yii::app()->loadHelper('surveytranslator');
+                $tmp_survlangs = Survey::model()->findByPk($iSurveyID)->additionalLanguages;
+                $baselang = Survey::model()->findByPk($iSurveyID)->language;
+                $tmp_survlangs[] = $baselang;
+                rsort($tmp_survlangs);
+                $aData['tmp_survlangs'] = $tmp_survlangs;
             }
-            else
-            {
-                $qshowstyle = "";
-            }
-            $aData['qshowstyle'] = $qshowstyle;
-            $aData['action'] = $action;
-            $aData['surveyid'] = $iSurveyID;
-            $aData['qid'] = $qid;
-            $aData['gid'] = $gid;
-            $aData['clang'] = $clang;
-            $aData['qrrow'] = $qrrow;
-            $aData['baselang'] = $baselang;
-            $aAttributesWithValues = Questions::model()->getAdvancedSettingsWithValues($qid, $qrrow['type'], $iSurveyID, $baselang);
-            $DisplayArray = array();
-            foreach ($aAttributesWithValues as $aAttribute)
+        }
+        $aData['qtypes'] = $qtypes = getQuestionTypeList('', 'array');
+        if ($action == 'editansweroptions' || $action == "editsubquestions" || $action == "editquestion" || $action == "editdefaultvalues" || $action =="editdefaultvalues" || $action == "copyquestion")
+        {
+            $qshowstyle = "style='display: none'";
+        }
+        else
+        {
+            $qshowstyle = "";
+        }
+        $aData['qshowstyle'] = $qshowstyle;
+        $aData['action'] = $action;
+        $aData['surveyid'] = $iSurveyID;
+        $aData['qid'] = $qid;
+        $aData['gid'] = $gid;
+        $aData['clang'] = $clang;
+        $aData['qrrow'] = $qrrow;
+        $aData['baselang'] = $baselang;
+        $aAttributesWithValues = Questions::model()->getAdvancedSettingsWithValues($qid, $qrrow['type'], $iSurveyID, $baselang);
+        $DisplayArray = array();
+        foreach ($aAttributesWithValues as $aAttribute)
+        {
+            if (($aAttribute['i18n'] == false && isset($aAttribute['value']) && $aAttribute['value'] != $aAttribute['default']) || ($aAttribute['i18n'] == true && isset($aAttribute['value'][$baselang]) && $aAttribute['value'][$baselang] != $aAttribute['default']))
             {
-                if (($aAttribute['i18n'] == false && isset($aAttribute['value']) && $aAttribute['value'] != $aAttribute['default']) || ($aAttribute['i18n'] == true && isset($aAttribute['value'][$baselang]) && $aAttribute['value'][$baselang] != $aAttribute['default']))
+                if ($aAttribute['inputtype'] == 'singleselect')
                 {
-                    if ($aAttribute['inputtype'] == 'singleselect')
-                    {
-                        $aAttribute['value'] = $aAttribute['options'][$aAttribute['value']];
-                    }
-                    /*
-                    if ($aAttribute['name']=='relevance')
-                    {
-                    $sRelevance = $aAttribute['value'];
-                    if ($sRelevance !== '' && $sRelevance !== '1' && $sRelevance !== '0')
-                    {
-                    LimeExpressionManager::ProcessString("{" . $sRelevance . "}");    // tests Relevance equation so can pretty-print it
-                    $aAttribute['value']= LimeExpressionManager::GetLastPrettyPrintExpression();
-                    }
-                    }
-                    */
-                    $DisplayArray[] = $aAttribute;
+                    $aAttribute['value'] = $aAttribute['options'][$aAttribute['value']];
                 }
+                /*
+                if ($aAttribute['name']=='relevance')
+                {
+                $sRelevance = $aAttribute['value'];
+                if ($sRelevance !== '' && $sRelevance !== '1' && $sRelevance !== '0')
+                {
+                LimeExpressionManager::ProcessString("{" . $sRelevance . "}");    // tests Relevance equation so can pretty-print it
+                $aAttribute['value']= LimeExpressionManager::GetLastPrettyPrintExpression();
+                }
+                }
+                */
+                $DisplayArray[] = $aAttribute;
             }
-            $aData['advancedsettings'] = $DisplayArray;
-            $aData['condarray'] = $condarray;
-            $aData['sImageURL'] = Yii::app()->getConfig('adminimageurl');
-            $aData['iIconSize'] = Yii::app()->getConfig('adminthemeiconsize');
-            $questionsummary .= $this->getController()->render('/admin/survey/Question/questionbar_view', $aData, true);
         }
+        $aData['advancedsettings'] = $DisplayArray;
+        $aData['condarray'] = $condarray;
+        $aData['sImageURL'] = Yii::app()->getConfig('adminimageurl');
+        $aData['iIconSize'] = Yii::app()->getConfig('adminthemeiconsize');
+        $questionsummary .= $this->getController()->render('/admin/survey/Question/questionbar_view', $aData, true);
         $finaldata['display'] = $questionsummary;
 
         $this->getController()->render('/survey_view', $finaldata);

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -604,7 +604,7 @@ function getQuestions($surveyid,$gid,$selectedqid)
         }
         $sQuestionselecter .=">{$qrow['title']}:";
         $sQuestionselecter .= " ";
-        $question=flattenText($qrow['question'],true);
+        $question=flattenText($qrow['question']);
         if (strlen($question)<35)
         {
             $sQuestionselecter .= $question;
@@ -4585,7 +4585,7 @@ function flattenText($sTextToFlatten, $keepSpan=false, $bDecodeHTMLEntities=fals
 {
     $sNicetext = stripJavaScript($sTextToFlatten);
     // When stripping tags, add a space before closing tags so that strings with embedded HTML tables don't get concatenated
-    $sNicetext = str_replace('</td',' </td', $sNicetext);
+    $sNicetext = str_replace(array('</td','</th'),array(' </td',' </th'), $sNicetext);
     if ($keepSpan) {
         // Keep <span> so can show EM syntax-highlighting; add space before tags so that word-wrapping not destroyed when remove tags.
         $sNicetext = strip_tags($sNicetext,'<span><table><tr><td><th>');

diff --git a/application/views/admin/survey/Question/questionbar_view.php b/application/views/admin/survey/Question/questionbar_view.php
@@ -9,7 +9,7 @@
         </ul></div>
     <?php } ?>
 <div class='menubar-title ui-widget-header'>
-    <strong><?php $clang->eT("Question"); ?></strong> <span class='basic'><?php echo FlattenText($qrrow['question']); ?> (<?php echo $clang->gT("ID").":".$qid; ?>)</span>
+    <strong><?php $clang->eT("Question"); ?></strong> <span class='basic'><?php echo ellipsize(FlattenText($qrrow['question']),200); ?> (<?php echo $clang->gT("ID").":".$qid; ?>)</span>
 </div>
 <div class='menubar-main'>
     <div class='menubar-left'>