Miglioramenti per le email (#9)

bug.php

@@ -3,7 +3,7 @@
 include_once __DIR__.'/core.php';
 
 $pageTitle = 'Bug';
-$jscript_modules[] = $js.'/ckeditor/ckeditor.js';
+$jscript_modules[] = App::getPaths()['js'].'/ckeditor/ckeditor.js';
 
 if (filter('op') == 'send') {
     // Preparazione email
@@ -193,10 +193,7 @@ echo '
 			var firstFocus = 1;
 
 			CKEDITOR.replace("body", {
-				toolbar: [
+				toolbar: globals.ckeditorToolbar
-					{ name: "document", items: [ "NewPage", "Preview", "-", "Templates" ] }, // Defines toolbar group with name (used to create voice label) and items in 3 subgroups
-					["Bold","Italic","Underline","Superscript","-","NumberedList","BulletedList","Outdent","Indent","Blockquote","-","Format",], // Defines toolbar group without name
-				]
 			});
 
 			CKEDITOR.instances.body.on("key", function() {

editor.php

@@ -92,7 +92,7 @@ if (empty($records)) {
 
     // Pulsanti di default
     echo '
-                    <div id="pulsanti" data-spy="affix" data-offset-top="200">
+                    <div id="pulsanti">
                         <a class="btn btn-warning" href="'.ROOTDIR.'/controller.php?id_module='.$id_module.'">
                             <i class="fa fa-chevron-left"></i> '.tr("Torna all'elenco").'
                         </a>
@@ -117,6 +117,15 @@ if (empty($records)) {
 
                         $("#save").click(function(){
                             $("#submit").trigger("click");
+                        });';
+
+    // Pulsanti dinamici
+    if (!isMobile()) {
+        echo '
+                        $("#pulsanti").affix({
+                            offset: {
+                                top: 200
+                            }
                         });
 
                         $("#pulsanti").on("affix.bs.affix", function(){
@@ -125,7 +134,10 @@ if (empty($records)) {
 
                         $("#pulsanti").on("affix-top.bs.affix", function(){
                             $("#pulsanti").css("width", "100%");
-                        });
+                        });';
+    }
+
+    echo '
                     });
                     </script>
 

include/top.php

@@ -98,17 +98,31 @@ if (Auth::check()) {
     echo '
             };
 			globals = {
-                rootdir: \''.$rootdir.'\', js: \''.$paths['js'].'\', css: \''.$paths['css'].'\', img: \''.$paths['img'].'\',
+                rootdir: \''.$rootdir.'\',
+                js: \''.$paths['js'].'\',
+                css: \''.$paths['css'].'\',
+                img: \''.$paths['img'].'\',
+
                 id_module: \''.$id_module.'\',
                 id_record: \''.$id_record.'\',
+
                 aggiornamenti_id: \''.($dbo->isInstalled() ? Modules::get('Aggiornamenti')['id'] : '').'\',
+
                 cifre_decimali: '.get_var('Cifre decimali per importi').',
-                decimals: "'.Translator::getFormatter()->getNumberSeparators()['decimals'].'", thousands: "'.Translator::getFormatter()->getNumberSeparators()['thousands'].'",
+
+                decimals: "'.Translator::getFormatter()->getNumberSeparators()['decimals'].'",
+                thousands: "'.Translator::getFormatter()->getNumberSeparators()['thousands'].'",
+
                 search: search,
                 translations: translations,
+                locale: \''.$lang.'\',
+
                 start_date: \''.Translator::dateToLocale($_SESSION['period_start']).'\',
                 end_date: \''.Translator::dateToLocale($_SESSION['period_end']).'\',
-                locale: \''.$lang.'\',
+
+                ckeditorToolbar: [
+					[ "Bold", "Italic", "Underline", "Superscript", "-", "NumberedList", "BulletedList", "Outdent", "Indent", "Blockquote", "-", "Format"],
+				],
             };
 		</script>';
 }

mail.php

@@ -119,11 +119,18 @@ echo '
             emails = JSON.parse(response);
 
             $(".destinatari").each(function(){
-                $(this).autocomplete({source: emails});
+                $(this).autocomplete({
+                    source: emails,
+                    minLength: 0
+                }).focus(function() {
+                    $(this).autocomplete("search", $(this).val())
+                });;
             });
         });
 
-        CKEDITOR.replace("body");
+        CKEDITOR.replace("body", {
+            toolbar: globals.ckeditorToolbar
+        });
     });
 
     function send(){

modules/emails/edit.php

@@ -88,9 +88,9 @@ echo '
             $module_dir = DOCROOT.'/modules/'.Modules::get($records[0]['id_module'])['directory'];
             $variables = [];
 
-			if (file_exists($module_dir.'/custom/variables.php') ) {
+            if (file_exists($module_dir.'/custom/variables.php')) {
                 $variables = include $module_dir.'/custom/variables.php';
-			} elseif (file_exists($module_dir.'/variables.php') ) {
+            } elseif (file_exists($module_dir.'/variables.php')) {
                 $variables = include $module_dir.'/variables.php';
             }
 
@@ -125,6 +125,8 @@ echo '
 
 <script>
     $(document).ready(function(){
-        CKEDITOR.replace("body");
+        CKEDITOR.replace("body", {
+            toolbar: globals.ckeditorToolbar
+        });
     });
 </script>