diff --git a/swad_account.c b/swad_account.c
index 6c337521..36609d90 100644
--- a/swad_account.c
+++ b/swad_account.c
@@ -37,6 +37,7 @@
#include "swad_ID.h"
#include "swad_notification.h"
#include "swad_parameter.h"
+#include "swad_preference.h"
#include "swad_profile.h"
#include "swad_social.h"
@@ -101,12 +102,13 @@ void Acc_ShowFormAccount (void)
Acc_ShowFormChangeMyAccount ();
else
{
- Acc_ShowFormRequestNewAccountWithParams ("","");
+ /* Links to log in and to change language */
+ fprintf (Gbl.F.Out,"");
- /***** Form to send students to be enrolled / removed *****/
- Act_FormStart (ActEdiPrf);
- Lay_PutConfirmButton ("Change language");
- Act_FormEnd ();
+ Acc_ShowFormRequestNewAccount ();
}
}
@@ -114,11 +116,19 @@ void Acc_ShowFormAccount (void)
/********************* Show form to create a new account *********************/
/*****************************************************************************/
+void Acc_ShowFormRequestNewAccount (void)
+ {
+ Acc_ShowFormRequestNewAccountWithParams ("","");
+ }
+
+/*****************************************************************************/
+/************ Show form to create a new account using parameters *************/
+/*****************************************************************************/
+
static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWithoutArroba,
const char *NewEmail)
{
extern const char *The_ClassForm[The_NUM_THEMES];
- extern const char *Txt_Log_in;
extern const char *Txt_Nickname;
extern const char *Txt_HELP_nickname;
extern const char *Txt_HELP_email;
@@ -127,12 +137,6 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
extern const char *Txt_Create_account;
char NewNicknameWithArroba[Nck_MAX_BYTES_NICKNAME_WITH_ARROBA+1];
- /***** Link to log in *****/
- fprintf (Gbl.F.Out,"");
-
/***** Form to enter some data of the new user *****/
Act_FormStart (ActCreUsrAcc);
sprintf (Gbl.Title,Txt_New_on_PLATFORM_Sign_up,Cfg_PLATFORM_SHORT_NAME);
diff --git a/swad_account.h b/swad_account.h
index 18e2833f..15b68b1f 100644
--- a/swad_account.h
+++ b/swad_account.h
@@ -45,6 +45,7 @@
/*****************************************************************************/
void Acc_ShowFormAccount (void);
+void Acc_ShowFormRequestNewAccount (void);
void Acc_ShowFormChangeMyAccount (void);
bool Acc_CreateNewAccountAndLogIn (void);
void Acc_CreateNewUsr (struct UsrData *UsrDat);
diff --git a/swad_action.c b/swad_action.c
index 2f722b4f..bad24c90 100644
--- a/swad_action.c
+++ b/swad_action.c
@@ -4539,7 +4539,7 @@ void Act_AdjustActionWhenNoUsrLogged (void)
else if (Gbl.CurrentCty.Cty.CtyCod > 0) // Country selected
Gbl.Action.Act = ActSeeCtyInf;
else
- Gbl.Action.Act = Cfg_DEFAULT_ACTION_WHEN_NO_USR_LOGGED;
+ Gbl.Action.Act = ActFrmLogIn;
Tab_SetCurrentTab ();
}
diff --git a/swad_changelog.h b/swad_changelog.h
index e47117d2..ae4e85d4 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -110,23 +110,30 @@
// TODO: Reply to all
// TODO: Hour in exam announcement should start at six a.m.
-// TODO: FIX BUG: In results of search of students, no mark of confirmation is shown even if the student really has confirmed his/her registration in the course
// TODO: Forum SWAD should be always named "SWAD"?
// TODO: Enable chat for guests?
// TODO: Go to forum post (or at least to forum thread) from social timeline and notifications?
// TODO: Width of column for data in notifications is too short
+// TODO: Change size of DegTypName in table deg_types from VARCHAR(32) TO VARCHAR(255)
+// TODO: Remove AllowDirectLogIn in table deg_types
+// TODO: If a follower follows a user whose profile is no longer visible ==> put icon to unfollow in list of followed
+// TODO: FIX BUG: In results of search of students, no mark of confirmation is shown even if the student really has confirmed his/her registration in the course
+
+// TODO: Remove edition of years in edition of degrees. Every degree will have years from 1 to 12 (and N.A.)
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 15.137.2 (2016-02-16)"
+#define Log_PLATFORM_VERSION "SWAD 15.138 (2016-02-29)"
#define CSS_FILE "swad15.137.2.css"
#define JS_FILE "swad15.131.3.js"
// 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 15.138: Feb 29, 2016 Form to sign up is shown below login form. (196012 lines)
+ Version 15.137.3: Feb 29, 2016 Change in button when file uploading is done. (195986 lines)
Version 15.137.2: Feb 13, 2016 Fixed bug in search of my documents. (195985 lines)
Version 15.137.1: Feb 13, 2016 Fixed bug at the end of ranking (number too low). (195968 lines)
Version 15.137: Feb 07, 2016 New figure about number of social notes. (195953 lines)
diff --git a/swad_config.h b/swad_config.h
index 7a11d32c..1907cf9d 100644
--- a/swad_config.h
+++ b/swad_config.h
@@ -84,7 +84,6 @@
#define Cfg_ABOUT_LOGO_HEIGHT 40
#define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS
-#define Cfg_DEFAULT_ACTION_WHEN_NO_USR_LOGGED ActFrmUsrAcc
#define Cfg_EXTERNAL_LOGIN_CLIENT_COMMAND "" // Client of the web service called by this CGI
#define Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME ""
@@ -137,7 +136,6 @@
#define Cfg_ABOUT_LOGO_HEIGHT 32
#define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS
-#define Cfg_DEFAULT_ACTION_WHEN_NO_USR_LOGGED ActFrmUsrAcc
#define Cfg_EXTERNAL_LOGIN_CLIENT_COMMAND "" // Client of the web service called by this CGI
#define Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME ""
@@ -207,7 +205,6 @@
#define Cfg_ABOUT_LOGO_HEIGHT 32
#define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS
-#define Cfg_DEFAULT_ACTION_WHEN_NO_USR_LOGGED ActFrmLogIn
#define Cfg_EXTERNAL_LOGIN_CLIENT_COMMAND "./prado" // Client of the web service called by this CGI
#define Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME "PRADO"
@@ -267,7 +264,6 @@
#define Cfg_ABOUT_LOGO_HEIGHT 32
#define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS
-#define Cfg_DEFAULT_ACTION_WHEN_NO_USR_LOGGED ActFrmLogIn
#define Cfg_EXTERNAL_LOGIN_CLIENT_COMMAND "" // Client of the web service called by this CGI
#define Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME ""
diff --git a/swad_preference.c b/swad_preference.c
index 1a66931d..67dc3f15 100644
--- a/swad_preference.c
+++ b/swad_preference.c
@@ -230,6 +230,19 @@ void Pre_RemoveOldPrefsFromIP (void)
DB_QueryDELETE (Query,"can not remove old preferences");
}
+/*****************************************************************************/
+/************** Put link to change language (edit preferences) ***************/
+/*****************************************************************************/
+
+void Pre_PutLinkToChangeLanguage (void)
+ {
+ extern const char *Txt_Log_in;
+
+ Lay_PutContextualLink (ActEdiPrf,NULL,
+ "cty64x64.gif",
+ "Change language","Change language");
+ }
+
/*****************************************************************************/
/********************* Put a selector to select language *********************/
/*****************************************************************************/
diff --git a/swad_preference.h b/swad_preference.h
index 6f01df85..10b83a24 100644
--- a/swad_preference.h
+++ b/swad_preference.h
@@ -45,6 +45,7 @@ void Pre_GetPrefsFromIP (void);
void Pre_SetPrefsFromIP (void);
void Pre_RemoveOldPrefsFromIP (void);
+void Pre_PutLinkToChangeLanguage (void);
void Pre_PutSelectorToSelectLanguage (void);
void Pre_AskChangeLanguage (void);
void Pre_ChangeLanguage (void);
diff --git a/swad_text.c b/swad_text.c
index 9b2b09d9..5a64f28c 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -11382,23 +11382,23 @@ const char *Txt_File_size =
const char *Txt_FILE_UPLOAD_Done =
#if L==1
- "Finalitzar";
+ "Fet";
#elif L==2
"Gemacht";
#elif L==3
"Done";
#elif L==4
- "Finalizar";
+ "Hecho";
#elif L==5
- "Fini";
+ "Terminé";
#elif L==6
- "Finalizar"; // Okoteve traducción
+ "Hecho"; // Okoteve traducción
#elif L==7
"Fatto";
#elif L==8
"Gotowe";
#elif L==9
- "Terminar";
+ "Feito";
#endif
const char *Txt_File_with_the_logo =
diff --git a/swad_user.c b/swad_user.c
index efa1fc6f..c98edd6c 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -1443,6 +1443,19 @@ void Usr_Logout (void)
Lay_AdvertisementMobile ();
}
+/*****************************************************************************/
+/*************************** Put link to log in ******************************/
+/*****************************************************************************/
+
+void Usr_PutLinkToLogin (void)
+ {
+ extern const char *Txt_Log_in;
+
+ Lay_PutContextualLink (ActFrmLogIn,NULL,
+ "login-green64x64.png",
+ Txt_Log_in,Txt_Log_in);
+ }
+
/*****************************************************************************/
/************************ Write form for user log in *************************/
/*****************************************************************************/
@@ -1450,7 +1463,6 @@ void Usr_Logout (void)
void Usr_WriteFormLogin (void)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
- extern const char *Txt_Create_account;
extern const char *Txt_Enter_from_X;
extern const char *Txt_Log_in;
extern const char *Txt_User;
@@ -1461,10 +1473,6 @@ void Usr_WriteFormLogin (void)
/***** Links to other actions *****/
fprintf (Gbl.F.Out,"");
@@ -1538,6 +1547,9 @@ void Usr_WriteFormLogin (void)
Lay_EndRoundFrameTable ();
Act_FormEnd ();
+ /***** Form to create a new account *****/
+ Acc_ShowFormRequestNewAccount ();
+
fprintf (Gbl.F.Out,"");
}
@@ -2620,7 +2632,7 @@ void Usr_ShowFormsLogoutAndRole (void)
/***** Link to log out *****/
fprintf (Gbl.F.Out,"");
diff --git a/swad_user.h b/swad_user.h
index 3102d6d4..f11e20b5 100644
--- a/swad_user.h
+++ b/swad_user.h
@@ -247,6 +247,7 @@ bool Usr_ChkIfEncryptedUsrCodExists (const char *EncryptedUsrCod);
void Usr_WriteFormLoginLogout (void);
void Usr_Logout (void);
+void Usr_PutLinkToLogin (void);
void Usr_WriteFormLogin (void);
void Usr_WelcomeUsr (void);
void Usr_PutFormLogIn (void);