mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-17 05:55:43 +02:00
Version 15.203.6
This commit is contained in:
parent
3788e52ad7
commit
10805e0aea
|
@ -1100,13 +1100,13 @@ a:hover /* Default ==> underlined */
|
||||||
.BT_SUBMIT_INLINE
|
.BT_SUBMIT_INLINE
|
||||||
{
|
{
|
||||||
box-sizing:border-box;
|
box-sizing:border-box;
|
||||||
min-width:180px;
|
min-width:140px;
|
||||||
color:white;
|
color:white;
|
||||||
font-size:15px;
|
font-size:15px;
|
||||||
font-weight:bold;
|
font-weight:bold;
|
||||||
line-height:normal;
|
line-height:normal;
|
||||||
margin:0 5px;
|
margin:0 10px;
|
||||||
padding:5px 10px;
|
padding:4px;
|
||||||
border-radius:4px;
|
border-radius:4px;
|
||||||
box-shadow:0 1px 0 rgba(255,255,255,0.15) inset;
|
box-shadow:0 1px 0 rgba(255,255,255,0.15) inset;
|
||||||
}
|
}
|
||||||
|
|
16
swad_ID.c
16
swad_ID.c
|
@ -432,7 +432,8 @@ static bool ID_ICanSeeAnotherUsrID (struct UsrData *UsrDat)
|
||||||
|
|
||||||
static void ID_PutButtonToReqConfirmID (struct UsrData *UsrDat,unsigned NumID)
|
static void ID_PutButtonToReqConfirmID (struct UsrData *UsrDat,unsigned NumID)
|
||||||
{
|
{
|
||||||
extern const char *Txt_Confirm;
|
extern const char *The_ClassFormBold[The_NUM_THEMES];
|
||||||
|
extern const char *Txt_Confirm_ID;
|
||||||
|
|
||||||
Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActReqCnfID_Std :
|
Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActReqCnfID_Std :
|
||||||
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActReqCnfID_Tch :
|
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActReqCnfID_Tch :
|
||||||
|
@ -440,7 +441,8 @@ static void ID_PutButtonToReqConfirmID (struct UsrData *UsrDat,unsigned NumID)
|
||||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||||
fprintf (Gbl.F.Out,"<input type=\"hidden\" name=\"UsrID\" value=\"%s\" />",
|
fprintf (Gbl.F.Out,"<input type=\"hidden\" name=\"UsrID\" value=\"%s\" />",
|
||||||
UsrDat->IDs.List[NumID].ID);
|
UsrDat->IDs.List[NumID].ID);
|
||||||
Lay_PutCreateButtonInline (Txt_Confirm);
|
Lay_PutIconLink ("ok_on16x16.gif",Txt_Confirm_ID,Txt_Confirm_ID,
|
||||||
|
The_ClassFormBold[Gbl.Prefs.Theme]);
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -450,7 +452,7 @@ static void ID_PutButtonToReqConfirmID (struct UsrData *UsrDat,unsigned NumID)
|
||||||
|
|
||||||
static void ID_PutButtonToConfirmID (struct UsrData *UsrDat,unsigned NumID)
|
static void ID_PutButtonToConfirmID (struct UsrData *UsrDat,unsigned NumID)
|
||||||
{
|
{
|
||||||
extern const char *Txt_Confirm;
|
extern const char *Txt_Confirm_ID;
|
||||||
|
|
||||||
Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActCnfID_Std :
|
Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActCnfID_Std :
|
||||||
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActCnfID_Tch :
|
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActCnfID_Tch :
|
||||||
|
@ -458,7 +460,7 @@ static void ID_PutButtonToConfirmID (struct UsrData *UsrDat,unsigned NumID)
|
||||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||||
fprintf (Gbl.F.Out,"<input type=\"hidden\" name=\"UsrID\" value=\"%s\" />",
|
fprintf (Gbl.F.Out,"<input type=\"hidden\" name=\"UsrID\" value=\"%s\" />",
|
||||||
UsrDat->IDs.List[NumID].ID);
|
UsrDat->IDs.List[NumID].ID);
|
||||||
Lay_PutCreateButton (Txt_Confirm);
|
Lay_PutCreateButton (Txt_Confirm_ID);
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -912,6 +914,8 @@ static void ID_InsertANewUsrIDInDB (long UsrCod,const char *NewID,bool Confirmed
|
||||||
|
|
||||||
void ID_RequestConfirmOtherUsrID (void)
|
void ID_RequestConfirmOtherUsrID (void)
|
||||||
{
|
{
|
||||||
|
extern const char *Txt_ID_X_had_already_been_confirmed;
|
||||||
|
extern const char *Txt_Do_you_want_to_confirm_the_ID_X;
|
||||||
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
|
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
|
||||||
char UsrID[ID_MAX_LENGTH_USR_ID+1];
|
char UsrID[ID_MAX_LENGTH_USR_ID+1];
|
||||||
bool ICanConfirm = false;
|
bool ICanConfirm = false;
|
||||||
|
@ -947,14 +951,14 @@ void ID_RequestConfirmOtherUsrID (void)
|
||||||
if (Gbl.Usrs.Other.UsrDat.IDs.List[NumIDFound].Confirmed)
|
if (Gbl.Usrs.Other.UsrDat.IDs.List[NumIDFound].Confirmed)
|
||||||
{
|
{
|
||||||
/***** ID found and already confirmed *****/
|
/***** ID found and already confirmed *****/
|
||||||
sprintf (Gbl.Message,"El ID %s ya había sido confirmado.", // TODO: Need translation!!!
|
sprintf (Gbl.Message,Txt_ID_X_had_already_been_confirmed,
|
||||||
Gbl.Usrs.Other.UsrDat.IDs.List[NumIDFound].ID);
|
Gbl.Usrs.Other.UsrDat.IDs.List[NumIDFound].ID);
|
||||||
Lay_ShowAlert (Lay_INFO,Gbl.Message);
|
Lay_ShowAlert (Lay_INFO,Gbl.Message);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/***** Ask for confirmation *****/
|
/***** Ask for confirmation *****/
|
||||||
sprintf (Gbl.Message,"¿Desea confirmar el ID %s?", // TODO: Need translation!!!
|
sprintf (Gbl.Message,Txt_Do_you_want_to_confirm_the_ID_X,
|
||||||
Gbl.Usrs.Other.UsrDat.IDs.List[NumIDFound].ID);
|
Gbl.Usrs.Other.UsrDat.IDs.List[NumIDFound].ID);
|
||||||
Lay_ShowAlert (Lay_INFO,Gbl.Message);
|
Lay_ShowAlert (Lay_INFO,Gbl.Message);
|
||||||
|
|
||||||
|
|
|
@ -2391,12 +2391,12 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
||||||
/* ActRcvFrmEnrSevStd*/{1428,-1,TabUsr,ActLstStd ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReceiveFormAdminStds ,NULL},
|
/* ActRcvFrmEnrSevStd*/{1428,-1,TabUsr,ActLstStd ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReceiveFormAdminStds ,NULL},
|
||||||
/* ActRcvFrmEnrSevTch*/{1429,-1,TabUsr,ActLstTch ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReceiveFormAdminTchs ,NULL},
|
/* ActRcvFrmEnrSevTch*/{1429,-1,TabUsr,ActLstTch ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReceiveFormAdminTchs ,NULL},
|
||||||
|
|
||||||
/* ActReqCnfID_Oth */{1565,-1,TabUsr,ActLstOth ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RequestConfirmOtherUsrID ,NULL},
|
/* ActReqCnfID_Oth */{1565,-1,TabUsr,ActLstOth ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RequestConfirmOtherUsrID ,NULL},
|
||||||
/* ActReqCnfID_Std */{1566,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RequestConfirmOtherUsrID ,NULL},
|
/* ActReqCnfID_Std */{1566,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RequestConfirmOtherUsrID ,NULL},
|
||||||
/* ActReqCnfID_Tch */{1567,-1,TabUsr,ActLstTch ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RequestConfirmOtherUsrID ,NULL},
|
/* ActReqCnfID_Tch */{1567,-1,TabUsr,ActLstTch ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RequestConfirmOtherUsrID ,NULL},
|
||||||
/* ActCnfID_Oth */{1568,-1,TabUsr,ActLstOth ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ConfirmOtherUsrID ,NULL},
|
/* ActCnfID_Oth */{1568,-1,TabUsr,ActLstOth ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ConfirmOtherUsrID ,NULL},
|
||||||
/* ActCnfID_Std */{1569,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ConfirmOtherUsrID ,NULL},
|
/* ActCnfID_Std */{1569,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ConfirmOtherUsrID ,NULL},
|
||||||
/* ActCnfID_Tch */{1570,-1,TabUsr,ActLstTch ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ConfirmOtherUsrID ,NULL},
|
/* ActCnfID_Tch */{1570,-1,TabUsr,ActLstTch ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ConfirmOtherUsrID ,NULL},
|
||||||
|
|
||||||
/* ActFrmIDsOth */{1447,-1,TabUsr,ActLstOth ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ShowFormOthIDs ,NULL},
|
/* ActFrmIDsOth */{1447,-1,TabUsr,ActLstOth ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ShowFormOthIDs ,NULL},
|
||||||
/* ActFrmIDsStd */{1448,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ShowFormOthIDs ,NULL},
|
/* ActFrmIDsStd */{1448,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ShowFormOthIDs ,NULL},
|
||||||
|
|
|
@ -134,13 +134,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 15.203.5 (2016-04-24)"
|
#define Log_PLATFORM_VERSION "SWAD 15.203.6 (2016-04-24)"
|
||||||
#define CSS_FILE "swad15.203.css"
|
#define CSS_FILE "swad15.203.css"
|
||||||
#define JS_FILE "swad15.197.js"
|
#define JS_FILE "swad15.197.js"
|
||||||
|
|
||||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
||||||
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
|
||||||
/*
|
/*
|
||||||
|
Version 15.203.6: Apr 24, 2016 New form to confirm another user's ID. Not finished. (201295 lines)
|
||||||
Version 15.203.5: Apr 24, 2016 New form to confirm another user's ID. Not finished. (201230 lines)
|
Version 15.203.5: Apr 24, 2016 New form to confirm another user's ID. Not finished. (201230 lines)
|
||||||
Version 15.203.4: Apr 23, 2016 New form to confirm another user's ID. Not finished. (201140 lines)
|
Version 15.203.4: Apr 23, 2016 New form to confirm another user's ID. Not finished. (201140 lines)
|
||||||
Version 15.203.3: Apr 23, 2016 New form to confirm another user's ID. Not finished. (201113 lines)
|
Version 15.203.3: Apr 23, 2016 New form to confirm another user's ID. Not finished. (201113 lines)
|
||||||
|
|
63
swad_text.c
63
swad_text.c
|
@ -4837,6 +4837,27 @@ const char *Txt_Confirm_email =
|
||||||
"Confirmar e-mail";
|
"Confirmar e-mail";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
const char *Txt_Confirm_ID =
|
||||||
|
#if L==1
|
||||||
|
"Confirmar ID";
|
||||||
|
#elif L==2
|
||||||
|
"ID bestätigen";
|
||||||
|
#elif L==3
|
||||||
|
"Confirm ID";
|
||||||
|
#elif L==4
|
||||||
|
"Confirmar ID";
|
||||||
|
#elif L==5
|
||||||
|
"Confirmer ID";
|
||||||
|
#elif L==6
|
||||||
|
"Confirmar ID"; // Okoteve traducción
|
||||||
|
#elif L==7
|
||||||
|
"Confermare ID";
|
||||||
|
#elif L==8
|
||||||
|
"Potwierdzenie ID";
|
||||||
|
#elif L==9
|
||||||
|
"Confirmar ID";
|
||||||
|
#endif
|
||||||
|
|
||||||
const char *Txt_Confirm_my_enrollment =
|
const char *Txt_Confirm_my_enrollment =
|
||||||
#if L==1
|
#if L==1
|
||||||
"Confirmar la meva inscripció";
|
"Confirmar la meva inscripció";
|
||||||
|
@ -9118,6 +9139,27 @@ const char *Txt_Do_you_really_want_to_reset_the_survey_X = // Warning: it is ver
|
||||||
"Você realmente deseja reiniciar o inquérito <strong>%s</strong>?";
|
"Você realmente deseja reiniciar o inquérito <strong>%s</strong>?";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
const char *Txt_Do_you_want_to_confirm_the_ID_X = // Warning: it is very important to include %s in the following sentences
|
||||||
|
#if L==1
|
||||||
|
"Voleu confirmar l'ID (DNI/cèdula) <strong>%s</strong>?";
|
||||||
|
#elif L==2
|
||||||
|
"Wollen Sie die ID <strong>%s</strong> zu bestätigen?";
|
||||||
|
#elif L==3
|
||||||
|
"Do you want to confirm the ID (identity number/passport) <strong>%s</strong>?";
|
||||||
|
#elif L==4
|
||||||
|
"¿Desea confirmar el ID (DNI/cédula) <strong>%s</strong>?";
|
||||||
|
#elif L==5
|
||||||
|
"Voulez-vous confirmer l'ID <strong>%s</strong>?";
|
||||||
|
#elif L==6
|
||||||
|
"¿Desea confirmar el ID (DNI/cédula) <strong>%s</strong>?"; // Okoteve traducción
|
||||||
|
#elif L==7
|
||||||
|
"Vuoi confermare l'ID <strong>%s</strong>?";
|
||||||
|
#elif L==8
|
||||||
|
"Czy chcesz potwierdzić I <strong>%s</strong>?";
|
||||||
|
#elif L==9
|
||||||
|
"Você quer confirmar o ID <strong>%s</strong>?";
|
||||||
|
#endif
|
||||||
|
|
||||||
const char *Txt_Document =
|
const char *Txt_Document =
|
||||||
#if L==1
|
#if L==1
|
||||||
"Document";
|
"Document";
|
||||||
|
@ -14050,6 +14092,27 @@ const char *Txt_ID =
|
||||||
"Nº identif.";
|
"Nº identif.";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
const char *Txt_ID_X_had_already_been_confirmed = // Warning: it is very important to include %s in the following sentences
|
||||||
|
#if L==1
|
||||||
|
"El ID (DNI/cédula) %s ja havia estat confirmat.";
|
||||||
|
#elif L==2
|
||||||
|
"ID %s hatte bereits bestätigt worden.";
|
||||||
|
#elif L==3
|
||||||
|
"ID %s had already been confirmed.";
|
||||||
|
#elif L==4
|
||||||
|
"El ID (DNI/cédula) %s ya había sido confirmado.";
|
||||||
|
#elif L==5
|
||||||
|
"L'ID %s avait déjà été confirmée.";
|
||||||
|
#elif L==6
|
||||||
|
"El ID (DNI/cédula) %s ya había sido confirmado."; // Okoteve traducción
|
||||||
|
#elif L==7
|
||||||
|
"L'ID %s era già stato confermato.";
|
||||||
|
#elif L==8
|
||||||
|
"ID %s została już potwierdzona.";
|
||||||
|
#elif L==9
|
||||||
|
"O ID %s já havia sido confirmada.";
|
||||||
|
#endif
|
||||||
|
|
||||||
const char *Txt_ID_X_confirmed = // Warning: it is very important to include %s in the following sentences
|
const char *Txt_ID_X_confirmed = // Warning: it is very important to include %s in the following sentences
|
||||||
#if L==1
|
#if L==1
|
||||||
"ID (DNI/cédula) %s confirmat";
|
"ID (DNI/cédula) %s confirmat";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user