Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-05-31 22:05:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version19.32.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2019-10-11 09:09:19 +02:00
parent d36ae6a8cc
commit a2998c6b68
8 changed files with 235 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
swad_centre.c
View File

@ -183,14 +183,12 @@ void Ctr_SeeCtrWithPendingDegs (void)
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
fprintf (Gbl.F.Out,"%s" fprintf (Gbl.F.Out,"%s",Txt_Centre);
"</th>", Tbl_TH_End ();
Txt_Centre);
Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
fprintf (Gbl.F.Out,"%s" fprintf (Gbl.F.Out,"%s",Txt_Degrees_ABBREVIATION);
"</th>", Tbl_TH_End ();
Txt_Degrees_ABBREVIATION);
Tbl_TR_End (); Tbl_TR_End ();
@ -2701,9 +2699,8 @@ static void Ctr_PutHeadCentresForEdition (void)
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
fprintf (Gbl.F.Out,"%s" fprintf (Gbl.F.Out,"%s",Txt_Code);
"</th>", Tbl_TH_End ();
Txt_Code);
Tbl_TH_Empty (1); Tbl_TH_Empty (1);

3
swad_changelog.h
View File

@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 19.32.1 (2019-10-11)" #define Log_PLATFORM_VERSION "SWAD 19.32.2 (2019-10-11)"
#define CSS_FILE "swad19.29.css" #define CSS_FILE "swad19.29.css"
#define JS_FILE "swad19.30.js" #define JS_FILE "swad19.30.js"
/* /*
@ -496,6 +496,7 @@ ps2pdf source.ps destination.pdf
// TODO: En un TFG no preasignado con estudiante tiene que salir un triángulo amarillo // TODO: En un TFG no preasignado con estudiante tiene que salir un triángulo amarillo
// TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
Version 19.32.2: Oct 11, 2019 Code refactoring in HTML. (246668 lines)
Version 19.32.1: Oct 11, 2019 Code refactoring in HTML. (246668 lines) Version 19.32.1: Oct 11, 2019 Code refactoring in HTML. (246668 lines)
Version 19.32: Oct 10, 2019 Code refactoring in HTML. (246631 lines) Version 19.32: Oct 10, 2019 Code refactoring in HTML. (246631 lines)
Version 19.31.40: Oct 10, 2019 Code refactoring in HTML tables. (246669 lines) Version 19.31.40: Oct 10, 2019 Code refactoring in HTML tables. (246669 lines)

17
swad_chat.c
View File

@ -284,14 +284,15 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE LIGHT_BLUE\">"
"%s" Tbl_TH_Begin ("class=\"CENTER_MIDDLE LIGHT_BLUE\"");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_CHAT_Room_code);
"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">" Tbl_TH_End ();
"%s"
"</th>", Tbl_TH_Begin ("class=\"LEFT_MIDDLE LIGHT_BLUE\"");
Txt_CHAT_Room_code, fprintf (Gbl.F.Out,"%s",Txt_No_of_users);
Txt_No_of_users); Tbl_TH_End ();
Tbl_TR_End (); Tbl_TR_End ();
/***** Loop over chat rooms *****/ /***** Loop over chat rooms *****/

47
swad_classroom.c
View File

@ -120,7 +120,7 @@ void Cla_SeeClassrooms (void)
Order <= (Cla_Order_t) (Cla_NUM_ORDERS - 1); Order <= (Cla_Order_t) (Cla_NUM_ORDERS - 1);
Order++) Order++)
{ {
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"); Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
Frm_StartForm (ActSeeCla); Frm_StartForm (ActSeeCla);
Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order);
Frm_LinkFormSubmit (Txt_CLASSROOMS_HELP_ORDER[Order],"TIT_TBL",NULL); Frm_LinkFormSubmit (Txt_CLASSROOMS_HELP_ORDER[Order],"TIT_TBL",NULL);
@ -962,27 +962,30 @@ static void Cla_PutHeadClassrooms (void)
extern const char *Txt_Location; extern const char *Txt_Location;
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"BM\"></th>"
"<th class=\"RIGHT_MIDDLE\">" Tbl_TH_Begin ("class=\"BM\"");
"%s" Tbl_TH_End ();
"</th>"
"<th class=\"LEFT_MIDDLE\">" Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Code);
"</th>" Tbl_TH_End ();
"<th class=\"LEFT_MIDDLE\">"
"%s" Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Short_name);
"<th class=\"LEFT_MIDDLE\">" Tbl_TH_End ();
"%s"
"</th>" Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Full_name);
"%s" Tbl_TH_End ();
"</th>",
Txt_Code, Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
Txt_Short_name, fprintf (Gbl.F.Out,"%s",Txt_Capacity_OF_A_CLASSROOM);
Txt_Full_name, Tbl_TH_End ();
Txt_Capacity_OF_A_CLASSROOM,
Txt_Location); Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
fprintf (Gbl.F.Out,"%s",Txt_Location);
Tbl_TH_End ();
Tbl_TR_End (); Tbl_TR_End ();
} }

