Merge pull request #1278 from aragonc/1.10.x

fix panel hide template scroll - refs BT#11374

main/newscorm/lp_add_item.php

@@ -203,11 +203,8 @@ $(document).ready(function() {
 /* DISPLAY SECTION */
 
 echo $learnPath->build_action_menu();
-
 echo '<div class="row" style="overflow:hidden">';
-
 echo '<div id="lp_sidebar" class="col-md-4">';
-
 echo $learnPath->return_new_tree(null, true);
 
 $message = isset($_REQUEST['message']) ? $_REQUEST['message'] : null;
@@ -217,16 +214,12 @@ if ($type == 'document' && !isset($_GET['file'])) {
     // Show the template list.
     echo '<div id="frmModel" class="scrollbar-inner lp-add-item"></div>';
 }
-
 echo '</div>';
-
 // hide bar div
 if ($action == 'add_item' && $type == 'document' && !isset($_GET['file'])) {
     echo '<div class="col-md-1"><div id="hide_bar_template"></div></div> ';
 }
-
 echo '<div id="doc_form" class="col-md-8">';
-
 //@todo use session flash messages
 if (in_array($message, array('ItemUpdated'))) {
     echo Display::return_message(get_lang($message));

main/newscorm/lp_edit_item.php

@@ -133,8 +133,27 @@ function confirmation(name) {
         return false;
     }
 }
+jQuery(document).ready(function(){
+    jQuery('.scrollbar-inner').scrollbar();
+});
 
 $(document).ready(function() {
+    $("#doc_form").removeClass( "col-md-8" ).addClass( "col-md-7" );
+    
+    $("#hide_bar_template").click(function() {
+        $("#lp_sidebar").toggleClass("hide");
+        
+        if ($('#doc_form').is('.col-md-7')) {
+            $('#doc_form').removeClass('col-md-7');
+            $('#doc_form').addClass('col-md-11');
+        } else {
+            $('#doc_form').removeClass('col-md-11');
+            $('#doc_form').addClass('col-md-7');
+        }
+       
+        $("#hide_bar_template").toggleClass("hide_bar_template_not_hide");
+    });
+    
     $('.lp-btn-associate-forum').on('click', function (e) {
         var associate = confirm('<?php echo get_lang('ConfirmAssociateForumToLPItem') ?>');
 
@@ -159,8 +178,9 @@ $(document).ready(function() {
 
 echo $_SESSION['oLP']->build_action_menu();
 
-echo '<div class="row">';
-echo '<div class="col-md-3">';
+echo '<div class="row" style="overflow:hidden">';
+//echo '<div class="col-md-3">';
+echo '<div id="lp_sidebar" class="col-md-4">';
 $path_item = isset($_GET['path_item']) ? $_GET['path_item'] : 0;
 $path_item = Database::escape_string($path_item);
 $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
@@ -173,15 +193,18 @@ $path_parts = pathinfo($path_file);
 
 if (Database::num_rows($res_doc) > 0 && $path_parts['extension'] == 'html') {
     echo $_SESSION['oLP']->return_new_tree();
-
     // Show the template list
-    echo '<div id="frmModel" class="lp-add-item"></div>';
+    echo '<div id="frmModel" class="scrollbar-inner lp-add-item"></div>';
 } else {
     echo $_SESSION['oLP']->return_new_tree();
 }
-
 echo '</div>';
-echo '<div class="col-md-9">';
+// hide bar div
+if ($action == 'edit_item') {
+    echo '<div class="col-md-1"><div id="hide_bar_template"></div></div> ';
+}
+
+echo '<div id="doc_form" class="col-md-7">';
 
 if (isset($is_success) && $is_success === true) {
     $msg = '<div class="lp_message" style="margin-bottom:10px;">';