diff --git a/swad_account.c b/swad_account.c index 7344f88ff..67d1ae2ea 100644 --- a/swad_account.c +++ b/swad_account.c @@ -117,6 +117,7 @@ void Acc_ShowFormMyAccount (void) /***** Links to other actions *****/ fprintf (Gbl.F.Out,"
"); Usr_PutLinkToLogin (); + Pwd_PutLinkToSendNewPasswd (); Lan_PutLinkToChangeLanguage (); fprintf (Gbl.F.Out,"
"); @@ -140,7 +141,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title) /***** Start box *****/ Box_StartBox (NULL,Title,NULL, - Hlp_PROFILE_SignUp,Box_CLOSABLE); + Hlp_PROFILE_SignUp,Box_NOT_CLOSABLE); /***** Help alert *****/ Ale_ShowAlert (Ale_INFO,Txt_If_you_think_you_may_have_been_registered_); @@ -262,9 +263,6 @@ void Acc_CheckIfEmptyAccountExists (void) Acc_ShowFormCheckIfIHaveAccount (Txt_Before_creating_a_new_account_check_if_you_have_been_already_registered); } - - /**** Show form to create a new account *****/ - // Acc_ShowFormRequestNewAccountWithParams ("",""); } /*****************************************************************************/ @@ -327,6 +325,13 @@ static void Acc_WriteRowEmptyAccount (unsigned NumUsr,const char *ID,struct UsrD void Acc_ShowFormCreateMyAccount (void) { + /***** Links to other actions *****/ + fprintf (Gbl.F.Out,"
"); + Usr_PutLinkToLogin (); + Pwd_PutLinkToSendNewPasswd (); + Lan_PutLinkToChangeLanguage (); + fprintf (Gbl.F.Out,"
"); + /**** Show form to create a new account *****/ Acc_ShowFormRequestNewAccountWithParams ("",""); } diff --git a/swad_box.c b/swad_box.c index 66b03f58b..3a492c09c 100644 --- a/swad_box.c +++ b/swad_box.c @@ -27,6 +27,7 @@ #include // For boolean type #include // For fprintf +#include // For malloc and free #include "swad_action.h" #include "swad_box.h" diff --git a/swad_button.c b/swad_button.c index 2b2e0f925..b2cb5211c 100644 --- a/swad_button.c +++ b/swad_button.c @@ -149,16 +149,7 @@ void Btn_PutRemoveButtonInline (const char *TxtButton) "", TxtButton); } -/* -void Btn_PutCloseBoxButtonInline (const char *TxtButton) - { - fprintf (Gbl.F.Out,"", - Gbl.Box.Ids[Gbl.Box.Nested],TxtButton); - } -*/ + void Btn_PutCloseTabButton (const char *TxtButton) { fprintf (Gbl.F.Out,"
" diff --git a/swad_button.h b/swad_button.h index b8555c7ee..75de1d169 100644 --- a/swad_button.h +++ b/swad_button.h @@ -55,7 +55,6 @@ void Btn_PutConfirmButton (const char *TxtButton); void Btn_PutConfirmButtonInline (const char *TxtButton); void Btn_PutRemoveButton (const char *TxtButton); void Btn_PutRemoveButtonInline (const char *TxtButton); -// void Btn_PutCloseBoxButtonInline (const char *TxtButton); void Btn_PutCloseTabButton (const char *TxtButton); #endif diff --git a/swad_changelog.h b/swad_changelog.h index 8a8d4ee78..27f7dee65 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -458,11 +458,17 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.129.1 (2019-07-04)" +#define Log_PLATFORM_VERSION "SWAD 18.129.3 (2019-07-04)" #define CSS_FILE "swad18.123.css" #define JS_FILE "swad18.123.js" /* - Version 18.129.1: Jul 04, 2019 Creation of a new account is splitted into two steps. (243441 lines) + Version 18.129.3: Jul 04, 2019 Changes in translation of alert. (243433 lines) + Version 18.129.2: Jul 04, 2019 Changes in creation of a new account. (243451 lines) + Version 18.129.1: Jul 04, 2019 Creation of a new account is splitted into two steps. (243444 lines) + 2 changes necessary in database: +UPDATE actions SET Txt='Solicitar la creación de una cuenta (1/2)' WHERE ActCod='36' AND Language='es'; +INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1787','es','N','Solicitar la creación de una cuenta (2/2)'); + Version 18.129: Jul 04, 2019 Button to skip step in creation of a new account. (243425 lines) Version 18.128: Jun 13, 2019 Fixed bug in creation of degrees. (243365 lines) Version 18.127.3: May 31, 2019 Code refactoring and cleaning in games. (243346 lines) diff --git a/swad_text.c b/swad_text.c index 2fe01e005..bddae45e1 100644 --- a/swad_text.c +++ b/swad_text.c @@ -15151,49 +15151,41 @@ const char *Txt_If_you_have_an_Android_device_try_SWADroid = const char *Txt_If_you_have_forgotten_your_password_ = #if L==1 // ca - "Si usted ha olvidado su contraseña," - " se le enviará una nueva" - " a la dirección de correo" - " que escribió en su ficha personal."; // Necessita traduccio + "Si vostè ha oblidat la seva contrasenya," + " se li enviarà una de nova" + " a la vostra adreça de correu."; #elif L==2 // de "Wenn Sie Ihr Passwort vergessen haben," - " eine neue wird" - " die E-Mail von Ihnen angegebene Adresse" - " in Ihren Profil gesendet werden vergessen."; + " wird ein neues" + " an Ihre E-Mail-Adresse gesendet."; #elif L==3 // en "If you have forgotten your password," " a new one will be sent" - " to the email address" - " you entered in your record."; + " to your email address."; #elif L==4 // es "Si usted ha olvidado su contraseña," " se le enviará una nueva" - " a la dirección de correo" - " que escribió en su ficha personal."; + " a su dirección de correo."; #elif L==5 // fr "Si vous avez oublié votre mot de passe," - " une nouvelle sera envoyé" - " à l'adresse électronique" - " que vous avez entré dans votre carte."; + " un nouveau mot de passe vous sera envoyé" + " à votre adresse e-mail."; #elif L==6 // gn "Si usted ha olvidado su contraseña," " se le enviará una nueva" - " a la dirección de correo" - " que escribió en su ficha personal."; // Okoteve traducción + " a su dirección de correo."; // Okoteve traducción #elif L==7 // it "Se hai dimenticato la tua password," - " una nuova verrà inviata" - " all'indirizzo email" - " che hai inserito nella tua scheda."; + " ne verrà inviata una nuova" + " al tuo indirizzo email."; #elif L==8 // pl - "Jesli nie pamietasz hasla," - " nowe zostanie wyslane na adres email," - " który wszedl w rekordzie."; + "Jeśli zapomniałeś hasła," + " nowe zostanie wysłane" + " na Twój adres e-mail."; #elif L==9 // pt "Se você tiver esquecido sua senha," " uma nova será enviada" - " para o email" - " que você inseriu em seu cartão."; + " para o seu endereço de email."; #endif const char *Txt_If_you_have_written_your_ID_nickname_or_email_correctly_ =