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

LimeSurvey · Mar 2, 2016 · 8b2b216 · 8b2b216
2 parents f6c4812 + 316af99
commit 8b2b216
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/application/controllers/admin/responses.php b/application/controllers/admin/responses.php
@@ -297,12 +297,14 @@ public function view($iSurveyID, $iId, $sBrowseLang = '')
             {
                 Yii::app()->session['flashmessage'] = gT("This response ID is invalid.");
             }
-
+			
             $aViewUrls[] = 'browseidfooter_view';
             $aData['sidemenu']['state'] = false;
             $aData['menu']['edition'] = true;
             $aData['menu']['view'] = true;
             $aData['menu']['close'] =  true;
+            // This resets the url on the close button to go to the upper view
+            $aData['menu']['closeurl'] = $this->getController()->createUrl("admin/responses/sa/browse/surveyid/".$iSurveyId);
 
             $this->_renderWrappedTemplate('',$aViewUrls, $aData);
         }

diff --git a/application/views/admin/htmleditor/pop_editor_view.php b/application/views/admin/htmleditor/pop_editor_view.php
@@ -34,7 +34,11 @@ function closeme()
                 var sReplacementFieldTitle = '<?php eT('LimeSurvey replacement field properties','js');?>';
                 var sReplacementFieldButton = '<?php eT('Insert/edit LimeSurvey replacement field','js');?>';
                 $(document).ready(function(){
-                    console.log('iGroupId: '+iGroupId);
+                    //console.log('iGroupId: '+iGroupId);
+		    // Better use try/catch to not crash JS completely
+		    /*
+	            try{ console.log('iGroupId: '+iGroupId); } catch (e){ console.log(e); }
+	            */
                     CKEDITOR.on('instanceReady',CKeditor_OnComplete);
                     var oCKeditor = CKEDITOR.replace( 'MyTextarea' ,  { height	: '350',
                         width	: '98%',

diff --git a/application/views/admin/responses/browsemenubar_view.php b/application/views/admin/responses/browsemenubar_view.php
@@ -252,7 +252,7 @@ class="btn btn-default <?php if (!$previous) {echo 'disabled';}?>">
                 <span class="icon-databack text-success" title='<?php eT("Show previous..."); ?>'></span> <?php eT("Show previous..."); ?>
             </a>
             <a href='<?php echo $this->createUrl("admin/responses/sa/view/surveyid/$surveyid/id/$next"); ?>' title='<?php eT("Show next..."); ?>'
-            class="btn btn-default" <?php if (!$next) {echo 'disabled';}?>">
+            class="btn btn-default <?php if (!$next) {echo 'disabled';}?>">
                 <span class="icon-dataforward text-success" title='<?php eT("Show next..."); ?>'></span> <?php eT("Show next..."); ?>
             </a>