From 5c296c679e8c1af3888f28731f841d449a84a2df Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jul 2017 13:42:07 +0200
Subject: [PATCH] Enhance source code editor

---
 htdocs/core/class/doleditor.class.php | 14 +++----
 htdocs/langs/en_US/main.lang          |  1 +
 htdocs/modulebuilder/index.php        | 53 +++++++++++++--------------
 htdocs/theme/eldy/style.css.php       | 29 +++++++++++++++
 4 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 9a9f0387309..1fd57089a11 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -256,8 +256,10 @@ class DolEditor
 			$format=(GETPOST('format','aZ09')?GETPOST('format','aZ09'):'php');
 
             $out.= '<!-- Output Ace editor -->'."\n";
-        	$out.= '<div id="statusBar"></div>';
-            $out.= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width?'width: '.$this->width.'px; ':'').($this->height?' height: '.$this->height.'px; ':'').'">';
+            $out.= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width?'width: '.$this->width.'px; ':'');
+            $out.= ($this->height?' height: '.$this->height.'px; ':'');
+            //$out.=" min-height: 100px;";
+            $out.= '">';
         	/*$out.= preg_replace(array('/^<\?php/','/\?>$/'), array('&lt;?php','?&gt;'), $this->content); */
         	$out.= htmlentities($this->content);
         	$out.= '</pre>';
@@ -268,18 +270,14 @@ class DolEditor
         	$out.= '<script type="text/javascript" language="javascript">'."\n";
         	$out.= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 
-				    // Init status bar. Need lib ext-statusbar
-        			//var StatusBar = ace.require("ace/ext/statusbar").StatusBar;
-	    			//var statusBar = new StatusBar(aceEditor, document.getElementById("statusBar"));
-
 				    aceEditor.session.setMode("ace/mode/'.$format.'");
 					aceEditor.setOptions({
 	   				   enableBasicAutocompletion: true, // the editor completes the statement when you hit Ctrl + Space. Need lib ext-language_tools.js
 					   enableLiveAutocompletion: false, // the editor completes the statement while you are typing. Need lib ext-language_tools.js
 					   showPrintMargin: false, // hides the vertical limiting strip
 					   minLines: 10,
-					   //maxLines: 34,
-					   fontSize: "100%" // ensures that the editor fits in the environment
+					   maxLines: 34,
+					   fontSize: "110%" // ensures that the editor fits in the environment
 					});
 
 					// defines the style of the editor
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index f3e06a1f1a8..ff874d2fc1b 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -730,6 +730,7 @@ SetBankAccount=Define Bank Account
 AccountCurrency=Account Currency
 ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
+ShowMoreLines=Show more lines
 PublicUrl=Public URL
 AddBox=Add box
 SelectElementAndClick=Select an element and click %s
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index d8e1fa786a7..b5cba7c7352 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -611,28 +611,7 @@ if (! dol_is_dir($dirins))
 }
 $dirins_ok=(dol_is_dir($dirins));
 
-$head='<style type="text/css" media="screen">
-	.ace_editor {
-		margin: 0;
-	}
-	#statusBar {
-        margin: 0;
-        padding: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        height: 20px;
-        background-color: rgb(245, 245, 245);
-        color: gray;
-    }
-    .ace_status-indicator {
-        color: gray;
-        position: relative;
-        right: 0;
-        border-left: 1px solid;
-    }
-	</style>';
-llxHeader($head, $langs->trans("ModuleBuilder"), "", '', 0, 0,
+llxHeader('', $langs->trans("ModuleBuilder"), "", '', 0, 0,
 	array(
 		'/includes/ace/ace.js',
 		'/includes/ace/ext-statusbar.js',
@@ -894,17 +873,17 @@ elseif (! empty($module))
 
         dol_fiche_head($head2, $tab, '', -1, '');
 
-        print $langs->trans("ModuleBuilderDesc".$tab).'<br><br>';
-
         if ($tab == 'description')
         {
-            $pathtofile = $modulelowercase.'/core/modules/mod'.$module.'.class.php';
+        	$pathtofile = $modulelowercase.'/core/modules/mod'.$module.'.class.php';
             $pathtofilereadme = $modulelowercase.'/README.md';
             $pathtochangelog = $modulelowercase.'/ChangeLog.md';
 
             if ($action != 'editfile' || empty($file))
             {
-                print '<span class="fa fa-file"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
+	        	print $langs->trans("ModuleBuilderDesc".$tab).'<br><br>';
+
+            	print '<span class="fa fa-file"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
                 print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                 print '<br>';
 
@@ -1014,7 +993,27 @@ elseif (! empty($module))
         	    print '<input type="hidden" name="tab" value="'.$tab.'">';
         	    print '<input type="hidden" name="module" value="'.$module.'">';
 
-        	    $doleditor=new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%', '');
+        	    $htmlname='editfilecontent';
+
+        	    $out.= '<div class="aceeditorstatusbar" id="statusBar">'.$langs->trans("File").' : '.$file;
+        	    $out.= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
+        	    $out.= '</div>';
+        	    $out.= '<script type="text/javascript" language="javascript">'."\n";
+        	    $out.= 'jQuery(document).ready(function() {'."\n";
+        	    $out.= '	var aceEditor = window.ace.edit("'.$htmlname.'aceeditorid");
+	        	    		// Init status bar. Need lib ext-statusbar
+    	    		    	var StatusBar = window.ace.require("ace/ext/statusbar").StatusBar;
+        			    	var statusBar = new StatusBar(aceEditor, document.getElementById("statusBar"));';
+        	    $out.= '	jQuery("#morelines").click(function() {
+								console.log("We click on more lines");
+        	    				var aceEditor = window.ace.edit("'.$htmlname.'aceeditorid");
+        	    				aceEditor.setOptions({ maxLines: 500 });
+							});
+						})';
+        	    $out.= '</script>'."\n";
+        	    print $out;
+
+        	    $doleditor=new DolEditor($htmlname, $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%', '');
         	    print $doleditor->Create(1, '', false);
 
         	    print '<center>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b82fd096cfe..4baaf59d51e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3657,6 +3657,35 @@ a.cke_dialog_ui_button_ok span {
 }
 
 
+/* ============================================================================== */
+/*  ACE editor                                                                    */
+/* ============================================================================== */
+.ace_editor {
+    border: 1px solid #ddd;
+	margin: 0;
+}
+#statusBar {
+        margin: 0;
+        padding: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        height: 20px;
+        background-color: #ebebeb;
+        /* color: gray; */
+}
+.ace_status-indicator {
+        color: gray;
+        position: relative;
+        right: 0;
+        border-left: 1px solid;
+}
+.aceeditorstatusbar {
+
+}
+
+
+
 /* ============================================================================== */
 /*  File upload                                                                   */
 /* ============================================================================== */