may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
Nejc Kovač 2022-08-22 12:50:32 +02:00
commit fd8a28a2b5
6 changed files with 1657 additions and 1486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/survey/script/js-lang.php
View File

@ -205,6 +205,7 @@ lang('for');
lang('alternative_email_delete');
lang('srv_anketa_deleted_restore_confirm');
lang('srv_data_deleted_restore_confirm');
lang('more2');
//LOKACIJA

38
admin/survey/script/script.js
View File

@ -1504,7 +1504,20 @@ function normalmode_spremenljivka (spremenljivka) {
// prikaze editor za ne-spremenljivko (za karkoli druzga pac)
function create_editor (id, focus) {
CKEDITOR.replace(id);
editor = CKEDITOR.replace(id);
// Dodamo gumb vec
editor.addCommand("advanced_editor_show", {
exec: function(edt) {
advanced_editor_show();
}
});
editor.ui.addButton('More', {
label: lang['more2'],
command: 'advanced_editor_show',
name: "More",
});
//namestitev editorja za tekst pri obveščanju
if(gup('a') == 'alert' && focus == false){
@ -1644,9 +1657,20 @@ function remove_editor (id) {
// prikaze editor za spremenljivko (definiran mora biti textarea za idjem naslov_$spremenljivka
function editor_display (spremenljivka) {
//if (editor_init != true) {
CKEDITOR.replace( 'naslov_'+spremenljivka );
editor = CKEDITOR.replace( 'naslov_'+spremenljivka );
// Dodamo gumb vec
editor.addCommand("advanced_editor_show", {
exec: function(edt) {
advanced_editor_show();
}
});
editor.ui.addButton('More', {
label: lang['more2'],
command: 'advanced_editor_show',
name: "More",
});
//v kolikor je default vrednost potem naredimo selectAll
var def = $('#naslov_'+spremenljivka).attr("default");
@ -1655,24 +1679,18 @@ function editor_display (spremenljivka) {
this.execCommand('selectAll');
});
}
// editor_init = true;
//}
}
function editor_display_hotspot (vre_id) {
//if (editor_init != true) {
CKEDITOR.replace( 'hotspot_image_'+vre_id, {toolbar: 'HotSpot', width: 300, removePlugins: 'elementspath'}); //izberi config toolbar HotSpot, sirina naj bo 300px, odstrani spodnji tag, kjer po default-u so oznake html (body, p, ipd.)
//v kolikor je default vrednost potem naredimo selectAll
var def = $('#hotspot_image_'+vre_id).attr("default");
//if( def == 1) {
CKEDITOR.instances['hotspot_image_' + vre_id].on('focus', function () {
this.execCommand('selectAll');
});
//}
// editor_init = true;
//}
}
// odstrani editor (treba preden se odstrani html)

8
admin/survey/script/vprasanjeInline.js
View File

@ -954,6 +954,14 @@ function inline_load_editor (_this) {
}
}
// Prikazemo / skrijemo napredne gumbe za editor
function advanced_editor_show(){
/*$('#cke_43, #cke_47, #cke_51').show();
$('#cke_41').hide();*/
$('.cke_toolbar:nth-child(10)').hide();
$('.cke_toolbar:nth-child(12), .cke_toolbar:nth-child(13), .cke_toolbar:nth-child(14)').show();
}
function inline_load_editor_hotspot (_this, vre_id) {
$(_this).css('display', 'none');

1
editors/ckeditor_4_4/config.js
View File

@ -33,6 +33,7 @@ CKEDITOR.editorConfig = function (config) {
{name: 'align', items: ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock']},
{name: 'list', items: ['NumberedList', 'BulletedList']},
{name: 'links', items: ['Link', 'Unlink', 'Image']},
{name: 'more', items: ['More']},
'/',
{name: 'other', items: ['Scayt', 'Strike', 'SpecialChar']},
{name: 'vec', items:['Styles', 'Format', 'Outdent', 'Indent', 'HorizontalRule']},

3019
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

48
resources/sass/admin_new/components/ckeditor/ckeditor.scss
View File

@ -27,3 +27,51 @@ div.button_holder.editor_button_holder{
.cke_dialog table tr th{
border-bottom: 0 !important;
}
.cke_toolbox span:nth-child(1),
.cke_toolbox span:nth-child(2),
.cke_toolbox span:nth-child(3),
.cke_toolbox span:nth-child(4),
.cke_toolbox span:nth-child(5),
.cke_toolbox span:nth-child(6),
.cke_toolbox span:nth-child(7),
.cke_toolbox span:nth-child(8),
.cke_toolbox span:nth-child(9){
}
.cke_toolbox span:nth-child(10){
.cke_button_icon{
display: none;
}
.cke_button_label{
display: inline;
padding-left: 0;
}
}
//.cke_toolbox span:nth-child(11),
.cke_toolbox span:nth-child(12),
.cke_toolbox span:nth-child(13),
.cke_toolbox span:nth-child(14){
display: none;
}
/*
#cke_43,
#cke_47,
#cke_51{
display: none;
}
// Gumb vec
#cke_42{
.cke_button_icon{
display: none;
}
.cke_button_label{
display: inline;
padding-left: 0;
}
}*/