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

Version19.31.28

This commit is contained in:
Antonio Cañas Vargas 2019-10-09 15:09:42 +02:00
parent 02b72c6868
commit 3e2260a8a9
7 changed files with 161 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.31.27 (2019-10-08)" #define Log_PLATFORM_VERSION "SWAD 19.31.28 (2019-10-08)"
#define CSS_FILE "swad19.29.css" #define CSS_FILE "swad19.29.css"
#define JS_FILE "swad19.30.js" #define JS_FILE "swad19.30.js"
/* /*
@ -495,6 +495,7 @@ ps2pdf source.ps destination.pdf
// TODO: Un TFG preasignado sin estudiante tiene que salir un triángulo amarillo // TODO: Un TFG preasignado sin 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.31.28: Oct 08, 2019 Code refactoring in HTML tables. (246783 lines)
Version 19.31.27: Oct 08, 2019 Code refactoring in HTML tables. (246823 lines) Version 19.31.27: Oct 08, 2019 Code refactoring in HTML tables. (246823 lines)
Version 19.31.26: Oct 08, 2019 Code refactoring in HTML tables. (246850 lines) Version 19.31.26: Oct 08, 2019 Code refactoring in HTML tables. (246850 lines)
Version 19.31.25: Oct 08, 2019 Code refactoring in HTML tables. (246872 lines) Version 19.31.25: Oct 08, 2019 Code refactoring in HTML tables. (246872 lines)

10
swad_info.c
View File

@ -1134,12 +1134,13 @@ void Inf_FormsToSelSendInfo (void)
InfoSrc < Inf_NUM_INFO_SOURCES; InfoSrc < Inf_NUM_INFO_SOURCES;
InfoSrc++) InfoSrc++)
{ {
/* Select info source */
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP");
/* Select info source */
if (InfoSrc == InfoSrcSelected) if (InfoSrc == InfoSrcSelected)
fprintf (Gbl.F.Out," LIGHT_BLUE"); Tbl_StartCellAttr ("class=\"DAT LEFT_TOP LIGHT_BLUE\"");
fprintf (Gbl.F.Out,"\">"); else
Tbl_StartCellAttr ("class=\"DAT LEFT_TOP\"");
Frm_StartForm (Inf_ActionsSelecInfoSrc[Gbl.Crs.Info.Type]); Frm_StartForm (Inf_ActionsSelecInfoSrc[Gbl.Crs.Info.Type]);
fprintf (Gbl.F.Out,"<input type=\"radio\"" fprintf (Gbl.F.Out,"<input type=\"radio\""
" id=\"InfoSrc%u\" name=\"InfoSrc\" value=\"%u\"", " id=\"InfoSrc%u\" name=\"InfoSrc\" value=\"%u\"",
@ -1173,6 +1174,7 @@ void Inf_FormsToSelSendInfo (void)
if (Inf_FormsForEditionTypes[InfoSrc]) if (Inf_FormsForEditionTypes[InfoSrc])
Inf_FormsForEditionTypes[InfoSrc] (InfoSrc); Inf_FormsForEditionTypes[InfoSrc] (InfoSrc);
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
} }

227
swad_institution.c
View File

