From 6e37d4546d644bf3c0c5521a7e92bb6df0c8f51c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 4 Jul 2019 10:39:42 +0200 Subject: [PATCH] Version18.129.1 --- swad_account.c | 21 +++++++--- swad_account.h | 2 +- swad_action.c | 5 ++- swad_action.h | 99 ++++++++++++++++++++++++------------------------ swad_box.h | 2 +- swad_button.c | 4 +- swad_button.h | 2 +- swad_changelog.h | 3 +- 8 files changed, 76 insertions(+), 62 deletions(-) diff --git a/swad_account.c b/swad_account.c index 8af8493aa..7344f88ff 100644 --- a/swad_account.c +++ b/swad_account.c @@ -122,9 +122,6 @@ void Acc_ShowFormMyAccount (void) /**** Show form to check if I have an account *****/ Acc_ShowFormCheckIfIHaveAccount (Txt_Before_creating_a_new_account_check_if_you_have_been_already_registered); - - /**** Show form to create a new account *****/ - Acc_ShowFormRequestNewAccountWithParams ("",""); } } @@ -158,11 +155,13 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title) "", The_ClassFormInBox[Gbl.Prefs.Theme],Txt_ID, ID_MAX_CHARS_USR_ID); - Btn_PutConfirmButtonInline (Txt_Check); + Btn_PutCreateButtonInline (Txt_Check); Frm_EndForm (); /***** Form to skip this step *****/ - Btn_PutCloseBoxButtonInline (Txt_Skip_this_step); + Frm_StartForm (ActCreMyAcc); + Btn_PutConfirmButton (Txt_Skip_this_step); + Frm_EndForm (); /***** End box *****/ Box_EndBox (); @@ -265,7 +264,7 @@ void Acc_CheckIfEmptyAccountExists (void) } /**** Show form to create a new account *****/ - Acc_ShowFormRequestNewAccountWithParams ("",""); + // Acc_ShowFormRequestNewAccountWithParams ("",""); } /*****************************************************************************/ @@ -322,6 +321,16 @@ static void Acc_WriteRowEmptyAccount (unsigned NumUsr,const char *ID,struct UsrD ""); } +/*****************************************************************************/ +/********************* Show form to create a new account *********************/ +/*****************************************************************************/ + +void Acc_ShowFormCreateMyAccount (void) + { + /**** Show form to create a new account *****/ + Acc_ShowFormRequestNewAccountWithParams ("",""); + } + /*****************************************************************************/ /************ Show form to create a new account using parameters *************/ /*****************************************************************************/ diff --git a/swad_account.h b/swad_account.h index da695dc32..24109a7fd 100644 --- a/swad_account.h +++ b/swad_account.h @@ -52,8 +52,8 @@ typedef enum void Acc_PutLinkToCreateAccount (void); void Acc_ShowFormMyAccount (void); - void Acc_CheckIfEmptyAccountExists (void); +void Acc_ShowFormCreateMyAccount (void); void Acc_ShowFormGoToRequestNewAccount (void); void Acc_ShowFormChgMyAccount (void); diff --git a/swad_action.c b/swad_action.c index a68b897c4..f845bda5f 100644 --- a/swad_action.c +++ b/swad_action.c @@ -1535,8 +1535,9 @@ Profile: 1301. ActPrnAgdQR Show agenda QR code ready to print 1302. ActChkUsrAcc Check if already exists a new account without password associated to a ID + NEW. ActCreMyAcc Form to create a new account for me 1303. ActCreUsrAcc Create new user account - 1304. ActRemMyID Remove one of my user's IDs + 1304. ActRemMyID Remove one of my user's IDs 1305. ActChgMyID Create a new user's ID for me 1306. ActRemMyNck Remove one of my old nicknames 1307. ActChgMyNck Change my nickname @@ -3143,6 +3144,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActPrnAgdQR */{1618,-1,TabUnk,ActSeeMyAgd ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Agd_PrintAgdQRCode ,NULL}, /* ActChkUsrAcc */{1584,-1,TabUnk,ActFrmMyAcc ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Acc_CheckIfEmptyAccountExists ,NULL}, + /* ActCreMyAcc */{1787,-1,TabUnk,ActFrmMyAcc ,0x001,0x001,0x001,0x001,0x001,0x001,0x001,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Acc_ShowFormCreateMyAccount ,NULL}, /* ActCreUsrAcc */{1163,-1,TabUnk,ActFrmMyAcc ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Acc_AfterCreationNewAccount ,NULL}, /* ActRemMyID */{1147,-1,TabUnk,ActFrmMyAcc ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ID_RemoveMyUsrID ,NULL}, @@ -4993,6 +4995,7 @@ Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse un ActRemMch, // #1784 ActResMch, // #1785 ActShoMch, // #1786 + ActCreMyAcc, // #1787 }; /*****************************************************************************/ diff --git a/swad_action.h b/swad_action.h index 0a0966010..5aa910253 100644 --- a/swad_action.h +++ b/swad_action.h @@ -64,9 +64,9 @@ typedef enum typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to indicate obsolete action -#define Act_NUM_ACTIONS (1 + 4 + 64 + 38 + 12 + 42 + 36 + 19 + 110 + 169 + 437 + 176 + 169 + 16 + 67) +#define Act_NUM_ACTIONS (1 + 4 + 64 + 38 + 12 + 42 + 36 + 19 + 110 + 169 + 437 + 176 + 169 + 16 + 68) -#define Act_MAX_ACTION_COD 1786 +#define Act_MAX_ACTION_COD 1787 #define Act_MAX_OPTIONS_IN_MENU_PER_TAB 13 @@ -1568,60 +1568,61 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to #define ActPrnAgdQR (ActSeeMyUsgRep + 19) #define ActChkUsrAcc (ActSeeMyUsgRep + 20) -#define ActCreUsrAcc (ActSeeMyUsgRep + 21) -#define ActRemMyID (ActSeeMyUsgRep + 22) -#define ActChgMyID (ActSeeMyUsgRep + 23) -#define ActRemMyNck (ActSeeMyUsgRep + 24) -#define ActChgMyNck (ActSeeMyUsgRep + 25) -#define ActRemMyMai (ActSeeMyUsgRep + 26) -#define ActChgMyMai (ActSeeMyUsgRep + 27) -#define ActCnfMai (ActSeeMyUsgRep + 28) -#define ActChgMyPwd (ActSeeMyUsgRep + 29) -#define ActReqRemMyAcc (ActSeeMyUsgRep + 30) -#define ActRemMyAcc (ActSeeMyUsgRep + 31) +#define ActCreMyAcc (ActSeeMyUsgRep + 21) +#define ActCreUsrAcc (ActSeeMyUsgRep + 22) +#define ActRemMyID (ActSeeMyUsgRep + 23) +#define ActChgMyID (ActSeeMyUsgRep + 24) +#define ActRemMyNck (ActSeeMyUsgRep + 25) +#define ActChgMyNck (ActSeeMyUsgRep + 26) +#define ActRemMyMai (ActSeeMyUsgRep + 27) +#define ActChgMyMai (ActSeeMyUsgRep + 28) +#define ActCnfMai (ActSeeMyUsgRep + 29) +#define ActChgMyPwd (ActSeeMyUsgRep + 30) +#define ActReqRemMyAcc (ActSeeMyUsgRep + 31) +#define ActRemMyAcc (ActSeeMyUsgRep + 32) -#define ActChgMyData (ActSeeMyUsgRep + 32) +#define ActChgMyData (ActSeeMyUsgRep + 33) -#define ActReqMyPho (ActSeeMyUsgRep + 33) -#define ActDetMyPho (ActSeeMyUsgRep + 34) -#define ActUpdMyPho (ActSeeMyUsgRep + 35) -#define ActReqRemMyPho (ActSeeMyUsgRep + 36) -#define ActRemMyPho (ActSeeMyUsgRep + 37) +#define ActReqMyPho (ActSeeMyUsgRep + 34) +#define ActDetMyPho (ActSeeMyUsgRep + 35) +#define ActUpdMyPho (ActSeeMyUsgRep + 36) +#define ActReqRemMyPho (ActSeeMyUsgRep + 37) +#define ActRemMyPho (ActSeeMyUsgRep + 38) -#define ActChgCtyMyIns (ActSeeMyUsgRep + 38) -#define ActChgMyIns (ActSeeMyUsgRep + 39) -#define ActChgMyCtr (ActSeeMyUsgRep + 40) -#define ActChgMyDpt (ActSeeMyUsgRep + 41) -#define ActChgMyOff (ActSeeMyUsgRep + 42) -#define ActChgMyOffPho (ActSeeMyUsgRep + 43) +#define ActChgCtyMyIns (ActSeeMyUsgRep + 39) +#define ActChgMyIns (ActSeeMyUsgRep + 40) +#define ActChgMyCtr (ActSeeMyUsgRep + 41) +#define ActChgMyDpt (ActSeeMyUsgRep + 42) +#define ActChgMyOff (ActSeeMyUsgRep + 43) +#define ActChgMyOffPho (ActSeeMyUsgRep + 44) -#define ActReqEdiMyNet (ActSeeMyUsgRep + 44) -#define ActChgMyNet (ActSeeMyUsgRep + 45) +#define ActReqEdiMyNet (ActSeeMyUsgRep + 45) +#define ActChgMyNet (ActSeeMyUsgRep + 46) -#define ActChgThe (ActSeeMyUsgRep + 46) -#define ActReqChgLan (ActSeeMyUsgRep + 47) -#define ActChgLan (ActSeeMyUsgRep + 48) -#define ActChg1stDay (ActSeeMyUsgRep + 49) -#define ActChgDatFmt (ActSeeMyUsgRep + 50) -#define ActChgCol (ActSeeMyUsgRep + 51) -#define ActHidLftCol (ActSeeMyUsgRep + 52) -#define ActHidRgtCol (ActSeeMyUsgRep + 53) -#define ActShoLftCol (ActSeeMyUsgRep + 54) -#define ActShoRgtCol (ActSeeMyUsgRep + 55) -#define ActChgIco (ActSeeMyUsgRep + 56) -#define ActChgMnu (ActSeeMyUsgRep + 57) -#define ActChgPriPho (ActSeeMyUsgRep + 58) -#define ActChgBasPriPrf (ActSeeMyUsgRep + 59) -#define ActChgExtPriPrf (ActSeeMyUsgRep + 60) -#define ActChgCooPrf (ActSeeMyUsgRep + 61) -#define ActChgNtfPrf (ActSeeMyUsgRep + 62) +#define ActChgThe (ActSeeMyUsgRep + 47) +#define ActReqChgLan (ActSeeMyUsgRep + 48) +#define ActChgLan (ActSeeMyUsgRep + 49) +#define ActChg1stDay (ActSeeMyUsgRep + 50) +#define ActChgDatFmt (ActSeeMyUsgRep + 51) +#define ActChgCol (ActSeeMyUsgRep + 52) +#define ActHidLftCol (ActSeeMyUsgRep + 53) +#define ActHidRgtCol (ActSeeMyUsgRep + 54) +#define ActShoLftCol (ActSeeMyUsgRep + 55) +#define ActShoRgtCol (ActSeeMyUsgRep + 56) +#define ActChgIco (ActSeeMyUsgRep + 57) +#define ActChgMnu (ActSeeMyUsgRep + 58) +#define ActChgPriPho (ActSeeMyUsgRep + 59) +#define ActChgBasPriPrf (ActSeeMyUsgRep + 60) +#define ActChgExtPriPrf (ActSeeMyUsgRep + 61) +#define ActChgCooPrf (ActSeeMyUsgRep + 62) +#define ActChgNtfPrf (ActSeeMyUsgRep + 63) -#define ActPrnUsrQR (ActSeeMyUsgRep + 63) +#define ActPrnUsrQR (ActSeeMyUsgRep + 64) -#define ActPrnMyTT (ActSeeMyUsgRep + 64) -#define ActEdiTut (ActSeeMyUsgRep + 65) -#define ActChgTut (ActSeeMyUsgRep + 66) -#define ActChgMyTT1stDay (ActSeeMyUsgRep + 67) +#define ActPrnMyTT (ActSeeMyUsgRep + 65) +#define ActEdiTut (ActSeeMyUsgRep + 66) +#define ActChgTut (ActSeeMyUsgRep + 67) +#define ActChgMyTT1stDay (ActSeeMyUsgRep + 68) /*****************************************************************************/ /******************************** Public types *******************************/ diff --git a/swad_box.h b/swad_box.h index c31e00347..147ef8adc 100644 --- a/swad_box.h +++ b/swad_box.h @@ -35,7 +35,7 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Box_MAX_NESTED 10 +#define Box_MAX_NESTED 5 /*****************************************************************************/ /********************************* Public types ******************************/ diff --git a/swad_button.c b/swad_button.c index 278665a96..2b2e0f925 100644 --- a/swad_button.c +++ b/swad_button.c @@ -149,7 +149,7 @@ void Btn_PutRemoveButtonInline (const char *TxtButton) "", TxtButton); } - +/* void Btn_PutCloseBoxButtonInline (const char *TxtButton) { fprintf (Gbl.F.Out,"