loviuz/openstamanager
loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-01-31 07:55:17 +01:00
Code Issues Releases Activity

Miglioramento della gestione della libreria JS CKEditor

Browse Source
This commit is contained in:
Thomas Zilio 2017-09-22 14:37:18 +02:00
parent 60612585b1
commit 28a67ea4b7
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bug.php
View File

@ -3,7 +3,7 @@
include_once __DIR__.'/core.php';
$pageTitle = 'Bug';
$jscript_modules[] = $js.'/ckeditor.js';
$jscript_modules[] = $js.'/ckeditor/ckeditor.js';
if (filter('op') == 'send') {
// Preparazione email

8
gulpfile.js
View File

@ -180,14 +180,14 @@ gulp.task('srcFonts', function () {
gulp.task('ckeditor', function () {
gulp.src([
config.main.bowerDirectory + '/ckeditor/{adapters,lang,skins}/**/*',
config.main.bowerDirectory + '/ckeditor/{adapters,lang,skins,plugins}/**/*.{js,json,css,png}',
])
.pipe(gulp.dest(config.production + '/' + config.paths.js));
.pipe(gulp.dest(config.production + '/' + config.paths.js + '/ckeditor'));
gulp.src([
config.main.bowerDirectory + '/ckeditor/{ckeditor,styles}.js',
config.main.bowerDirectory + '/ckeditor/*.{js,css}',
])
.pipe(gulp.dest(config.production + '/' + config.paths.js));
.pipe(gulp.dest(config.production + '/' + config.paths.js + '/ckeditor'));
});
gulp.task('colorpicker', function () {

9
modules/emails/edit.php
View File

@ -3,7 +3,7 @@
include_once __DIR__.'/../../core.php';
echo '
<script src="'.$rootdir.'/assets/dist/js/ckeditor.js"></script>';
<script src="'.$rootdir.'/assets/dist/js/ckeditor/ckeditor.js"></script>';
?>
<form action="" method="post" id="add-form">
@ -77,11 +77,6 @@ echo '
<script>
$(document).ready(function(){
CKEDITOR.replace("body", {
toolbar: [
{ 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.replace("body");
});
</script>

2
package.json
View File

@ -36,7 +36,7 @@
"bootstrap-colorpicker": "^2.5.1",
"bootstrap-daterangepicker": "^2.1.25",
"chart.js": "^2.7.0",
"ckeditor": "^4.6.2",
"ckeditor": "git://github.com/ckeditor/ckeditor-releases.git#full/latest",
"components-jqueryui": "^1.12.1",
"core-js": "^2.5.1",
"datatables.net-bs": "^1.10.15",

8
update/2_3_1.sql
View File

@ -135,7 +135,7 @@ CREATE TABLE IF NOT EXISTS `zz_email_print` (
) ENGINE=InnoDB;
-- Aggiunta dei moduli dedicati alla gestione delle email
INSERT INTO `zz_modules` (`id`, `name`, `title`, `directory`, `options`, `icon`, `version`, `compatibility`, `order`, `parent`, `default`, `enabled`) VALUES (NULL, 'Account email', 'Account email', 'smtp', 'SELECT |select| FROM zz_smtp WHERE 1=1 AND deleted = 0 HAVING 2=2 ORDER BY `name`', 'fa fa-envelope', '2.3', '2.3', '10', NULL, 1, 1);
INSERT INTO `zz_modules` (`id`, `name`, `title`, `directory`, `options`, `icon`, `version`, `compatibility`, `order`, `parent`, `default`, `enabled`) VALUES (NULL, 'Account email', 'Account email', 'smtp', 'SELECT |select| FROM zz_smtp WHERE 1=1 AND deleted = 0 HAVING 2=2 ORDER BY `name`', 'fa fa-user-o', '2.3', '2.3', '10', NULL, 1, 1);
INSERT INTO `zz_modules` (`id`, `name`, `title`, `directory`, `options`, `icon`, `version`, `compatibility`, `order`, `parent`, `default`, `enabled`) VALUES (NULL, 'Template email', 'Template email', 'emails', 'SELECT |select| FROM zz_emails WHERE 1=1 AND deleted = 0 HAVING 2=2 ORDER BY `name`', 'fa fa-pencil-square-o', '2.3', '2.3', '10', NULL, 1, 1);
INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`, `enabled`, `default`) VALUES
@ -148,3 +148,9 @@ INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`,
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Template email'), '#', 'id', 2, 1, 0, 1, 1),
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Template email'), 'Nome', 'name', 3, 1, 0, 1, 1),
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Template email'), 'Oggetto', 'subject', 4, 1, 0, 1, 1);
-- Raggruppamento dei moduli per le email
INSERT INTO `zz_modules` (`id`, `name`, `title`, `directory`, `options`, `options2`, `icon`, `version`, `compatibility`, `order`, `parent`, `default`, `enabled`) VALUES (NULL, 'Gestione email', 'Gestione email', '', '', '', 'fa fa-envelope', '2.3', '2.3', '1', NULL, '1', '1');
UPDATE `zz_modules` `t1` INNER JOIN `zz_modules` `t2` ON (`t1`.`name` = 'Account email' AND `t2`.`name` = 'Gestione email') SET `t1`.`parent` = `t2`.`id`;
UPDATE `zz_modules` `t1` INNER JOIN `zz_modules` `t2` ON (`t1`.`name` = 'Template email' AND `t2`.`name` = 'Gestione email') SET `t1`.`parent` = `t2`.`id`;