From eea4ccb9dd9ff44bf960f13ddf333217c595d0a3 Mon Sep 17 00:00:00 2001
From: Alex Aragon <aragcar@gmail.com>
Date: Fri, 8 Jul 2016 12:09:55 -0500
Subject: [PATCH] fix expand document edit - refs BT#7583

---
 main/document/create_document.php | 25 ++++-------
 main/document/edit_document.php   | 71 +++++++++++++++++--------------
 2 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/main/document/create_document.php b/main/document/create_document.php
index dff0395d6d..15c9780273 100755
--- a/main/document/create_document.php
+++ b/main/document/create_document.php
@@ -14,36 +14,29 @@ $this_section = SECTION_COURSES;
 $htmlHeadXtra[] = '
 <script>
 
-var hide_bar = function() {
-    $("#template_col").hide();
-    $("#doc_form").removeClass("col-md-9");
-    $("#doc_form").addClass("col-md-11");
-    $("#hide_bar_template").css({"background-image" : \'url("'.Display::returnIconPath('hide2.png').'")\'})
-}
-
 $(document).ready(function() {
     $(".scrollbar-light").scrollbar();
     
-    if ($(window).width() <= 785 ) {
-        hide_bar();
-    }    
-
+    
     $("#hide_bar_template").click(function() {
-        
-        $("#expand").toggleClass("hide");
         $("#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");
         }
-        
+
         $("#hide_bar_template").toggleClass("hide_bar_template_not_hide");
-        
     });
 
     CKEDITOR.on("instanceReady", function (e) {
diff --git a/main/document/edit_document.php b/main/document/edit_document.php
index a8c28a89de..ad9f17a18f 100755
--- a/main/document/edit_document.php
+++ b/main/document/edit_document.php
@@ -30,23 +30,27 @@ require_once '../inc/global.inc.php';
 // Template's javascript
 $htmlHeadXtra[] = '
 <script>
-var hide_bar = function() {
-    $("#template_col").hide();
-    $("#doc_form").removeClass("col-md-9");
-    $("#doc_form").addClass("col-md-11");
-    $("#hide_bar_template").css({"background-image" : \'url("'.Display::returnIconPath('hide.png').'")\'})
-}
 
 $(document).ready(function() {
     $(".scrollbar-light").scrollbar();
 
-    if ($(window).width() <= 785 ) {
-        hide_bar();
-    }
-
     $("#hide_bar_template").click(function() {
-        $("#template_col").toggleClass("hide");
-        $("#hide_bar_template").toggleClass("hide_bar_template_not_hide");
+        $("#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");
+        }
     });
 
     CKEDITOR.on("instanceReady", function (e) {
@@ -533,21 +537,20 @@ if ($owner_id == api_get_user_id() ||
 	if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){
 		Display::display_warning_message(get_lang('BrowserDontSupportsSVG'));
 	}
-    echo '<div class="row" style="overflow:hidden">
-            <div id="template_col" class="col-md-2">
+    // HTML-editor
+    echo '<div class="page-create">
+            <div class="row" style="overflow:hidden">
+            <div id="template_col" class="col-md-3">
                 <div class="panel panel-default">
                 <div class="panel-body">
                     <div id="frmModel" class="items-templates scrollbar-light"></div>
                 </div>
                 </div>
             </div>
-            <div class="col-md-1">
-                <div id="hide_bar_template"></div>
-            </div>
             <div id="doc_form" class="col-md-9">
-				'.$form->returnForm().'
+                '.$form->returnForm().'
             </div>
-          </div>';
+          </div></div>';
 }
 
 Display::display_footer();
@@ -585,33 +588,39 @@ function change_name($base_work_dir, $source_file, $rename_to, $dir, $doc)
 //return button back to
 function show_return($document_id, $path, $call_from_tool='', $slide_id=0, $is_certificate_mode=false)
 {
+    
+    $actionsLeft = null;
+    $actionsRight =  null;
+    
     global $parent_id;
-	echo '<div class="actions">';
-
     $url = api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq().'&id='.$parent_id;
 
 	if ($is_certificate_mode) {
 		$selectedCategory = (isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : '');
-		echo '<a href="document.php?curdirpath='. $selectedCategory .'&selectcat=' . $selectedCategory .'">'.
+		$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('Back'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Back'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
 	} elseif($call_from_tool=='slideshow') {
-		echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.
+		$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>';
 	} elseif($call_from_tool=='editdraw') {
-		echo '<a href="'.$url.'">'.
+		$actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
-		echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>';
+		$actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>';
 	} elseif($call_from_tool=='editodf') {
-        echo '<a href="'.$url.'">'.
+        $actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
-        echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), array(), 32).'</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('Back'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Back'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
     } elseif($call_from_tool=='editpaint'){
-		echo '<a href="'.$url.'">'.
+		$actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), array(), ICON_SIZE_MEDIUM).'</a>';
-		echo '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>';
+		$actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>';
 	} else {
-		echo '<a href="'.$url.'">'.
+		$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('Back'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Back'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
 	}
-	echo '</div>';
+    
+    echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => ''));
 }