Merge pull request #1316 from jloguercio/1.11.x

Fix new document template missing list from learning paths - Refs #8323

main/inc/lib/display.lib.php

@@ -1042,7 +1042,7 @@ class Display
             if ($i == 1) {
                 $active = ' active';
             }
-            $item = self::tag('a', $item, array('href'=>'#'.$id.'-'.$i, 'role'=> 'tab', 'data-toggle' => 'tab'));
+            $item = self::tag('a', $item, array('href'=>'#'.$id.'-'.$i, 'role'=> 'tab', 'data-toggle' => 'tab', 'id' => $id . $i));
             $ul_attributes['role'] = 'presentation';
             $ul_attributes['class'] = $active;
             $lis .= self::tag('li', $item, $ul_attributes);

main/lp/lp_add_item.php

@@ -193,7 +193,23 @@ $(document).ready(function() {
             e.preventDefault();
         }
     });
+
+    // hide the current template list for new documment until it tab clicked
+    $('#frmModel').hide();
+
 });
+
+// document template for new document tab handler
+$(document).on( 'shown.bs.tab', 'a[data-toggle="tab"]', function (e) {
+
+    var id = e.target.id;
+
+    if (id == 'subtab2') {
+        $('#frmModel').show();
+    } else {
+        $('#frmModel').hide();
+    }
+})
 </script>
 <?php
 
@@ -207,7 +223,7 @@ echo $learnPath->return_new_tree(null, true);
 $message = isset($_REQUEST['message']) ? $_REQUEST['message'] : null;
 
 // Show the template list.
-if ($type == 'document' && !isset($_GET['file'])) {
+if (($type == 'document' || $type == 'step') && !isset($_GET['file'])) {
     // Show the template list.
     echo '<div id="frmModel" class="scrollbar-inner lp-add-item">';
     echo '</div>';

main/template/default/layout/header.js.tpl

@@ -38,8 +38,8 @@
                 var templatesConfig = CKEDITOR.getTemplates("default");
 
                 var $templatesUL = $("<ul>");
-
-                $.each(templatesConfig.templates, function () {
+                if (templatesConfig) {
+                    $.each(templatesConfig.templates, function () {
                     var template = this;
                     var $templateLi = $("<li>");
 
@@ -47,25 +47,26 @@
                     templateHTML += "<b>" + template.title + "</b>";
 
                     if (template.description) {
-                        templateHTML += "<div class=description>" + template.description + "</div>";
+                    templateHTML += "<div class=description>" + template.description + "</div>";
                     }
 
                     templateHTML += "</div>";
 
                     $("<a>", {
-                        href: "#",
-                        html: templateHTML,
-                        click: function (e) {
-                            e.preventDefault();
-                            if (CKEDITOR.instances[editorName]) {
-                                CKEDITOR.instances[editorName].setData(template.html, function () {
-                                    this.checkDirty();
-                                });
-                            }
-                        }
+                    href: "#",
+                    html: templateHTML,
+                    click: function (e) {
+                    e.preventDefault();
+                    if (CKEDITOR.instances[editorName]) {
+                    CKEDITOR.instances[editorName].setData(template.html, function () {
+                    this.checkDirty();
+                    });
+                    }
+                    }
                     }).appendTo($templateLi);
                     $templatesUL.append($templateLi);
-                });
+                    });
+                }
                 $templatesUL.appendTo("#frmModel");
             });
         };