mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-31 01:35:36 +02:00
Merge branch 'ent-9321-bugs-en-consolas-visuales' into 'develop'
fixed show modal label VC in list item pandora_enterprise#9321 pandora_enterprise#9321 See merge request artica/pandorafms!5036
This commit is contained in:
commit
661c77e107
@ -833,23 +833,21 @@ ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
|
|||||||
|
|
||||||
var added_config = {
|
var added_config = {
|
||||||
"selector": "#tinyMCE_editor",
|
"selector": "#tinyMCE_editor",
|
||||||
"elements": "text-label",
|
"elements": "tinyMCE_editor",
|
||||||
"plugins": "noneditable",
|
"plugins": "noneditable",
|
||||||
"theme_advanced_buttons1":
|
"theme_advanced_buttons1": "bold,italic,|,justifyleft,justifycenter,justifyright,|,undo,redo,|,image,link,|,fontselect,|,forecolor,fontsizeselect,|,code",
|
||||||
"bold,italic,|,justifyleft,justifycenter,justifyright,|,undo,redo,|,image,link,|,fontselect,|,forecolor,fontsizeselect,|,code",
|
|
||||||
"valid_children": "+body[style]",
|
"valid_children": "+body[style]",
|
||||||
"theme_advanced_font_sizes": "true",
|
"theme_advanced_font_sizes": "true",
|
||||||
"content_css":
|
"content_css": <?php echo '"'.ui_get_full_url('include/styles/pandora.css', false, false, false).'"'; ?>,
|
||||||
<?php echo '"'.ui_get_full_url('include/styles/pandora.css', false, false, false).'"'; ?>,
|
|
||||||
"editor_deselector": "noselected",
|
"editor_deselector": "noselected",
|
||||||
"inline_styles": true,
|
"inline_styles": true,
|
||||||
"nowrap": true,
|
"nowrap": true,
|
||||||
"width": "400",
|
"width": "400",
|
||||||
"height": "200",
|
"height": "200",
|
||||||
}
|
"body_class": "tinyMCEBody",
|
||||||
|
}
|
||||||
defineTinyMCE(added_config);
|
|
||||||
|
|
||||||
|
defineTinyMCE(added_config);
|
||||||
$("#dialog_label_editor").hide ()
|
$("#dialog_label_editor").hide ()
|
||||||
.dialog ({
|
.dialog ({
|
||||||
title: "<?php echo __('Edit label'); ?>",
|
title: "<?php echo __('Edit label'); ?>",
|
||||||
@ -860,26 +858,22 @@ ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
|
|||||||
opacity: 0.5,
|
opacity: 0.5,
|
||||||
background: "black"
|
background: "black"
|
||||||
},
|
},
|
||||||
width: 450,
|
width: 530,
|
||||||
height: 300,
|
height: 300,
|
||||||
autoOpen: false,
|
autoOpen: false,
|
||||||
beforeClose: function() {
|
beforeClose: function() {
|
||||||
var id_layout_data = $("#active_id_layout_data").val();
|
var id_layout_data = $("#active_id_layout_data").val();
|
||||||
var label = tinyMCE.activeEditor.getContent();
|
var label = tinyMCE.activeEditor.getContent();
|
||||||
|
|
||||||
$("#hidden-label_" + id_layout_data).val(label);
|
$("#hidden-label_" + id_layout_data).val(label);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
|
||||||
|
|
||||||
var idText = $("#ip_text").html();
|
var idText = $("#ip_text").html();
|
||||||
|
});
|
||||||
|
|
||||||
function show_dialog_label_editor(id_layout_data) {
|
function show_dialog_label_editor(id_layout_data) {
|
||||||
var label = $("#hidden-label_" + id_layout_data).val();
|
var label = $("#hidden-label_" + id_layout_data).val();
|
||||||
|
|
||||||
$("#active_id_layout_data").val(id_layout_data);
|
$("#active_id_layout_data").val(id_layout_data);
|
||||||
|
|
||||||
$("#tinyMCE_editor").val(label);
|
|
||||||
tinyMCE.activeEditor.setContent(label);
|
tinyMCE.activeEditor.setContent(label);
|
||||||
$("#dialog_label_editor").dialog("open");
|
$("#dialog_label_editor").dialog("open");
|
||||||
}
|
}
|
||||||
@ -887,7 +881,6 @@ ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
|
|||||||
function toggle_checkbox_multiple_delete() {
|
function toggle_checkbox_multiple_delete() {
|
||||||
checked_head_multiple = $("input[name='head_multiple_delete']")
|
checked_head_multiple = $("input[name='head_multiple_delete']")
|
||||||
.is(":checked");
|
.is(":checked");
|
||||||
|
|
||||||
$("input[name='multiple_delete_items']")
|
$("input[name='multiple_delete_items']")
|
||||||
.prop("checked", checked_head_multiple);
|
.prop("checked", checked_head_multiple);
|
||||||
}
|
}
|
||||||
@ -900,7 +893,6 @@ ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
$("input[name='id_item_json']").val(JSON.stringify(delete_items));
|
$("input[name='id_item_json']").val(JSON.stringify(delete_items));
|
||||||
$("#form_multiple_delete").submit();
|
$("#form_multiple_delete").submit();
|
||||||
}
|
}
|
||||||
|
@ -201,7 +201,7 @@ ol.steps li.visited a {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* White text */
|
/* White text */
|
||||||
a,
|
a:not(.visual-console-item),
|
||||||
label,
|
label,
|
||||||
#menu_tab_left li a,
|
#menu_tab_left li a,
|
||||||
#menu_tab_left li span,
|
#menu_tab_left li span,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user