tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop

Browse Source
This commit is contained in:
vanessa gil 2017-03-14 16:46:57 +01:00
commit 2ccde70442
9 changed files with 19146 additions and 28985 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -187,7 +187,7 @@ function update_button_palette_callback() {
case 'background':
if(values['width'] < 1024 || values['height'] < 768){
alert('Please min size recommend is 1024x768');
alert('Min allowed size is 1024x768');
return false;
}
@ -414,11 +414,11 @@ function update_button_palette_callback() {
$('#' + idItem + ' table').remove();
$('#' + idItem).append(tempoimg);
$("#" + idItem + ' table').css('height','');
$("#" + idItem + ' table').css('width','100%');
$("#" + idItem + ' span').css('width','100%');
$("#" + idItem + ' table').css('width','70');
$("#" + idItem + ' span').css('width','70');
$("#" + idItem + ' img').css('margin-top','');
//if(parseInt($("#" + idItem).css('width'))-parseInt($("#" + idItem + " img").css('width'))/2 == 0 || values['height'] == 0 || values['width'] == 0){
$("#" + idItem + ' img').css('margin-left',(parseInt($("#" + idItem).css('width'))/2)-(parseInt($("#" + idItem + " img").css('width'))/2)+'px');
//$("#" + idItem + ' img').css('margin-left',(parseInt($("#" + idItem).css('width'))/2)-(parseInt($("#" + idItem + " img").css('width'))/2)+'px');
//}
//else{
//$("#" + idItem + ' img').css('margin-left','');
@ -433,15 +433,15 @@ function update_button_palette_callback() {
$('#' + idItem + ' img').remove();
$('#' + idItem).append(tempoimg);
$("#" + idItem + ' table').css('height','');
$("#" + idItem + ' table').css('width','100%');
$("#" + idItem + ' span').css('width','100%');
$("#" + idItem + ' table').css('width','70');
$("#" + idItem + ' span').css('width','70');
$("#" + idItem + ' img').css('margin-top','');
//if(parseInt($("#" + idItem).css('width'))-parseInt($("#" + idItem + " img").css('width'))/2 == 0 || values['height'] == 0 || values['width'] == 0){
//$("#" + idItem + ' img').css('margin-left','');
//}
//else{
$("#" + idItem + ' img').css('margin-left',(parseInt($("#" + idItem).css('width'))/2)-(parseInt($("#" + idItem + " img").css('width'))/2)+'px');
//$("#" + idItem + ' img').css('margin-left',(parseInt($("#" + idItem).css('width'))/2)-(parseInt($("#" + idItem + " img").css('width'))/2)+'px');
//}
$("#" + idItem + ' > p').remove();
}
@ -1464,7 +1464,7 @@ function set_static_graph_status(idElement, image, status) {
$('#'+idElement+ ' img').css('margin-top', parseInt($('#'+idElement).css('height'))/2 - parseInt($('#'+idElement+ ' img').css('height'))/2);
}
else{
$('#'+idElement+ ' img').css('margin-left',parseInt($('#'+idElement).css('width'))/2 - parseInt($('#'+idElement+ ' img').css('width'))/2);
$('#'+idElement+ ' img').css('margin-left',parseInt($('#'+idElement).css('width'))/2 - parseInt($('#'+idElement+ ' img').css('width'))/2);
}
@ -1990,19 +1990,19 @@ function createItem(type, values, id_data) {
.attr('value', -1)
.attr('name', 'status_' + id_data);
if(values['label_position'] == 'up'){
item
.append('<table><tr><td></td></tr><tr><td><span id="text_'+id_data+'" class="text">'+values['label']+'</span></td></tr><tr><td></td></tr></table>')
.append($image)
.append($image)
.append($input);
if(values['label_position'] == 'up'){
item
.append('<table style="width:70px"><tr><td></td></tr><tr><td><span id="text_'+id_data+'" class="text">'+values['label']+'</span></td></tr><tr><td></td></tr></table>')
.append($image)
.append($image)
.append($input);
}
else if(values['label_position'] == 'down'){
item
.append($image)
.append($image)
.append('<table><tr><td></td></tr><tr><td><span id="text_'+id_data+'" class="text">'+values['label']+'</span></td></tr><tr><td></td></tr></table>')
.append('<table style="width:70px"><tr><td></td></tr><tr><td><span id="text_'+id_data+'" class="text">'+values['label']+'</span></td></tr><tr><td></td></tr></table>')
.append($input);
}
else if(values['label_position'] == 'left'){

5
pandora_console/godmode/reporting/visual_console_builder.editor.php
View File

@ -131,7 +131,7 @@ $backgroundSizes = getimagesize(
html_print_input_hidden('background_original_width', $backgroundSizes[0]);
html_print_input_hidden('background_original_height', $backgroundSizes[1]);
html_print_input_hidden('id_visual_console', $visualConsole['id']);
html_print_input_hidden('message_size', __('Please min size recommend is 1024x768'));
html_print_input_hidden('message_size', __('Min allowed size is 1024x768'));
// Loading dialog
@ -240,7 +240,6 @@ ui_require_javascript_file ('encode_decode_base64');
else{
$('#period_row').css('display','');
}
})
});
</script>

2
pandora_console/godmode/setup/setup_visuals.php
View File

@ -204,7 +204,7 @@ else{
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
$row++;
$table_styles->data[$row][0] = __('Custom logo (login)') . ui_print_help_icon("custom_logo_login", true);
$table_styles->data[$row][0] = __('Custom logo (login)') . ui_print_help_icon("custom_logo", true);
if(enterprise_installed()) {
$table_styles->data[$row][1] = html_print_select(

2
pandora_console/include/ajax/rolling_release.ajax.php
View File

@ -51,7 +51,7 @@ if (is_ajax ()) {
else {
if (file_exists($dir) && is_dir($dir)) {
if (is_readable($dir)) {
if ($number >= $config['MR'] + 1) {
if ($number > $config['MR'] + 1) {
$message = "bad_mr_filename";
echo $message;

2
pandora_console/include/functions_config.php
View File

@ -301,7 +301,7 @@ function config_update_config () {
if (!config_update_value ('ad_start_tls', get_parameter ('ad_start_tls')))
$error_update[] = __('Start TLS');
if (!config_update_value ('ad_advanced_config', get_parameter ('ad_advanced_config')))
$error_update[] = __('Advance Config AD');
$error_update[] = __('Advanced Config AD');
if (!config_update_value ('ad_domain', get_parameter ('ad_domain')))
$error_update[] = __('Domain');
if (!config_update_value ('ad_adv_perms', get_parameter ('ad_adv_perms')))

2
pandora_console/include/functions_update_manager.php
View File

@ -343,7 +343,7 @@ function update_manager_check_online_free_packages ($is_ajax=true) {
echo "<p><b>There is a new version:</b> " . $result[0]['version'] . "</p>";
echo "<a href='javascript: update_last_package(\"" . base64_encode($result[0]["file_name"]) .
"\", \"" . $result[0]['version'] ."\");'>" .
__("Update to the last version") . "</a>";
__("Update to the next version") . "</a>";
}
else {
echo __("There is no update available.");

1509
pandora_console/include/javascript/tiny_mce/themes/advanced/editor_template.js vendored
View File

File diff suppressed because one or more lines are too long

46575
pandora_console/include/languages/index.pot
View File

File diff suppressed because it is too large Load Diff

4
pandora_console/include/styles/pandora.css
View File

@ -2441,11 +2441,11 @@ span#plugin_description {
font-size: 8pt !important;
line-height: 8pt;
}
.visual_font_size_10pt, .visual_font_size_10pt > em , .visual_font_size_10pt > strong, .visual_font_size_10pt > strong > em, .visual_font_size_10pt > em > strong, .visual_font_size_10pt em span, .visual_font_size_10pt span em {
.visual_font_size_10pt, .visual_font_size_10pt > em, .visual_font_size_10pt > strong, .visual_font_size_10pt > strong > span , .visual_font_size_10pt > span, .visual_font_size_10pt > strong > em, .visual_font_size_10pt > em > strong, .visual_font_size_10pt em span, .visual_font_size_10pt span em {
font-size: 10pt !important;
line-height: 10pt;
}
.visual_font_size_12pt, .visual_font_size_12pt > em , .visual_font_size_12pt > strong, .visual_font_size_12pt > strong > em, .visual_font_size_12pt > em > strong, .visual_font_size_12pt em span, .visual_font_size_12pt span em {
.visual_font_size_12pt, .visual_font_size_12pt > em, .visual_font_size_12pt > strong, .visual_font_size_12pt > strong > span , .visual_font_size_12pt > span, .visual_font_size_12pt > strong > em, .visual_font_size_12pt > em > strong, .visual_font_size_12pt em span, .visual_font_size_12pt span em {
font-size: 12pt !important;
line-height: 12pt;
}