diff options
| -rw-r--r-- | index.html | 28 | ||||
| -rw-r--r-- | js/codeq/aaiLogin.js | 2 | ||||
| -rw-r--r-- | js/codeq/login.js | 1 |
3 files changed, 4 insertions, 27 deletions
@@ -52,35 +52,11 @@ <li id="navigation-logout"><a href="#" data-tkey="logout">Logout</a></li> <li id="navigation-profile"><a href="#" data-tkey="profile">Profile</a></li> <li role="separator" class="divider"></li> - <li><a href="#" data-toggle="modal" data-target="#modalChangePassword" data-tkey="change_pass" id="change-password">Change password</a></li> + <li class="saml-login-hide"><a href="#" data-toggle="modal" data-target="#modalChangePassword" data-tkey="change_pass" id="change-password">Change password</a></li> </ul> </li> <li id="settings_dropdown_menu"> <!-- class="dropdown"--> <a href="" class="dropdown-toggle" data-toggle="dropdown" id="settingsTrigger" title="Settings, options..." aria-expanded="true"><span class="glyphicon glyphicon glyphicon-wrench" aria-hidden="true"></span></a> - <!--<a href="" class="dropdown-toggle" data-toggle="dropdown" id="settingsTrigger" title="Settings, options..." aria-expanded="true"><span class="glyphicon glyphicon glyphicon-wrench" aria-hidden="true"></span></a> - <div class="dropdown-menu" style="background-color: #fff"> - <form class="form col-sm-12"> - <div class="form-group"> - <span class="small" data-tkey="language">Language</span> - <a class="text-muted" data-container="body" data-toggle="popover" data-trigger="hover" data-placement="left" data-html="true" data-tkey-data-content="ui_language_title" data-content="Select the UI language." data-original-title="" title=""><i class="glyphicon glyphicon-question-sign"></i></a><br> - <select class="form-control" id="gui_lang_select"> - <option value="sl">Slovensko</option> - <option value="en">English</option> - </select> - </div> - <div class="form-group"> - <span class="small" data-tkey="robot_address">Robot’s address</span> - <a class="text-muted" data-container="body" data-toggle="popover" data-trigger="hover" data-placement="left" data-html="true" data-tkey-data-content="robot_address_title" data-content="Set the robot's IPv4 or IPv6 address." data-original-title="" title=""><i class="glyphicon glyphicon-question-sign"></i></a><br> - <input type="text" class="form-control" id="robot_address_input" data-tkey-placeholder="robot_address_placeholder" placeholder="IP address" pattern="(((^|\.)((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]?\d))){4}$)|(((^|:)([0-9a-fA-F]{0,4})){1,8}$)" data-tkey-title="robot_address_title" title="Set the robot's IPv4 or IPv6 address."> - </div> - <div class="form-group"> - <div class="text-right"> - <button type="button" class="btn btn-default" data-target="settingsDropdown" data-toggle="dropdown" id="settings_cancel_btn">Close</button> - <button type="button" class="btn btn-primary" data-target="settingsDropdown" data-toggle="dropdown" id="settings_save_btn">Save</button> - </div> - </div> - </form> - </div>--> </li> </ul> </div><!--/.nav-collapse --> @@ -369,7 +345,7 @@ <h2> <span data-tkey="profile">Profile</span> <div class="btn-group pull-right"> - <a href="" data-toggle="modal" data-target="#modalChangePassword" class="btn btn-default" data-tkey="change_pass" id="change_pass_profile">Change Password</a> + <a href="" data-toggle="modal" data-target="#modalChangePassword" class="btn btn-default saml-login-hide" data-tkey="change_pass" id="change_pass_profile">Change Password</a> <a href="#" class="btn btn-default" id="btnProfileGoBack" onclick="history.back()" data-tkey="go_back">Go back</a> </div> </h2> diff --git a/js/codeq/aaiLogin.js b/js/codeq/aaiLogin.js index 2e49138..7e48486 100644 --- a/js/codeq/aaiLogin.js +++ b/js/codeq/aaiLogin.js @@ -14,7 +14,7 @@ codeq.globalStateMachine.register('aailogin',{ 'enter': function(){ jqDisabledOverlay.css('display', ''); - + $('.saml-login-hide').css('display','none');//hide the change password buttons, in the case we go back to the normal login page (cancel or error) they will be reset to being visible when we enter the normal login state jqNavigationHomeBtn.off('click');//remove the click listener of this element here jqNavBarRight.css('display','none');//hide settings etc. diff --git a/js/codeq/login.js b/js/codeq/login.js index 9c71547..61f248d 100644 --- a/js/codeq/login.js +++ b/js/codeq/login.js @@ -41,6 +41,7 @@ }; var loginFun = function(){ + $('.saml-login-hide').css('display','');//if we login the normal way we want to show the change password buttons. if we enter the saml login they will be hidden $('#disabled').css('display', ''); $('#disabled').css('cursor', 'wait'); codeq.comms.connect() |