@ -202,16 +202,14 @@ void Ins_SeeInsWithPendingCtrs (void)
/* Institution logo and name */ /* Institution logo and name */
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE %s\">", Tbl_StartCellAttr ("class=\"LEFT_MIDDLE %s\"",BgColor);
BgColor);
Ins_DrawInstitutionLogoAndNameWithLink (&Ins,ActSeeCtr, Ins_DrawInstitutionLogoAndNameWithLink (&Ins,ActSeeCtr,
"DAT_NOBR","CENTER_MIDDLE"); "DAT_NOBR","CENTER_MIDDLE");
Tbl_EndCell (); Tbl_EndCell ();
/* Number of pending centres (row[1]) */ /* Number of pending centres (row[1]) */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE %s\">" Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE %s\"",BgColor);
"%s", fprintf (Gbl.F.Out,"%s",row[1]);
BgColor,row[1]);
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
@ -359,13 +357,13 @@ static void Ins_Configuration (bool PrintView)
/***** Country *****/ /***** Country *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"RIGHT_MIDDLE\"");
"<label for=\"OthCtyCod\" class=\"%s\">%s:</label>", fprintf (Gbl.F.Out,"<label for=\"OthCtyCod\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme], The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Country); Txt_Country);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
if (!PrintView && if (!PrintView &&
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM) Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
// Only system admins can move an institution to another country // Only system admins can move an institution to another country
@ -402,13 +400,13 @@ static void Ins_Configuration (bool PrintView)
/***** Institution full name *****/ /***** Institution full name *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"RIGHT_MIDDLE\"");
"<label for=\"FullName\" class=\"%s\">%s:</label>", fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme], The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Institution); Txt_Institution);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT_N LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"DAT_N LEFT_MIDDLE\"");
if (!PrintView && if (!PrintView &&
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM) Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
// Only system admins can edit institution full name // Only system admins can edit institution full name
@ -434,13 +432,13 @@ static void Ins_Configuration (bool PrintView)
/***** Institution short name *****/ /***** Institution short name *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"RIGHT_MIDDLE\"");
"<label for=\"ShortName\" class=\"%s\">%s:</label>", fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme], The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Short_name); Txt_Short_name);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT_N LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"DAT_N LEFT_MIDDLE\"");
if (!PrintView && if (!PrintView &&
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM) Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
// Only system admins can edit institution short name // Only system admins can edit institution short name
@ -466,13 +464,13 @@ static void Ins_Configuration (bool PrintView)
/***** Institution WWW *****/ /***** Institution WWW *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"RIGHT_MIDDLE\"");
"<label for=\"WWW\" class=\"%s\">%s:</label>", fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme], The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Web); Txt_Web);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
if (!PrintView && if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM) Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM)
// Only institution admins and system admins // Only institution admins and system admins
@ -504,14 +502,12 @@ static void Ins_Configuration (bool PrintView)
/***** Shortcut to the institution *****/ /***** Shortcut to the institution *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
"%s:", fprintf (Gbl.F.Out,"%s:",Txt_Shortcut);
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Shortcut);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">" Tbl_StartCellAttr ("class=\"LEFT_MIDDLE\"");
"<a href=\"%s/%s?ins=%ld\" class=\"DAT\" target=\"_blank\">" fprintf (Gbl.F.Out,"<a href=\"%s/%s?ins=%ld\" class=\"DAT\" target=\"_blank\">"
"%s/%s?ins=%ld" "%s/%s?ins=%ld"
"</a>", "</a>",
Cfg_URL_SWAD_CGI, Cfg_URL_SWAD_CGI,
@ -529,13 +525,11 @@ static void Ins_Configuration (bool PrintView)
/***** QR code with link to the institution *****/ /***** QR code with link to the institution *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
"%s:", fprintf (Gbl.F.Out,"%s:",Txt_QR_code);
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_QR_code);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"LEFT_MIDDLE\"");
QR_LinkTo (250,"ins",Gbl.Hierarchy.Ins.InsCod); QR_LinkTo (250,"ins",Gbl.Hierarchy.Ins.InsCod);
Tbl_EndCell (); Tbl_EndCell ();
@ -546,29 +540,24 @@ static void Ins_Configuration (bool PrintView)
/***** Number of users who claim to belong to this institution *****/ /***** Number of users who claim to belong to this institution *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
"%s:", fprintf (Gbl.F.Out,"%s:",Txt_Users_of_the_institution);
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Users_of_the_institution);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
"%u", fprintf (Gbl.F.Out,"%u",Usr_GetNumUsrsWhoClaimToBelongToIns (Gbl.Hierarchy.Ins.InsCod));
Usr_GetNumUsrsWhoClaimToBelongToIns (Gbl.Hierarchy.Ins.InsCod));
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
Tbl_StartRow (); Tbl_StartRow ();
/***** Number of centres *****/ /***** Number of centres *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
"%s:", fprintf (Gbl.F.Out,"%s:",Txt_Centres);
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Centres);
Tbl_EndCell (); Tbl_EndCell ();
/* Form to go to see centres of this institution */ /* Form to go to see centres of this institution */
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"LEFT_MIDDLE\"");
Frm_StartFormGoTo (ActSeeCtr); Frm_StartFormGoTo (ActSeeCtr);
Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod); Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod);
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
@ -585,15 +574,12 @@ static void Ins_Configuration (bool PrintView)
/***** Number of degrees *****/ /***** Number of degrees *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
"%s:", fprintf (Gbl.F.Out,"%s:",Txt_Degrees);
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Degrees);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
"%u", fprintf (Gbl.F.Out,"%u",Deg_GetNumDegsInIns (Gbl.Hierarchy.Ins.InsCod));
Deg_GetNumDegsInIns (Gbl.Hierarchy.Ins.InsCod));
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
@ -601,15 +587,12 @@ static void Ins_Configuration (bool PrintView)
/***** Number of courses *****/ /***** Number of courses *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
"%s:", fprintf (Gbl.F.Out,"%s:",Txt_Courses);
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Courses);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
"%u", fprintf (Gbl.F.Out,"%u",Crs_GetNumCrssInIns (Gbl.Hierarchy.Ins.InsCod));
Crs_GetNumCrssInIns (Gbl.Hierarchy.Ins.InsCod));
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
@ -617,15 +600,12 @@ static void Ins_Configuration (bool PrintView)
/***** Number of departments *****/ /***** Number of departments *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
"%s:", fprintf (Gbl.F.Out,"%s:",Txt_Departments);
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Departments);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
"%u", fprintf (Gbl.F.Out,"%u",Dpt_GetNumDepartmentsInInstitution (Gbl.Hierarchy.Ins.InsCod));
Dpt_GetNumDepartmentsInInstitution (Gbl.Hierarchy.Ins.InsCod));
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
@ -673,16 +653,14 @@ static void Ins_ShowNumUsrsInCrssOfIns (Rol_Role_t Role)
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
"%s:", fprintf (Gbl.F.Out,"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
(Role == Rol_UNK) ? Txt_Users_in_courses : (Role == Rol_UNK) ? Txt_Users_in_courses :
Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
"%u", fprintf (Gbl.F.Out,"%u",Usr_GetNumUsrsInCrssOfIns (Role,Gbl.Hierarchy.Ins.InsCod));
Usr_GetNumUsrsInCrssOfIns (Role,Gbl.Hierarchy.Ins.InsCod));
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
@ -824,59 +802,50 @@ static void Ins_ListOneInstitutionForSeeing (struct Instit *Ins,unsigned NumIns)
Tbl_StartRow (); Tbl_StartRow ();
/***** Number of institution in this list *****/ /***** Number of institution in this list *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE %s\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE %s\"",TxtClassNormal,BgColor);
"%u", fprintf (Gbl.F.Out,"%u",NumIns);
TxtClassNormal,BgColor,
NumIns);
Tbl_EndCell (); Tbl_EndCell ();
/***** Institution logo and name *****/ /***** Institution logo and name *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE %s\">",BgColor); Tbl_StartCellAttr ("class=\"LEFT_MIDDLE %s\"",BgColor);
Ins_DrawInstitutionLogoAndNameWithLink (Ins,ActSeeCtr, Ins_DrawInstitutionLogoAndNameWithLink (Ins,ActSeeCtr,
TxtClassStrong,"CENTER_MIDDLE"); TxtClassStrong,"CENTER_MIDDLE");
Tbl_EndCell (); Tbl_EndCell ();
/***** Stats *****/ /***** Stats *****/
/* Number of users who claim to belong to this institution */ /* Number of users who claim to belong to this institution */
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE %s\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE %s\"",TxtClassNormal,BgColor);
"%u", fprintf (Gbl.F.Out,"%u",Ins->NumUsrsWhoClaimToBelongToIns);
TxtClassNormal,BgColor,Ins->NumUsrsWhoClaimToBelongToIns);
Tbl_EndCell (); Tbl_EndCell ();
/* Number of centres in this institution */ /* Number of centres in this institution */
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE %s\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE %s\"",TxtClassNormal,BgColor);
"%u", fprintf (Gbl.F.Out,"%u",Ins->Ctrs.Num);
TxtClassNormal,BgColor,Ins->Ctrs.Num);
Tbl_EndCell (); Tbl_EndCell ();
/* Number of degrees in this institution */ /* Number of degrees in this institution */
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE %s\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE %s\"",TxtClassNormal,BgColor);
"%u", fprintf (Gbl.F.Out,"%u",Ins->NumDegs);
TxtClassNormal,BgColor,Ins->NumDegs);
Tbl_EndCell (); Tbl_EndCell ();
/* Number of courses in this institution */ /* Number of courses in this institution */
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE %s\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE %s\"",TxtClassNormal,BgColor);
"%u", fprintf (Gbl.F.Out,"%u",Ins->NumCrss);
TxtClassNormal,BgColor,Ins->NumCrss);
Tbl_EndCell (); Tbl_EndCell ();
/* Number of departments in this institution */ /* Number of departments in this institution */
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE %s\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE %s\"",TxtClassNormal,BgColor);
"%u", fprintf (Gbl.F.Out,"%u",Ins->NumDpts);
TxtClassNormal,BgColor,Ins->NumDpts);
Tbl_EndCell (); Tbl_EndCell ();
/* Number of users in courses of this institution */ /* Number of users in courses of this institution */
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE %s\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE %s\"",TxtClassNormal,BgColor);
"%u", fprintf (Gbl.F.Out,"%u",Ins->NumUsrs);
TxtClassNormal,BgColor,Ins->NumUsrs);
Tbl_EndCell (); Tbl_EndCell ();
/***** Institution status *****/ /***** Institution status *****/
StatusTxt = Ins_GetStatusTxtFromStatusBits (Ins->Status); StatusTxt = Ins_GetStatusTxtFromStatusBits (Ins->Status);
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE %s\">", Tbl_StartCellAttr ("class=\"%s LEFT_MIDDLE %s\"",TxtClassNormal,BgColor);
TxtClassNormal,BgColor);
if (StatusTxt != Ins_STATUS_ACTIVE) // If active ==> do not show anything if (StatusTxt != Ins_STATUS_ACTIVE) // If active ==> do not show anything
fprintf (Gbl.F.Out,"%s",Txt_INSTITUTION_STATUS[StatusTxt]); fprintf (Gbl.F.Out,"%s",Txt_INSTITUTION_STATUS[StatusTxt]);
Tbl_EndCell (); Tbl_EndCell ();
@ -1516,9 +1485,10 @@ static void Ins_ListInstitutionsForEdition (void)
ICanEdit = Ins_CheckIfICanEdit (Ins); ICanEdit = Ins_CheckIfICanEdit (Ins);
/* Put icon to remove institution */
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"BM\">");
/* Put icon to remove institution */
Tbl_StartCellAttr ("class=\"BM\">");
if (Ins->Ctrs.Num || if (Ins->Ctrs.Num ||
Ins->NumUsrsWhoClaimToBelongToIns || Ins->NumUsrsWhoClaimToBelongToIns ||
Ins->NumUsrs || // Institution has centres or users ==> deletion forbidden Ins->NumUsrs || // Institution has centres or users ==> deletion forbidden
@ -1534,20 +1504,18 @@ static void Ins_ListInstitutionsForEdition (void)
Tbl_EndCell (); Tbl_EndCell ();
/* Institution code */ /* Institution code */
fprintf (Gbl.F.Out,"<td class=\"DAT CODE\">" Tbl_StartCellAttr ("class=\"DAT CODE\"");
"%ld", fprintf (Gbl.F.Out,"%ld",Ins->InsCod);
Ins->InsCod);
Tbl_EndCell (); Tbl_EndCell ();
/* Institution logo */ /* Institution logo */
fprintf (Gbl.F.Out,"<td title=\"%s\" class=\"LEFT_MIDDLE\"" Tbl_StartCellAttr ("title=\"%s\" class=\"LEFT_MIDDLE\" style=\"width:25px;\"",
" style=\"width:25px;\">", Ins->FullName);
Ins->FullName);
Log_DrawLogo (Hie_INS,Ins->InsCod,Ins->ShrtName,20,NULL,true); Log_DrawLogo (Hie_INS,Ins->InsCod,Ins->ShrtName,20,NULL,true);
Tbl_EndCell (); Tbl_EndCell ();
/* Institution short name */ /* Institution short name */
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
if (ICanEdit) if (ICanEdit)
{ {
Frm_StartForm (ActRenInsSho); Frm_StartForm (ActRenInsSho);
@ -1565,7 +1533,7 @@ static void Ins_ListInstitutionsForEdition (void)
Tbl_EndCell (); Tbl_EndCell ();
/* Institution full name */ /* Institution full name */
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
if (ICanEdit) if (ICanEdit)
{ {
Frm_StartForm (ActRenInsFul); Frm_StartForm (ActRenInsFul);
@ -1584,7 +1552,7 @@ static void Ins_ListInstitutionsForEdition (void)
Tbl_EndCell (); Tbl_EndCell ();
/* Institution WWW */ /* Institution WWW */
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
if (ICanEdit) if (ICanEdit)
{ {
Frm_StartForm (ActChgInsWWW); Frm_StartForm (ActChgInsWWW);
@ -1614,33 +1582,30 @@ static void Ins_ListInstitutionsForEdition (void)
Tbl_EndCell (); Tbl_EndCell ();
/* Number of users who claim to belong to this institution */ /* Number of users who claim to belong to this institution */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE\"");
"%u", fprintf (Gbl.F.Out,"%u",Ins->NumUsrsWhoClaimToBelongToIns);
Ins->NumUsrsWhoClaimToBelongToIns);
Tbl_EndCell (); Tbl_EndCell ();
/* Number of centres */ /* Number of centres */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE\"");
"%u", fprintf (Gbl.F.Out,"%u",Ins->Ctrs.Num);
Ins->Ctrs.Num);
Tbl_EndCell (); Tbl_EndCell ();
/* Number of users in courses of this institution */ /* Number of users in courses of this institution */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE\"");
"%u", fprintf (Gbl.F.Out,"%u",Ins->NumUsrs);
Ins->NumUsrs);
Tbl_EndCell (); Tbl_EndCell ();
/* Institution requester */ /* Institution requester */
UsrDat.UsrCod = Ins->RequesterUsrCod; UsrDat.UsrCod = Ins->RequesterUsrCod;
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat,Usr_DONT_GET_PREFS); Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat,Usr_DONT_GET_PREFS);
fprintf (Gbl.F.Out,"<td class=\"DAT INPUT_REQUESTER LEFT_TOP\">"); Tbl_StartCellAttr ("class=\"DAT INPUT_REQUESTER LEFT_TOP\"");
Msg_WriteMsgAuthor (&UsrDat,true,NULL); Msg_WriteMsgAuthor (&UsrDat,true,NULL);
Tbl_EndCell (); Tbl_EndCell ();
/* Institution status */ /* Institution status */
StatusTxt = Ins_GetStatusTxtFromStatusBits (Ins->Status); StatusTxt = Ins_GetStatusTxtFromStatusBits (Ins->Status);
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM && if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM &&
StatusTxt == Ins_STATUS_PENDING) StatusTxt == Ins_STATUS_PENDING)
{ {
@ -2276,21 +2241,21 @@ static void Ins_PutFormToCreateInstitution (void)
Tbl_StartRow (); Tbl_StartRow ();
/***** Column to remove institution, disabled here *****/ /***** Column to remove institution, disabled here *****/
fprintf (Gbl.F.Out,"<td class=\"BM\">"); Tbl_StartCellAttr ("class=\"BM\"");
Tbl_EndCell (); Tbl_EndCell ();
/***** Institution code *****/ /***** Institution code *****/
fprintf (Gbl.F.Out,"<td class=\"CODE\">"); Tbl_StartCellAttr ("class=\"CODE\"");
Tbl_EndCell (); Tbl_EndCell ();
/***** Institution logo *****/ /***** Institution logo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:25px;\">"); Tbl_StartCellAttr ("class=\"LEFT_MIDDLE\" style=\"width:25px;\"");
Log_DrawLogo (Hie_INS,-1L,"",20,NULL,true); Log_DrawLogo (Hie_INS,-1L,"",20,NULL,true);
Tbl_EndCell (); Tbl_EndCell ();
/***** Institution short name *****/ /***** Institution short name *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">" Tbl_StartCellAttr ("class=\"LEFT_MIDDLE\"");
"<input type=\"text\" name=\"ShortName\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"ShortName\""
" maxlength=\"%u\" value=\"%s\"" " maxlength=\"%u\" value=\"%s\""
" class=\"INPUT_SHORT_NAME\"" " class=\"INPUT_SHORT_NAME\""
" required=\"required\" />", " required=\"required\" />",
@ -2298,8 +2263,8 @@ static void Ins_PutFormToCreateInstitution (void)
Tbl_EndCell (); Tbl_EndCell ();
/***** Institution full name *****/ /***** Institution full name *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">" Tbl_StartCellAttr ("class=\"LEFT_MIDDLE\"");
"<input type=\"text\" name=\"FullName\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FullName\""
" maxlength=\"%u\" value=\"%s\"" " maxlength=\"%u\" value=\"%s\""
" class=\"INPUT_FULL_NAME\"" " class=\"INPUT_FULL_NAME\""
" required=\"required\" />", " required=\"required\" />",
@ -2307,8 +2272,8 @@ static void Ins_PutFormToCreateInstitution (void)
Tbl_EndCell (); Tbl_EndCell ();
/***** Institution WWW *****/ /***** Institution WWW *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">" Tbl_StartCellAttr ("class=\"LEFT_MIDDLE\"");
"<input type=\"url\" name=\"WWW\"" fprintf (Gbl.F.Out,"<input type=\"url\" name=\"WWW\""
" maxlength=\"%u\" value=\"%s\"" " maxlength=\"%u\" value=\"%s\""
" class=\"INPUT_WWW\"" " class=\"INPUT_WWW\""
" required=\"required\" />", " required=\"required\" />",
@ -2316,27 +2281,27 @@ static void Ins_PutFormToCreateInstitution (void)
Tbl_EndCell (); Tbl_EndCell ();
/***** Number of users who claim to belong to this institution ****/ /***** Number of users who claim to belong to this institution ****/
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE\"");
"0"); fprintf (Gbl.F.Out,"0");
Tbl_EndCell (); Tbl_EndCell ();
/***** Number of centres *****/ /***** Number of centres *****/
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE\"");
"0"); fprintf (Gbl.F.Out,"0");
Tbl_EndCell (); Tbl_EndCell ();
/***** Number of users in courses of this institution ****/ /***** Number of users in courses of this institution ****/
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE\"");
"0"); fprintf (Gbl.F.Out,"0");
Tbl_EndCell (); Tbl_EndCell ();
/***** Institution requester *****/ /***** Institution requester *****/
fprintf (Gbl.F.Out,"<td class=\"DAT INPUT_REQUESTER LEFT_TOP\">"); Tbl_StartCellAttr ("class=\"DAT INPUT_REQUESTER LEFT_TOP\"");
Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,true,NULL); Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,true,NULL);
Tbl_EndCell (); Tbl_EndCell ();
/***** Institution status *****/ /***** Institution status *****/
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();

