Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 14.102.5

This commit is contained in:
Antonio Cañas Vargas 2015-03-27 16:56:48 +01:00
parent 71e730db1d
commit 9eb0616e12
4 changed files with 53 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.102.4 (2015/03/25)"
#define Log_PLATFORM_VERSION "SWAD 14.102.5 (2015/03/27)"
// 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
/*
Version 14.102.5: Mar 27, 2015 Changes in layout of log in. (183909 lines)
Version 14.102.4: Mar 25, 2015 Fixed bug in ranking. (183883 lines)
Version 14.102.3: Mar 25, 2015 Fixed bug in record. (183882 lines)
Version 14.102.2: Mar 25, 2015 Fixed bug in record. (183882 lines)

6
swad_layout.c
View File

@ -1545,7 +1545,7 @@ void Lay_PutLinkToPrintView2 (void)
/**************** Show advertisement about mobile version ********************/
/*****************************************************************************/
#define Lay_SHOW_ADVERTISEMENT_ONE_TIME_OF_X 1 // n ==> show advertisement 1/n of the times
#define Lay_SHOW_ADVERTISEMENT_ONE_TIME_OF_X 5 // n ==> show advertisement 1/n of the times
void Lay_AdvertisementMobile (void)
{
@ -1553,6 +1553,8 @@ void Lay_AdvertisementMobile (void)
if (!(rand () % Lay_SHOW_ADVERTISEMENT_ONE_TIME_OF_X))
{
fprintf (Gbl.F.Out,"<div style=\"margin-top:20px;\">");
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,8,NULL);
@ -1572,6 +1574,8 @@ void Lay_AdvertisementMobile (void)
/***** End table *****/
Lay_EndRoundFrameTable10 ();
fprintf (Gbl.F.Out,"</div>");
}
}

21
swad_text.c
View File

@ -26285,6 +26285,27 @@ const char *Txt_Password =
"Senha";
#endif
const char *Txt_password =
#if L==0
"contrasenya";
#elif L==1
"Passwort";
#elif L==2
"password";
#elif L==3
"contrase&ntilde;a";
#elif L==4
"mot de passe";
#elif L==5
"tera&ntilde;emi";
#elif L==6
"password";
#elif L==7
"has&lstrok;o";
#elif L==8
"senha";
#endif
const char *Txt_Paste =
#if L==0
"Pegar"; // Necessita traduccio

44
swad_user.c
View File

@ -1337,21 +1337,24 @@ void Usr_WriteFormLogin (void)
extern const char *Txt_New_on_PLATFORM_Sign_up;
extern const char *Txt_Create_account;
extern const char *Txt_Enter_from_X;
extern const char *Txt_Log_in;
extern const char *Txt_User;
extern const char *Txt_nick_email_or_ID;
extern const char *Txt_Password;
extern const char *Txt_Log_in;
extern const char *Txt_password;
extern const char *Txt_I_forgot_my_password;
/***** Link to create a new account *****/
/***** Links to other actions *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:20px;\">");
/* Link to create a new account */
Act_FormStart (ActFrmUsrAcc);
sprintf (Gbl.Title,Txt_New_on_PLATFORM_Sign_up,Cfg_PLATFORM_SHORT_NAME);
Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("arroba",Txt_Create_account,Gbl.Title);
Act_FormEnd ();
/***** Link to enter from external site *****/
/* Link to enter from external site */
if (Cfg_EXTERNAL_LOGIN_URL[0] &&
Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME[0])
{
@ -1362,6 +1365,14 @@ void Usr_WriteFormLogin (void)
Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME);
Lay_PutSendIcon ("login",Gbl.Title,Gbl.Title);
}
/* Link to send a new password */
Act_FormStart (ActReqSndNewPwd);
Par_PutHiddenParamString ("UsrId",Gbl.Usrs.Me.UsrIdLogin);
Act_LinkFormSubmit (Txt_I_forgot_my_password,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("key",Txt_I_forgot_my_password,Txt_I_forgot_my_password);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
/***** Form start *****/
@ -1371,9 +1382,9 @@ void Usr_WriteFormLogin (void)
/***** User's ID/nickname and password *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"<td class=\"BM\">"
"<img src=\"%s/user16x16.gif\" title=\"%s\""
" class=\"ICON16x16\" />"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">"
"<input type=\"text\" id=\"UsrId\" name=\"UsrId\""
@ -1382,23 +1393,24 @@ void Usr_WriteFormLogin (void)
"</td>"
"</tr>"
"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"<td class=\"BM\">"
"<img src=\"%s/key16x16.gif\" title=\"%s\""
" class=\"ICON16x16\" />"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">"
"<input type=\"password\" name=\"UsrPwd\""
" size=\"25\" maxlength=\"%u\" />"
" size=\"25\" maxlength=\"%u\" placeholder=\"%s\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Gbl.Prefs.IconsURL,
Txt_User,
Usr_MAX_LENGTH_USR_LOGIN,
Txt_nick_email_or_ID,
Gbl.Usrs.Me.UsrIdLogin,
The_ClassFormul[Gbl.Prefs.Theme],
Gbl.Prefs.IconsURL,
Txt_Password,
Pwd_MAX_LENGTH_PLAIN_PASSWORD);
Pwd_MAX_LENGTH_PLAIN_PASSWORD,
Txt_password);
/***** Send button and form end *****/
fprintf (Gbl.F.Out,"<tr>"
@ -1412,12 +1424,6 @@ void Usr_WriteFormLogin (void)
Lay_EndRoundFrameTable10 ();
Act_FormEnd ();
/***** Link used for sending a new password *****/
Act_FormStart (ActReqSndNewPwd);
Par_PutHiddenParamString ("UsrId",Gbl.Usrs.Me.UsrIdLogin);
Act_LinkFormSubmit (Txt_I_forgot_my_password,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("key",Txt_I_forgot_my_password,Txt_I_forgot_my_password);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}