116
swad_country.c
View File

@ -156,14 +156,15 @@ void Cty_SeeCtyWithPendingInss (void)
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Country);
"<th class=\"RIGHT_MIDDLE\">" Tbl_TH_End ();
"%s"
"</th>", Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
Txt_Country, fprintf (Gbl.F.Out,"%s",Txt_Institutions_ABBREVIATION);
Txt_Institutions_ABBREVIATION); Tbl_TH_End ();
Tbl_TR_End (); Tbl_TR_End ();
/***** List the countries *****/ /***** List the countries *****/
@ -666,9 +667,9 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
Order <= Cty_ORDER_BY_NUM_USRS; Order <= Cty_ORDER_BY_NUM_USRS;
Order++) Order++)
{ {
fprintf (Gbl.F.Out,"<th class=\"%s\">", Tbl_TH_Begin ("class=\"%s\"",
Order == Cty_ORDER_BY_COUNTRY ? "LEFT_MIDDLE" : Order == Cty_ORDER_BY_COUNTRY ? "LEFT_MIDDLE" :
"RIGHT_MIDDLE"); "RIGHT_MIDDLE");
if (OrderSelectable) if (OrderSelectable)
{ {
Frm_StartForm (ActSeeCty); Frm_StartForm (ActSeeCty);
@ -687,27 +688,28 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
} }
Tbl_TH_End (); Tbl_TH_End ();
} }
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">"
"%s" Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Institutions_ABBREVIATION);
"<th class=\"RIGHT_MIDDLE\">" Tbl_TH_End ();
"%s"
"</th>" Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Centres_ABBREVIATION);
"%s" Tbl_TH_End ();
"</th>"
"<th class=\"RIGHT_MIDDLE\">" Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Degrees_ABBREVIATION);
"</th>" Tbl_TH_End ();
"<th class=\"RIGHT_MIDDLE\">"
"%s+<br />%s" Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_Courses_ABBREVIATION);
Txt_Institutions_ABBREVIATION, Tbl_TH_End ();
Txt_Centres_ABBREVIATION,
Txt_Degrees_ABBREVIATION, Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
Txt_Courses_ABBREVIATION, fprintf (Gbl.F.Out,"%s+<br />%s",
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
Tbl_TH_End ();
Tbl_TR_End (); Tbl_TR_End ();
} }
@ -2149,32 +2151,34 @@ static void Cty_PutHeadCountriesForEdition (void)
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"BM\"></th>" Tbl_TH_Begin ("class=\"BM\"");
"<th class=\"RIGHT_MIDDLE\">" Tbl_TH_End ();
"%s"
"</th>" Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Numeric_BR_code_BR_ISO_3166_1);
"%s" Tbl_TH_End ();
"</th>",
Txt_Numeric_BR_code_BR_ISO_3166_1, Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
Txt_Alphabetic_BR_code_BR_ISO_3166_1); fprintf (Gbl.F.Out,"%s",Txt_Alphabetic_BR_code_BR_ISO_3166_1);
Tbl_TH_End ();
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Name);
"<th class=\"LEFT_MIDDLE\">" Tbl_TH_End ();
"%s"
"</th>" Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_WWW);
"%s" Tbl_TH_End ();
"</th>"
"<th class=\"RIGHT_MIDDLE\">" Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Users);
"</th>", Tbl_TH_End ();
Txt_Name,
Txt_WWW, Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
Txt_Users, fprintf (Gbl.F.Out,"%s",Txt_Institutions_ABBREVIATION);
Txt_Institutions_ABBREVIATION); Tbl_TH_End ();
Tbl_TR_End (); Tbl_TR_End ();
} }

226
swad_course.c
View File

