From c094eb82cbec718cd7b49b01255a525bdd990f4a Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <carsten.schmitz@limesurvey.org>
Date: Tue, 13 Mar 2012 21:53:05 +0100
Subject: [PATCH] Fixed issue #5891: "Add/edit answers for this question" icon
 for Array (Numbers) & Array (Texts) is "Row-Icon" instead of "Row-Column"
 Icon

---
 application/helpers/frontend_helper.php          |  12 ++++++------
 .../admin/survey/Question/questionbar_view.php   |   4 ++--
 images/subquestions2d.png                        | Bin 0 -> 1236 bytes
 images/subquestions2d_20.png                     | Bin 0 -> 719 bytes
 4 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 images/subquestions2d.png
 create mode 100644 images/subquestions2d_20.png

diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
index 2986e77555a..672e96018b8 100644
--- a/application/helpers/frontend_helper.php
+++ b/application/helpers/frontend_helper.php
@@ -60,7 +60,7 @@ function loadanswers()
             //A match has been found. Let's load the values!
             //If this is from an email, build surveysession first
             $_SESSION['LEMtokenResume']=true;
-                    
+
             $row=$result->read();
             foreach ($row as $column => $value)
             {
@@ -297,7 +297,7 @@ function checkconfield($value)
         // we know the true fieldname $value (for instance SGQA for each checkboxes)
         // and we want to compare it to the values stored in $_SESSION['fieldarray'] which are simple fieldnames
         // ==> We first translate $value to the simple fieldname (let's call it the masterFieldName) from
-        //     the $_SESSION['fieldnamesInfo'] translation table
+        //     the $_SESSION['survey_X']['fieldnamesInfo'] translation table
         if (isset($_SESSION['survey_'.$surveyid]['fieldnamesInfo'][$value]))
         {
             $masterFieldName = $_SESSION['survey_'.$surveyid]['fieldnamesInfo'][$value];
@@ -1184,7 +1184,7 @@ function sendSubmitNotifications($surveyid)
         {
             $aReplacementVars['RELOADURL']='';
         }
-        
+
         if (!isset($_SESSION['survey_'.$surveyid]['srid']))
             $srid = null;
         $aReplacementVars['ADMINNAME'] = $thissurvey['adminname'];
@@ -2094,13 +2094,13 @@ function buildsurveysession($surveyid,$previewGroup=false)
                     $startingValues[$field] = array (
                         'type'=>$type,
                         'value'=>$value,
-                        );  
+                        );
                 }
             }
         }
     }
     $_SESSION['survey_'.$surveyid]['startingValues']=$startingValues;
-    
+
     if (isset($_SESSION['survey_'.$surveyid]['fieldarray'])) $_SESSION['survey_'.$surveyid]['fieldarray']=array_values($_SESSION['survey_'.$surveyid]['fieldarray']);
 
     //Check if a passthru label and value have been included in the query url
@@ -2778,7 +2778,7 @@ function display_first_page() {
     $_SESSION['LEMpostKey'] = mt_rand();
     echo "<input type='hidden' name='LEMpostKey' value='{$_SESSION['LEMpostKey']}' id='LEMpostKey' />\n";
     echo "<input type='hidden' name='thisstep' id='thisstep' value='0' />\n";
-    
+
     echo "\n</form>\n";
     echo templatereplace(file_get_contents("$thistpl/endpage.pstpl"),array(),$redata,'frontend_helper[2782]');
 
diff --git a/application/views/admin/survey/Question/questionbar_view.php b/application/views/admin/survey/Question/questionbar_view.php
index dcde95c6c3f..c27a3ff9822 100644
--- a/application/views/admin/survey/Question/questionbar_view.php
+++ b/application/views/admin/survey/Question/questionbar_view.php
@@ -131,7 +131,7 @@
                 { ?>
                 <a href='<?php echo $this->createUrl('admin/question/subquestions/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid); ?>'
                     title='<?php $clang->eTview("Edit subquestions for this question"); ?>'>
-                    <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/subquestions.png' alt='<?php $clang->eT("Edit subquestions for this question"); ?>' /></a>
+                    <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/<?php if ($qtypes[$qrrow['type']]['subquestions']==1){?>subquestions.png<?php } else {?>subquestions2d.png<?php } ?>' alt='<?php $clang->eT("Edit subquestions for this question"); ?>' /></a>
                 <?php }
             }
             else
