tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix visual errors

This commit is contained in:
enriquecd 2016-09-29 15:02:12 +02:00
parent 4345282d25
commit 78f5d79638
6 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/general/alert_enterprise.php
View File

@ -16,8 +16,16 @@ $tipo = $_GET['message'];
echo "
<div class='modalheader'>
<span class='modalheadertext'>
Community version</span>
<span class='modalheadertext'>";
if(!enterprise_installed()){
echo "Community version";
}
else{
echo "Enterprise version";
}
echo "</span>
<img class='modalclosex cerrar' src='".$config['homeurl']."images/icono_cerrar.png'>
</div>

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

@ -163,17 +163,39 @@ $table_styles->data[$row][1] .= "&nbsp;" .
$row++;
$table_styles->data[$row][0] = __('Custom logo') . ui_print_help_icon("custom_logo", true);
if(enterprise_installed()){
$table_styles->data[$row][1] = html_print_select(
list_files('enterprise/images/custom_logo', "png", 1, 0), 'custom_logo',
$config["custom_logo"], '', '', '',true,false,true,'',$open,'width:240px');
}
else{
$table_styles->data[$row][1] = html_print_select(
list_files('images/custom_logo', "png", 1, 0), 'custom_logo',
$config["custom_logo"], '', '', '',true,false,true,'',$open,'width:240px');
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
}
$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 in login') . ui_print_help_icon("custom_logo", true);
$table_styles->data[$row][0] = __('Custom logo in login') . ui_print_help_icon("custom_logo_login", true);
if(enterprise_installed()){
$table_styles->data[$row][1] = html_print_select(
list_files('images/custom_logo_login', "png", 1, 0), 'custom_logo_login',
list_files('enterprise/images/custom_logo_login', "png", 1, 0), 'custom_logo_login',
$config["custom_logo_login"], '', '', '',true,false,true,'',$open,'width:240px');
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
}
else{
$table_styles->data[$row][1] = html_print_select(
list_files('images/custom_logo_login', "png", 1, 0), 'custom_logo_login',
$config["custom_logo_login"], '', '', '',true,false,true,'',$open,'width:240px');
}
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_login_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
$row++;

23
pandora_console/include/functions_config.php
View File

@ -462,22 +462,12 @@ function config_update_config () {
if (!config_update_value ('flash_charts', (bool) get_parameter ('flash_charts')))
$error_update[] = __('Interactive charts');
if(!enterprise_installed()){
$open=true;
}
if(!$open){
if (!config_update_value ('custom_logo', (string) get_parameter ('custom_logo')))
$error_update[] = __('Custom logo');
if (!config_update_value ('custom_logo_login', (string) get_parameter ('custom_logo_login')))
$error_update[] = __('Custom logo login');
}
if (!config_update_value ('login_background', (string) get_parameter ('login_background')))
@ -1053,19 +1043,16 @@ function config_process_config () {
config_update_value ('fixed_menu', false);
}
if(!$open){
if (!isset ($config["custom_logo"])) {
config_update_value ('custom_logo', 'pandora_logo_head.png');
config_update_value ('custom_logo', 'pandora_logo_head_3.png');
}
if (!isset ($config["custom_logo_login"])) {
config_update_value ('custom_logo_login', 'pandora_logo.png');
config_update_value ('custom_logo_login', 'login_logo.png');
}
}
if (!isset ($config['history_db_enabled'])) {
config_update_value ( 'history_db_enabled', false);
}

2
pandora_console/include/functions_html.php
View File

@ -543,7 +543,7 @@ function html_print_select ($fields, $name, $selected = '', $script = '',
}
$output .= "</select>";
if ($modal){
if ($modal && !enterprise_installed()){
$output .= "
<div id='".$message."' class='publienterprise' title='Community version' style='display:inline;position:relative;top:10px;left:0px;margin-top: -2px !important; margin-left: 2px !important;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
";

2
pandora_console/include/functions_ui.php
View File

@ -2417,7 +2417,7 @@ function ui_print_page_header ($title, $icon = "", $return = false, $help = "",
$buffer .= '<ul class="mn"><li class="' . $type . '">&nbsp;' . '&nbsp; ';
$buffer .= '<span style="margin-right:10px;">' .
ui_print_truncate_text($title, 46);
if ($modal){
if ($modal && !enterprise_installed()){
$buffer .= "
<div id='".$message."' class='publienterprise' title='Community version' style='float: right;margin-top: -2px !important; margin-left: 2px !important;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
";

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

@ -3539,10 +3539,6 @@ color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;
}
.textodialogo{
max-width:60%;
width:60%;
min-width:60%;
float:left;
margin-left: 0px;
color:#333;
padding:20px;