accurator/commit
login modal variable name changes
| author | Cristina-Iulia Bucur |
|---|---|
| Thu Nov 19 13:00:34 2015 +0100 | |
| committer | Cristina-Iulia Bucur |
| Thu Nov 19 13:00:34 2015 +0100 | |
| commit | cbb330f3dec932afef393eba5189769dbf14c3a8 |
| tree | 2c4af491c6e72a0ae1bf88261c4397734fa18af4 |
| parent | 84d7eb9fd88a63e05ef4cd5e807fa35edf149ebe |
Diff style: patch stat
diff --git a/lib/accurator/annotate_page.pl b/lib/accurator/annotate_page.pl index aafd11f..48c1ebf 100644 --- a/lib/accurator/annotate_page.pl +++ b/lib/accurator/annotate_page.pl @@ -149,32 +149,32 @@ metadata --> login_modal --> html({|html|| <!-- Login modal --> - <div class="modal fade" id="modalLogin"> + <div class="modal fade" id="loginDivLogin"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" id="mdlBtnClose">×</button> - <h4 id="mdlTxtTitle"> + <button type="button" class="close" id="loginBtnClose">×</button> + <h4 id="loginHdrTitle"> </h4> </div> <div class="modal-body"> <form role="form"> <div class="form-group"> - <label id="mdlFrmUsername" for="inputUsername"> + <label id="loginLblUsername" for="loginInpUsername"> </label> - <input type="text" class="form-control" id="inputUsername"> + <input type="text" class="form-control" id="loginInpUsername"> </div> <div class="form-group"> - <label id="mdlFrmPassword" for="password"> + <label id="loginLblPassword" for="password"> </label> - <input type="password" class="form-control" id="inputPassword"> + <input type="password" class="form-control" id="loginInpPassword"> </div> - <p class="text-warning" id="mdlLblLogin"> + <p class="text-warning" id="loginTxtWarning"> </p> </form> </div> <div class="modal-footer"> - <button class="btn btn-primary" id="mdlBtnLogin"> + <button class="btn btn-primary" id="loginBtnLogin"> </button> </div> </div> diff --git a/rdf/ui/labels.ttl b/rdf/ui/labels.ttl index 7bab2c6..92683b1 100644 --- a/rdf/ui/labels.ttl +++ b/rdf/ui/labels.ttl @@ -151,9 +151,9 @@ aui:registerModal a auis:UI ; dcterms:title "Accurator register UI"@en ; aui:mdlTitleRegister "Create your Accurator account"@en ; aui:mdlFrmFullNameRegister "Full name"@en ; - aui:mdlFrmUsernameRegister "Username"@en ; - aui:mdlFrmPasswordRegister "Password"@en ; - aui:mdlFrmPasswordRepeatRegister "Confirm your password"@en ; + aui:loginLblUsernameRegister "Username"@en ; + aui:loginLblPasswordRegister "Password"@en ; + aui:loginLblPasswordRepeatRegister "Confirm your password"@en ; aui:mdlBtnRegister "Register"@en ; aui:lblRegistrationFailed "Registration failed, please fill in all fields."@en ; aui:lblUserTaken "Username already exists."@en ; @@ -163,9 +163,9 @@ aui:registerModal a auis:UI ; aui:mdlTitleRegister a auis:UILabel . aui:mdlFrmFullNameRegister a auis:UILabel . -aui:mdlFrmUsernameRegister a auis:UILabel . -aui:mdlFrmPasswordRegister a auis:UILabel . -aui:mdlFrmPasswordRepeatRegister a auis:UILabel . +aui:loginLblUsernameRegister a auis:UILabel . +aui:loginLblPasswordRegister a auis:UILabel . +aui:loginLblPasswordRepeatRegister a auis:UILabel . aui:mdlBtnRegister a auis:UILabel . aui:lblRegistrationFailed a auis:UILabel . aui:lblUserTaken a auis:UILabel . @@ -177,17 +177,17 @@ aui:lblServerError a auis:UILabel . ##### Login Modal ##### aui:loginModal a auis:UI ; - aui:mdlTxtTitle "Log in"@en ; - aui:mdlFrmUsername "Username"@en ; - aui:mdlFrmPassword "Password"@en ; - aui:mdlBtnLogin "Log in"@en ; + aui:loginHdrTitle "Log in"@en ; + aui:loginLblUsername "Username"@en ; + aui:loginLblPassword "Password"@en ; + aui:loginBtnLogin "Log in"@en ; aui:loginWarning "Log in unsuccessful"@en ; aui:loginIncomplete "Please add both your username and password"@en . -aui:mdlTxtTitle a auis:UILabel . -aui:mdlFrmUsername a auis:UILabel . -aui:mdlFrmPassword a auis:UILabel . -aui:mdlBtnLogin a auis:UILabel . +aui:loginHdrTitle a auis:UILabel . +aui:loginLblUsername a auis:UILabel . +aui:loginLblPassword a auis:UILabel . +aui:loginBtnLogin a auis:UILabel . aui:loginWarning a auis:UILabel . aui:loginIncomplete a auis:UILabel . diff --git a/rdf/ui/labels_nl.ttl b/rdf/ui/labels_nl.ttl index 8c02e1b..956f0dc 100644 --- a/rdf/ui/labels_nl.ttl +++ b/rdf/ui/labels_nl.ttl @@ -94,9 +94,9 @@ aui:end a auis:UI ; aui:registerModal a auis:UI ; aui:mdlTitleRegister "Maak uw Accurator-account"@nl ; aui:mdlFrmFullNameRegister "Volledige naam"@nl ; - aui:mdlFrmUsernameRegister "Kies een gebruikersnaam"@nl ; - aui:mdlFrmPasswordRegister "Wachtwoord"@nl ; - aui:mdlFrmPasswordRepeatRegister "Bevestig uw wachtwoord"@nl ; + aui:loginLblUsernameRegister "Kies een gebruikersnaam"@nl ; + aui:loginLblPasswordRegister "Wachtwoord"@nl ; + aui:loginLblPasswordRepeatRegister "Bevestig uw wachtwoord"@nl ; aui:mdlBtnRegister "Registreer"@nl ; aui:lblRegistrationFailed "Registratie mislukt, vul alle velden in."@nl ; aui:lblUserTaken "Gebruikersnaam bestaat al."@nl ; @@ -107,10 +107,10 @@ aui:registerModal a auis:UI ; ##### Login Modal ##### aui:loginModal a auis:UI ; - aui:mdlTxtTitle "Inloggen"@nl ; - aui:mdlFrmUsername "Gebruikersnaam"@nl ; - aui:mdlFrmPassword "Wachtwoord"@nl ; - aui:mdlBtnLogin "Log in"@nl ; + aui:loginHdrTitle "Inloggen"@nl ; + aui:loginLblUsername "Gebruikersnaam"@nl ; + aui:loginLblPassword "Wachtwoord"@nl ; + aui:loginBtnLogin "Log in"@nl ; aui:loginWarning "Inloggen mislukt"@nl ; aui:loginIncomplete "Voer zowel een gebruikersnaam als wachtwoord in"@nl . diff --git a/web/html/additional_info.html b/web/html/additional_info.html index 0703a81..8830806 100644 --- a/web/html/additional_info.html +++ b/web/html/additional_info.html @@ -282,32 +282,32 @@ </div> <!-- Login modal --> - <div class="modal fade" id="modalLogin"> + <div class="modal fade" id="loginDivLogin"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" id="mdlBtnClose">×</button> - <h4 id="mdlTxtTitle"> + <button type="button" class="close" id="loginBtnClose">×</button> + <h4 id="loginHdrTitle"> </h4> </div> <div class="modal-body"> <form role="form"> <div class="form-group"> - <label id="mdlFrmUsername" for="inputUsername"> + <label id="loginLblUsername" for="loginInpUsername"> </label> - <input type="text" class="form-control" id="inputUsername"> + <input type="text" class="form-control" id="loginInpUsername"> </div> <div class="form-group"> - <label id="mdlFrmPassword" for="password"> + <label id="loginLblPassword" for="password"> </label> - <input type="password" class="form-control" id="inputPassword"> + <input type="password" class="form-control" id="loginInpPassword"> </div> - <p class="text-warning" id="mdlLblLogin"> + <p class="text-warning" id="loginTxtWarning"> </p> </form> </div> <div class="modal-footer"> - <button class="btn btn-primary" id="mdlBtnLogin"> + <button class="btn btn-primary" id="loginBtnLogin"> </button> <button class="btn btn-link" id="mdlBtnIntro"> </button> diff --git a/web/html/domain.html b/web/html/domain.html index 18cee2b..68810ad 100644 --- a/web/html/domain.html +++ b/web/html/domain.html @@ -82,32 +82,32 @@ </div> <!-- Login modal --> - <div class="modal fade" id="modalLogin"> + <div class="modal fade" id="loginDivLogin"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" id="mdlBtnClose">×</button> - <h4 id="mdlTxtTitle"> + <button type="button" class="close" id="loginBtnClose">×</button> + <h4 id="loginHdrTitle"> </h4> </div> <div class="modal-body"> <form role="form"> <div class="form-group"> - <label id="mdlFrmUsername" for="inputUsername"> + <label id="loginLblUsername" for="loginInpUsername"> </label> - <input type="text" class="form-control" id="inputUsername"> + <input type="text" class="form-control" id="loginInpUsername"> </div> <div class="form-group"> - <label id="mdlFrmPassword" for="password"> + <label id="loginLblPassword" for="password"> </label> - <input type="password" class="form-control" id="inputPassword"> + <input type="password" class="form-control" id="loginInpPassword"> </div> - <p class="text-warning" id="mdlLblLogin"> + <p class="text-warning" id="loginTxtWarning"> </p> </form> </div> <div class="modal-footer"> - <button class="btn btn-primary" id="mdlBtnLogin"> + <button class="btn btn-primary" id="loginBtnLogin"> </button> </div> </div> diff --git a/web/html/end.html b/web/html/end.html index 98e2700..dadb9b9 100644 --- a/web/html/end.html +++ b/web/html/end.html @@ -93,32 +93,32 @@ </div> <!-- Login modal --> - <div class="modal fade" id="modalLogin"> + <div class="modal fade" id="loginDivLogin"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" id="mdlBtnClose">×</button> - <h4 id="mdlTxtTitle"> + <button type="button" class="close" id="loginBtnClose">×</button> + <h4 id="loginHdrTitle"> </h4> </div> <div class="modal-body"> <form role="form"> <div class="form-group"> - <label id="mdlFrmUsername" for="inputUsername"> + <label id="loginLblUsername" for="loginInpUsername"> </label> - <input type="text" class="form-control" id="inputUsername"> + <input type="text" class="form-control" id="loginInpUsername"> </div> <div class="form-group"> - <label id="mdlFrmPassword" for="password"> + <label id="loginLblPassword" for="password"> </label> - <input type="password" class="form-control" id="inputPassword"> + <input type="password" class="form-control" id="loginInpPassword"> </div> - <p class="text-warning" id="mdlLblLogin"> + <p class="text-warning" id="loginTxtWarning"> </p> </form> </div> <div class="modal-footer"> - <button class="btn btn-primary" id="mdlBtnLogin"> + <button class="btn btn-primary" id="loginBtnLogin"> </button> </div> </div> diff --git a/web/html/expertise.html b/web/html/expertise.html index 97d3ffc..871f9f6 100644 --- a/web/html/expertise.html +++ b/web/html/expertise.html @@ -105,32 +105,32 @@ </div> <!-- Login modal --> - <div class="modal fade" id="modalLogin"> + <div class="modal fade" id="loginDivLogin"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" id="mdlBtnClose">×</button> - <h4 id="mdlTxtTitle"> + <button type="button" class="close" id="loginBtnClose">×</button> + <h4 id="loginHdrTitle"> </h4> </div> <div class="modal-body"> <form role="form"> <div class="form-group"> - <label id="mdlFrmUsername" for="inputUsername"> + <label id="loginLblUsername" for="loginInpUsername"> </label> - <input type="text" class="form-control" id="inputUsername"> + <input type="text" class="form-control" id="loginInpUsername"> </div> <div class="form-group"> - <label id="mdlFrmPassword" for="password"> + <label id="loginLblPassword" for="password"> </label> - <input type="password" class="form-control" id="inputPassword"> + <input type="password" class="form-control" id="loginInpPassword"> </div> - <p class="text-warning" id="mdlLblLogin"> + <p class="text-warning" id="loginTxtWarning"> </p> </form> </div> <div class="modal-footer"> - <button class="btn btn-primary" id="mdlBtnLogin"> + <button class="btn btn-primary" id="loginBtnLogin"> </button> <button class="btn btn-link" id="mdlBtnIntro"> </button> diff --git a/web/html/intro.html b/web/html/intro.html index 4e87ac3..737a665 100644 --- a/web/html/intro.html +++ b/web/html/intro.html @@ -95,32 +95,32 @@ </div> <!-- Login modal --> - <div class="modal fade" id="modalLogin"> + <div class="modal fade" id="loginDivLogin"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" id="mdlBtnClose">×</button> - <h4 id="mdlTxtTitle"> + <button type="button" class="close" id="loginBtnClose">×</button> + <h4 id="loginHdrTitle"> </h4> </div> <div class="modal-body"> <form role="form"> <div class="form-group"> - <label id="mdlFrmUsername" for="inputUsername"> + <label id="loginLblUsername" for="loginInpUsername"> </label> - <input type="text" class="form-control" id="inputUsername"> + <input type="text" class="form-control" id="loginInpUsername"> </div> <div class="form-group"> - <label id="mdlFrmPassword" for="password"> + <label id="loginLblPassword" for="loginInpPassword"> </label> - <input type="password" class="form-control" id="inputPassword"> + <input type="password" class="form-control" id="loginInpPassword"> </div> - <p class="text-warning" id="mdlLblLogin"> + <p class="text-warning" id="loginTxtWarning"> </p> </form> </div> <div class="modal-footer"> - <button class="btn btn-primary" id="mdlBtnLogin"> + <button class="btn btn-primary" id="loginBtnLogin"> </button> </div> </div> @@ -132,7 +132,7 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" id="mdlBtnCloseRegister">×</button> + <button type="button" class="close" id="loginBtnCloseRegister">×</button> <h4 id="mdlTitleRegister"> </h4> </div> @@ -144,19 +144,19 @@ <input type="text" class="form-control" id="inputFullNameRegister"> </div> <div class="form-group"> - <label id="mdlFrmUsernameRegister" for="inputUsernameRegister"> + <label id="loginLblUsernameRegister" for="loginInpUsernameRegister"> </label> - <input type="text" class="form-control" id="inputUsernameRegister"> + <input type="text" class="form-control" id="loginInpUsernameRegister"> </div> <div class="form-group"> - <label id="mdlFrmPasswordRegister" for="inputPasswordRegister"> + <label id="loginLblPasswordRegister" for="loginInpPasswordRegister"> </label> - <input type="password" class="form-control" id="inputPasswordRegister"> + <input type="password" class="form-control" id="loginInpPasswordRegister"> </div> <div class="form-group"> - <label id="mdlFrmPasswordRepeatRegister" for="inputPasswordRepeatRegister"> + <label id="loginLblPasswordRepeatRegister" for="loginInpPasswordRepeatRegister"> </label> - <input type="password" class="form-control" id="inputPasswordRepeatRegister"> + <input type="password" class="form-control" id="loginInpPasswordRepeatRegister"> </div> <p class="text-warning" id="mdlLblRegister"> </p> diff --git a/web/html/profile.html b/web/html/profile.html index 0f19a1d..0ea7629 100644 --- a/web/html/profile.html +++ b/web/html/profile.html @@ -134,32 +134,32 @@ </div> <!-- Login modal --> - <div class="modal fade" id="modalLogin"> + <div class="modal fade" id="loginDivLogin"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" id="mdlBtnClose">×</button> - <h4 id="mdlTxtTitle"> + <button type="button" class="close" id="loginBtnClose">×</button> + <h4 id="loginHdrTitle"> </h4> </div> <div class="modal-body"> <form role="form"> <div class="form-group"> - <label id="mdlFrmUsername" for="inputUsername"> + <label id="loginLblUsername" for="loginInpUsername"> </label> - <input type="text" class="form-control" id="inputUsername"> + <input type="text" class="form-control" id="loginInpUsername"> </div> <div class="form-group"> - <label id="mdlFrmPassword" for="password"> + <label id="loginLblPassword" for="password"> </label> - <input type="password" class="form-control" id="inputPassword"> + <input type="password" class="form-control" id="loginInpPassword"> </div> - <p class="text-warning" id="mdlLblLogin"> + <p class="text-warning" id="loginTxtWarning"> </p> </form> </div> <div class="modal-footer"> - <button class="btn btn-primary" id="mdlBtnLogin"> + <button class="btn btn-primary" id="loginBtnLogin"> </button> <button class="btn btn-link" id="mdlBtnIntro"> </button> diff --git a/web/html/results.html b/web/html/results.html index 9682516..43f0465 100644 --- a/web/html/results.html +++ b/web/html/results.html @@ -48,32 +48,32 @@ </div> <!-- Login modal --> - <div class="modal fade" id="modalLogin"> + <div class="modal fade" id="loginDivLogin"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" id="mdlBtnClose">×</button> - <h4 id="mdlTxtTitle"> + <button type="button" class="close" id="loginBtnClose">×</button> + <h4 id="loginHdrTitle"> </h4> </div> <div class="modal-body"> <form role="form"> <div class="form-group"> - <label id="mdlFrmUsername" for="inputUsername"> + <label id="loginLblUsername" for="loginInpUsername"> </label> - <input type="text" class="form-control" id="inputUsername"> + <input type="text" class="form-control" id="loginInpUsername"> </div> <div class="form-group"> - <label id="mdlFrmPassword" for="password"> + <label id="loginLblPassword" for="password"> </label> - <input type="password" class="form-control" id="inputPassword"> + <input type="password" class="form-control" id="loginInpPassword"> </div> - <p class="text-warning" id="mdlLblLogin"> + <p class="text-warning" id="loginTxtWarning"> </p> </form> </div> <div class="modal-footer"> - <button class="btn btn-primary" id="mdlBtnLogin"> + <button class="btn btn-primary" id="loginBtnLogin"> </button> <button class="btn btn-link" id="mdlBtnIntro"> </button> diff --git a/web/js/accurator_intro.js b/web/js/accurator_intro.js index 9c00ce7..bdbd070 100644 --- a/web/js/accurator_intro.js +++ b/web/js/accurator_intro.js @@ -62,7 +62,7 @@ function addButtonEvents() { document.location.href="profile.html"; }; onDismissal = function() { - $("#modalLogin").modal('hide'); + $("#loginDivLogin").modal('hide'); }; loginModal(onSuccess, onDismissal); }); diff --git a/web/js/accurator_utilities.js b/web/js/accurator_utilities.js index f2113c6..59b5439 100644 --- a/web/js/accurator_utilities.js +++ b/web/js/accurator_utilities.js @@ -382,47 +382,47 @@ function loginModal(onSuccess, onDismissal) { .done(function(data){ loginButtonEvent(onSuccess, onDismissal); initModalLabels(data); - $("#modalLogin").modal(); - $("#inputUsername").focus(); + $("#loginDivLogin").modal(); + $("#loginInpUsername").focus(); }); } function initModalLabels(data) { - $("#mdlTxtTitle").html(data.mdlTxtTitle); - $("#mdlBtnLogin").html(data.mdlBtnLogin); - $("#mdlFrmUsername").html(data.mdlFrmUsername); - $("#mdlFrmPassword").html(data.mdlFrmPassword); + $("#loginHdrTitle").html(data.loginHdrTitle); + $("#loginBtnLogin").html(data.loginBtnLogin); + $("#loginLblUsername").html(data.loginLblUsername); + $("#loginLblPassword").html(data.loginLblPassword); loginWarning = data.loginWarning; loginIncomplete = data.loginIncomplete; $("body").on('shown.bs.modal', '.modal', function () { - $("#inputUsername").focus(); + $("#loginInpUsername").focus(); }) } function loginButtonEvent(onSuccess, onDismissal) { - $("#mdlBtnLogin").click(function() { + $("#loginBtnLogin").click(function() { login(onSuccess); }); // Login on pressing enter - $("#inputPassword").keypress(function(event) { + $("#loginInpPassword").keypress(function(event) { if (event.which == 13) login(onSuccess); }); - $("#inputUsername").keypress(function(event) { + $("#loginInpUsername").keypress(function(event) { if (event.which == 13) login(onSuccess); }); - $("#modalLogin").on('hidden.bs.modal', function (e) { + $("#loginDivLogin").on('hidden.bs.modal', function (e) { onDismissal(); }); - $("#mdlBtnClose").click(function() { + $("#loginBtnClose").click(function() { onDismissal(); }); } function login(onSuccess) { - var user = getUserUri($("#inputUsername").val()); - var password = $("#inputPassword").val(); + var user = getUserUri($("#loginInpUsername").val()); + var password = $("#loginInpPassword").val(); if(user == "" || password == "") { $(".modal-body").append($.el.p({'class':'text-danger'}, loginIncomplete)); @@ -444,8 +444,8 @@ function loginServer(user, password, onSuccess) { setUserSettingsLocal(dataLogin, onSuccess); // remove event listener and hide modal - $("#modalLogin").off('hidden.bs.modal'); - $("#modalLogin").modal('hide'); + $("#loginDivLogin").off('hidden.bs.modal'); + $("#loginDivLogin").modal('hide'); } } }); @@ -480,9 +480,9 @@ function initRegisterModalLabels(labels) { // Add retrieved labels to html elements $("#mdlTitleRegister").html(labels.mdlTitleRegister); $("#mdlFrmFullNameRegister").html(labels.mdlFrmFullNameRegister); - $("#mdlFrmUsernameRegister").html(labels.mdlFrmUsernameRegister); - $("#mdlFrmPasswordRegister").html(labels.mdlFrmPasswordRegister); - $("#mdlFrmPasswordRepeatRegister").html(labels.mdlFrmPasswordRepeatRegister); + $("#loginLblUsernameRegister").html(labels.loginLblUsernameRegister); + $("#loginLblPasswordRegister").html(labels.loginLblPasswordRegister); + $("#loginLblPasswordRepeatRegister").html(labels.loginLblPasswordRepeatRegister); $("#mdlBtnRegister").html(labels.mdlBtnRegister); // Set text variables for possible later use lblRegistrationFailed = labels.lblRegistrationFailed; @@ -500,7 +500,7 @@ function registerButtonEvent(onDismissal) { register(); }); // register on pressing enter - $("#inputPasswordRepeatRegister").keypress(function(event) { + $("#loginInpPasswordRepeatRegister").keypress(function(event) { if (event.which == 13) { register(); } @@ -508,7 +508,7 @@ function registerButtonEvent(onDismissal) { $("#modalRegister").on('hidden.bs.modal', function (e) { onDismissal(); }); - $("#mdlBtnCloseRegister").click(function() { + $("#loginBtnCloseRegister").click(function() { onDismissal(); }); } @@ -516,10 +516,10 @@ function registerButtonEvent(onDismissal) { function register() { // Get and check initial form input var name = $("#inputFullNameRegister").val(); - var user = $("#inputUsernameRegister").val(); + var user = $("#loginInpUsernameRegister").val(); var userUri = getUserUri(user); - var password = $("#inputPasswordRegister").val(); - var passwordRepeat = $("#inputPasswordRepeatRegister").val(); + var password = $("#loginInpPasswordRegister").val(); + var passwordRepeat = $("#loginInpPasswordRepeatRegister").val(); if((name == "") || (user == "") || (password == "") || (passwordRepeat == "")){ setRegisterFailureText(lblRegistrationFailed);