diff --git a/swad_changelog.h b/swad_changelog.h index 9eb8db43d..864f79c50 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.96.2 (2015/03/18)" +#define Log_PLATFORM_VERSION "SWAD 14.96.3 (2015/03/18)" // 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.96.3: Mar 18, 2015 Changes in record cards. (183017 lines) Version 14.96.2: Mar 18, 2015 Changes in record cards. (183011 lines) Version 14.96.1: Mar 18, 2015 Changes in user's profile. (183015 lines) Version 14.96: Mar 18, 2015 New layout in record cards. (183011 lines) diff --git a/swad_profile.c b/swad_profile.c index 817c36680..11f34146d 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -79,7 +79,6 @@ static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickna static void Prf_GetUsrDatAndShowUserProfile (void); static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat); -static void Prf_ShowHistoricUserProfile (const struct UsrData *UsrDat); static void Prf_GetUsrFigures (long UsrCod,struct UsrFigures *UsrFigures); @@ -238,15 +237,12 @@ bool Prf_ShowUserProfile (void) /***** Common record *****/ Rec_ShowSharedUsrRecord (Rec_RECORD_PUBLIC,&Gbl.Usrs.Other.UsrDat); - /***** Show details of user's profile *****/ - Prf_ShowDetailsUserProfile (&Gbl.Usrs.Other.UsrDat); - fprintf (Gbl.F.Out,"" "
" - "%s" - " | " - ""
- "%u %s " - "%u %s " - "%u %s" - "" - " | ",
- The_ClassFormul[Gbl.Prefs.Theme],
- Txt_ROLES_SINGUL_Abc[Rol_ROLE_TEACHER][UsrDat->Sex],
- NumCrssUsrIsTeacher,
- (NumCrssUsrIsTeacher == 1) ? Txt_course :
- Txt_courses,
- NumTchs,
- (NumTchs == 1) ? Txt_ROLES_SINGUL_abc[Rol_ROLE_TEACHER][Usr_SEX_UNKNOWN] :
- Txt_ROLES_PLURAL_abc[Rol_ROLE_TEACHER][Usr_SEX_UNKNOWN],
- NumStds,
- (NumStds == 1) ? Txt_ROLES_SINGUL_abc[Rol_ROLE_STUDENT][Usr_SEX_UNKNOWN] :
- Txt_ROLES_PLURAL_abc[Rol_ROLE_STUDENT][Usr_SEX_UNKNOWN]);
- }
- if ((NumCrssUsrIsStudent = Usr_GetNumCrssOfUsrWithARole (UsrDat->UsrCod,Rol_ROLE_STUDENT)))
- {
- NumTchs = Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_ROLE_STUDENT,Rol_ROLE_TEACHER);
- NumStds = Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_ROLE_STUDENT,Rol_ROLE_STUDENT);
- fprintf (Gbl.F.Out,"" - "%s" - " | " - ""
- "%u %s " - "%u %s " - "%u %s" - "" - " | ",
- The_ClassFormul[Gbl.Prefs.Theme],
- Txt_ROLES_SINGUL_Abc[Rol_ROLE_STUDENT][UsrDat->Sex],
- NumCrssUsrIsStudent,
- (NumCrssUsrIsStudent == 1) ? Txt_course :
- Txt_courses,
- NumTchs,
- (NumTchs == 1) ? Txt_ROLES_SINGUL_abc[Rol_ROLE_TEACHER][Usr_SEX_UNKNOWN] :
- Txt_ROLES_PLURAL_abc[Rol_ROLE_TEACHER][Usr_SEX_UNKNOWN],
- NumStds,
- (NumStds == 1) ? Txt_ROLES_SINGUL_abc[Rol_ROLE_STUDENT][Usr_SEX_UNKNOWN] :
- Txt_ROLES_PLURAL_abc[Rol_ROLE_STUDENT][Usr_SEX_UNKNOWN]);
- }
-
- /***** Number of files currently published *****/
- if ((NumFiles = Brw_GetNumFilesUsr (UsrDat->UsrCod)))
- NumPublicFiles = Brw_GetNumPublicFilesUsr (UsrDat->UsrCod);
- else
- NumPublicFiles = 0;
- fprintf (Gbl.F.Out,"" - "%s" - " | " - ""
- "%u %s " - "%u %s" - "" - " | ",
- The_ClassFormul[Gbl.Prefs.Theme],
- Txt_Files,
- NumFiles,
- (NumFiles == 1) ? Txt_file :
- Txt_files,
- NumPublicFiles,Txt_public_FILES);
-
- /***** End of table *****/
- fprintf (Gbl.F.Out,"
" + "%s" + " | " + ""
+ "%u %s " + "%u %s + %u %s" + "" + " | "
+ "
" + "%s" + " | " + ""
+ "%u %s " + "%u %s + %u %s" + "" + " | "
+ "
" + "%s" + " | " + ""
+ "%u %s " + "%u %s" + "" + " | "
+ "", C4_WIDTH); Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : @@ -2208,7 +2209,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, ""); /***** Commands *****/ - CommandsRowspan = 4; // Name + Webs/social networks + Layout row + Country + CommandsRowspan = 5; // Name + Nickname + Webs/social networks + Layout row + Country if (ShowIDRows) CommandsRowspan += 6; // Email, ID, Role, Surname1, Surname2, Firstname if (ShowAddressRows) @@ -2390,14 +2391,19 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, /***** Full name *****/ fprintf (Gbl.F.Out," | "
- "%s %s %s", + "%s %s %s" + " | "
+ "",
C2_WIDTH + C3_WIDTH,
UsrDat->FirstName ,
UsrDat->Surname1,
UsrDat->Surname2);
/***** User's nickname *****/
- fprintf (Gbl.F.Out,""
+ " ",
+ C2_WIDTH + C3_WIDTH);
if (UsrDat->Nickname[0])
{
if (GoToPublicProfileForm)
@@ -2437,7 +2443,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
ClassData,C2_WIDTH + C3_WIDTH);
if (ShowData)
{
- if (DataForm)
+ if (CountryForm)
{
/* If list of countries is empty, try to get it */
if (!Gbl.Ctys.Num)
@@ -3243,7 +3249,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
Lay_ShowAlert (Lay_WARNING,Txt_Before_going_to_any_other_option_you_must_fill_your_centre_and_department);
/***** Start table *****/
- Lay_StartRoundFrameTable10 ("580px",2,
+ Lay_StartRoundFrameTable10 ("560px",2,
IAmTeacher ? Txt_Institution_centre_and_department :
Txt_Institution);
diff --git a/swad_record.h b/swad_record.h
index 9265bcd23..340962cd9 100644
--- a/swad_record.h
+++ b/swad_record.h
@@ -35,11 +35,7 @@
/***************************** Public constants ******************************/
/*****************************************************************************/
-#define Rec_WIDTH_SHARE_RECORD_BIG 580
-// #define Rec_WIDTH_SHARE_RECORD_SMALL 540
-// #define Rec_WIDTH_SHARE_RECORD_PRINT 540
-// #define Rec_WIDTH_COURSE_RECORD Rec_WIDTH_SHARE_RECORD_BIG
-// #define Rec_WIDTH_COURSE_RECORD_PRINT Rec_WIDTH_SHARE_RECORD_BIG
+#define Rec_WIDTH_SHARE_RECORD_BIG 560
#define Rec_MAX_LENGTH_NAME_FIELD 255
#define Rec_MIN_LINES_IN_EDITION_FIELD 1
diff --git a/swad_text.c b/swad_text.c
index 5fd30d01c..ca3cb9412 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -38084,7 +38084,7 @@ const char *Txt_Tags = // Tags used in test
const char *Txt_Teachers_ABBREVIATION = // Abbreviation of "Teachers"
#if L==0
- "Prof."; // Necessita traduccio
+ "Prof.";
#elif L==1
"Lehr.";
#elif L==2
@@ -38098,11 +38098,32 @@ const char *Txt_Teachers_ABBREVIATION = // Abbreviation of "Teachers"
#elif L==6
"Prof.";
#elif L==7
- "Teach."; // Potrzebujesz tlumaczenie
+ "Naucz.";
#elif L==8
"Prof.";
#endif
+const char *Txt_teachers_ABBREVIATION = // Abbreviation of "Teachers"
+#if L==0
+ "prof.";
+#elif L==1
+ "Lehr.";
+#elif L==2
+ "teach.";
+#elif L==3
+ "prof.";
+#elif L==4
+ "enseig.";
+#elif L==5
+ "prof."; // Okoteve traducción
+#elif L==6
+ "prof.";
+#elif L==7
+ "naucz.";
+#elif L==8
+ "prof.";
+#endif
+
const char *Txt_Test =
#if L==0
"Test";
diff --git a/swad_timetable.c b/swad_timetable.c
index e6a16e425..bda7c7383 100644
--- a/swad_timetable.c
+++ b/swad_timetable.c
@@ -781,7 +781,7 @@ static void TT_DrawTimeTable (void)
}
/***** Table start *****/
- fprintf (Gbl.F.Out," |