-
-
-
-
+
- + '.$structure->getTranslation('title'); // Pulsante "Aggiungi" solo se il modulo è di tipo "table" e se esiste il template per la popup if ($structure->hasAddFile() && $structure->permission == 'rw') { echo ' - '; +
'; } echo ' @@ -68,8 +68,8 @@ $plugins = Plugin::where('idmodule_to', $id_module)->where('position', 'tab_main // Tab dei plugin foreach ($plugins as $plugin) { echo ' -- - '.$plugin->getTranslation('title').' +
'; } diff --git a/editor.php b/editor.php index 6ce5d8045..ad3849cb1 100755 --- a/editor.php +++ b/editor.php @@ -109,15 +109,15 @@ if (empty($record) || !$has_access) { echo '--
+
-
- ----'; } // Plugin @@ -426,21 +403,21 @@ if (empty($record) || !$has_access) { $record = $module_record; echo ' --'; +--
'.$description.'
--+'.Carbon::parse($operation['created_at'])->diffForHumans().'
-'.$operation['username'].'
-- +
'; } echo ' - '; + '; } else { echo ' -++++- '; ++-++'.$description.'
++'.Carbon::parse($operation['created_at'])->diffForHumans().'
+'.$operation['username'].'
- --+ ++ +- - '.tr('Informazione:').' '.tr('Nessun log disponibile per questa scheda').'. -'; ++ + '.tr('Informazione:').' '.tr('Nessun log disponibile per questa scheda').'. +'; } echo ' -'; +'; } $record = $module_record; echo ' -'; $id_plugin = $plugin['id']; include base_dir().'/include/manager.php'; echo ' -'; + - +
-'; +'; if (!empty($record['deleted_at'])) { $operation = $dbo->fetchOne("SELECT zz_operations.created_at, username FROM zz_operations INNER JOIN zz_users ON zz_operations.id_utente = zz_users.id WHERE op='delete' AND id_module=".prepare($id_module).' AND id_record='.prepare($id_record).' ORDER BY zz_operations.created_at DESC'); @@ -162,88 +162,65 @@ if (empty($record) || !$has_access) { } // Pulsanti di default - echo ' -- - '.tr("Torna all'elenco").' - + echo ' -'; } redirectOperation($id_module, !empty($id_parent) ? $id_parent : $id_record); @@ -450,10 +427,10 @@ echo '{( "name": "widgets", "id_module": "'.$id_module.'", "id_record": "'.$id_r if (!empty($record)) { echo ' -- {( "name": "button", "type": "print", "id_module": "'.$id_module.'", "id_plugin": "'.$id_plugin.'", "id_record": "'.$id_record.'" )} +'; // Campi personalizzati echo ' -+ + '.tr("Torna all'elenco").' + - {( "name": "button", "type": "email", "id_module": "'.$id_module.'", "id_plugin": "'.$id_plugin.'", "id_record": "'.$id_record.'" )}'; +++ {( "name": "button", "type": "print", "id_module": "'.$id_module.'", "id_plugin": "'.$id_plugin.'", "id_record": "'.$id_record.'" )} + + {( "name": "button", "type": "email", "id_module": "'.$id_module.'", "id_plugin": "'.$id_plugin.'", "id_record": "'.$id_record.'" )}'; if (Module::find((new Module())->getByField('title', 'Account SMS', Models\Locale::getPredefined()->id))) { - echo ' - {( "name": "button", "type": "sms", "id_module": "'.$id_module.'", "id_plugin": "'.$id_plugin.'", "id_record": "'.$id_record.'" )}'; + echo ' + {( "name": "button", "type": "sms", "id_module": "'.$id_module.'", "id_plugin": "'.$id_plugin.'", "id_record": "'.$id_record.'" )}'; } echo ' - ++ - - -
'; + $("#save-close").on("click", function (){ + form.find("[name=backto]").val("record-list"); + $("#submit").trigger("click"); + }); + }); + + + +
'; // Pulsanti personalizzati $buttons = $structure->filepath('buttons.php'); @@ -253,12 +230,12 @@ if (empty($record) || !$has_access) { $buttons = ob_get_clean(); echo ' -- '.$buttons.' -++ '.$buttons.' +- -
'; + +
'; // Eventuale header personalizzato $header = $structure->filepath('header.php'); if ($header) { @@ -269,7 +246,7 @@ if (empty($record) || !$has_access) { // Contenuti del modulo echo ' -'; +'; +'; $path = $structure->getEditFile(); if (!empty($path)) { @@ -277,73 +254,73 @@ if (empty($record) || !$has_access) { } echo ' --- {( "name": "custom_fields", "id_module": "'.$id_module.'", "id_record": "'.$id_record.'", "position": "top" )} -++ {( "name": "custom_fields", "id_module": "'.$id_module.'", "id_record": "'.$id_record.'", "position": "top" )} +-- {( "name": "custom_fields", "id_module": "'.$id_module.'", "id_record": "'.$id_record.'" )} -++ {( "name": "custom_fields", "id_module": "'.$id_module.'", "id_record": "'.$id_record.'" )} +- '; + // Campi a fine form + aggiungiContenuto(last, "#custom_fields_bottom-edit_'.$id_module.'-'.$id_plugin.'", {}); + }); + '; if ($structure->permission != '-' && $structure->use_notes && $user->gruppo != 'Clienti') { echo ' -'; +'; } if ($structure->permission != '-' && $structure->use_checklists) { echo ' -'; include base_dir().'/plugins/notes.php'; echo ' -'; +'; +'; } // Informazioni sulle operazioni if (Auth::admin()) { echo ' -'; include base_dir().'/plugins/checks.php'; echo ' -'; +'; ++'; $operations = $dbo->fetchArray('SELECT `zz_operations`.*, `zz_users`.`username` FROM `zz_operations` LEFT JOIN `zz_users` ON `zz_operations`.`id_utente` = `zz_users`.`id` WHERE id_module = '.prepare($id_module).' AND id_record = '.prepare($id_record).' ORDER BY `created_at` DESC LIMIT 200'); if (!empty($operations)) { echo ' -'; +- ';
+
- ';
foreach ($operations as $operation) {
$description = $operation['op'];
@@ -382,42 +359,42 @@ if (empty($record) || !$has_access) {
}
echo '
-
- - '.tr('Indietro').' - '; +
+ + '.tr('Indietro').' + '; } echo ' @@ -467,7 +444,7 @@ if ($read_only || !empty($block_edit)) { $(document).ready(function(){ $("input, textarea, select", "section.content")'.$not.'.attr("readonly", "true"); $("select, input[type=checkbox]", "section.content")'.$not.'.prop("disabled", true); - $(".checkbox-buttons label", "section.content")'.$not.'.addClass("disabled"); + $(".checkbox-buttons badge", "section.content")'.$not.'.addClass("disabled"); '; // Nascondo il plugin Note interne ai clienti diff --git a/gulpfile.js b/gulpfile.js index 8c7616362..3e0ce8918 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -124,6 +124,7 @@ const JS = gulp.parallel(() => { 'leaflet-gesture-handling/dist/leaflet-gesture-handling.min.js', 'ismobilejs/dist/isMobile.min.js', 'ua-parser-js/dist/ua-parser.min.js', + 'popper.js/dist/umd/popper.js', ]; for (const i in vendor) { @@ -225,15 +226,15 @@ function srcCSS() { .pipe(gulp.dest(config.production + '/' + config.paths.css)); const themes = gulp.src([ - config.development + '/' + config.paths.css + '/themes/*.{css,scss,less,styl}', - config.nodeDirectory + '/admin-lte/dist/css/skins/_all-skins.min.css', - ]) - .pipe(gulpIf('*.scss', sass(), gulpIf('*.less', less(), gulpIf('*.styl', stylus())))) - .pipe(autoprefixer()) - .pipe(gulpIf(!config.debug, minifyCSS(config.minifiers.css))) - .pipe(concat('themes.min.css')) - .pipe(flatten()) - .pipe(gulp.dest(config.production + '/' + config.paths.css)); + config.development + '/' + config.paths.css + '/themes/*.{css,scss,less,styl}', + config.nodeDirectory + '/admin-lte/dist/css/adminlte.min.css', + ]) + .pipe(gulpIf('*.scss', sass(), gulpIf('*.less', less(), gulpIf('*.styl', stylus())))) + .pipe(autoprefixer()) + .pipe(gulpIf(!config.debug, minifyCSS(config.minifiers.css))) + .pipe(concat('themes.min.css')) + .pipe(flatten()) + .pipe(gulp.dest(config.production + '/' + config.paths.css)); return merge(css, print, themes); } @@ -307,11 +308,11 @@ const fonts = gulp.parallel(() => { 'font-awesome/fonts/fontawesome-webfont.woff', 'font-awesome/fonts/fontawesome-webfont.woff2', 'font-awesome/fonts/FontAwesome.otf', - 'bootstrap/dist/fonts/glyphicons-halflings-regular.eot', - 'bootstrap/dist/fonts/glyphicons-halflings-regular.svg', - 'bootstrap/dist/fonts/glyphicons-halflings-regular.ttf', - 'bootstrap/dist/fonts/glyphicons-halflings-regular.woff', - 'bootstrap/dist/fonts/glyphicons-halflings-regular.woff2', + 'select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.eot', + 'select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.svg', + 'select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.ttf', + 'select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.woff', + 'select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.woff2', '../assets/src/css/fonts/sourcesanspro-regular-webfont.eot', '../assets/src/css/fonts/sourcesanspro-regular-webfont.svg', '../assets/src/css/fonts/sourcesanspro-regular-webfont.ttf', diff --git a/include/colonne.php b/include/colonne.php index e65a82e5d..a2b1b5d47 100644 --- a/include/colonne.php +++ b/include/colonne.php @@ -30,8 +30,8 @@ echo ' $fields = $dbo->fetchArray('SELECT `zz_views`.*, (SELECT GROUP_CONCAT(`zz_groups_lang`.`title`) FROM `zz_group_view` INNER JOIN `zz_groups` ON `zz_group_view`.`id_gruppo` = `zz_groups`.`id` LEFT JOIN `zz_groups_lang` ON (`zz_groups`.`id` = `zz_groups_lang`.`id_record` AND `zz_groups_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') WHERE `zz_group_view`.`id_vista` = `zz_views`.`id`) AS gruppi_con_accesso FROM `zz_views` LEFT JOIN `zz_views_lang` ON (`zz_views`.`id` = `zz_views_lang`.`id_record` AND `zz_views_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') WHERE `id_module`='.prepare($id_module).' ORDER BY `order` ASC'); foreach ($fields as $field) { echo ' --++'.$field['name'].'
( '.$field['gruppi_con_accesso'].') @@ -48,8 +48,8 @@ echo ' '; echo ' --++-
+ - + '.$structure->getTranslation('title'); // Pulsante "Aggiungi" solo se il modulo è di tipo "table" e se esiste il template per la popup if ($structure->hasAddFile() && $structure->permission == 'rw') { echo ' - '; +