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

Merge branch '1724-Aplicar-efecto-visual-a-pantalla-de-login-2' into 'develop'

Browse Source 
Add optional token animation and vissual effects in visual styles configuration view - #1724

See merge request artica/pandorafms!1232
This commit is contained in:
vgilc 2018-01-08 13:10:48 +01:00
commit bf6b5abe41
4 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/general/login_page.php
View File

@ -25,6 +25,24 @@ include_once($homedir . 'include/functions_ui.php');
include_once($homedir . 'include/functions.php'); include_once($homedir . 'include/functions.php');
include_once($homedir . 'include/functions_html.php'); include_once($homedir . 'include/functions_html.php');
if($config['visual_animation']){
echo
'<style>
@keyframes login_move {
from {margin-left: 10%;margin-right: 10%;opacity:0.1}
to {margin-left: 5%;margin-right: 5%;opacity:1}
}
div.container_login{
animation-name: login_move;
animation-duration: 3s;
}
</style>';
}
if (!isset($login_screen)) { if (!isset($login_screen)) {
$login_screen = 'login'; $login_screen = 'login';
} }

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

@ -282,6 +282,13 @@ $table_styles->data['autohidden'][0] = __('Autohidden menu');
$table_styles->data['autohidden'][1] = html_print_checkbox('autohidden_menu', $table_styles->data['autohidden'][1] = html_print_checkbox('autohidden_menu',
1, $config['autohidden_menu'], true); 1, $config['autohidden_menu'], true);
$table_styles->data[$row][0] = __('Visual effects and animation');
$table_styles->data[$row][1] = __('Yes') . '&nbsp;' .
html_print_radio_button ('visual_animation', 1, '', $config["visual_animation"], true) .
'&nbsp;&nbsp;';
$table_styles->data[$row][1] .= __('No') . '&nbsp;' .
html_print_radio_button ('visual_animation', 0, '', $config["visual_animation"], true);
echo "<fieldset>"; echo "<fieldset>";
echo "<legend>" . __('Style configuration') . "</legend>"; echo "<legend>" . __('Style configuration') . "</legend>";
html_print_table ($table_styles); html_print_table ($table_styles);

6
pandora_console/include/functions_config.php
View File

@ -555,6 +555,8 @@ function config_update_config () {
$error_update[] = __('Default icon in GIS'); $error_update[] = __('Default icon in GIS');
if (!config_update_value ('autohidden_menu', get_parameter('autohidden_menu'))) if (!config_update_value ('autohidden_menu', get_parameter('autohidden_menu')))
$error_update[] = __('Autohidden menu'); $error_update[] = __('Autohidden menu');
if (!config_update_value ('visual_animation', get_parameter('visual_animation')))
$error_update[] = __('visual_animation');
if (!config_update_value ('fixed_graph', get_parameter('fixed_graph'))) if (!config_update_value ('fixed_graph', get_parameter('fixed_graph')))
$error_update[] = __('Fixed graph'); $error_update[] = __('Fixed graph');
if (!config_update_value ('fixed_header', get_parameter('fixed_header'))) if (!config_update_value ('fixed_header', get_parameter('fixed_header')))
@ -1819,6 +1821,10 @@ function config_process_config () {
config_update_value ('autohidden_menu', 0); config_update_value ('autohidden_menu', 0);
} }
if (!isset($config['visual_animation'])) {
config_update_value ('visual_animation', 1);
}
if (!isset($config['networkmap_max_width'])) { if (!isset($config['networkmap_max_width'])) {
config_update_value ('networkmap_max_width', 900); config_update_value ('networkmap_max_width', 900);
} }

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

@ -3899,8 +3899,8 @@ li#li_margin_left{
div.container_login{ div.container_login{
margin-top: 10%; margin-top: 10%;
margin-left: 5%; margin-left: 5%;
margin-right: 5%; margin-right: 5%;
} }
@ -3928,16 +3928,7 @@ div.login_logo_icon img{
width: 150px; width: 150px;
} }
@keyframes login_move {
from {margin-left: 10%;margin-right: 10%;opacity:0.1}
to {margin-left: 5%;margin-right: 5%;opacity:1}
}
div.container_login{
animation-name: login_move;
animation-duration: 3s;
}
div.login_double_auth_code, div.login_double_auth_code,
div.login_nick, div.login_nick,
div.login_pass { div.login_pass {