@@ -226,7 +226,7 @@
         <tr ><td></td><td>
                 <span class='statusentryhighlight'>
                     <?php $clang->eT("Warning"); ?>: <a href='<?php echo $this->createUrl("admin/question/subquestions/surveyid/$surveyid/gid/$gid/qid/$qid"); ?>'><?php $clang->eT("You need to add subquestions to this question"); ?>
-                        <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/subquestions_20.png' title='<?php $clang->eT("Edit subquestions for this question"); ?>' /></a></span></td></tr>
+                        <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/<?php if ($qtypes[$qrrow['type']]['subquestions']==1){?>subquestions_20<?php } else {?>subquestions2d_20<?php } ?>.png' title='<?php $clang->eT("Edit subquestions for this question"); ?>' /></a></span></td></tr>
         <?php }
 
         if ($qrrow['type'] == "M" or $qrrow['type'] == "P")
diff --git a/images/subquestions2d.png b/images/subquestions2d.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ac5c6b5144a25ff37b6f2d4943b3b46fa1e3b67
GIT binary patch
literal 1236
zcmV;_1S|WAP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700004b3#c}2nYxW
zd<bNS00009a7bBm0004E0004E0beK3Qvd(}8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11W`#uK~z|U?U=uB97PnzKQmt6on@2QL9*qFh{7fXLJ`maMg9bY
zgs8$_fZW-VB_EbSqKJfPXhV%eXy|dINI++hP=bQeBAO&V-|qT$cYaaq&3X53_iQIQ
z#|2Ls&D_lQ=6(0gy!U2CIOn*?B40LvljOn^3{C<FA*O+;3F+6)IXxEPoEs^?3~&p0
z1X#dLs94}{;47e2$)$?i;^O>26C_nx8m-2kKy#Rn81`Zz#4TWbacP0|?VG&u?g~8w
zp*D1tAyS4=S-ATc9DMTWDyeXUsy}Wtp)&nqN$-bTe|46(-&-Q;V?t$!jNxgVvj6J?
ze*F3e;)4+2OXu9@MLtzd@)5xL_D!zecnjTZkVr{SND`6PM?x?a1O!2Vnvx_^l1M=+
z1-(AT<J^?QN=YhnoUeOAqMHq_e()wYKKsz?{&<*7iD2I$UI$oxXJueD|JB8|mrxr*
zrE77Sb7aPq`-kSeeC?{AZgng{a&Hv?38GS=Z+nS!VN8$WGV4&rjh*W#SBckMl-e-U
z)rQ2DCk~Y!v`ZE=Hs5mvf*v>P9GSJ{eqF?9LRBAW#uF57gqWXrfK!IZ*ul~b<E~hT
zvaZ~(J+b58XC@da!;!Ef3Oy0}&L3$zut?c5d7X|du^#!5NIe6=t}^t57+T_EB7XaJ
zJuz(vvtvxG43W}g7L>6hsiK?ZWMX4;1N2LhJ_A8{_X(GSfJ-p2*6|K5_}0&lxdb_G
zbQS=zFoAy)W`S8?X$X}hg59$c^f7+Kt<G6WnM4TD0(t=Z_ivL*Nu)GgZ8*#<q0Zyo
zVXA4|JD}BSvAMa45W@ezR0C{nZ4m?kJ3BkIBs!fA3kwSXIOj?>skLA#90`sXN8}u_
zvxL^twU)?OuJ{Rp6AwhsCAH^4?{OvXD>%$)#IH`#qGy#8y}0PX-9kApsU;X{L$9Ci
z%0&~639RQwP-%{kgG^G4gW-j+pfbd`Qugpxybu=bD$5c56y-BSrt?gY8T>UxDK+?y
zcM4w{lYfX1f?lszi2;b?xRzjT9NgI0n0N^Bk|YVcyLm1-bsTIqrw9V+41l9>eR0l#
zMZ2aDg1NalU^Gbky3^?(gkXMtzA}&(ty?9v7X0JkcO+8MRhq*r-+PC?otSXu-qTlF
ztrqQeyLNJGE$w!jMx(*@_I54qnKDVJ42i5h35VLqnOb!(R!+zywa4^RrG|-Sl293X
z(iX_+LYUF#_GB{l$Ul5wEd=YAMo^QV1jRv|k~OC*mpFRC1k*J2O*=eRQq+IQc?9tL
zZx0IO3YR9WPi?`|?!mpiJ>PsdJXW>DcYw{GzPZEusbcQhYs9v2_fVQRvocBYOw#Fe
zY87j(Ns^=%m!>IudwZ;{t@*C+M?e*iM=cr1ea`vuNC@!@Fn!|dR-a@O_yYKg2|m9G
yA?)(<@{^U7m2a!aRlaUrG`a9k!2c6`UilBTf%t@aakv%$0000<MNUMnLSTZa&Or45

literal 0
HcmV?d00001

diff --git a/images/subquestions2d_20.png b/images/subquestions2d_20.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f7cea83e5e31ec3c8462f57c14e6685445b992d
GIT binary patch
literal 719
zcmV;=0x<oFP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00004b3#c}2nYxW
zd<bNS00009a7bBm00027000270mdy!jQ{`u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10!&FnK~y-6t(3t_6mb;CKfhgdbOXbL5XEa4*&!&14ie#^E=3S^
zivEuTMZNkrlz%`(M-O^12n(TuhoZV<JHK6}HFb4<GxM9Bc^!6V+)<J>eDL_qJb0gZ
z@B4o9l!$Pi)^$9fl<ENr9p)z@VsjA@K}2}`@Yemo!HXM!oWYa+f&R~zhA-bqIVx>=
zczE#ZljoCT6VL9l9VJwZMXl6$^x_KDAVT{g6=NCr9&m4R1Z^yvb;FxiORT?J`*Kj*
zy++!aQmUs~{WCW4v<cJ3;u?zp6%(ROn8mzCjB6~~Shk~t(FeCV+}XRDc3fybw;D~D
zZb1OFAEABQiZ_AUSX|%Ynvkt122jU=&14hewyM#_wt&sb(yF{DL3<YMg;YGtmY1JN
zZpy`#9Y%psT9N}S*BAjtjs{D-{F@<Q2)N!z*l1%Y5kV={3;65b7IFQMvS%q9i?g~L
z&&|yhmC8C|W@d)j+1czp2m<>0`VbLyqUA~$p@Rq=Sai_TupQQk<u&w=^mC2<SI()H
z(=eT|Yb;gI0tMnYCcUfaX|2tkgCNKOa~e)fy^K*xL_`D<B{+`bWNj;@@O__Bsg%Xy
zIA(f!I@2%*{PbgyvKR8pSjvZ?z3_goI6psMY_H%<L($oN3#k~}>4L~vnv?*txo_J3
zim)S~wHA(UZ4)RWw!5c$?d|I&e%1~s?;G5GQ)o0A1VNDV_E^1MXJKIh$8kPnUr5(Z
zsZ_ez)!Y3st+o?aO3C>6cm=p|Vtt*L{g?2k*<TduvZSw9zpnrQ002ovPDHLkV1g;N
BM>7Bb

literal 0
HcmV?d00001