Skip to content
Code-Schnipsel Gruppen Projekte
Commit 14d49ac6 erstellt von Jan Wennrich's avatar Jan Wennrich
Dateien durchsuchen

Merge branch 'master' into '2.3' 

Version 2.3.1

See merge request !6
Übergeordnete d38f86e9 d828498d
No related branches found
No related tags found
1 Merge Request!6Version 2.3.1
Leerzeichenänderungen ausblenden
Inline Nebeneinander
bin/Editor.css
+ 10
− 4
Zeige Datei @ 14d49ac6
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
.control-editor, .control-editor,
.control-editor-container { .control-editor-container {
float: left; float: left;
min-height: 300px;
height: 100%; height: 100%;
width: 100%; width: 100%;
} }
...@@ -33,8 +34,8 @@ ...@@ -33,8 +34,8 @@
background: #0069B4; background: #0069B4;
color: #FFFFFF; color: #FFFFFF;
box-shadow: none; box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
-webkit-box-shadow: none; -webkit-box-shadow: none;
} }
...@@ -50,8 +51,13 @@ ...@@ -50,8 +51,13 @@
text-decoration: inherit; text-decoration: inherit;
} }
div.cke_panel.cke_combopanel.cke_ltr { width: 300px !important; } div.cke_panel.cke_combopanel.cke_ltr {
span.cke_rcombo span.cke_styles a span span.cke_text { width: 150px; } width: 300px !important;
}
span.cke_rcombo span.cke_styles a span span.cke_text {
width: 150px;
}
.cke_notifications_area { .cke_notifications_area {
position: absolute; position: absolute;
......
locale.xml
+ 9
− 0
Zeige Datei @ 14d49ac6
...@@ -151,5 +151,14 @@ ...@@ -151,5 +151,14 @@
<de><![CDATA[Editor Baustein ändern]]></de> <de><![CDATA[Editor Baustein ändern]]></de>
<en><![CDATA[Change editor brick]]></en> <en><![CDATA[Change editor brick]]></en>
</locale> </locale>
<locale name="window.bricks.editor.selectBrick">
<de><![CDATA[Anderen Brick auswählen]]></de>
<en><![CDATA[Select other brick]]></en>
</locale>
<locale name="window.bricks.editor.editBrick">
<de><![CDATA[Brick editieren]]></de>
<en><![CDATA[Edit brick]]></en>
</locale>
</groups> </groups>
</locales> </locales>
plugins/quiqqer/qui-font-awesome/lang/en.js 0 → 100644
+ 3
− 0
Zeige Datei @ 14d49ac6
CKEDITOR.plugins.setLang('qui-font-awesome', 'en', {
button: 'Font-Awesome'
});
plugins/quiqqer/quiqqerBricks/plugin.js
+ 65
− 24
Zeige Datei @ 14d49ac6
(function () { (function () {
"use strict"; "use strict";
console.log('init quiqqer bricks');
// finds out which project are active // finds out which project are active
var getProjectData = function (Node, editor) { var getProjectData = function (Node, editor) {
var Panel, Site; var Panel, Site;
var project = ''; var project = '';
var lang = ''; var lang = '';
if (Node.closest('.qui-panel')) { if (Node.closest('.qui-panel')) {
Panel = window.QUI.Controls.getById( Panel = window.QUI.Controls.getById(
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
Site = Panel.getSite(); Site = Panel.getSite();
project = Site.getProject().getName(); project = Site.getProject().getName();
lang = Site.getProject().getLang(); lang = Site.getProject().getLang();
} }
} else { } else {
Node = editor.ui.contentsElement.$; Node = editor.ui.contentsElement.$;
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
Site = Panel.getSite(); Site = Panel.getSite();
project = Site.getProject().getName(); project = Site.getProject().getName();
lang = Site.getProject().getLang(); lang = Site.getProject().getLang();
} }
} }
} }
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
return; return;
} }
var brickId = Node.getAttribute('data-brickid'); var brickId = Node.getAttribute('data-brickid');
var projectData = getProjectData(Node, editor); var projectData = getProjectData(Node, editor);
require([ require([
...@@ -63,18 +63,30 @@ ...@@ -63,18 +63,30 @@
Win.getContent().set( Win.getContent().set(
'html', 'html',
'<label style="display: flex; width: 300px; margin: 2rem auto 0;">' + '<label style="display: flex; width: 350px; margin: 2rem auto 0;">' +
' <span style="padding: 0 10px 0 0; line-height: 30px;">Brick ID:</span>' + ' <span style="padding: 0 10px 0 0; line-height: 30px;">Brick ID:</span>' +
' <input style="flex-grow: 1" type="text" name="brickId" />' + ' <input style="flex-grow: 1" type="text" name="brickId" />' +
' <button class="qui-button">' + ' <button class="qui-button" name="select">' +
' <span class="fa fa-cubes"></span>' + ' <span class="fa fa-cubes"></span>' +
' </button>' + ' </button>' +
' <button class="qui-button" name="edit">' +
' <span class="fa fa-edit"></span>' +
' </button>' +
'</label>' '</label>'
); );
Win.getContent().getElement('input').set('value', brickId); Win.getContent().getElement('input').set('value', brickId);
Win.getContent().getElement('button[name="select"]').set(
'title',
QUILocale.get('quiqqer/ckeditor4', 'window.bricks.editor.selectBrick')
);
Win.getContent().getElement('button').addEvent('click', function () { Win.getContent().getElement('button[name="edit"]').set(
'title',
QUILocale.get('quiqqer/ckeditor4', 'window.bricks.editor.editBrick')
);
Win.getContent().getElement('button[name="select"]').addEvent('click', function () {
require([ require([
'package/quiqqer/bricks/bin/Controls/backend/BrickSelectWindow' 'package/quiqqer/bricks/bin/Controls/backend/BrickSelectWindow'
], function (BrickSelectWindow) { ], function (BrickSelectWindow) {
...@@ -94,6 +106,29 @@ ...@@ -94,6 +106,29 @@
}).open(); }).open();
}); });
}); });
Win.getContent().getElement('button[name="edit"]').addEvent('click', function () {
let brickId = Win.getContent().getElement('input').value;
if (brickId === '') {
return;
}
Win.close();
require([
'utils/Panels',
'package/quiqqer/bricks/bin/BrickEdit'
], function (PanelUtils, BrickPanel) {
PanelUtils.openPanelInTasks(
new BrickPanel({
id : brickId,
projectName: projectData.project,
projectLang: projectData.lang
})
);
});
});
}, },
onSubmit: function (Win) { onSubmit: function (Win) {
...@@ -118,7 +153,7 @@ ...@@ -118,7 +153,7 @@
// edit // edit
element.addEventListener('click', function (e) { element.addEventListener('click', function (e) {
var Target = e.target; var Target = e.target;
var Brick = Target; var Brick = Target;
if (!Brick.classList.contains('quiqqer_bricks_placeholder')) { if (!Brick.classList.contains('quiqqer_bricks_placeholder')) {
Brick = Target.closest('.quiqqer_bricks_placeholder'); Brick = Target.closest('.quiqqer_bricks_placeholder');
...@@ -143,8 +178,8 @@ ...@@ -143,8 +178,8 @@
// refresh placeholder display data // refresh placeholder display data
var refreshPlaceholderDisplay = function (element, editor) { var refreshPlaceholderDisplay = function (element, editor) {
var doc = editor.document.$; var doc = editor.document.$;
var Info = element.querySelector('.quiqqer_bricks_placeholder_info'); var Info = element.querySelector('.quiqqer_bricks_placeholder_info');
var Settings = element.querySelector('.quiqqer_bricks_placeholder_settings'); var Settings = element.querySelector('.quiqqer_bricks_placeholder_settings');
if (!Info) { if (!Info) {
...@@ -156,8 +191,8 @@ ...@@ -156,8 +191,8 @@
} }
if (!Settings) { if (!Settings) {
Settings = doc.createElement('div'); Settings = doc.createElement('div');
Settings.innerHTML = '<button name="delete">x</button>'; Settings.innerHTML = '<button name="delete">x</button>';
Settings.contentEditable = false; Settings.contentEditable = false;
Settings.classList.add('quiqqer_bricks_placeholder_settings'); Settings.classList.add('quiqqer_bricks_placeholder_settings');
...@@ -175,8 +210,8 @@ ...@@ -175,8 +210,8 @@
}; };
var setCustomEvents = function (evt) { var setCustomEvents = function (evt) {
var editor = evt.editor; var editor = evt.editor;
var doc = editor.document.$; var doc = editor.document.$;
var elements = doc.querySelectorAll('.quiqqer_bricks_placeholder'); var elements = doc.querySelectorAll('.quiqqer_bricks_placeholder');
for (var i = 0, len = elements.length; i < len; i++) { for (var i = 0, len = elements.length; i < len; i++) {
...@@ -187,9 +222,13 @@ ...@@ -187,9 +222,13 @@
// add ckeditor // add ckeditor
window.CKEDITOR.plugins.add('quiqqerBricks', { window.CKEDITOR.plugins.add('quiqqerBricks', {
icons: "icon", icons: "icon",
lang : ['en', 'de'], lang : [
'en',
'de'
],
onLoad: function () { onLoad: function () {
console.log('onload quiqqer bricks');
// Register styles for placeholder widget frame. // Register styles for placeholder widget frame.
window.CKEDITOR.addCss( window.CKEDITOR.addCss(
'.quiqqer_bricks_placeholder {' + '.quiqqer_bricks_placeholder {' +
...@@ -229,6 +268,8 @@ ...@@ -229,6 +268,8 @@
}, },
init: function (editor) { init: function (editor) {
console.log('on init quiqqer bricks');
var self = this; var self = this;
this.$Editor = editor; this.$Editor = editor;
...@@ -250,7 +291,7 @@ ...@@ -250,7 +291,7 @@
var brickId, textNode, PH; var brickId, textNode, PH;
for (var i = 0, len = placeholders.length; i < len; i++) { for (var i = 0, len = placeholders.length; i < len; i++) {
PH = placeholders[i]; PH = placeholders[i];
brickId = PH.get('data-brickid'); brickId = PH.get('data-brickid');
if (!brickId) { if (!brickId) {
...@@ -294,11 +335,11 @@ ...@@ -294,11 +335,11 @@
if ("id" in attributes) { if ("id" in attributes) {
return '<cke:object ' + return '<cke:object ' +
'contenteditable="false" ' + 'contenteditable="false" ' +
'data-cke-widget-wrapper="1" ' + 'data-cke-widget-wrapper="1" ' +
'class="quiqqer_bricks_placeholder cke_widget_wrapper cke_widget_inline" ' + 'class="quiqqer_bricks_placeholder cke_widget_wrapper cke_widget_inline" ' +
'data-brickid="' + attributes.id + '"' + 'data-brickid="' + attributes.id + '"' +
'></cke:object>'; '></cke:object>';
} }
return ""; return "";
...@@ -322,7 +363,7 @@ ...@@ -322,7 +363,7 @@
'package/quiqqer/bricks/bin/Controls/backend/BrickSelectWindow' 'package/quiqqer/bricks/bin/Controls/backend/BrickSelectWindow'
], function (BrickSelectWindow) { ], function (BrickSelectWindow) {
// get project, if editor is in panel // get project, if editor is in panel
var Node = editor.ui.contentsElement.$; var Node = editor.ui.contentsElement.$;
var projectData = getProjectData(Node, editor); var projectData = getProjectData(Node, editor);
new BrickSelectWindow({ new BrickSelectWindow({
...@@ -355,7 +396,7 @@ ...@@ -355,7 +396,7 @@
); );
var i, len, o; var i, len, o;
var doc = editor.document.$; var doc = editor.document.$;
var nodes = doc.body.querySelectorAll('div.quiqqer_bricks_placeholder'); var nodes = doc.body.querySelectorAll('div.quiqqer_bricks_placeholder');
for (i = 0, len = nodes.length; i < len; i++) { for (i = 0, len = nodes.length; i < len; i++) {
......
src/QUI/Ckeditor/EventHandler.php
+ 0
− 21
Zeige Datei @ 14d49ac6
...@@ -27,27 +27,6 @@ class EventHandler ...@@ -27,27 +27,6 @@ class EventHandler
} }
$PluginManager = new Manager(); $PluginManager = new Manager();
// ----- Begin tempfix -----
// This is a temporary fix for updating the systems
// there was a bug in the utils package which compromised the update process of the ckeditor, thus rendering the ckeditor useless
if (!file_exists(VAR_DIR . "package/quiqqer/ckeditor4/plugins/bin/image/dialogs/image.js")) {
$newFolder = VAR_DIR . "package/quiqqer/ckeditor4/plugins." . time() . ".bak";
rename(
VAR_DIR . "package/quiqqer/ckeditor4/plugins",
$newFolder
);
file_put_contents(
$newFolder . "/README.md",
"This directory was created as backup. If your ckeditor is working as intended you can delete this directory if you do not need it anymore"
);
}
// ----- End tempfix -----
$PluginManager->installPluginsFromSource(); $PluginManager->installPluginsFromSource();
} }
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren

PCSG & QUIQQER support and DEV System - GitLab