From 947de49b91a979aad0323a4c38d8a0399bae6595 Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Fri, 8 Jul 2016 10:10:24 -0500 Subject: [PATCH] fix panel hide template scroll - refs BT#11374 --- main/newscorm/lp_add_item.php | 7 ------- main/newscorm/lp_edit_item.php | 35 ++++++++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/main/newscorm/lp_add_item.php b/main/newscorm/lp_add_item.php index 6c8f6b7fad..7078e58807 100755 --- a/main/newscorm/lp_add_item.php +++ b/main/newscorm/lp_add_item.php @@ -203,11 +203,8 @@ $(document).ready(function() { /* DISPLAY SECTION */ echo $learnPath->build_action_menu(); - echo '
'; - echo '
'; - 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 '
'; } - echo '
'; - // hide bar div if ($action == 'add_item' && $type == 'document' && !isset($_GET['file'])) { echo '
'; } - echo '
'; - //@todo use session flash messages if (in_array($message, array('ItemUpdated'))) { echo Display::return_message(get_lang($message)); diff --git a/main/newscorm/lp_edit_item.php b/main/newscorm/lp_edit_item.php index fb2bacd9f2..60333cfb0b 100755 --- a/main/newscorm/lp_edit_item.php +++ b/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(''); @@ -159,8 +178,9 @@ $(document).ready(function() { echo $_SESSION['oLP']->build_action_menu(); -echo '
'; -echo '
'; +echo '
'; +//echo '
'; +echo '
'; $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 '
'; + echo '
'; } else { echo $_SESSION['oLP']->return_new_tree(); } - echo '
'; -echo '
'; +// hide bar div +if ($action == 'edit_item') { + echo '
'; +} + +echo '
'; if (isset($is_success) && $is_success === true) { $msg = '
';