10
swad_layout.c
View File

@ -1620,7 +1620,7 @@ void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto,
Tbl_StartRow (); Tbl_StartRow ();
/***** First column: institution logo *****/ /***** First column: institution logo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:80px;\">"); Tbl_StartCellAttr ("class=\"LEFT_TOP\" style=\"width:80px;\"");
if (InsCod > 0) if (InsCod > 0)
{ {
if (!PrintView) if (!PrintView)
@ -1632,7 +1632,7 @@ void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto,
Tbl_EndCell (); Tbl_EndCell ();
/***** Second column: class photo title *****/ /***** Second column: class photo title *****/
fprintf (Gbl.F.Out,"<td class=\"CLASSPHOTO_TITLE CENTER_MIDDLE\">"); Tbl_StartCellAttr ("class=\"CLASSPHOTO_TITLE CENTER_MIDDLE\"");
if (InsCod > 0) if (InsCod > 0)
{ {
if (!PrintView) if (!PrintView)
@ -1668,7 +1668,7 @@ void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto,
Tbl_EndCell (); Tbl_EndCell ();
/***** Third column: degree logo *****/ /***** Third column: degree logo *****/
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\" style=\"width:80px;\">"); Tbl_StartCellAttr ("class=\"RIGHT_TOP\" style=\"width:80px;\"");
if (DegCod > 0) if (DegCod > 0)
{ {
if (!PrintView) if (!PrintView)
@ -1706,8 +1706,8 @@ void Lay_AdvertisementMobile (void)
/***** Show advertisement *****/ /***** Show advertisement *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"DAT CENTER_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT CENTER_MIDDLE\"");
"<a href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\"" fprintf (Gbl.F.Out,"<a href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\""
" class=\"DAT\">" " class=\"DAT\">"
"%s<br /><br />" "%s<br /><br />"
"<img src=\"%s/SWADroid200x300.png\"" "<img src=\"%s/SWADroid200x300.png\""

31
swad_link.c
View File

@ -422,9 +422,10 @@ static void Lnk_ListLinksForEdition (void)
{ {
Lnk = &Gbl.Links.Lst[NumLnk]; Lnk = &Gbl.Links.Lst[NumLnk];
/* Put icon to remove link */
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"BM\">");
/* Put icon to remove link */
Tbl_StartCellAttr ("class=\"BM\"");
Frm_StartForm (ActRemLnk); Frm_StartForm (ActRemLnk);
Lnk_PutParamLnkCod (Lnk->LnkCod); Lnk_PutParamLnkCod (Lnk->LnkCod);
Ico_PutIconRemove (); Ico_PutIconRemove ();
@ -432,13 +433,12 @@ static void Lnk_ListLinksForEdition (void)
Tbl_EndCell (); Tbl_EndCell ();
/* Link code */ /* Link code */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE\"");
"%ld", fprintf (Gbl.F.Out,"%ld",Lnk->LnkCod);
Lnk->LnkCod);
Tbl_EndCell (); Tbl_EndCell ();
/* Link short name */ /* Link short name */
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"); Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
Frm_StartForm (ActRenLnkSho); Frm_StartForm (ActRenLnkSho);
Lnk_PutParamLnkCod (Lnk->LnkCod); Lnk_PutParamLnkCod (Lnk->LnkCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"ShortName\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"ShortName\""
@ -451,7 +451,7 @@ static void Lnk_ListLinksForEdition (void)
Tbl_EndCell (); Tbl_EndCell ();
/* Link full name */ /* Link full name */
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"); Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
Frm_StartForm (ActRenLnkFul); Frm_StartForm (ActRenLnkFul);
Lnk_PutParamLnkCod (Lnk->LnkCod); Lnk_PutParamLnkCod (Lnk->LnkCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FullName\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FullName\""
@ -464,7 +464,7 @@ static void Lnk_ListLinksForEdition (void)
Tbl_EndCell (); Tbl_EndCell ();
/* Link WWW */ /* Link WWW */
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"); Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
Frm_StartForm (ActChgLnkWWW); Frm_StartForm (ActChgLnkWWW);
Lnk_PutParamLnkCod (Lnk->LnkCod); Lnk_PutParamLnkCod (Lnk->LnkCod);
fprintf (Gbl.F.Out,"<input type=\"url\" name=\"WWW\"" fprintf (Gbl.F.Out,"<input type=\"url\" name=\"WWW\""
@ -475,6 +475,7 @@ static void Lnk_ListLinksForEdition (void)
Gbl.Form.Id); Gbl.Form.Id);
Frm_EndForm (); Frm_EndForm ();
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
} }
@ -748,14 +749,14 @@ static void Lnk_PutFormToCreateLink (void)
Tbl_StartRow (); Tbl_StartRow ();
/***** Link code *****/ /***** Link code *****/
fprintf (Gbl.F.Out,"<td class=\"BM\">"); Tbl_StartCellAttr ("class=\"BM\"");
Tbl_EndCell (); Tbl_EndCell ();
Tbl_PutEmptyCells (1); Tbl_PutEmptyCells (1);
/***** Link short name *****/ /***** Link short name *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
"<input type=\"text\" name=\"ShortName\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"ShortName\""
" maxlength=\"%u\" value=\"%s\"" " maxlength=\"%u\" value=\"%s\""
" class=\"INPUT_SHORT_NAME\"" " class=\"INPUT_SHORT_NAME\""
" required=\"required\" />", " required=\"required\" />",
@ -763,8 +764,8 @@ static void Lnk_PutFormToCreateLink (void)
Tbl_EndCell (); Tbl_EndCell ();
/***** Link full name *****/ /***** Link full name *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
"<input type=\"text\" name=\"FullName\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FullName\""
" maxlength=\"%u\" value=\"%s\"" " maxlength=\"%u\" value=\"%s\""
" class=\"INPUT_FULL_NAME\"" " class=\"INPUT_FULL_NAME\""
" required=\"required\" />", " required=\"required\" />",
@ -772,8 +773,8 @@ static void Lnk_PutFormToCreateLink (void)
Tbl_EndCell (); Tbl_EndCell ();
/***** Link WWW *****/ /***** Link WWW *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
"<input type=\"url\" name=\"WWW\"" fprintf (Gbl.F.Out,"<input type=\"url\" name=\"WWW\""
" maxlength=\"%u\" value=\"%s\"" " maxlength=\"%u\" value=\"%s\""
" class=\"INPUT_WWW\"" " class=\"INPUT_WWW\""
" required=\"required\" />", " required=\"required\" />",

72
swad_mail.c
View File

@ -156,19 +156,16 @@ void Mai_SeeMailDomains (void)
/* Write data of this mail domain */ /* Write data of this mail domain */
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\">" Tbl_StartCellAttr ("class=\"DAT LEFT_TOP\"");
"%s", fprintf (Gbl.F.Out,"%s",Gbl.Mails.Lst[NumMai].Domain);
Gbl.Mails.Lst[NumMai].Domain);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\">" Tbl_StartCellAttr ("class=\"DAT LEFT_TOP\"");
"%s", fprintf (Gbl.F.Out,"%s",Gbl.Mails.Lst[NumMai].Info);
Gbl.Mails.Lst[NumMai].Info);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP\">" Tbl_StartCellAttr ("class=\"DAT RIGHT_TOP\"");
"%u", fprintf (Gbl.F.Out,"%u",Gbl.Mails.Lst[NumMai].NumUsrs);
Gbl.Mails.Lst[NumMai].NumUsrs);
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
@ -488,9 +485,10 @@ static void Mai_ListMailDomainsForEdition (void)
{ {
Mai = &Gbl.Mails.Lst[NumMai]; Mai = &Gbl.Mails.Lst[NumMai];
/* Put icon to remove mail */
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"BM\">");
/* Put icon to remove mail */
Tbl_StartCellAttr ("class=\"BM\"");
Frm_StartForm (ActRemMai); Frm_StartForm (ActRemMai);
Mai_PutParamMaiCod (Mai->MaiCod); Mai_PutParamMaiCod (Mai->MaiCod);
Ico_PutIconRemove (); Ico_PutIconRemove ();
@ -498,13 +496,12 @@ static void Mai_ListMailDomainsForEdition (void)
Tbl_EndCell (); Tbl_EndCell ();
/* Mail code */ /* Mail code */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE\"");
"%ld", fprintf (Gbl.F.Out,"%ld",Mai->MaiCod);
Mai->MaiCod);
Tbl_EndCell (); Tbl_EndCell ();
/* Mail domain */ /* Mail domain */
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"); Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
Frm_StartForm (ActRenMaiSho); Frm_StartForm (ActRenMaiSho);
Mai_PutParamMaiCod (Mai->MaiCod); Mai_PutParamMaiCod (Mai->MaiCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Domain\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Domain\""
@ -516,7 +513,7 @@ static void Mai_ListMailDomainsForEdition (void)
Tbl_EndCell (); Tbl_EndCell ();
/* Mail domain info */ /* Mail domain info */
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"); Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
Frm_StartForm (ActRenMaiFul); Frm_StartForm (ActRenMaiFul);
Mai_PutParamMaiCod (Mai->MaiCod); Mai_PutParamMaiCod (Mai->MaiCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Info\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Info\""
@ -528,9 +525,8 @@ static void Mai_ListMailDomainsForEdition (void)
Tbl_EndCell (); Tbl_EndCell ();
/* Number of users */ /* Number of users */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE\"");
"%u", fprintf (Gbl.F.Out,"%u",Mai->NumUsrs);
Mai->NumUsrs);
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
@ -770,16 +766,16 @@ static void Mai_PutFormToCreateMailDomain (void)
Tbl_StartRow (); Tbl_StartRow ();
/***** Mail domain *****/ /***** Mail domain *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
"<input type=\"text\" name=\"Domain\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Domain\""
" size=\"15\" maxlength=\"%u\" value=\"%s\"" " size=\"15\" maxlength=\"%u\" value=\"%s\""
" required=\"required\" />", " required=\"required\" />",
Cns_MAX_CHARS_EMAIL_ADDRESS,Mai_EditingMai->Domain); Cns_MAX_CHARS_EMAIL_ADDRESS,Mai_EditingMai->Domain);
Tbl_EndCell (); Tbl_EndCell ();
/***** Mail domain info *****/ /***** Mail domain info *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
"<input type=\"text\" name=\"Info\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Info\""
" size=\"40\" maxlength=\"%u\" value=\"%s\"" " size=\"40\" maxlength=\"%u\" value=\"%s\""
" required=\"required\" />", " required=\"required\" />",
Mai_MAX_CHARS_MAIL_INFO,Mai_EditingMai->Info); Mai_MAX_CHARS_MAIL_INFO,Mai_EditingMai->Info);
@ -1278,36 +1274,36 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
row = mysql_fetch_row (mysql_res); row = mysql_fetch_row (mysql_res);
Confirmed = (row[1][0] == 'Y'); Confirmed = (row[1][0] == 'Y');
Tbl_StartRow ();
if (NumEmail == 1) if (NumEmail == 1)
{ {
/* The first mail is the current one */ /* The first mail is the current one */
Tbl_StartRow (); Tbl_StartCellAttr ("class=\"REC_C1_BOT RIGHT_TOP\"");
fprintf (Gbl.F.Out,"<label for=\"Email\" class=\"%s\">"
fprintf (Gbl.F.Out,"<td class=\"REC_C1_BOT RIGHT_TOP\">"
"<label for=\"Email\" class=\"%s\">"
"%s:" "%s:"
"</label>", "</label>",
The_ClassFormInBox[Gbl.Prefs.Theme], The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Current_email); Txt_Current_email);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"REC_C2_BOT LEFT_TOP USR_ID\">"); Tbl_StartCellAttr ("class=\"REC_C2_BOT LEFT_TOP USR_ID\"");
} }
else // NumEmail >= 2 else // NumEmail >= 2
{ {
Tbl_StartRow ();
if (NumEmail == 2) if (NumEmail == 2)
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"REC_C1_BOT RIGHT_TOP\">" {
"<label for=\"Email\" class=\"%s\">" Tbl_StartCellAttr ("rowspan=\"%u\" class=\"REC_C1_BOT RIGHT_TOP\"",
NumEmails - 1);
fprintf (Gbl.F.Out,"<label for=\"Email\" class=\"%s\">"
"%s:" "%s:"
"</label>", "</label>",
NumEmails - 1,
The_ClassFormInBox[Gbl.Prefs.Theme], The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Other_emails); Txt_Other_emails);
Tbl_EndCell (); Tbl_EndCell ();
}
fprintf (Gbl.F.Out,"<td class=\"REC_C2_BOT LEFT_TOP DAT\">"); Tbl_StartCellAttr ("class=\"REC_C2_BOT LEFT_TOP DAT\"");
} }
/* Form to remove email */ /* Form to remove email */
@ -1392,14 +1388,14 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
/***** Form to enter new email *****/ /***** Form to enter new email *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"REC_C1_BOT RIGHT_TOP\">" Tbl_StartCellAttr ("class=\"REC_C1_BOT RIGHT_TOP\"");
"<label for=\"NewEmail\" class=\"%s\">%s:</label>", fprintf (Gbl.F.Out,"<label for=\"NewEmail\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme], The_ClassFormInBox[Gbl.Prefs.Theme],
NumEmails ? Txt_New_email : // A new email NumEmails ? Txt_New_email : // A new email
Txt_Email); // The first email Txt_Email); // The first email
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"REC_C2_BOT LEFT_TOP DAT\">"); Tbl_StartCellAttr ("class=\"REC_C2_BOT LEFT_TOP DAT\"");
if (ItsMe) if (ItsMe)
Frm_StartFormAnchor (ActChgMyMai,Mai_EMAIL_SECTION_ID); Frm_StartFormAnchor (ActChgMyMai,Mai_EMAIL_SECTION_ID);
else else

4
swad_mark.c
View File

@ -121,7 +121,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (void)
Mrk_GetNumRowsHeaderAndFooter (&Marks); Mrk_GetNumRowsHeaderAndFooter (&Marks);
/***** Write the number of rows of header *****/ /***** Write the number of rows of header *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"%s RIGHT_TOP COLOR%u\"",
The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme], The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
Frm_StartForm (Gbl.Crs.Grps.GrpCod > 0 ? ActChgNumRowHeaGrp : // Group zone Frm_StartForm (Gbl.Crs.Grps.GrpCod > 0 ? ActChgNumRowHeaGrp : // Group zone
@ -141,7 +141,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (void)
Tbl_EndCell (); Tbl_EndCell ();
/***** Write the number of rows of footer *****/ /***** Write the number of rows of footer *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"%s RIGHT_TOP COLOR%u\"",
The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme], The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
Frm_StartForm (Gbl.Crs.Grps.GrpCod > 0 ? ActChgNumRowFooGrp : // Group zone Frm_StartForm (Gbl.Crs.Grps.GrpCod > 0 ? ActChgNumRowFooGrp : // Group zone