@ -1804,29 +1804,33 @@ static void Crs_PutHeadCoursesForSeeing (void)
extern const char *Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NUM_ROLES]; extern const char *Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NUM_ROLES];
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"BM\"></th>"
"<th class=\"CENTER_MIDDLE\">" Tbl_TH_Begin ("class=\"BM\"");
"%s" Tbl_TH_End ();
"</th>"
"<th class=\"CENTER_MIDDLE\">" Tbl_TH_Begin ("class=\"CENTER_MIDDLE\"");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Institutional_BR_code);
"</th>" Tbl_TH_End ();
"<th class=\"LEFT_MIDDLE\">"
"%s" Tbl_TH_Begin ("class=\"CENTER_MIDDLE\"");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Year_OF_A_DEGREE);
"<th class=\"RIGHT_MIDDLE\">" Tbl_TH_End ();
"%s"
"</th>" Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Course);
"%s" Tbl_TH_End ();
"</th>"
"<th class=\"LEFT_MIDDLE\">" Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
Txt_Institutional_BR_code, Tbl_TH_End ();
Txt_Year_OF_A_DEGREE,
Txt_Course, Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); Tbl_TH_End ();
Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
Tbl_TH_End ();
Tbl_TR_End (); Tbl_TR_End ();
} }
@ -1846,41 +1850,45 @@ static void Crs_PutHeadCoursesForEdition (void)
extern const char *Txt_Requester; extern const char *Txt_Requester;
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"BM\"></th>"
"<th class=\"RIGHT_MIDDLE\">" Tbl_TH_Begin ("class=\"BM\"");
"%s" Tbl_TH_End ();
"</th>"
"<th class=\"CENTER_MIDDLE\">" Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
"%s (%s)" fprintf (Gbl.F.Out,"%s",Txt_Code);
"</th>" Tbl_TH_End ();
"<th class=\"CENTER_MIDDLE\">"
"%s" Tbl_TH_Begin ("class=\"CENTER_MIDDLE\"");
"</th>" fprintf (Gbl.F.Out,"%s (%s)",Txt_Institutional_code,Txt_optional);
"<th class=\"LEFT_MIDDLE\">" Tbl_TH_End ();
"%s"
"</th>" Tbl_TH_Begin ("class=\"CENTER_MIDDLE\"");
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Year_OF_A_DEGREE);
"%s" Tbl_TH_End ();
"</th>"
"<th class=\"RIGHT_MIDDLE\">" Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Short_name_of_the_course);
"</th>" Tbl_TH_End ();
"<th class=\"RIGHT_MIDDLE\">"
"%s" Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Full_name_of_the_course);
"<th class=\"LEFT_MIDDLE\">" Tbl_TH_End ();
"%s"
"</th>" Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
"</th>", Tbl_TH_End ();
Txt_Code,
Txt_Institutional_code,Txt_optional, Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
Txt_Year_OF_A_DEGREE, fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
Txt_Short_name_of_the_course, Tbl_TH_End ();
Txt_Full_name_of_the_course,
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD], fprintf (Gbl.F.Out,"%s",Txt_Requester);
Txt_Requester); Tbl_TH_End ();
Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
Tbl_TH_End ();
Tbl_TR_End (); Tbl_TR_End ();
} }
@ -3109,34 +3117,43 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role)
Txt_USER_in_COURSE, Txt_USER_in_COURSE,
Role == Rol_UNK ? Txt_User[Usr_SEX_UNKNOWN] : // Role == Rol_UNK ==> any role Role == Rol_UNK ? Txt_User[Usr_SEX_UNKNOWN] : // Role == Rol_UNK ==> any role
Txt_ROLES_SINGUL_Abc[Role][UsrDat->Sex]); Txt_ROLES_SINGUL_Abc[Role][UsrDat->Sex]);
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th colspan=\"7\" class=\"LEFT_MIDDLE\">%s:</th>",
Gbl.Title); Tbl_TH_Begin ("colspan=\"7\" class=\"LEFT_MIDDLE\"");
fprintf (Gbl.F.Out,"%s:",Gbl.Title);
Tbl_TH_End ();
Tbl_TR_End (); Tbl_TR_End ();
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"BM\"></th>"
"<th class=\"BM\"></th>" Tbl_TH_Begin ("class=\"BM\"");
"<th class=\"LEFT_MIDDLE\">" Tbl_TH_End ();
"%s"
"</th>" Tbl_TH_Begin ("class=\"BM\"");
"<th class=\"CENTER_MIDDLE\">" Tbl_TH_End ();
"%s"
"</th>" Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Degree);
"%s" Tbl_TH_End ();
"</th>"
"<th class=\"RIGHT_MIDDLE\">" Tbl_TH_Begin ("class=\"CENTER_MIDDLE\"");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Year_OF_A_DEGREE);
"</th>" Tbl_TH_End ();
"<th class=\"RIGHT_MIDDLE\">"
"%s" Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_Course);
Txt_Degree, Tbl_TH_End ();
Txt_Year_OF_A_DEGREE,
Txt_Course, Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); Tbl_TH_End ();
Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
Tbl_TH_End ();
Tbl_TR_End (); Tbl_TR_End ();
/* Write courses */ /* Write courses */
@ -3188,27 +3205,30 @@ void Crs_ListCrssFound (MYSQL_RES **mysql_res,unsigned NumCrss)
/***** Heading row *****/ /***** Heading row *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"BM\"></th>"
"<th class=\"LEFT_MIDDLE\">" Tbl_TH_Begin ("class=\"BM\"");
"%s" Tbl_TH_End ();
"</th>"
"<th class=\"CENTER_MIDDLE\">" Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Degree);
"</th>" Tbl_TH_End ();
"<th class=\"LEFT_MIDDLE\">"
"%s" Tbl_TH_Begin ("class=\"CENTER_MIDDLE\"");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Year_OF_A_DEGREE);
"<th class=\"RIGHT_MIDDLE\">" Tbl_TH_End ();
"%s"
"</th>" Tbl_TH_Begin ("class=\"LEFT_MIDDLE\"");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Course);
"%s" Tbl_TH_End ();
"</th>",
Txt_Degree, Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
Txt_Year_OF_A_DEGREE, fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
Txt_Course, Tbl_TH_End ();
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\"");
fprintf (Gbl.F.Out,"%s", Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
Tbl_TH_End ();
Tbl_TR_End (); Tbl_TR_End ();
/***** Write courses *****/ /***** Write courses *****/

