Fixed issue: End tour button seemed out of place Redirection not work…

…ing in tour

application/config/version.php

@@ -13,7 +13,7 @@
 
 
 $config['versionnumber'] = '3.0.1'; //The current version of this branch, LS3
-$config['dbversionnumber'] = 340;
+$config['dbversionnumber'] = 341;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['assetsversionnumber'] = '30002';

application/core/LsDefaultDataSets.php

@@ -2,7 +2,7 @@
 /**
  * A collection of default data sets, like surveymenus, surveymenuentries, and tutorials
  */
-class LsDefaultDataSet extends CModel {
+class LsDefaultDataSets {
 
     public static function getSurveyMenuEntryData(){
         $headerArray = ['menu_id','user_id','ordering','name','title','menu_title','menu_description','menu_icon','menu_icon_type','menu_class','menu_link','action','template','partial','classes','permission','permission_grade','data','getdatamethod','language','active','changed_at','changed_by','created_at','created_by'];
@@ -233,7 +233,7 @@ public static function getTutorialData() {
         $returnArray = [];
 
         $returnArray[] = [
-            'name' => 'beginnerTour',
+            'name' => 'firstStartTour',
             'title' => 'Beginner tour',
             'icon' => 'fa-rocket',
             'description' => 'The first start tour to get your first feeling into LimeSurvey',
@@ -243,8 +243,9 @@ public static function getTutorialData() {
                 'orphan' => true,
                 'template' => ""
                 ."<div class='popover tour lstutorial__template--mainContainer'>" 
-                    ."<div class='arrow'></div>"
-                    ."<h3 class='popover-title lstutorial__template--title'></h3>"
+                ."<div class='arrow'></div>"
+                ."<button class='pull-right ls-space margin top-5 right-5 btn btn-warning btn-sm' data-role='end' data-toggle='tooltip' title='".gT('End tour')."'><i class='fa fa-close'></i></button>"
+                ."<h3 class='popover-title lstutorial__template--title'></h3>"
                     ."<div class='popover-content lstutorial__template--content'></div>"
                     ."<div class='popover-navigation lstutorial__template--navigation'>"
                         ."<div class='row'>"
@@ -253,11 +254,6 @@ public static function getTutorialData() {
                                 ."<button class='btn btn-primary col-md-6' data-role='next'>".gT('Next')."</button>"
                             ."</div>"
                         ."</div>"
-                        ."<div class='row ls-space margin top-5'>"
-                            ."<div class='text-left col-sm-12'>"
-                                ."<button class='pull-left btn btn-warning col-sm-6' data-role='end'>".gT('End tour')."</button>"
-                            ."</div>"
-                        ."</div>"
                     ."</div>"
                 ."</div>",
                 'onShown' => "(function(tour){ console.ls.log($('#notif-container').children()); $('#notif-container').children().remove(); })",
@@ -300,8 +296,6 @@ public static function getTutorialEntryData() {
                     'reflex' => true,
                     'onShow' => "(function(tour){ $('#welcomeModal').modal('hide'); })",
                     'onNext' => "(function(tour){
-                        tour.setCurrentStep(2);
-                        return new Promise(function(res,rej){});
                     })",
                 ))
             ),

application/helpers/update/updatedb_helper.php

@@ -901,6 +901,31 @@ function db_upgrade_all($iOldDBVersion, $bSilent = false)
             $oTransaction->commit();
         }
 
+        /**
+         * Recreate basic tour again from DefaultDataSet
+         */
+        If ($iOldDBVersion < 341) {
+            $oTransaction = $oDB->beginTransaction();
+
+            $oDB->createCommand()->truncateTable('{{tutorials}}');
+            foreach($tutorialsData=LsDefaultDataSets::getTutorialData() as $tutorials){
+                $oDB->createCommand()->insert('{{tutorials}}', $tutorials);
+            }
+
+            $oDB->createCommand()->truncateTable('{{tutorial_entries}}');
+            $oDB->createCommand()->truncateTable('{{tutorial_entry_relation}}');
+
+            foreach($tutorialEntryData=LsDefaultDataSets::getTutorialEntryData() as $tutorialEntry) {
+                $teid =  $tutorialEntry['teid'];
+                unset($tutorialEntry['teid']);
+                $oDB->createCommand()->insert('{{tutorial_entries}}', $tutorialEntry);
+                $oDB->createCommand()->insert('{{tutorial_entry_relation}}', array('tid' => 1, 'teid' => $teid));
+            }
+
+            $oDB->createCommand()->update('{{settings_global}}', array('stg_value'=>341), "stg_name='DBVersion'");
+            $oTransaction->commit();
+        }
+
     } catch (Exception $e) {
         Yii::app()->setConfig('Updating', false);
         $oTransaction->rollback();

assets/packages/lstutorial/build/lstutorial.js

@@ -18394,9 +18394,9 @@ const globalTourObject = function(){
             if(url.charAt(0) == '/')
                 url = url.substring(1);
 
-            const baseUrl = (getBasedUrls || forceGet) ? '?r=admin/' : 'admin/';
-            const conatainsIndex = (/\/index.php\/?/.test(window.location.href));
-            const returnUrl = window.LS.data.baseUrl+(conatainsIndex ? '/index.php' : '/')+baseUrl+url+combineParams(params);
+            const baseUrl = (getBasedUrls || forceGet) ? '?r=admin/' : '/admin/';
+            const containsIndex = (/\/index.php\/?/.test(window.location.href));
+            const returnUrl = window.LS.data.baseUrl+(containsIndex ? '/index.php' : '/')+baseUrl+url+combineParams(params);
 
             return returnUrl;
 
@@ -18423,7 +18423,6 @@ const globalTourObject = function(){
             tutorialObject.onShown = tutorialObject.onShown ? eval(tutorialObject.onShown) : null;
             tutorialObject.onEnd = tutorialObject.onEnd ? eval(tutorialObject.onEnd) : null;
             tutorialObject.onStart = tutorialObject.onStart ? eval(tutorialObject.onStart) : null;
-
             return tutorialObject;
         };
 

assets/packages/lstutorial/src/tours/global-tour-object.js

@@ -22,9 +22,9 @@ const globalTourObject = function(){
             if(url.charAt(0) == '/')
                 url = url.substring(1);
 
-            const baseUrl = (getBasedUrls || forceGet) ? '?r=admin/' : 'admin/';
-            const conatainsIndex = (/\/index.php\/?/.test(window.location.href));
-            const returnUrl = window.LS.data.baseUrl+(conatainsIndex ? '/index.php' : '/')+baseUrl+url+combineParams(params);
+            const baseUrl = (getBasedUrls || forceGet) ? '?r=admin/' : '/admin/';
+            const containsIndex = (/\/index.php\/?/.test(window.location.href));
+            const returnUrl = window.LS.data.baseUrl+(containsIndex ? '/index.php' : '/')+baseUrl+url+combineParams(params);
 
             return returnUrl;
 

installer/create-database.php

@@ -67,7 +67,7 @@ function createDatabase($oDB){
             'usergroup' => "integer NOT NULL "
         ));
 
-        foreach( $boxesData=LsDefaultDataSet::getBoxesData() as $box){
+        foreach( $boxesData=LsDefaultDataSets::getBoxesData() as $box){
             $oDB->createCommand()->insert("{{boxes}}", $box);
         }
 
@@ -455,7 +455,7 @@ function createDatabase($oDB){
         $oDB->createCommand()->createIndex('{{surveymenu_name}}', '{{surveymenu}}', 'name', true);
         $oDB->createCommand()->createIndex('{{idx2_surveymenu}}', '{{surveymenu}}', 'title', false);
 
-        foreach($surveyMenuRowData=LsDefaultDataSet::getSurveyMenuData() as $surveyMenuRow) {
+        foreach($surveyMenuRowData=LsDefaultDataSets::getSurveyMenuData() as $surveyMenuRow) {
             $oDB->createCommand()->insert("{{surveymenu}}", $surveyMenuRow);
         }
 
@@ -496,7 +496,7 @@ function createDatabase($oDB){
 
 
 
-        foreach($surveyMenuEntryRowData=LsDefaultDataSet::getSurveyMenuEntryData() as $surveyMenuEntryRow){
+        foreach($surveyMenuEntryRowData=LsDefaultDataSets::getSurveyMenuEntryData() as $surveyMenuEntryRow){
             $oDB->createCommand()->insert("{{surveymenu_entries}}", $surveyMenuEntryRow);
         }
 
@@ -589,7 +589,7 @@ function createDatabase($oDB){
         $oDB->createCommand()->createIndex('{{idx1_surveys_groups}}', '{{surveys_groups}}', 'name', false);
         $oDB->createCommand()->createIndex('{{idx2_surveys_groups}}', '{{surveys_groups}}', 'title', false);
 
-        foreach($surveyGroupData=LsDefaultDataSet::getSurveygroupData() as $surveyGroup){
+        foreach($surveyGroupData=LsDefaultDataSets::getSurveygroupData() as $surveyGroup){
             $oDB->createCommand()->insert("{{surveys_groups}}", $surveyGroup);
         }
 
@@ -683,7 +683,7 @@ function createDatabase($oDB){
         $headerArray = ['name','folder','title','creation_date','author','author_email','author_url','copyright','license','version','api_version','view_folder','files_folder',
         'description','last_update','owner_id','extends'];
 
-        foreach($templateData=LsDefaultDataSet::getTemplatesData() as $template){
+        foreach($templateData=LsDefaultDataSets::getTemplatesData() as $template){
             $oDB->createCommand()->insert("{{templates}}", $template );
         }
 
@@ -711,7 +711,7 @@ function createDatabase($oDB){
         $oDB->createCommand()->createIndex('{{idx3_template_configuration}}', '{{template_configuration}}', 'gsid', false);
         $oDB->createCommand()->createIndex('{{idx4_template_configuration}}', '{{template_configuration}}', 'uid', false);
 
-        foreach($templateConfigurationData=LsDefaultDataSet::getTemplateConfigurationData() as $templateConfiguration){
+        foreach($templateConfigurationData=LsDefaultDataSets::getTemplateConfigurationData() as $templateConfiguration){
             $oDB->createCommand()->insert("{{template_configuration}}", $templateConfiguration );
         }
 
@@ -731,7 +731,7 @@ function createDatabase($oDB){
         );
         $oDB->createCommand()->createIndex('{{idx1_tutorials}}', '{{tutorials}}', 'name', true);
 
-        foreach($tutorialsData=LsDefaultDataSet::getTutorialData() as $tutorials){
+        foreach($tutorialsData=LsDefaultDataSets::getTutorialData() as $tutorials){
             $oDB->createCommand()->insert('{{tutorials}}', $tutorials);
         }
 
@@ -768,7 +768,7 @@ function createDatabase($oDB){
         );
 
 
-        foreach($tutorialEntryData=LsDefaultDataSet::getTutorialEntryData() as $tutorialEntry) {
+        foreach($tutorialEntryData=LsDefaultDataSets::getTutorialEntryData() as $tutorialEntry) {
             $teid =  $tutorialEntry['teid'];
             unset($tutorialEntry['teid']);
             $oDB->createCommand()->insert('{{tutorial_entries}}', $tutorialEntry);