Avoid repeat code to expand/contract sidebar on documents tool

pull/2487/head
Angel Fernando Quiroz Campos 9 years ago
parent ee6e9c40f0
commit 23fb113481
  1. 30
      main/document/create_document.php
  2. 31
      main/document/edit_document.php
  3. 2
      main/lp/learnpath.class.php
  4. 21
      main/lp/lp_add_item.php
  5. 16
      main/lp/lp_edit_item.php
  6. 36
      main/template/default/layout/header.js.tpl

@ -20,23 +20,13 @@ $htmlHeadXtra[] = '
<script>
$(document).ready(function() {
$(".scrollbar-light").scrollbar();
$("#hide_bar_template").click(function() {
$("#expand").toggleClass("hide");
$("#contract").toggleClass("hide");
if ($("#doc_form").is(".col-md-9")) {
$("#doc_form").removeClass("col-md-9");
$("#doc_form").addClass("col-md-11");
$("#template_col").removeClass("col-md-3");
$("#template_col").addClass("hide");
} else {
$("#doc_form").removeClass("col-md-11");
$("#doc_form").addClass("col-md-9");
$("#template_col").removeClass("hide");
$("#template_col").addClass("col-md-3");
}
expandColumnToogle("#hide_bar_template", {
selector: "#template_col",
width: 3
}, {
selector: "#doc_form",
width: 9
});
CKEDITOR.on("instanceReady", function (e) {
@ -302,7 +292,7 @@ $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('title', get_lang('FileExists'), 'callback', 'document_exists');
$current_session_id = api_get_session_id();
$form->addHtmlEditor('content','', true, true, $editorConfig, true);
$form->addHtmlEditor('content', get_lang('Content'), true, true, $editorConfig, true);
// Comment-field
$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
@ -610,12 +600,12 @@ if ($form->validate()) {
if ($is_certificate_mode) {
$actionsLeft = '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
$actionsLeft .= '<a id="hide_bar_template" href="#">'.
$actionsLeft .= '<a id="hide_bar_template" href="#" role="button">'.
Display::return_icon('expand.png',get_lang('Back'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Back'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
} else {
$actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
$actionsLeft .= '<a id="hide_bar_template" href="#">'.
$actionsLeft .= '<a id="hide_bar_template" href="#" role="button">'.
Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).
Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
}

@ -36,24 +36,13 @@ $htmlHeadXtra[] = '
<script>
$(document).ready(function() {
$(".scrollbar-light").scrollbar();
$("#hide_bar_template").click(function() {
$("#expand").toggleClass("hide");
$("#contract").toggleClass("hide");
if ($("#doc_form").is(".col-md-9")) {
$("#doc_form").removeClass("col-md-9");
$("#doc_form").addClass("col-md-11");
$("#template_col").removeClass("col-md-3");
$("#template_col").addClass("hide");
} else {
$("#doc_form").removeClass("col-md-11");
$("#doc_form").addClass("col-md-9");
$("#template_col").removeClass("hide");
$("#template_col").addClass("col-md-3");
}
expandColumnToogle("#hide_bar_template", {
selector: "#template_col",
width: 3
}, {
selector: "#doc_form",
width: 9
});
CKEDITOR.on("instanceReady", function (e) {
@ -600,7 +589,7 @@ function show_return($document_id, $path, $call_from_tool='', $slide_id=0, $is_c
$selectedCategory = (isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : '');
$actionsLeft .= '<a href="document.php?curdirpath='. $selectedCategory .'&selectcat=' . $selectedCategory .'">'.
Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
$actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
$actionsLeft .= '<a id="hide_bar_template" href="#" role="button">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
} elseif($call_from_tool=='slideshow') {
$actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.
Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'),'',ICON_SIZE_MEDIUM).'</a>';
@ -612,7 +601,7 @@ function show_return($document_id, $path, $call_from_tool='', $slide_id=0, $is_c
$actionsLeft .= '<a href="'.$url.'">'.
Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
$actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), array(), 32).'</a>';
$actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
$actionsLeft .= '<a id="hide_bar_template" href="#" role="button">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
} elseif($call_from_tool=='editpaint'){
$actionsLeft .= '<a href="'.$url.'">'.
Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), array(), ICON_SIZE_MEDIUM).'</a>';
@ -620,7 +609,7 @@ function show_return($document_id, $path, $call_from_tool='', $slide_id=0, $is_c
} else {
$actionsLeft .= '<a href="'.$url.'">'.
Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
$actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
$actionsLeft .= '<a id="hide_bar_template" href="#" role="button">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
}
echo $toolbar = Display::toolbarAction('actions-documents', array($actionsLeft));

@ -5916,7 +5916,7 @@ class learnpath
$actionsLeft .= '<a href="lp_controller.php?'.api_get_cidreq().'&gradebook=' . $gradebook . '&action=view&lp_id=' . $_SESSION['oLP']->lp_id . '&isStudentView=true" target="_self">' . Display :: return_icon('preview_view.png', get_lang('Display'),'',ICON_SIZE_MEDIUM).'</a> ';
$actionsLeft .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=admin_view&lp_id=' . $_SESSION['oLP']->lp_id . '&updateaudio=true">' . Display :: return_icon('upload_audio.png', get_lang('UpdateAllAudioFragments'),'',ICON_SIZE_MEDIUM).'</a>';
$actionsLeft .= '<a href="lp_controller.php?'.api_get_cidreq().'&action=edit&lp_id=' . $_SESSION['oLP']->lp_id . '">' . Display :: return_icon('settings.png', get_lang('CourseSettings'),'',ICON_SIZE_MEDIUM).'</a>';
$actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
$actionsLeft .= '<a id="hide_bar_template" href="#" role="button">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
$buttons = array(
array(
'title' => get_lang('SetPrerequisiteForEachItem'),

@ -172,23 +172,10 @@ jQuery(document).ready(function(){
});
$(document).ready(function() {
$("#hide_bar_template").click(function() {
$("#expand").toggleClass("hide");
$("#contract").toggleClass("hide");
if ($("#doc_form").is(".col-md-8")) {
$("#doc_form").removeClass("col-md-8");
$("#doc_form").addClass("col-md-11");
$("#lp_sidebar").removeClass("col-md-4");
$("#lp_sidebar").addClass("hide");
} else {
$("#doc_form").removeClass("col-md-11");
$("#doc_form").addClass("col-md-8");
$("#lp_sidebar").removeClass("hide");
$("#lp_sidebar").addClass("col-md-4");
}
expandColumnToogle('#hide_bar_template', {
selector: '#lp_sidebar'
}, {
selector: '#doc_form'
});
$('.lp-btn-associate-forum').on('click', function (e) {

@ -143,18 +143,10 @@ jQuery(document).ready(function(){
});
$(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");
expandColumnToogle('#hide_bar_template', {
selector: '#lp_sidebar'
}, {
selector: '#doc_form'
});
$('.lp-btn-associate-forum').on('click', function (e) {

@ -433,4 +433,40 @@ function hideUnhide(inId, inIdTxt, inTxtHide, inTxtUnhide)
$('#'+inIdTxt).attr("value", inTxtHide);
}
}
function expandColumnToogle(buttonSelector, col1Info, col2Info)
{
$(buttonSelector).on('click', function (e) {
e.preventDefault();
col1Info = $.extend({
selector: '',
width: 4
}, col1Info);
col2Info = $.extend({
selector: '',
width: 8
}, col2Info);
if (!col1Info.selector || !col2Info.selector) {
return;
}
var col1 = $(col1Info.selector),
col2 = $(col2Info.selector);
$('#expand').toggleClass('hide');
$('#contract').toggleClass('hide');
if (col2.is('.col-md-' + col2Info.width)) {
col2.removeClass('col-md-' + col2Info.width).addClass('col-md-12');
col1.removeClass('col-md-' + col1Info.width).addClass('hide');
return;
}
col2.removeClass('col-md-12').addClass('col-md-' + col2Info.width);
col1.removeClass('hide').addClass('col-md-' + col1Info.width);
});
}
</script>

Loading…
Cancel
Save