Merge pull request #11 from Matej-ch/intro_version_update

Intro version update

composer.json

@@ -2,7 +2,7 @@
     "name": "matejch/yii2-page-guide",
     "description": "Ability to add guide to pages for user orientation",
     "type": "yii2-extension",
-    "version": "1.2.1",
+    "version": "1.3.0",
     "keywords": ["yii2","extension","guide"],
     "license": "MIT",
     "authors": [
@@ -13,8 +13,7 @@
     ],
     "require": {
         "php": ">=7.2.0",
-        "yiisoft/yii2": "~2.0.42",
-        "bower-asset/intro.js": "^2.9"
+        "yiisoft/yii2": "~2.0.42"
     },
     "repositories": [
         {
@@ -31,5 +30,10 @@
         "psr-4": {
             "matejch\\pageGuide\\tests\\": "tests/"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "yiisoft/yii2-composer": true
+        }
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yii2-page-guide",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Page guide extension\r ====================\r Ability to add guide to pages for user orientation",
   "main": "",
   "scripts": {

src/assets/IntrojsAsset.php

@@ -6,13 +6,15 @@
 
 class IntrojsAsset extends AssetBundle
 {
-    public $sourcePath = '@vendor/bower-asset/intro.js/minified/';
-
     public $css = [
-        'introjs.min.css',
+        'https://cdn.jsdelivr.net/npm/intro.js@5.1.0/introjs.css',
     ];
 
     public $js = [
-        'intro.min.js',
+        'https://cdn.jsdelivr.net/npm/intro.js@5.1.0/intro.min.js',
+    ];
+
+    public $jsOptions = [
+        'defer' => 'defer',
     ];
 }

src/messages/cs/view.php

@@ -14,6 +14,7 @@
     'step' => 'Krok',
     'element' => 'Element na který napojit návod',
     'element_help' => 'Nápověda k elementu',
+    'element_title' => 'Titulek nápovedy',
     'help_4' => 'Přesuňte požadovaný element sem',
     'rule_element' => 'Element',
     'intro' => 'Obsah',

src/messages/en/view.php

@@ -13,6 +13,7 @@
     'help_3' => 'Every page you want to use for creating page guides must have widget PageAssist on it from widget directory',
     'step' => 'Step',
     'element' => 'Element for linking information',
+    'element_title' => 'Assistance title',
     'element_help' => 'Assistance for element',
     'help_4' => 'Moved element from other window here',
     'rule_element' => 'Element',

src/messages/it/view.php

@@ -14,6 +14,7 @@
     'step' => 'Passo',
     'element' => 'Elemento per collegare le informazioni',
     'element_help' => 'Assistenza per l\'elemento',
+    'element_title' => 'Assistance title',
     'help_4' => 'Muovere l\'elemento dall\'altra finestra qui',
     'rule_element' => 'Elemento',
     'intro' => 'Contenuto',

src/messages/sk/view.php

@@ -13,6 +13,7 @@
     'help_3' => 'Na stránkach ktorých chcete vytvoriť pomocníka musí mať widget PageAssist z adresára widget',
     'step' => 'Krok',
     'element' => 'Element na ktorý napojiť návod',
+    'element_title' => 'Titulok nápovedy',
     'element_help' => 'Nápoveda k elementu',
     'help_4' => 'Presuňte požadovaný element sem',
     'rule_element' => 'Element',

src/views/page-guide/partials/_rule.php

@@ -25,6 +25,12 @@
                 'top' => Yii::t('pageGuide/view','top')
             ], ['class' => 'form-control js-position']) ?>
     </div>
+
+    <div class="w-full">
+        <label class="control-label"><?= Yii::t('pageGuide/view','element_title') ?></label>
+        <input name="PageGuide[rules][<?= $index ?>][title]" value="<?= $rule['title'] ?? '' ?>" class="form-control js-title">
+    </div>
+
     <div class="w-full">
         <label class="control-label"><?= Yii::t('pageGuide/view','element_help') ?></label>
         <textarea name="PageGuide[rules][<?= $index ?>][intro]" cols="30" rows="10" class="form-control js-intro"><?= $rule['intro'] ?? '' ?></textarea>

src/views/page-guide/templates/_rule.php

@@ -22,6 +22,12 @@
                     'top' => Yii::t('pageGuide/view','top')
                 ], ['class' => 'form-control js-position']) ?>
         </div>
+
+        <div class="w-full">
+            <label class="control-label"><?= Yii::t('pageGuide/view','element_title') ?></label>
+            <input name="PageGuide[rules][][title]" value="" class="form-control js-title">
+        </div>
+
         <div class="w-full">
             <label class="control-label"><?= Yii::t('pageGuide/view','element_help') ?></label>
             <textarea name="PageGuide[rules][][intro]" cols="30" rows="10" class="form-control js-intro"></textarea>

src/views/page-guide/update.php

@@ -1,9 +1,9 @@
 <?php
 
 /* @var $this yii\web\View */
-/* @var $model \matejch\pageGuide\PageGuide */
+/* @var $model \matejch\pageGuide\models\PageGuide*/
 
-$this->title = Yii::t('pageGuide/view','update guide',['id' => $model->id]);
+$this->title = Yii::t('pageGuide/view','update guide',['id' => $model->url]);
 $this->params['breadcrumbs'][] = ['label' => Yii::t('pageGuide/view','page guide'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = 'Update';
 ?>

src/web/js/assist.js

@@ -56,7 +56,7 @@ document.addEventListener('DOMContentLoaded',() => {
 
         intro.setOption("prevLabel",window.guideLabels.prevLabel || 'Prev' );
         intro.setOption("nextLabel",window.guideLabels.nextLabel || 'Next' );
-        intro.setOption("skipLabel",window.guideLabels.skipLabel || 'Skip' );
+        intro.setOption("skipLabel", '×');
         intro.setOption("doneLabel",window.guideLabels.doneLabel || 'Done' );
 
         if(window.guideCallbacks) {
@@ -128,6 +128,7 @@ document.addEventListener('DOMContentLoaded',() => {
             container.querySelector('.js-step').name = 'PageGuide[rules]['+step+'][step]';
             container.querySelector('.js-step').value = step + 1;
             container.querySelector('.js-position').name = 'PageGuide[rules]['+step+'][position]';
+            container.querySelector('.js-title').name = 'PageGuide[rules]['+step+'][title]';
             container.querySelector('.js-element').name = 'PageGuide[rules]['+step+'][element]';
             container.querySelector('.js-intro').name = 'PageGuide[rules]['+step+'][intro]';
 
@@ -155,6 +156,7 @@ document.addEventListener('DOMContentLoaded',() => {
         tmpl.querySelector('.js-step').name = 'PageGuide[rules]['+count+'][step]';
         tmpl.querySelector('.js-step').value = count + 1;
         tmpl.querySelector('.js-position').name = 'PageGuide[rules]['+count+'][position]';
+        tmpl.querySelector('.js-title').name = 'PageGuide[rules]['+count+'][title]';
         tmpl.querySelector('.js-element').name = 'PageGuide[rules]['+count+'][element]';
         tmpl.querySelector('.js-intro').name = 'PageGuide[rules]['+count+'][intro]';
         document.getElementById('js-el-container').appendChild(tmpl);