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

Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0

This commit is contained in:
fermin831 2016-05-27 14:08:43 +02:00
parent 13fd06dda1 9caeb1e7f8
commit 0ce116e2fc
1 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pandora_console/general/login_page.php
View File

@ -112,7 +112,32 @@ echo '<div id="login_in">';
html_print_input_hidden ($key, $value); html_print_input_hidden ($key, $value);
} }
} }
if ($config['auth'] == 'saml') {
echo '<div id="log_nick" class="login_nick" style="display: none;>';
html_print_image ("/images/usuario_login.png", false);
html_print_input_text_extended ("nick", '', "nick", '', '', '' , false,
'', '"id="nick_text" class="login login_user" placeholder="'.__('User').'"');
echo '</div>';
echo '<div id="log_pass" class="login_pass" style="display: none;>';
html_print_image ("/images/candado_login.png", false);
html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false,
'', 'id="pass_text" class="login login_password" placeholder="'.__('Password').'"', false, true);
echo '</div>';
echo '<div id="log_button" class="login_button" style="display: none;">';
html_print_submit_button(__("Login as admin"), "login_button", false, 'class="sub next_login"');
echo '</div>';
echo '<div style="padding-left: 50px !important">';
echo '<input type="button" id="input_saml" class="next_login" style="width: 150px;" value="Login as admin" onclick="show_normal_menu()">';
echo '<br><br>';
echo '<div class="saml_button">';
html_print_submit_button(__("Login with SAML"), "login_button_saml", false, 'class="next_login" style="width: 150px;');
echo '</div>';
echo '</div>';
}
else {
echo '<div class="login_nick">'; echo '<div class="login_nick">';
html_print_image ("/images/usuario_login.png", false); html_print_image ("/images/usuario_login.png", false);
html_print_input_text_extended ("nick", '', "nick", '', '', '' , false, html_print_input_text_extended ("nick", '', "nick", '', '', '' , false,
@ -124,13 +149,10 @@ echo '<div id="login_in">';
'', 'class="login login_password" placeholder="'.__('Password').'"', false, true); '', 'class="login login_password" placeholder="'.__('Password').'"', false, true);
echo '</div>'; echo '</div>';
echo '<div class="login_button">'; echo '<div class="login_button">';
if ($config['auth'] == 'saml') {
html_print_submit_button(__("Login with SAML"), "login_button_saml", false, 'class="sub login_boton"');
}
else {
html_print_submit_button(__("Login"), "login_button", false, 'class="sub next_login"'); html_print_submit_button(__("Login"), "login_button", false, 'class="sub next_login"');
}
echo '</div>'; echo '</div>';
}
break; break;
case 'logout': case 'logout':
echo '<h1 id="log_title">' . __('Logged out') . '</h1>'; echo '<h1 id="log_title">' . __('Logged out') . '</h1>';
@ -316,6 +338,14 @@ html_print_div(array('id' => 'modal_alert', 'hidden' => true));
?> ?>
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
/* <![CDATA[ */ /* <![CDATA[ */
function show_normal_menu() {
document.getElementById('input_saml').style.display = 'none';
document.getElementById('log_nick').style.display = 'block';
document.getElementById('log_pass').style.display = 'block';
document.getElementById('log_button').style.display = 'inline';
document.getElementById('nick_text').className = 'login login_user';
document.getElementById('pass_text').className = 'login login_password';
}
function modal_alert_critical() { function modal_alert_critical() {
$("#modal_alert").hide () $("#modal_alert").hide ()