diff options
| -rw-r--r-- | css/codeq.css | 11 | ||||
| -rw-r--r-- | index.html | 18 | ||||
| -rw-r--r-- | js/codeq/navigation.js | 2 |
3 files changed, 21 insertions, 10 deletions
diff --git a/css/codeq.css b/css/codeq.css index 33a4c2f..80522c9 100644 --- a/css/codeq.css +++ b/css/codeq.css @@ -105,10 +105,21 @@ button.navbar-toggle > span.glyphicon { margin: 0; } +/* misc */ form { margin-bottom: 0; } +div#disabled { + background-color: rgba(0, 0, 0, 0.7); + cursor: wait; + position: fixed; + left: 0; + right: 0; + top: 0; + bottom: 0; +} + /* modal screens*/ #screen_login, #screen_signup, #screen_change_pass, #screen_settings, #screen_upgrade_to_aai { padding: 15px 0; @@ -84,7 +84,7 @@ <li id="navigation-logout"><a href="#" tabindex="41" data-tkey="logout">Logout</a></li> <li id="navigation-profile"><a href="#" tabindex="42" data-tkey="profile">Profile</a></li> <li class="saml-login-hide divider" role="separator"></li> - <li class="saml-login-hide"><a href="#" tabindex="43" data-tkey="change_pass" id="change-password">Change password</a></li> + <li id="navigation-change-password" class="saml-login-hide"><a href="#" tabindex="43" data-tkey="change_pass">Change password</a></li> <li class="divider" role="separator"></li> <li id="navigation-about"><a href="#" tabindex="44" data-tkey="about">About</a></li> </ul> @@ -132,7 +132,7 @@ <input type="checkbox"> keep me logged-in </label> </div--> - <button type="submit" class="btn btn-primary btn-block" id="submit" data-tkey="signin_button">Sign in</button> + <button type="submit" class="btn btn-primary btn-block" data-tkey="signin_button">Sign in</button> <div class="login-failed" data-tkey="login_failed" style="display: none;">Login failed.</div> </form> </div> @@ -207,7 +207,7 @@ </div> <div class="text-center"> <button type="button" class="btn btn-default" id="exit_signup_btn" data-tkey="cancel">Cancel</button> - <button type="submit" class="btn btn-primary" id="btnSignUp" data-tkey="signup_button">Sign up</button> + <button type="submit" class="btn btn-primary" data-tkey="signup_button">Sign up</button> </div> </form> </div> @@ -248,7 +248,7 @@ </div> <div class="text-center"> <button type="button" class="btn btn-default" id="cancel_change_pass_button" data-tkey="cancel">Cancel</button> - <button type="submit" class="btn btn-primary" id="btnPasswdChange" data-tkey="change_password_button">Change password</button> + <button type="submit" class="btn btn-primary" data-tkey="change_password_button">Change password</button> </div> </form> </div> @@ -281,7 +281,7 @@ </div> <div class="text-center"> <button type="button" class="btn btn-default" id="btnUpgradeToAAINo" data-tkey="upgrade_to_aai_no_button">No, make new</button> - <button type="submit" class="btn btn-primary" id="btnUpgradeToAAIYes" data-tkey="upgrade_to_aai_yes_button">Yes, upgrade to AAI</button> + <button type="submit" class="btn btn-primary" data-tkey="upgrade_to_aai_yes_button">Yes, upgrade to AAI</button> </div> </form> </div> @@ -446,8 +446,8 @@ <div class="container" id="screen_profile" style="display: none;"> <h2 data-tkey="profile">Profile</h2> <div class="btn-group"> - <button type="button" class="btn btn-default saml-login-hide" data-tkey="change_pass" id="change_pass_profile">Change Password</button> - <button type="button" class="btn btn-default" id="btnProfileGoBack" data-tkey="go_back">Go back</button> + <button type="button" id="change_pass_profile" class="btn btn-default saml-login-hide" data-tkey="change_pass">Change Password</button> + <button type="button" id="btnProfileGoBack" class="btn btn-default" data-tkey="go_back">Go back</button> </div> <hr /> <div class="row"> @@ -507,7 +507,7 @@ </div> <div class="text-center"> <button type="button" class="btn btn-default" id="settings_cancel_btn" data-tkey="settings_cancel_btn">Close</button> - <button type="submit" class="btn btn-primary" id="settings_save_btn" data-tkey="save">Save</button> + <button type="submit" class="btn btn-primary" data-tkey="save">Save</button> </div> </form> </div> @@ -519,7 +519,7 @@ <!-- Covers the whole screen with a semi-transparent block, so no input events can be triggered below. Used as a wait screen; must be the last element in the DOM. It is active after load, javascript turns it off after initialization. --> - <div id="disabled" style="position: fixed; left: 0; right: 0; top: 0; bottom: 0; cursor: wait; background-color: rgba(0, 0, 0, 0.7);"></div> + <div id="disabled"></div> <!-- jQuery stuff --> <script src="js/jquery/jquery-1.11.3.js"></script> diff --git a/js/codeq/navigation.js b/js/codeq/navigation.js index 70b7fc5..60baa9b 100644 --- a/js/codeq/navigation.js +++ b/js/codeq/navigation.js @@ -202,7 +202,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ codeq.globalStateMachine.transition('about'); e.preventDefault();//prevent this since we'll trigger a page reload otherwise }); - $('#change-password').on('click', function(e){ + $('#navigation-change-password').on('click', function(e){ codeq.globalStateMachine.transition('changePassword'); e.preventDefault();//prevent this since we'll trigger a page reload otherwise }); |