Dev Fixed various minor issues and wording

LimeSurvey · Mar 30, 2012 · 5f54ad8 · 5f54ad8
1 parent c805044
commit 5f54ad8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -553,7 +553,7 @@ function _surveybar($iSurveyId, $gid=null)
         // EDIT SURVEY SETTINGS BUTTON
         $aData['surveysettings'] = hasSurveyPermission($iSurveyId, 'surveysettings', 'read');
         // Survey permission item
-        $aData['surveysecurity'] = (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1 || $surveyinfo['owner_id'] == Yii::app()->session['loginID']);
+        $aData['surveysecurity'] = (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1 || $surveyinfo['owner_id'] == Yii::app()->session['loginID'] || hasSurveyPermission($iSurveyId, 'surveysecurity', 'read'));
         // CHANGE QUESTION GROUP ORDER BUTTON
         $aData['surveycontent'] = hasSurveyPermission($iSurveyId, 'surveycontent', 'read');
         $aData['groupsum'] = (getGroupSum($iSurveyId, $surveyinfo['language']) > 1);

diff --git a/application/views/admin/labels/labelview_view.php b/application/views/admin/labels/labelview_view.php
@@ -154,7 +154,7 @@
             <div style='float:left;'>
                 <label for='quickadd'><?php $clang->eT('Enter your labels:') ?></label>
                 <br />
-                <textarea id='quickaddarea' class='tipme' title='<?php $clang->eT('Enter one label per line. You can provide a code by separating code and label text with a semikolon or tab. For multilingual surveys you add the translation(s) on the same line separated with a semikolon or space.') ?>' rows='30' cols='100' style='width:570px;'></textarea>
+                <textarea id='quickaddarea' class='tipme' title='<?php $clang->eT('Enter one label per line. You can provide a code by separating code and label text with a semikolon or tab. For multilingual surveys you add the translation(s) on the same line separated with a semikolon or tab.') ?>' rows='30' cols='100' style='width:570px;'></textarea>
                 <br /><button id='btnqareplace' type='button'><?php $clang->eT('Replace') ?></button>
                 <button id='btnqainsert' type='button'><?php $clang->eT('Add') ?></button>
                 <button id='btnqacancel' type='button'><?php $clang->eT('Cancel') ?></button>

diff --git a/application/views/admin/survey/Question/answerOptions_view.php b/application/views/admin/survey/Question/answerOptions_view.php
@@ -176,7 +176,7 @@
         </div>
         <div id='quickadd' class='labelsets-update' style='display:none;'><div style='float:left;'>
                           <label for='quickadd'><?php $clang->eT('Enter your answers:'); ?></label>
-                          <textarea id='quickaddarea' class='tipme' title='<?php $clang->eT('Enter one answer per line. You can provide a code by separating code and answer text with a semikolon or tab. For multilingual surveys you add the translation(s) on the same line separated with a semikolon or space.'); ?>' cols='100' rows='30' style='width:570px;'></textarea>
+                          <textarea id='quickaddarea' class='tipme' title='<?php $clang->eT('Enter one answer per line. You can provide a code by separating code and answer text with a semikolon or tab. For multilingual surveys you add the translation(s) on the same line separated with a semikolon or tab.'); ?>' cols='100' rows='30' style='width:570px;'></textarea>
                             <p class=button-list'>
                             <button id='btnqareplace' type='button'><?php $clang->eT('Replace'); ?></button>
                             <button id='btnqainsert' type='button'><?php $clang->eT('Add'); ?></button>

diff --git a/application/views/admin/survey/Question/subQuestion_view.php b/application/views/admin/survey/Question/subQuestion_view.php
@@ -169,7 +169,7 @@ class="highlight"
 <div id='quickadd' class='labelsets-update' style='display:none;'>
     <div style='float:left;'>
         <label for='quickadd'><?php $clang->eT('Enter your subquestions:'); ?></label>
-        <textarea id='quickaddarea' class='tipme' title='<?php $clang->eT('Enter one subquestion per line. You can provide a code by separating code and subquestion text with a semikolon or tab. For multilingual surveys you add the translation(s) on the same line separated with a semikolon or space.'); ?>' cols='100' rows='30' style='width:570px;'></textarea>
+        <textarea id='quickaddarea' class='tipme' title='<?php $clang->eT('Enter one subquestion per line. You can provide a code by separating code and subquestion text with a semikolon or tab. For multilingual surveys you add the translation(s) on the same line separated with a semikolon or tab.'); ?>' cols='100' rows='30' style='width:570px;'></textarea>
         <p class=button-list'>
         <button id='btnqareplace' type='button'><?php $clang->eT('Replace'); ?></button>
         <button id='btnqainsert' type='button'><?php $clang->eT('Add'); ?></button>