4
swad_group.c
View File

@ -5051,8 +5051,8 @@ void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) (void))
if (FuncParams) // Extra parameters depending on the action if (FuncParams) // Extra parameters depending on the action
FuncParams (); FuncParams ();
Ico_PutSettingIconLink (WhichGrps == Grp_MY_GROUPS ? "mysitemap.png" : Ico_PutSettingIconLink (WhichGrps == Grp_MY_GROUPS ? "mysitemap.png" :
"sitemap.svg", "sitemap.svg",
Txt_GROUP_WHICH_GROUPS[WhichGrps]); Txt_GROUP_WHICH_GROUPS[WhichGrps]);
Frm_EndForm (); Frm_EndForm ();
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }

22
swad_survey.c
View File

@ -595,7 +595,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
/***** Write second row of data of this survey *****/ /***** Write second row of data of this survey *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
/* Author of the survey */ /* 1st column: Author of the survey */
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
Tbl_TD_Begin ("colspan=\"2\" class=\"LEFT_TOP\""); Tbl_TD_Begin ("colspan=\"2\" class=\"LEFT_TOP\"");
else else
@ -603,11 +603,11 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
Svy_WriteAuthor (&Svy); Svy_WriteAuthor (&Svy);
Tbl_TD_End (); Tbl_TD_End ();
/* 2nd column: Scope, Users, Groups and Text */
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
Tbl_TD_Begin ("class=\"LEFT_TOP\""); Tbl_TD_Begin ("class=\"LEFT_TOP\"");
else else
Tbl_TD_Begin ("class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd); Tbl_TD_Begin ("class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Tbl_TD_End ();
/* Scope of the survey */ /* Scope of the survey */
fprintf (Gbl.F.Out,"<div class=\"%s\">%s: ", fprintf (Gbl.F.Out,"<div class=\"%s\">%s: ",
@ -620,28 +620,22 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
Lay_ShowErrorAndExit ("Wrong survey scope."); Lay_ShowErrorAndExit ("Wrong survey scope.");
break; break;
case Hie_SYS: // System case Hie_SYS: // System
fprintf (Gbl.F.Out,"%s", fprintf (Gbl.F.Out,"%s",Cfg_PLATFORM_SHORT_NAME);
Cfg_PLATFORM_SHORT_NAME);
break; break;
case Hie_CTY: // Country case Hie_CTY: // Country
fprintf (Gbl.F.Out,"%s %s", fprintf (Gbl.F.Out,"%s %s",Txt_Country,Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]);
Txt_Country,Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]);
break; break;
case Hie_INS: // Institution case Hie_INS: // Institution
fprintf (Gbl.F.Out,"%s %s", fprintf (Gbl.F.Out,"%s %s",Txt_Institution,Gbl.Hierarchy.Ins.ShrtName);
Txt_Institution,Gbl.Hierarchy.Ins.ShrtName);
break; break;
case Hie_CTR: // Centre case Hie_CTR: // Centre
fprintf (Gbl.F.Out,"%s %s", fprintf (Gbl.F.Out,"%s %s",Txt_Centre,Gbl.Hierarchy.Ctr.ShrtName);
Txt_Centre,Gbl.Hierarchy.Ctr.ShrtName);
break; break;
case Hie_DEG: // Degree case Hie_DEG: // Degree
fprintf (Gbl.F.Out,"%s %s", fprintf (Gbl.F.Out,"%s %s",Txt_Degree,Gbl.Hierarchy.Deg.ShrtName);
Txt_Degree,Gbl.Hierarchy.Deg.ShrtName);
break; break;
case Hie_CRS: // Course case Hie_CRS: // Course
fprintf (Gbl.F.Out,"%s %s", fprintf (Gbl.F.Out,"%s %s",Txt_Course,Gbl.Hierarchy.Crs.ShrtName);
Txt_Course,Gbl.Hierarchy.Crs.ShrtName);
break; break;
} }
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");