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.40

This commit is contained in:
Antonio Cañas Vargas 2014-12-22 14:08:19 +01:00
parent 862ae4bb99
commit 16b48fdafb
13 changed files with 694 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
swad_account.c
View File

@ -125,10 +125,10 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
/***** Nickname *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" class=\"%s\">"
"<td class=\"%s\" style=\"text-align:right;\">"
"%s: "
"</td>"
"<td align=\"left\">"
"<td style=\"text-align:left;\">"
"<input type=\"text\" name=\"NewNick\""
" size=\"16\" maxlength=\"%u\" value=\"@%s\" />"
"</td>"
@ -140,10 +140,10 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
/***** E-mail *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" class=\"%s\">"
"<td class=\"%s\" style=\"text-align:right;\">"
"%s: "
"</td>"
"<td align=\"left\">"
"<td style=\"text-align:left;\">"
"<input type=\"text\" name=\"NewEmail\""
" size=\"16\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
@ -158,7 +158,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
/***** Send button and form end *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" align=\"center\">"
"<td colspan=\"2\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
@ -249,7 +249,7 @@ static void Acc_PrintAccountSeparator (void)
/***** Separator *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" align=\"center\" valign=\"middle\">"
"<td colspan=\"2\" style=\"text-align:center; vertical-align:middle;\">"
"<hr class=\"%s\" />"
"</td>"
"</tr>",

11
swad_action.c
View File

@ -4095,7 +4095,7 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions)
{
/* Icon and text */
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\" valign=\"middle\" style=\"padding-left:2px;\">");
"<td style=\"text-align:left; vertical-align:middle; padding-left:2px;\">");
Act_FormStart (Action);
Act_LinkFormSubmit (Title,The_ClassFormulNB[Gbl.Prefs.Theme]);
@ -4150,13 +4150,16 @@ void Act_WriteSmallMFUActions (struct Act_ListMFUActions *ListMFUActions)
if ((Title = Act_GetTitleAction (Action)) != NULL)
{
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\" width=\"4\""
" style=\"background-image: url('%s/mbw2_4x1.gif'); background-repeat: repeat-y;\"></td>",
"<td style=\"width:4px; text-align:left;"
" background-image: url('%s/mbw2_4x1.gif');"
" background-repeat: repeat-y;\">"
"</td>",
Gbl.Prefs.IconsURL);
/* Icon and text */
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\" valign=\"middle\" width=\"110\" style=\"padding-left:2px;\">");
"<td style=\"widtg:110px; text-align:left;"
" vertical-align:middle; padding-left:2px;\">");
Act_FormStart (Action);
Act_LinkFormSubmit (Title,"MFU_ACT");
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s16x16.gif\" vspace=\"1\" alt=\"%s\""

30
swad_announcement.c
View File

@ -325,19 +325,25 @@ void Ann_ShowFormAnnouncement (void)
/***** Message subject and body *****/
fprintf (Gbl.F.Out,"<table>"
"<tr>"
"<td align=\"left\"></td>"
"<td align=\"left\" class=\"%s\">%s</td>"
"<td></td>"
"<td class=\"%s\" style=\"text-align:left;\">%s</td>"
"</tr>"
"<tr>"
"<td align=\"right\" valign=\"top\" class=\"%s\">%s: </td>"
"<td align=\"left\">"
"<textarea name=\"Subject\" cols=\"75\" rows=\"2\"></textarea>"
"<td class=\"%s\" style=\"text-align:right; vertical-align:top;\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
"<textarea name=\"Subject\" cols=\"75\" rows=\"2\">"
"</textarea>"
"</td>"
"</tr>"
"<tr>"
"<td align=\"right\" valign=\"top\" class=\"%s\">%s: </td>"
"<td align=\"left\">"
"<textarea name=\"Content\" cols=\"75\" rows=\"20\"></textarea>"
"<td class=\"%s\" style=\"text-align:right; vertical-align:top;\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
"<textarea name=\"Content\" cols=\"75\" rows=\"20\">"
"</textarea>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
@ -349,8 +355,12 @@ void Ann_ShowFormAnnouncement (void)
/***** Users' roles who can view the announcement *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"top\" class=\"TIT_TBL\">%s: </td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">",
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"%s: "
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">",
Txt_Users);
Rol_WriteSelectorRoles (1 << Rol_ROLE_STUDENT |
1 << Rol_ROLE_TEACHER);

85
swad_assignment.c
View File

@ -229,7 +229,10 @@ static void Asg_ShowOneAssignment (long AsgCod)
/***** Write first row of data of this assignment *****/
/* Start date/time */
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\" valign=\"top\" class=\"%s\" bgcolor=\"%s\">%02u/%02u/%02u<br />%02u:%02u h</td>",
"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top; background-color:%s;\">"
"%02u/%02u/%02u<br />%02u:%02u h"
"</td>",
Asg.Hidden ? (Asg.Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT") :
(Asg.Open ? "DATE_GREEN" :
@ -242,7 +245,10 @@ static void Asg_ShowOneAssignment (long AsgCod)
Asg.DateTimes[Asg_START_TIME].Time.Minute);
/* End date/time */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\" class=\"%s\" bgcolor=\"%s\">%02u/%02u/%02u<br />%02u:%02u h</td>",
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top; background-color:%s;\">"
"%02u/%02u/%02u<br />%02u:%02u h"
"</td>",
Asg.Hidden ? (Asg.Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT") :
(Asg.Open ? "DATE_GREEN" :
@ -255,7 +261,8 @@ static void Asg_ShowOneAssignment (long AsgCod)
Asg.DateTimes[Asg_END_TIME].Time.Minute);
/* Assignment title */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\" bgcolor=\"%s\">"
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:top;"
" background-color:%s;\">"
"<p class=\"%s\">%s</p>",
Gbl.ColorRows[Gbl.RowEvenOdd],
Asg.Hidden ? "ASG_TITLE_LIGHT" :
@ -264,20 +271,15 @@ static void Asg_ShowOneAssignment (long AsgCod)
fprintf (Gbl.F.Out,"</td>");
/* Send work? */
fprintf (Gbl.F.Out,"<td rowspan=\"2\" align=\"center\" valign=\"top\""
" bgcolor=\"%s\">"
"<table style=\"border-spacing:2px;\">"
"<tr>"
"<td align=\"center\" valign=\"top\" class=\"%s\">"
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"%s\" style=\"text-align:center;"
" vertical-align:top; background-color:%s;\">"
"<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICON16x16\" />"
"<br />%s</td>"
"</tr>"
"</table>"
"<br />%s"
"</td>",
Gbl.ColorRows[Gbl.RowEvenOdd],
(Asg.SendWork == Asg_SEND_WORK) ? "DAT_N" :
"DAT",
Gbl.ColorRows[Gbl.RowEvenOdd],
Gbl.Prefs.IconsURL,
(Asg.SendWork == Asg_SEND_WORK) ? "file_on" :
"file_off",
@ -287,7 +289,8 @@ static void Asg_ShowOneAssignment (long AsgCod)
Txt_No);
/* Assignment folder */
fprintf (Gbl.F.Out,"<td rowspan=\"2\" align=\"left\" valign=\"top\" bgcolor=\"%s\">",
fprintf (Gbl.F.Out,"<td rowspan=\"2\" style=\"text-align:left;"
" vertical-align:top; background-color:%s;\">",
Gbl.ColorRows[Gbl.RowEvenOdd]);
Asg_WriteAssignmentFolder (&Asg);
fprintf (Gbl.F.Out,"</td>"
@ -295,7 +298,8 @@ static void Asg_ShowOneAssignment (long AsgCod)
/***** Write second row of data of this assignment *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" align=\"left\" valign=\"top\" bgcolor=\"%s\">",
"<td colspan=\"2\" style=\"text-align:left;"
" vertical-align:top; background-color:%s;\">",
Gbl.ColorRows[Gbl.RowEvenOdd]);
/* Author of the assignment */
@ -318,7 +322,7 @@ static void Asg_ShowOneAssignment (long AsgCod)
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML
Str_InsertLinkInURLs (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links
fprintf (Gbl.F.Out,"<td align=\"left\" bgcolor=\"%s\">",
fprintf (Gbl.F.Out,"<td style=\"text-align:left; background-color:%s;\">",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (Gbl.CurrentCrs.Grps.NumGrps)
@ -420,7 +424,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg)
/***** Folder name *****/
fprintf (Gbl.F.Out,"</td>"
"<td align=\"left\" class=\"DAT\">%s</td>"
"<td class=\"DAT\" style=\"text-align:left;\">%s</td>"
"</tr>"
"</table>",
Asg->Folder);
@ -488,7 +492,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
"<tr>");
/***** Put form to remove assignment *****/
fprintf (Gbl.F.Out,"<td align=\"left\">");
fprintf (Gbl.F.Out,"<td style=\"text-align:left;\">");
Act_FormStart (ActReqRemAsg);
Asg_PutParamAsgCod (AsgCod);
Asg_PutHiddenParamAsgOrderType ();
@ -503,7 +507,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
Txt_Remove);
/***** Put form to hide/show assignment *****/
fprintf (Gbl.F.Out,"<td align=\"left\">");
fprintf (Gbl.F.Out,"<td style=\"text-align:left;\">");
Act_FormStart (Hidden ? ActShoAsg :
ActHidAsg);
Asg_PutParamAsgCod (AsgCod);
@ -526,7 +530,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
"</td>");
/***** Put form to edit assignment *****/
fprintf (Gbl.F.Out,"<td align=\"left\">");
fprintf (Gbl.F.Out,"<td style=\"text-align:left;\">");
Act_FormStart (ActEdiOneAsg);
Asg_PutParamAsgCod (AsgCod);
Asg_PutHiddenParamAsgOrderType ();
@ -1136,8 +1140,11 @@ void Asg_RequestCreatOrEditAsg (void)
/***** Assignment title *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"top\" class=\"TIT_TBL\">%s:</td>"
"<td align=\"left\" valign=\"top\">"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<input type=\"text\" name=\"Title\" size=\"80\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
@ -1150,11 +1157,14 @@ void Asg_RequestCreatOrEditAsg (void)
StartOrEndTime++)
{
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"top\" class=\"TIT_TBL\">%s:</td>"
"<td align=\"left\" valign=\"top\">"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<table class=\"CELLS_PAD_2\">"
"<tr>"
"<td align=\"left\" valign=\"top\">",
"<td style=\"text-align:left; vertical-align:top;\">",
Dates[StartOrEndTime]);
/* Date */
@ -1166,7 +1176,7 @@ void Asg_RequestCreatOrEditAsg (void)
false,false);
fprintf (Gbl.F.Out,"</td>"
"<td align=\"left\" valign=\"top\">");
"<td style=\"text-align:left; vertical-align:top;\">");
/* Time */
Dat_WriteFormHourMinute (NameSelectHour [StartOrEndTime],
@ -1183,8 +1193,12 @@ void Asg_RequestCreatOrEditAsg (void)
/***** Send work? *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"TIT_TBL\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"TIT_TBL\">"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"TIT_TBL\""
" style=\"text-align:left; vertical-align:middle;\">"
"%s: "
"<input type=\"text\" name=\"Folder\" size=\"%u\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
@ -1195,8 +1209,11 @@ void Asg_RequestCreatOrEditAsg (void)
/***** Assignment text *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"top\" class=\"TIT_TBL\">%s:</td>"
"<td align=\"left\" valign=\"top\">"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<textarea name=\"Txt\" cols=\"60\" rows=\"10\">",
Txt_Description);
if (!ItsANewAssignment)
@ -1239,14 +1256,18 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
{
/***** Start table *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"top\" class=\"TIT_TBL\">%s:</td>"
"<td align=\"left\" valign=\"top\">",
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
Txt_Groups);
Lay_StartRoundFrameTable10 (NULL,0,NULL);
/***** First row: checkbox to select the whole course *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"7\" align=\"left\" valign=\"middle\" class=\"DAT\">"
"<td colspan=\"7\" class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
"<input type=\"checkbox\" id=\"WholeCrs\" name=\"WholeCrs\" value=\"Y\"");
if (!Asg_CheckIfAsgIsAssociatedToGrps (AsgCod))
fprintf (Gbl.F.Out," checked=\"checked\"");

232
swad_attendance.c
View File

@ -254,7 +254,8 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
/***** Start date/time *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td align=\"left\" valign=\"top\" class=\"%s\"",
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\"",
Att->Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT") :
(Att->Open ? "DATE_GREEN" :
@ -269,14 +270,18 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
Att->DateTimes[Att_START_TIME].Time.Minute);
/***** End date/time *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\" class=\"%s\"",
fprintf (Gbl.F.Out,"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;",
Att->Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT") :
(Att->Open ? "DATE_GREEN" :
"DATE_RED"));
if (!ShowOnlyThisAttEventComplete)
fprintf (Gbl.F.Out," bgcolor=\"%s\"",Gbl.ColorRows[Gbl.RowEvenOdd]);
fprintf (Gbl.F.Out,">%02u/%02u/%02u<br />%02u:%02u h</td>",
fprintf (Gbl.F.Out," background-color:%s;",
Gbl.ColorRows[Gbl.RowEvenOdd]);
fprintf (Gbl.F.Out,"\">"
"%02u/%02u/%02u<br />%02u:%02u h"
"</td>",
Att->DateTimes[Att_END_TIME ].Date.Day,
Att->DateTimes[Att_END_TIME ].Date.Month,
Att->DateTimes[Att_END_TIME ].Date.Year % 100,
@ -284,10 +289,11 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
Att->DateTimes[Att_END_TIME ].Time.Minute);
/***** Attendance event title *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\"");
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:top;");
if (!ShowOnlyThisAttEventComplete)
fprintf (Gbl.F.Out," bgcolor=\"%s\"",Gbl.ColorRows[Gbl.RowEvenOdd]);
fprintf (Gbl.F.Out,">");
fprintf (Gbl.F.Out," background-color:%s;",
Gbl.ColorRows[Gbl.RowEvenOdd]);
fprintf (Gbl.F.Out,"\">");
/* Put form to view attendance event */
Act_FormStart (ActSeeOneAtt);
@ -299,16 +305,21 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
Att->Title);
/***** Number of students in this event *****/
fprintf (Gbl.F.Out,"<td align=\"right\" valign=\"top\" class=\"DAT_N\"");
fprintf (Gbl.F.Out,"<td class=\"DAT_N\""
" style=\"text-align:right; vertical-align:top;");
if (!ShowOnlyThisAttEventComplete)
fprintf (Gbl.F.Out," bgcolor=\"%s\"",Gbl.ColorRows[Gbl.RowEvenOdd]);
fprintf (Gbl.F.Out,">%u</td>"
fprintf (Gbl.F.Out," background-color:%s;",
Gbl.ColorRows[Gbl.RowEvenOdd]);
fprintf (Gbl.F.Out,"\">"
"%u"
"</td>"
"</tr>",
Att->NumStdsTotal);
/***** Write second row of data of this attendance event *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" align=\"left\" valign=\"top\" bgcolor=\"%s\">",
"<td colspan=\"2\" style=\"text-align:left;"
" vertical-align:top; background-color:%s;\">",
Gbl.ColorRows[Gbl.RowEvenOdd]);
/* Author of the attendance event */
@ -331,7 +342,8 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML
Str_InsertLinkInURLs (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links
fprintf (Gbl.F.Out,"<td colspan=\"2\" align=\"left\" bgcolor=\"%s\">",
fprintf (Gbl.F.Out,"<td colspan=\"2\""
" style=\"text-align:left; background-color:%s;\">",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (Gbl.CurrentCrs.Grps.NumGrps)
@ -470,7 +482,7 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden)
/***** Put form to remove attendance event *****/
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_4\">"
"<tr>"
"<td align=\"left\">");
"<td style=\"text-align:left;\">");
Act_FormStart (ActReqRemAtt);
Att_PutParamAttCod (AttCod);
Att_PutHiddenParamAttOrderType ();
@ -485,7 +497,7 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden)
Txt_Remove);
/***** Put form to hide/show attendance event *****/
fprintf (Gbl.F.Out,"<td align=\"left\">");
fprintf (Gbl.F.Out,"<td style=\"text-align:left;\">");
Act_FormStart (Hidden ? ActShoAtt :
ActHidAtt);
Att_PutParamAttCod (AttCod);
@ -508,7 +520,7 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden)
"</td>");
/***** Put form to edit attendance event *****/
fprintf (Gbl.F.Out,"<td align=\"left\">");
fprintf (Gbl.F.Out,"<td style=\"text-align:left;\">");
Act_FormStart (ActEdiOneAtt);
Att_PutParamAttCod (AttCod);
Att_PutHiddenParamAttOrderType ();
@ -1088,8 +1100,11 @@ void Att_RequestCreatOrEditAttEvent (void)
/***** Attendance event title *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"top\" class=\"TIT_TBL\">%s:</td>"
"<td align=\"left\" valign=\"top\">"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<input type=\"text\" name=\"Title\" size=\"80\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
@ -1102,11 +1117,14 @@ void Att_RequestCreatOrEditAttEvent (void)
StartOrEndTime++)
{
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"top\" class=\"TIT_TBL\">%s:</td>"
"<td align=\"left\" valign=\"top\">"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<table class=\"CELLS_PAD_2\">"
"<tr>"
"<td align=\"left\" valign=\"top\">",
"<td style=\"text-align:left; vertical-align:top;\">",
Dates[StartOrEndTime]);
/* Date */
@ -1118,7 +1136,7 @@ void Att_RequestCreatOrEditAttEvent (void)
false,false);
fprintf (Gbl.F.Out,"</td>"
"<td align=\"left\" valign=\"top\">");
"<td style=\"text-align:left; vertical-align:top;\">");
/* Time */
Dat_WriteFormHourMinute (NameSelectHour [StartOrEndTime],
@ -1133,8 +1151,11 @@ void Att_RequestCreatOrEditAttEvent (void)
/***** Visibility of comments *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"top\" class=\"TIT_TBL\">%s:</td>"
"<td align=\"left\" valign=\"top\">"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<select name=\"CommentTchVisible\">",
Txt_Teachers_comment);
@ -1156,8 +1177,11 @@ void Att_RequestCreatOrEditAttEvent (void)
/***** Attendance event description *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"top\" class=\"TIT_TBL\">%s:</td>"
"<td align=\"left\" valign=\"top\">"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<textarea name=\"Txt\" cols=\"60\" rows=\"5\">",
Txt_Description);
if (!ItsANewAttEvent)
@ -1200,14 +1224,18 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
{
/***** Start table *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"top\" class=\"TIT_TBL\">%s:</td>"
"<td align=\"left\" valign=\"top\">",
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
Txt_Groups);
Lay_StartRoundFrameTable10 (NULL,0,NULL);
/***** First row: checkbox to select the whole course *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"7\" align=\"left\" valign=\"middle\" class=\"DAT\">"
"<td colspan=\"7\" class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
"<input type=\"checkbox\" id=\"WholeCrs\" name=\"WholeCrs\" value=\"Y\"");
if (!Att_CheckIfAttEventIsAssociatedToGrps (AttCod))
fprintf (Gbl.F.Out," checked=\"checked\"");
@ -2009,7 +2037,8 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,struct UsrData *UsrDat
/***** Icon to show if the user is already registered *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"BT%d",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"\"><img src=\"%s/%s16x16.gif\""
fprintf (Gbl.F.Out,"\">"
"<img src=\"%s/%s16x16.gif\""
" alt=\"\" title=\"%s\" class=\"ICON16x16\" />"
"</td>",
Gbl.Prefs.IconsURL,
@ -2019,26 +2048,31 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,struct UsrData *UsrDat
Txt_Absent);
/***** Checkbox to select user *****/
fprintf (Gbl.F.Out,"<td align=\"center\" valign=\"top\" bgcolor=\"%s\">"
fprintf (Gbl.F.Out,"<td style=\"text-align:center; vertical-align:top; background-color:%s;\">"
"<input type=\"checkbox\" name=\"UsrCodStd\" value=\"%s\"",
BgColor,UsrDat->EncryptedUsrCod);
if (Present) // This student has attended to the event?
fprintf (Gbl.F.Out," checked=\"checked\"");
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_STUDENT) // A student can not change his attendance
fprintf (Gbl.F.Out," disabled=\"disabled\"");
fprintf (Gbl.F.Out," /></td>");
fprintf (Gbl.F.Out," />"
"</td>");
/***** Write number of student in the list *****/
fprintf (Gbl.F.Out,"<td align=\"right\" valign=\"top\" bgcolor=\"%s\" class=\"%s\">%u</td>",
BgColor,
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top; background-color:%s;\">"
"%u"
"</td>",
UsrDat->Accepted ? "DAT_SMALL_N" :
"DAT_SMALL",
BgColor,
NumStd);
/***** Show student's photo *****/
if (Gbl.Usrs.Listing.WithPhotos)
{
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\" bgcolor=\"%s\">",
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:top;"
" background-color:%s;\">",
BgColor);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,
@ -2049,18 +2083,20 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,struct UsrData *UsrDat
}
/***** Write user's ID ******/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\" bgcolor=\"%s\" class=\"%s\">",
BgColor,
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top; background-color:%s;\">",
UsrDat->Accepted ? "DAT_SMALL_N" :
"DAT_SMALL");
"DAT_SMALL",
BgColor);
ID_WriteUsrIDs (UsrDat,true);
fprintf (Gbl.F.Out,"</td>");
/***** Write student's name *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\" bgcolor=\"%s\" class=\"%s\">%s",
BgColor,
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top; background-color:%s;\">%s",
UsrDat->Accepted ? "DAT_SMALL_N" :
"DAT_SMALL",
BgColor,
UsrDat->Surname1);
if (UsrDat->Surname2[0])
fprintf (Gbl.F.Out," %s",UsrDat->Surname2);
@ -2068,7 +2104,8 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,struct UsrData *UsrDat
UsrDat->FirstName);
/***** Student's comment: write form or text */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\" bgcolor=\"%s\" class=\"DAT_SMALL\">",
fprintf (Gbl.F.Out,"<td class=\"DAT_SMALL\" style=\"text-align:left;"
" vertical-align:top; background-color:%s;\">",
BgColor);
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_STUDENT && Att->Open) // Show with form
fprintf (Gbl.F.Out,"<textarea name=\"CommentStd%ld\" cols=\"40\" rows=\"3\">%s</textarea>",
@ -2082,7 +2119,8 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,struct UsrData *UsrDat
fprintf (Gbl.F.Out,"</td>");
/***** Teacher's comment: write form, text or nothing */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\" bgcolor=\"%s\" class=\"DAT_SMALL\">",
fprintf (Gbl.F.Out,"<td class=\"DAT_SMALL\" style=\"text-align:left;"
" vertical-align:top; background-color:%s;\">",
BgColor);
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_TEACHER) // Show with form
fprintf (Gbl.F.Out,"<textarea name=\"CommentTch%ld\" cols=\"40\" rows=\"3\">%s</textarea>",
@ -2940,7 +2978,8 @@ static void Att_ListEventsToSelect (void)
/* Write a row for this event */
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" bgcolor=\"%s\" class=\"DAT\">"
"<td class=\"DAT\""
" style=\"text-align:center; background-color:%s;\">"
"<input type=\"checkbox\" name=\"AttCods\" value=\"%ld\"",
BgColor,
Gbl.AttEvents.Lst[NumAttEvent].AttCod);
@ -2948,9 +2987,18 @@ static void Att_ListEventsToSelect (void)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />"
"</td>"
"<td align=\"right\" bgcolor=\"%s\" class=\"DAT\">%u:</td>"
"<td align=\"left\" bgcolor=\"%s\" class=\"DAT\">%02u/%02u/%04u %02u:%02u h %s</td>"
"<td align=\"right\" bgcolor=\"%s\" class=\"DAT\">%u</td>"
"<td class=\"DAT\""
" style=\"text-align:right; background-color:%s;\">"
"%u:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; background-color:%s;\">"
"%02u/%02u/%04u %02u:%02u h %s"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:right; background-color:%s;\">"
"%u"
"</td>"
"</tr>",
BgColor,
NumAttEvent + 1,
@ -2971,7 +3019,8 @@ static void Att_ListEventsToSelect (void)
if (Gbl.CurrentAct == ActSeeLstAttStd)
{
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" colspan=\"4\" class=\"DAT\">");
"<td colspan=\"4\" class=\"DAT\""
" style=\"text-align:center;\">");
Act_LinkFormSubmit (Txt_Update_attendance_according_to_selected_events,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("recycle",Txt_Update_attendance_according_to_selected_events,Txt_Update_attendance);
fprintf (Gbl.F.Out,"</td>"
@ -3023,8 +3072,12 @@ static void Att_ListStdsAttendanceTable (unsigned NumStdsInList,long *LstSelecte
/***** Last row with the total of students present in each event *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"%u\" align=\"right\" class=\"DAT_N\""
" style=\"border-style:solid none none none;border-width:1px;\">%s:</td>",
"<td colspan=\"%u\" class=\"DAT_N\""
" style=\"text-align:right;"
" border-style:solid none none none;"
" border-width:1px;\">"
"%s:"
"</td>",
Gbl.Usrs.Listing.WithPhotos ? 4 :
3,
Txt_Number_of_students);
@ -3033,13 +3086,21 @@ static void Att_ListStdsAttendanceTable (unsigned NumStdsInList,long *LstSelecte
NumAttEvent++)
if (Gbl.AttEvents.Lst[NumAttEvent].Selected)
{
fprintf (Gbl.F.Out,"<td align=\"center\" class=\"DAT_N\""
" style=\"border-style:solid none none none;border-width:1px;\">%u</td>",
fprintf (Gbl.F.Out,"<td class=\"DAT_N\""
" style=\"text-align:center;"
" border-style:solid none none none;"
" border-width:1px;\">"
"%u"
"</td>",
Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList);
Total += Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList;
}
fprintf (Gbl.F.Out,"<td align=\"right\" class=\"DAT_N\""
" style=\"border-style:solid none none none;border-width:1px;\">%u</td>"
fprintf (Gbl.F.Out,"<td class=\"DAT_N\""
" style=\"text-align:right;"
" border-style:solid none none none;"
" border-width:1px;\">"
"%u"
"</td>"
"</tr>",
Total);
@ -3104,16 +3165,21 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr
/***** Write number of student in the list *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" bgcolor=\"%s\" class=\"%s\">%u</td>",
BgColor,
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle; background-color:%s;\">"
"%u"
"</td>",
UsrDat->Accepted ? "DAT_SMALL_N" :
"DAT_SMALL",
BgColor,
NumStd + 1);
/***** Show student's photo *****/
if (Gbl.Usrs.Listing.WithPhotos)
{
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" bgcolor=\"%s\" width=\"18\">",BgColor);
fprintf (Gbl.F.Out,"<td style=\"width:18px; text-align:left;"
" vertical-align:middle; background-color:%s;\">",
BgColor);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,
ShowPhoto ? PhotoURL :
@ -3124,18 +3190,21 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr
}
/***** Write user's ID ******/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" bgcolor=\"%s\" class=\"%s\">",
BgColor,
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:middle; background-color:%s;\">",
UsrDat->Accepted ? "DAT_SMALL_N" :
"DAT_SMALL");
"DAT_SMALL",
BgColor);
ID_WriteUsrIDs (UsrDat,true);
fprintf (Gbl.F.Out,"</td>");
/***** Write student's name *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" bgcolor=\"%s\" class=\"%s\">%s",
BgColor,
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:middle; background-color:%s;\">"
"%s",
UsrDat->Accepted ? "DAT_SMALL_N" :
"DAT_SMALL",
BgColor,
UsrDat->Surname1);
if (UsrDat->Surname2[0])
fprintf (Gbl.F.Out," %s",UsrDat->Surname2);
@ -3168,9 +3237,13 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr
}
/***** Last column with the number of times this user is present *****/
fprintf (Gbl.F.Out,"<td align=\"right\" valign=\"middle\" bgcolor=\"%s\" class=\"DAT_N\">%u</td>"
fprintf (Gbl.F.Out,"<td class=\"DAT_N\" style=\"text-align:right;"
" vertical-align:middle; background-color:%s;\">"
"%u"
"</td>"
"</tr>",
BgColor,NumTimesPresent);
BgColor,
NumTimesPresent);
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
}
@ -3233,14 +3306,18 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
/***** Write number of student in the list *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" bgcolor=\"%s\" class=\"%s\">%u:</td>",
BgColor,
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle; background-color:%s;\">"
"%u:"
"</td>",
UsrDat->Accepted ? "DAT_SMALL_N" :
"DAT_SMALL",
BgColor,
NumStd + 1);
/***** Show student's photo *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" bgcolor=\"%s\" width=\"18\">",
fprintf (Gbl.F.Out,"<td style=\"width:18px; text-align:left;"
" vertical-align:middle; background-color:%s;\">",
BgColor);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,
@ -3251,10 +3328,11 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
fprintf (Gbl.F.Out,"</td>");
/***** Write user's ID ******/
fprintf (Gbl.F.Out,"<td align=\"left\" bgcolor=\"%s\">"
fprintf (Gbl.F.Out,"<td style=\"text-align:left; background-color:%s;\">"
"<table>"
"<tr>"
"<td align=\"left\" valign=\"middle\" class=\"%s\">",
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:middle;\">",
BgColor,
UsrDat->Accepted ? "DAT_SMALL_N" :
"DAT_SMALL");
@ -3262,7 +3340,8 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
fprintf (Gbl.F.Out,"</td>");
/***** Write student's name *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" class=\"%s\">%s",
fprintf (Gbl.F.Out,"<td class=\"%s\""
" style=\"text-align:left; vertical-align:middle;\">%s",
UsrDat->Accepted ? "DAT_SMALL_N" :
"DAT_SMALL",
UsrDat->Surname1);
@ -3290,9 +3369,13 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
/***** Write a row for this event *****/
fprintf (Gbl.F.Out,"<tr>"
"<td bgcolor=\"%s\"></td>"
"<td align=\"right\" bgcolor=\"%s\" class=\"DAT\">%u:</td>"
"<td align=\"left\" bgcolor=\"%s\" class=\"DAT\">"
"<td style=\"background-color:%s;\"></td>"
"<td class=\"DAT\""
" style=\"text-align:right; background-color:%s;\">"
"%u:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; background-color:%s;\">"
"<img src=\"%s/%s16x16.gif\""
" alt=\"\" title=\"%s\" class=\"ICON16x16\" />"
" %02u/%02u/%04u %02u:%02u h %s</td>"
@ -3318,9 +3401,10 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
CommentTch[0])
{
fprintf (Gbl.F.Out,"<tr>"
"<td bgcolor=\"%s\"></td>"
"<td bgcolor=\"%s\"></td>"
"<td align=\"left\" bgcolor=\"%s\" class=\"DAT\">"
"<td style=\"background-color:%s;\"></td>"
"<td style=\"background-color:%s;\"></td>"
"<td class=\"DAT\" style=\"text-align:left;"
" background-color:%s;\">"
"<dl>",
BgColor,
BgColor,

38
swad_banner.c
View File

@ -98,7 +98,7 @@ void Ban_SeeBanners (void)
NumBan++)
/* Write data of this banner */
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\" class=\"DAT\">"
"<td class=\"DAT\" style=\"text-align:left;\">"
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">"
"<img src=\"%s/%s/%s\" width=\"120\" height=\"40\" alt=\"%s\" /></a>"
"</td>"
@ -340,13 +340,16 @@ static void Ban_ListBannersForEdition (void)
Txt_Hide);
/* Banner code */
fprintf (Gbl.F.Out,"<td align=\"right\" class=\"%s\">%ld&nbsp;</td>",
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:right;\">"
"%ld&nbsp;"
"</td>",
Ban->IsHidden ? "DAT_LIGHT" :
"DAT",
Ban->BanCod);
/* Banner short name */
fprintf (Gbl.F.Out,"<td align=\"center\" valign=\"middle\">");
fprintf (Gbl.F.Out,"<td style=\"text-align:center;"
" vertical-align:middle;\">");
Act_FormStart (ActRenBanSho);
Ban_PutParamBanCod (Ban->BanCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"ShortName\" size=\"12\" maxlength=\"%u\" value=\"%s\""
@ -356,7 +359,8 @@ static void Ban_ListBannersForEdition (void)
Ban_MAX_LENGTH_SHORT_NAME,Ban->ShortName,Gbl.FormId);
/* Banner full name */
fprintf (Gbl.F.Out,"<td align=\"center\" valign=\"middle\">");
fprintf (Gbl.F.Out,"<td style=\"text-align:center;"
" vertical-align:middle;\">");
Act_FormStart (ActRenBanFul);
Ban_PutParamBanCod (Ban->BanCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FullName\" size=\"24\" maxlength=\"%u\" value=\"%s\""
@ -366,7 +370,8 @@ static void Ban_ListBannersForEdition (void)
Ban_MAX_LENGTH_FULL_NAME,Ban->FullName,Gbl.FormId);
/* Banner image */
fprintf (Gbl.F.Out,"<td align=\"center\" valign=\"middle\">");
fprintf (Gbl.F.Out,"<td style=\"text-align:center;"
" vertical-align:middle;\">");
Act_FormStart (ActChgBanImg);
Ban_PutParamBanCod (Ban->BanCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Img\" size=\"12\" maxlength=\"%u\" value=\"%s\""
@ -376,7 +381,8 @@ static void Ban_ListBannersForEdition (void)
Ban_MAX_LENGTH_IMAGE,Ban->Img,Gbl.FormId);
/* Banner WWW */
fprintf (Gbl.F.Out,"<td align=\"center\" valign=\"middle\">");
fprintf (Gbl.F.Out,"<td style=\"text-align:center;"
" vertical-align:middle;\">");
Act_FormStart (ActChgBanWWW);
Ban_PutParamBanCod (Ban->BanCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"WWW\" size=\"24\" maxlength=\"%u\" value=\"%s\""
@ -739,25 +745,25 @@ static void Ban_PutFormToCreateBanner (void)
"<td></td>");
/***** Banner short name *****/
fprintf (Gbl.F.Out,"<td align=\"center\" valign=\"middle\">"
fprintf (Gbl.F.Out,"<td style=\"text-align:center; vertical-align:middle;\">"
"<input type=\"text\" name=\"ShortName\" size=\"12\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Ban_MAX_LENGTH_SHORT_NAME,Ban->ShortName);
/***** Banner full name *****/
fprintf (Gbl.F.Out,"<td align=\"center\" valign=\"middle\">"
fprintf (Gbl.F.Out,"<td style=\"text-align:center; vertical-align:middle;\">"
"<input type=\"text\" name=\"FullName\" size=\"24\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Ban_MAX_LENGTH_FULL_NAME,Ban->FullName);
/***** Banner image *****/
fprintf (Gbl.F.Out,"<td align=\"center\" valign=\"middle\">"
fprintf (Gbl.F.Out,"<td style=\"text-align:center; vertical-align:middle;\">"
"<input type=\"text\" name=\"Img\" size=\"12\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Ban_MAX_LENGTH_IMAGE,Ban->Img);
/***** Banner WWW *****/
fprintf (Gbl.F.Out,"<td align=\"center\" valign=\"middle\">"
fprintf (Gbl.F.Out,"<td style=\"text-align:center; vertical-align:middle;\">"
"<input type=\"text\" name=\"WWW\" size=\"24\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
@ -765,7 +771,7 @@ static void Ban_PutFormToCreateBanner (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" colspan=\"7\">"
"<td colspan=\"7\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
@ -793,11 +799,11 @@ static void Ban_PutHeadBanners (void)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"BM\"></td>"
"<td class=\"BM\"></td>"
"<td align=\"right\" class=\"TIT_TBL\">%s</td>"
"<td align=\"left\" class=\"TIT_TBL\">%s</td>"
"<td align=\"left\" class=\"TIT_TBL\">%s</td>"
"<td align=\"left\" class=\"TIT_TBL\">%s</td>"
"<td align=\"left\" class=\"TIT_TBL\">%s</td>"
"<td class=\"TIT_TBL\" style=\"text-align:right;\">%s</td>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">%s</td>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">%s</td>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">%s</td>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">%s</td>"
"</tr>",
Txt_Code,
Txt_Short_Name,

230
swad_centre.c
View File

@ -163,7 +163,8 @@ void Ctr_SeeCtrWithPendingDegs (void)
/* Centre logo */
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" valign=\"middle\" class=\"DAT\" bgcolor=\"%s\">"
"<td class=\"DAT\" style=\"text-align:center;"
" vertical-align:middle; background-color:%s;\">"
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">",
BgColor,Ctr.WWW,Ctr.FullName);
Ctr_DrawCentreLogo (Ctr.Logo,Ctr.ShortName,16,"vertical-align:top;");
@ -171,19 +172,24 @@ void Ctr_SeeCtrWithPendingDegs (void)
"</td>");
/* Centre full name */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" class=\"DAT\" bgcolor=\"%s\">",
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle; background-color:%s;\">",
BgColor);
Act_FormGoToStart (ActSeeDeg);
Ctr_PutParamCtrCod (Ctr.CtrCod);
sprintf (Gbl.Title,Txt_Go_to_X,Ctr.FullName);
Act_LinkFormSubmit (Gbl.Title,"DAT");
fprintf (Gbl.F.Out,"%s</a>"
fprintf (Gbl.F.Out,"%s"
"</a>"
"</form>"
"</td>",
Ctr.FullName);
/* Number of pending degrees (row[1]) */
fprintf (Gbl.F.Out,"<td align=\"right\" valign=\"middle\" class=\"DAT\" bgcolor=\"%s\">%s</td>"
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;"
" vertical-align:middle; background-color:%s;\">"
"%s"
"</td>"
"</tr>",
BgColor,row[1]);
@ -267,7 +273,8 @@ static void Ctr_Configuration (bool PrintView)
/***** Title *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" align=\"center\" class=\"TITLE_LOCATION\">");
"<td colspan=\"2\" class=\"TITLE_LOCATION\""
" style=\"text-align:center;\">");
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">",
@ -290,7 +297,8 @@ static void Ctr_Configuration (bool PrintView)
/* Photo image */
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" align=\"center\" class=\"DAT_SMALL\">");
"<td colspan=\"2\" class=\"DAT_SMALL\""
" style=\"text-align:center;\">");
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"DAT_N\">",
Gbl.CurrentCtr.Ctr.WWW);
@ -310,7 +318,8 @@ static void Ctr_Configuration (bool PrintView)
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SUPERUSER && !PrintView)
{
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" colspan=\"2\">");
"<td colspan=\"2\""
" style=\"text-align:center;\">");
Act_FormStart (ActChgCtrPhoAtt);
fprintf (Gbl.F.Out,"<textarea name=\"Attribution\" cols=\"50\" rows=\"2\""
" onchange=\"javascript:document.getElementById('%s').submit();\">",
@ -324,7 +333,9 @@ static void Ctr_Configuration (bool PrintView)
}
else if (PhotoAttribution)
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" colspan=\"2\" class=\"ATTRIBUTION\">%s"
"<td colspan=\"2\" class=\"ATTRIBUTION\""
" style=\"text-align:center;\">"
"%s"
"</td>"
"</tr>",
PhotoAttribution);
@ -335,8 +346,12 @@ static void Ctr_Configuration (bool PrintView)
/***** Centre full name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT_N\">",
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT_N\""
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Centre);
if (PutLink)
@ -350,8 +365,14 @@ static void Ctr_Configuration (bool PrintView)
/***** Centre short name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">%s</td>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
"%s"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Short_Name,
@ -361,8 +382,12 @@ static void Ctr_Configuration (bool PrintView)
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SUPERUSER)
{
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\">",
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Logo);
Act_FormStart (ActChgCtrLog);
@ -377,9 +402,15 @@ static void Ctr_Configuration (bool PrintView)
/***** Link to the centre *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">"
"<a href=\"%s/?CtrCod=%ld\" class=\"DAT\" target=\"_blank\">%s/?CtrCod=%ld</a>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
"<a href=\"%s/?CtrCod=%ld\" class=\"DAT\" target=\"_blank\">"
"%s/?CtrCod=%ld"
"</a>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
@ -391,8 +422,12 @@ static void Ctr_Configuration (bool PrintView)
{
/***** QR code with link to the centre *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">",
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_QR_code);
QR_LinkToCentre (200);
@ -403,8 +438,14 @@ static void Ctr_Configuration (bool PrintView)
{
/***** Number of degrees *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">%u</td>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">"
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Degrees,
@ -412,8 +453,14 @@ static void Ctr_Configuration (bool PrintView)
/***** Number of courses *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">%u</td>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">"
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Courses,
@ -421,8 +468,14 @@ static void Ctr_Configuration (bool PrintView)
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">%u</td>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">"
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_ROLE_TEACHER][Usr_SEX_UNKNOWN],
@ -430,8 +483,14 @@ static void Ctr_Configuration (bool PrintView)
/***** Number of students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">%u</td>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">"
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_ROLE_STUDENT][Usr_SEX_UNKNOWN],
@ -555,28 +614,35 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
/***** Number of centre in this list *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\" bgcolor=\"%s\">"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle; background-color:%s;\">"
"%u"
"</td>",
TxtClass,BgColor,
NumCtr);
/***** Centre logo *****/
fprintf (Gbl.F.Out,"<td align=\"center\" valign=\"middle\" class=\"%s\" bgcolor=\"%s\">"
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:center;"
" vertical-align:middle; background-color:%s;\">"
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">",
TxtClass,BgColor,Ctr->WWW,Ctr->FullName);
TxtClass,BgColor,
Ctr->WWW,Ctr->FullName);
Ctr_DrawCentreLogo (Ctr->Logo,Ctr->ShortName,16,"vertical-align:top;");
fprintf (Gbl.F.Out,"</a>"
"</td>");
/***** Place *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" class=\"%s\" bgcolor=\"%s\">%s</td>",
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:middle; background-color:%s;\">"
"%s"
"</td>",
TxtClass,BgColor,
Plc.PlcCod > 0 ? Plc.ShortName :
Txt_Another_place);
/***** Centre name *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" class=\"%s\" bgcolor=\"%s\">",
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:middle; background-color:%s;\">",
TxtClass,BgColor);
Act_FormGoToStart (ActSeeDeg);
Ctr_PutParamCtrCod (Ctr->CtrCod);
@ -588,18 +654,30 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
Ctr->FullName);
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<td align=\"right\" valign=\"middle\" class=\"%s\" bgcolor=\"%s\">%u</td>",
TxtClass,BgColor,Ctr->NumTchs);
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle; background-color:%s;\">"
"%u"
"</td>",
TxtClass,BgColor,
Ctr->NumTchs);
/***** Number of degrees *****/
fprintf (Gbl.F.Out,"<td align=\"right\" valign=\"middle\" class=\"%s\" bgcolor=\"%s\">%u</td>",
TxtClass,BgColor,Ctr->NumDegs);
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle; background-color:%s;\">"
"%u"
"</td>",
TxtClass,BgColor,
Ctr->NumDegs);
/***** Centre status *****/
StatusTxt = Ctr_GetStatusTxtFromStatusBits (Ctr->Status);
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" class=\"%s\" bgcolor=\"%s\">%s</td>"
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:middle; background-color:%s;\">"
"%s"
"</td>"
"</tr>",
TxtClass,BgColor,Txt_CENTRE_STATUS[StatusTxt]);
TxtClass,BgColor,
Txt_CENTRE_STATUS[StatusTxt]);
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
}
@ -1090,17 +1168,21 @@ static void Ctr_ListCentresForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Centre code */
fprintf (Gbl.F.Out,"<td align=\"right\" class=\"DAT\">%ld&nbsp;</td>",
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;\">"
"%ld&nbsp;"
"</td>",
Ctr->CtrCod);
/* Institution logo */
fprintf (Gbl.F.Out,"<td align=\"left\" width=\"20\" title=\"%s\">",
fprintf (Gbl.F.Out,"<td title=\"%s\""
" style=\"width:20px; text-align:left;\">",
Ctr->FullName);
Ctr_DrawCentreLogo (Ctr->Logo,Ctr->ShortName,16,NULL);
fprintf (Gbl.F.Out,"</td>");
/* Institution */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" class=\"DAT\">");
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">");
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SUPERUSER) // I can select institution
{
Act_FormStart (ActChgCtrIns);
@ -1124,7 +1206,8 @@ static void Ctr_ListCentresForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Place */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" class=\"DAT\">");
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">");
if (ICanEdit)
{
Act_FormStart (ActChgCtrPlc);
@ -1156,7 +1239,8 @@ static void Ctr_ListCentresForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Centre short name */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" class=\"DAT\">");
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">");
if (ICanEdit)
{
Act_FormStart (ActRenCtrSho);
@ -1172,7 +1256,8 @@ static void Ctr_ListCentresForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Centre full name */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" class=\"DAT\">");
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">");
if (ICanEdit)
{
Act_FormStart (ActRenCtrFul);
@ -1188,7 +1273,8 @@ static void Ctr_ListCentresForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Centre WWW */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" class=\"DAT\">");
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">");
if (ICanEdit)
{
Act_FormStart (ActChgCtrWWW);
@ -1211,16 +1297,20 @@ static void Ctr_ListCentresForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Number of teachers */
fprintf (Gbl.F.Out,"<td align=\"right\" class=\"DAT\">%u</td>",
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;\">"
"%u"
"</td>",
Ctr->NumTchs);
/* Number of degrees */
fprintf (Gbl.F.Out,"<td align=\"right\" class=\"DAT\">%u</td>",
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;\">"
"%u"
"</td>",
Ctr->NumDegs);
/* Centre status */
StatusTxt = Ctr_GetStatusTxtFromStatusBits (Ctr->Status);
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" class=\"DAT\">");
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:left; vertical-align:middle;\">");
if (Gbl.Usrs.Me.LoggedRole >= Rol_ROLE_INS_ADMIN &&
StatusTxt == Ctr_STATUS_PENDING)
{
@ -1245,7 +1335,8 @@ static void Ctr_ListCentresForEdition (void)
/* Centre requester */
UsrDat.UsrCod = Ctr->RequesterUsrCod;
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
fprintf (Gbl.F.Out,"<td align=\"left\" width=\"100\" valign=\"top\">"
fprintf (Gbl.F.Out,"<td style=\"width:100px;"
" text-align:left; vertical-align:top;\">"
"<table class=\"CELLS_PAD_2\" style=\"width:100px;\">"
"<tr>");
Msg_WriteMsgAuthor (&UsrDat,80,10,"DAT",true,NULL);
@ -1732,15 +1823,15 @@ void Ctr_ReqPhoto (void)
Act_FormStart (ActRecCtrPho);
fprintf (Gbl.F.Out,"<table>"
"<tr>"
"<td align=\"right\" class=\"%s\">"
"<td class=\"%s\" style=\"text-align:right;\">"
"%s:"
"</td>"
"<td align=\"left\">"
"<td style=\"text-align:left;\">"
"<input type=\"file\" name=\"%s\" size=\"40\" maxlength=\"100\" value=\"\" />"
"</td>"
"</tr>"
"<tr>"
"<td colspan=\"2\" align=\"center\">"
"<td colspan=\"2\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" accept=\"image/jpeg\" />"
"</td>"
"</tr>"
@ -1877,15 +1968,15 @@ static void Ctr_PutFormToCreateCentre (void)
Gbl.Prefs.IconsURL);
/***** Centre code *****/
fprintf (Gbl.F.Out,"<td align=\"right\" class=\"DAT\"></td>");
fprintf (Gbl.F.Out,"<td></td>");
/***** Centre logo *****/
fprintf (Gbl.F.Out,"<td align=\"left\" width=\"20\">");
fprintf (Gbl.F.Out,"<td style=\"width:20px; text-align:left;\">");
Ctr_DrawCentreLogo (NULL,"",16,NULL);
fprintf (Gbl.F.Out,"</td>");
/***** Institution *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\">"
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:middle;\">"
"<select name=\"OthInsCod\" style=\"width:50px;\" disabled=\"disabled\">"
"<option value=\"%ld\" selected=\"selected\">"
"%s"
@ -1896,7 +1987,7 @@ static void Ctr_PutFormToCreateCentre (void)
Gbl.CurrentIns.Ins.ShortName);
/***** Place *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\">"
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:middle;\">"
"<select name=\"PlcCod\" style=\"width:50px;\">"
"<option value=\"0\"");
if (Ctr->PlcCod == 0)
@ -1914,35 +2005,43 @@ static void Ctr_PutFormToCreateCentre (void)
"</td>");
/***** Centre short name *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\">"
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:middle;\">"
"<input type=\"text\" name=\"ShortName\" size=\"10\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Ctr_MAX_LENGTH_CENTRE_SHORT_NAME,Ctr->ShortName);
/***** Centre full name *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\">"
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:middle;\">"
"<input type=\"text\" name=\"FullName\" size=\"30\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Ctr_MAX_LENGTH_CENTRE_FULL_NAME,Ctr->FullName);
/***** Centre WWW *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\">"
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:middle;\">"
"<input type=\"text\" name=\"WWW\" size=\"10\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Cns_MAX_LENGTH_WWW,Ctr->WWW);
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<td align=\"right\" class=\"DAT\">0</td>");
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;\">"
"0"
"</td>");
/***** Number of degrees *****/
fprintf (Gbl.F.Out,"<td align=\"right\" class=\"DAT\">0</td>");
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;\">"
"0"
"</td>");
/***** Centre status *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" class=\"DAT\">%s</td>",
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
"%s"
"</td>",
Txt_CENTRE_STATUS[Ctr_STATUS_PENDING]);
/***** Centre requester *****/
fprintf (Gbl.F.Out,"<td align=\"left\" width=\"100\" valign=\"top\">"
fprintf (Gbl.F.Out,"<td style=\"width:100px;"
" text-align:left; vertical-align:top;\">"
"<table class=\"CELLS_PAD_2\" style=\"width:100px;\">"
"<tr>");
Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,80,10,"DAT",true,NULL);
@ -1953,7 +2052,7 @@ static void Ctr_PutFormToCreateCentre (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"centre\" colspan=\"12\">"
"<td colspan=\"12\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
@ -2343,7 +2442,8 @@ unsigned Ctr_ListCtrsFound (const char *Query)
/* Number of centres found */
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" class=\"TIT_TBL\" colspan=\"7\">");
"<td colspan=\"7\" class=\"TIT_TBL\""
" style=\"text-align:center;\">");
if (NumCtrs == 1)
fprintf (Gbl.F.Out,"1 %s",Txt_centre);
else

3
swad_changelog.h
View File

@ -35,11 +35,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.39.6 (2014/12/22)"
#define Log_PLATFORM_VERSION "SWAD 14.40 (2014/12/22)"
// 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 | tail -1
/*
Version 14.40 :Dic 22, 2014 Changes in HTML and CSS to validate HTML5 in W3C validator. (171118 lines)
Version 14.39.6 :Dic 22, 2014 Changes in HTML and CSS to validate HTML5 in W3C validator. (? lines)
Version 14.39.5 :Dic 21, 2014 Changes in HTML and CSS to validate HTML5 in W3C validator. (170725 lines)
Version 14.39.4 :Dic 21, 2014 Changes in HTML and CSS to validate HTML5 in W3C validator. (170688 lines)

24
swad_chat.c
View File

@ -116,7 +116,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_Chat_rooms);
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\" class=\"%s\">",
"<td class=\"%s\" style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
/***** Title of top level *****/
@ -232,8 +232,14 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
Lay_WriteTitle (Txt_Rooms_with_users);
Lay_StartRoundFrameTable10 (NULL,0,NULL);
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" bgcolor=\"%s\" class=\"TIT_TBL\">%s&nbsp;</td>"
"<td align=\"left\" bgcolor=\"%s\" class=\"TIT_TBL\">%s</td>"
"<td class=\"TIT_TBL\""
" style=\"text-align:center; background-color:%s;\">"
"%s&nbsp;"
"</td>"
"<td class=\"TIT_TBL\""
" style=\"text-align:left; background-color:%s;\">"
"%s"
"</td>"
"</tr>",
VERY_LIGHT_BLUE,Txt_CHAT_Room_code,
VERY_LIGHT_BLUE,Txt_No_of_users);
@ -246,8 +252,12 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
/* Get next chat room */
row = mysql_fetch_row (mysql_res);
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\" class=\"DAT\">%s</td>"
"<td align=\"right\" class=\"DAT\">%s</td>"
"<td class=\"DAT\" style=\"text-align:left;\">"
"%s"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
"%s"
"</td>"
"</tr>",
row[0],row[1]);
}
@ -276,12 +286,12 @@ static void Cht_WriteLinkToChat (const char *Icon,const char *RoomCode,const cha
sprintf (Gbl.Chat.WindowName,"%s_%s",RoomCode,Gbl.UniqueNameEncrypted);
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\" valign=\"top\">"
"<td style=\"text-align:left; vertical-align:top;\">"
"<table>"
"<tr>");
Msg_IndentDependingOnLevel (Level,IsLastItemInLevel);
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\">");
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:middle;\">");
Act_FormStart (ActCht);
Cht_WriteParamsRoomCodeAndNames (RoomCode,RoomShortName,RoomFullName);
Act_LinkFormSubmit (RoomFullName,(NumUsrsInRoom > 0) ? The_ClassFormulB[Gbl.Prefs.Theme] :

67
swad_connected.c
View File

@ -108,7 +108,7 @@ void Con_ShowConnectedUsrs (void)
Gbl.Now.Time.Minute);
Lay_StartRoundFrameTable10 (NULL,0,Gbl.Title);
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\">");
"<td>");
/* Number of connected users in the whole platform */
Con_ShowGlobalConnectedUsrs ();
@ -250,12 +250,16 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Start table *****/
fprintf (Gbl.F.Out,"<div class=\"CONNECTED\" style=\"width:110px;\">"
fprintf (Gbl.F.Out,"<div class=\"CONNECTED\""
" style=\"width:110px; margin-left:auto; margin-right:auto; \">"
"<table style=\"width:110px;\">");
/***** Write total number of sessions *****/
fprintf (Gbl.F.Out,"<tr>"
"<td width=\"110\" align=\"center\" valign=\"top\">%u %s</td>"
"<td style=\"width:110px;"
" text-align:center; vertical-align:top;\">"
"%u %s"
"</td>"
"</tr>",
Gbl.Session.NumSessions,
(Gbl.Session.NumSessions == 1) ? Txt_session :
@ -263,7 +267,10 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Write total number of users *****/
fprintf (Gbl.F.Out,"<tr>"
"<td width=\"110\" align=\"center\" valign=\"top\">%u %s:</td>"
"<td style=\"width:110px;"
" text-align:center; vertical-align:top;\">"
"%u %s:"
"</td>"
"</tr>",
UsrsTotal,
(UsrsTotal == 1) ? Txt_user[Usr_SEX_UNKNOWN] :
@ -271,7 +278,10 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Write total number of students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td width=\"110\" align=\"center\" valign=\"top\">%u %s</td>"
"<td style=\"width:110px;"
" text-align:center; vertical-align:top;\">"
"%u %s"
"</td>"
"</tr>",
StdsTotal,
(StdsTotal == 1) ? Txt_ROLES_SINGULAR_abc[Rol_ROLE_STUDENT][Usr_SEX_UNKNOWN] :
@ -279,7 +289,10 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Write total number of teachers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td width=\"110\" align=\"center\" valign=\"top\">%u %s</td>"
"<td style=\"width:110px;"
" text-align:center; vertical-align:top;\">"
"%u %s"
"</td>"
"</tr>",
TchsTotal,
(TchsTotal == 1) ? Txt_ROLES_SINGULAR_abc[Rol_ROLE_TEACHER][Usr_SEX_UNKNOWN] :
@ -288,7 +301,10 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Write total number of users who do not belong to any course *****/
if (WithoutCoursesTotal)
fprintf (Gbl.F.Out,"<tr>"
"<td width=\"110\" align=\"center\" valign=\"top\">%u %s</td>"
"<td style=\"width:110px;"
" text-align:center; vertical-align:top;\">"
"%u %s"
"</td>"
"</tr>",
WithoutCoursesTotal,
(WithoutCoursesTotal == 1) ? Txt_ROLES_SINGULAR_abc[Rol_ROLE_GUEST][Usr_SEX_UNKNOWN] :
@ -462,7 +478,8 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnMainZone (
/***** Write number of connected users who belong to current course *****/
NumUsrsThisRole = Con_GetNumConnectedUsrsWithARoleBelongingCurrentLocation (Role,&UsrSex);
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"3\" align=\"center\" valign=\"top\">"
"<td colspan=\"3\""
" style=\"text-align:center; vertical-align:top;\">"
"%u %s"
"</td>"
"</tr>",
@ -529,7 +546,8 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnRightColum
if (Gbl.Usrs.Connected.NumUsrsToList > Cfg_MAX_CONNECTED_SHOWN)
Gbl.Usrs.Connected.NumUsrsToList = Cfg_MAX_CONNECTED_SHOWN;
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"3\" width=\"110\" align=\"center\" valign=\"top\">"
"<td colspan=\"3\" style=\"width:110px;"
" text-align:center; vertical-align:top;\">"
"%u %s"
"</td>"
"</tr>",
@ -568,7 +586,7 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnRightColum
{
sprintf (Gbl.FormId,"form_con_%d",++Gbl.NumFormConnectedUsrs);
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" colspan=\"3\">");
"<td colspan=\"3\" style=\"text-align:center;\">");
Act_FormStartId (ActLstCon,Gbl.FormId);
Sco_PutParamScope (Sco_SCOPE_COURSE);
Act_LinkFormSubmitId (Txt_Connected_users,The_ClassConnected[Gbl.Prefs.Theme],Gbl.FormId);
@ -907,7 +925,9 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
/***** Show photo *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\" width=\"18\" valign=\"middle\" bgcolor=\"%s\">",Color);
"<td style=\"width:18px; text-align:left;"
" vertical-align:middle; background-color:%s;\">",
Color);
sprintf (Gbl.FormId,"form_con_%d",++Gbl.NumFormConnectedUsrs);
Act_FormStartId ((Role == Rol_ROLE_STUDENT) ? ActSeeRecOneStd :
ActSeeRecOneTch,
@ -924,8 +944,9 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
"</td>");
/***** Write full name and link *****/
fprintf (Gbl.F.Out,"<td align=\"left\" width=\"54\" valign=\"middle\" bgcolor=\"%s\" class=\"%s\">",
Color,Font);
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"width:54px; text-align:left;"
" vertical-align:middle; background-color:%s;\">",
Font,Color);
sprintf (Gbl.FormId,"form_con_%d",++Gbl.NumFormConnectedUsrs);
Act_FormStartId ((Role == Rol_ROLE_STUDENT) ? ActSeeRecOneStd :
ActSeeRecOneTch,
@ -938,8 +959,9 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
"</td>");
/***** Write time from last access *****/
fprintf (Gbl.F.Out,"<td width=\"38\" align=\"right\" valign=\"middle\" bgcolor=\"%s\" class=\"%s\">",
Color,Font);
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"width:38px; text-align:right;"
" vertical-align:middle; background-color:%s;\">",
Font,Color);
fprintf (Gbl.F.Out,"<div id=\"hm%u\">",Gbl.Usrs.Connected.NumUsr); // Used for automatic update, only when displayed on right column
Hours = Gbl.Usrs.Connected.Lst[Gbl.Usrs.Connected.NumUsr].Seconds / (60*60);
@ -1087,7 +1109,8 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
/***** Show photo *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\" width=\"18\" valign=\"middle\" bgcolor=\"%s\">",
"<td style=\"width:18px; text-align:left;"
" vertical-align:middle; background-color:%s;\">",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (PutLinkToRecord)
{
@ -1107,8 +1130,10 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
fprintf (Gbl.F.Out,"</td>");
/***** Write full name and link *****/
fprintf (Gbl.F.Out,"<td align=\"left\" width=\"256\" valign=\"middle\" bgcolor=\"%s\" class=\"%s\">",
Gbl.ColorRows[Gbl.RowEvenOdd],Font);
fprintf (Gbl.F.Out,"<td class=\"%s\""
" style=\"width:256px; text-align:left;"
" vertical-align:middle; background-color:%s;\">",
Font,Gbl.ColorRows[Gbl.RowEvenOdd]);
if (PutLinkToRecord)
{
Act_FormStart ((Role == Rol_ROLE_STUDENT) ? ActSeeRecOneStd :
@ -1123,8 +1148,10 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
fprintf (Gbl.F.Out,"</td>");
/***** Write time from last access *****/
fprintf (Gbl.F.Out,"<td width=\"38\" align=\"right\" valign=\"middle\" bgcolor=\"%s\" class=\"%s\">",
Gbl.ColorRows[Gbl.RowEvenOdd],Font);
fprintf (Gbl.F.Out,"<td class=\"%s\""
" style=\"width:38px; text-align:right;"
" vertical-align:middle; background-color:%s;\">",
Font,Gbl.ColorRows[Gbl.RowEvenOdd]);
Hours = Seconds / (60 * 60);
Minutes = (Seconds / 60) % 60;
Seconds %= 60;

261
swad_country.c
View File

@ -143,7 +143,8 @@ void Cty_SeeCtyWithPendingInss (void)
/* Country map */
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" valign=\"middle\" class=\"DAT\" bgcolor=\"%s\">"
"<td style=\"text-align:center;"
" vertical-align:middle; background-color:%s;\">"
"<a href=\"%s\" target=\"_blank\">"
"<img src=\"%s/%s/%s/%s.png\" class=\"COUNTRY_MAP_SMALL\""
" alt=\"%s\" title=\"%s\" />"
@ -157,7 +158,8 @@ void Cty_SeeCtyWithPendingInss (void)
Cty.Name[Gbl.Prefs.Language]);
/* Country name */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\" class=\"DAT\" bgcolor=\"%s\">",
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle; background-color:%s;\">",
BgColor);
Act_FormGoToStart (ActSeeIns);
Cty_PutParamCtyCod (Cty.CtyCod);
@ -169,7 +171,10 @@ void Cty_SeeCtyWithPendingInss (void)
Cty.Name[Gbl.Prefs.Language]);
/* Number of pending institutions (row[1]) */
fprintf (Gbl.F.Out,"<td align=\"right\" valign=\"middle\" class=\"DAT\" bgcolor=\"%s\">%s</td>"
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;"
" vertical-align:middle; background-color:%s;\">"
"%s"
"</td>"
"</tr>",
BgColor,row[1]);
@ -238,7 +243,8 @@ static void Cty_Configuration (bool PrintView)
/***** Title *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" align=\"center\" class=\"TITLE_LOCATION\">");
"<td colspan=\"2\" class=\"TITLE_LOCATION\""
" style=\"text-align:center;\">");
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">",
@ -264,7 +270,8 @@ static void Cty_Configuration (bool PrintView)
/* Map image */
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" colspan=\"2\" class=\"DAT_SMALL\">");
"<td colspan=\"2\" class=\"DAT_SMALL\""
" style=\"text-align:center;\">");
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">",
Gbl.CurrentCty.Cty.WWW[Gbl.Prefs.Language]);
@ -286,7 +293,8 @@ static void Cty_Configuration (bool PrintView)
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SUPERUSER && !PrintView)
{
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" colspan=\"2\">");
"<td colspan=\"2\""
" style=\"text-align:center;\">");
Act_FormStart (ActChgCtyMapAtt);
fprintf (Gbl.F.Out,"<textarea name=\"Attribution\" cols=\"50\" rows=\"2\""
" onchange=\"javascript:document.getElementById('%s').submit();\">",
@ -300,7 +308,9 @@ static void Cty_Configuration (bool PrintView)
}
else if (MapAttribution)
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" colspan=\"2\" class=\"ATTRIBUTION\">%s"
"<td colspan=\"2\" class=\"ATTRIBUTION\""
" style=\"text-align:center;\">"
"%s"
"</td>"
"</tr>",
MapAttribution);
@ -311,8 +321,12 @@ static void Cty_Configuration (bool PrintView)
/***** Country name (an link to WWW if exists) *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT_N\">",
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT_N\""
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Country);
if (!PrintView && Gbl.CurrentCty.Cty.WWW[Gbl.Prefs.Language][0])
@ -326,8 +340,12 @@ static void Cty_Configuration (bool PrintView)
/***** Link to the country inside platform *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
"<a href=\"%s/?CtyCod=%ld\" class=\"DAT\" target=\"_blank\">%s/?CtyCod=%ld</a>"
"</td>"
"</tr>",
@ -340,8 +358,12 @@ static void Cty_Configuration (bool PrintView)
{
/***** QR code with link to the country *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">",
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_QR_code);
QR_LinkToCountry (200);
@ -352,8 +374,14 @@ static void Cty_Configuration (bool PrintView)
{
/***** Number of institutions *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">%u</td>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">"
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Institutions,
@ -361,8 +389,14 @@ static void Cty_Configuration (bool PrintView)
/***** Number of centres *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">%u</td>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">"
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Centres,
@ -370,8 +404,14 @@ static void Cty_Configuration (bool PrintView)
/***** Number of degrees *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">%u</td>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">"
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Degrees,
@ -379,8 +419,14 @@ static void Cty_Configuration (bool PrintView)
/***** Number of courses *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">%u</td>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">"
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Courses,
@ -388,8 +434,14 @@ static void Cty_Configuration (bool PrintView)
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">%u</td>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">"
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_ROLE_TEACHER][Usr_SEX_UNKNOWN],
@ -397,8 +449,14 @@ static void Cty_Configuration (bool PrintView)
/***** Number of students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"%s\">%s:</td>"
"<td align=\"left\" valign=\"middle\" class=\"DAT\">%u</td>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">"
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_ROLE_STUDENT][Usr_SEX_UNKNOWN],
@ -520,7 +578,8 @@ void Cty_ListCountries2 (void)
/***** Country map (and link to WWW if exists) *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" bgcolor=\"%s\" class=\"COUNTRY_MAP_SMALL\">",
"<td class=\"COUNTRY_MAP_SMALL\""
" style=\"text-align:center; background-color:%s;\">",
BgColor);
sprintf (PathMap,"%s/%s/%s/%s/%s.png",
Cfg_PATH_SWAD_PUBLIC,
@ -549,7 +608,8 @@ void Cty_ListCountries2 (void)
fprintf (Gbl.F.Out,"</td>");
/* Name and link to go to this country */
fprintf (Gbl.F.Out,"<td align=\"left\" class=\"DAT\" bgcolor=\"%s\">",
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:left; background-color:%s;\">",
BgColor);
Act_FormGoToStart (ActSeeIns);
Cty_PutParamCtyCod (Gbl.Ctys.Lst[NumCty].CtyCod);
@ -565,10 +625,22 @@ void Cty_ListCountries2 (void)
/* Write stats of this country */
NumStds = Usr_GetNumUsrsInCountry (Rol_ROLE_STUDENT,Gbl.Ctys.Lst[NumCty].CtyCod);
NumTchs = Usr_GetNumUsrsInCountry (Rol_ROLE_TEACHER,Gbl.Ctys.Lst[NumCty].CtyCod);
fprintf (Gbl.F.Out,"<td align=\"right\" class=\"DAT\" bgcolor=\"%s\">%u</td>"
"<td align=\"right\" class=\"DAT\" bgcolor=\"%s\">%u</td>"
"<td align=\"right\" class=\"DAT\" bgcolor=\"%s\">%u</td>"
"<td align=\"right\" class=\"DAT\" bgcolor=\"%s\">%u</td>"
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:right; background-color:%s;\">"
"%u"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:right; background-color:%s;\">"
"%u"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:right; background-color:%s;\">"
"%u"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:right; background-color:%s;\">"
"%u"
"</td>"
"</tr>",
BgColor,Gbl.Ctys.Lst[NumCty].NumUsrs,
BgColor,NumStds,
@ -584,7 +656,10 @@ void Cty_ListCountries2 (void)
/***** Separation row *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" colspan=\"6\" class=\"DAT\">&nbsp;</td>"
"<td colspan=\"6\" class=\"DAT\""
" style=\"text-align:center;\">"
"&nbsp;"
"</td>"
"</tr>");
/***** Write institutions and users with other country *****/
@ -594,11 +669,21 @@ void Cty_ListCountries2 (void)
NumInssInOtherCtys = Ins_GetNumInssInCty (0);
fprintf (Gbl.F.Out,"<tr>"
"<td></td>"
"<td align=\"left\" class=\"DAT\">%s</td>"
"<td align=\"right\" class=\"DAT\">%u</td>"
"<td align=\"right\" class=\"DAT\">%u</td>"
"<td align=\"right\" class=\"DAT\">%u</td>"
"<td align=\"right\" class=\"DAT\">%u</td>"
"<td class=\"DAT\" style=\"text-align:left;\">"
"%s"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
"%u"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
"%u"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
"%u"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
"%u"
"</td>"
"</tr>",
Txt_Other_countries,
NumUsrsInOtherCtys,NumStds,NumTchs,NumInssInOtherCtys);
@ -613,11 +698,21 @@ void Cty_ListCountries2 (void)
NumUsrs = Sta_GetTotalNumberOfUsers (Sco_SCOPE_PLATFORM,Rol_ROLE_UNKNOWN); // NumUsrs >= NumStds + NumTchs
fprintf (Gbl.F.Out,"<tr>"
"<td></td>"
"<td align=\"left\" class=\"DAT\">%s</td>"
"<td align=\"right\" class=\"DAT\">%u</td>"
"<td align=\"right\" class=\"DAT\">%u</td>"
"<td align=\"right\" class=\"DAT\">%u</td>"
"<td align=\"right\" class=\"DAT\">%u</td>"
"<td class=\"DAT\" style=\"text-align:left;\">"
"%s"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
"%u"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
"%u"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
"%u"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
"%u"
"</td>"
"</tr>",
Txt_Country_unspecified,
NumUsrs - NumUsrsWithCountry,
@ -1188,7 +1283,8 @@ static void Cty_ListCountriesForEdition (void)
/* Put icon to remove country */
fprintf (Gbl.F.Out,"<tr>"
"<td rowspan=\"%u\" class=\"BT\">",1+Txt_NUM_LANGUAGES);
"<td rowspan=\"%u\" class=\"BT\">",
1 + Txt_NUM_LANGUAGES);
if (Cty->NumInss ||
Cty->NumUsrs) // Country has institutions or users ==> deletion forbidden
fprintf (Gbl.F.Out,"<img src=\"%s/deloff16x16.gif\""
@ -1208,25 +1304,37 @@ static void Cty_ListCountriesForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Numerical country code (ISO 3166-1) */
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" align=\"right\" valign=\"top\" class=\"DAT\">%03ld</td>",
1+Txt_NUM_LANGUAGES,Cty->CtyCod);
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT\""
" style=\"text-align:right; vertical-align:top;\">"
"%03ld"
"</td>",
1 + Txt_NUM_LANGUAGES,Cty->CtyCod);
/* Alphabetic country code with 2 letters (ISO 3166-1) */
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" align=\"right\" valign=\"top\" class=\"DAT\">%s</td>",
1+Txt_NUM_LANGUAGES,Cty->Alpha2);
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT\""
" style=\"text-align:right; vertical-align:top;\">"
"%s"
"</td>",
1 + Txt_NUM_LANGUAGES,Cty->Alpha2);
fprintf (Gbl.F.Out,"<td></td>"
"<td></td>"
"<td></td>");
/* Number of users */
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" align=\"right\" valign=\"top\" class=\"DAT\">%u</td>",
1+Txt_NUM_LANGUAGES,Cty->NumUsrs);
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT\""
" style=\"text-align:right; vertical-align:top;\">"
"%u"
"</td>",
1 + Txt_NUM_LANGUAGES,Cty->NumUsrs);
/* Number of institutions */
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" align=\"right\" valign=\"top\" class=\"DAT\">%u</td>"
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT\""
" style=\"text-align:right; vertical-align:top;\">"
"%u"
"</td>"
"</tr>",
1+Txt_NUM_LANGUAGES,Cty->NumInss);
1 + Txt_NUM_LANGUAGES,Cty->NumInss);
/* Country name in several languages */
for (Lan = (Txt_Language_t) 0;
@ -1235,11 +1343,15 @@ static void Cty_ListCountriesForEdition (void)
{
/* Language */
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"middle\" class=\"DAT\">%s:</td>",
"<td class=\"DAT\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>",
Txt_STR_LANG_NAME[Lan]);
/* Name */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\">");
fprintf (Gbl.F.Out,"<td style=\"text-align:left;"
" vertical-align:top;\">");
Act_FormStart (ActRenCty);
Cty_PutParamOtherCtyCod (Cty->CtyCod);
Par_PutHiddenParamUnsigned ("Lan",(unsigned) Lan);
@ -1251,7 +1363,8 @@ static void Cty_ListCountriesForEdition (void)
Cty->Name[Lan],Gbl.FormId);
/* WWW */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\">");
fprintf (Gbl.F.Out,"<td style=\"text-align:left;"
" vertical-align:top;\">");
Act_FormStart (ActChgCtyWWW);
Cty_PutParamOtherCtyCod (Cty->CtyCod);
Par_PutHiddenParamUnsigned ("Lan",(unsigned) Lan);
@ -1551,34 +1664,43 @@ static void Cty_PutFormToCreateCountry (void)
/***** Firts columns for CtyCod *****/
fprintf (Gbl.F.Out,"<tr>"
"<td rowspan=\"%u\" class=\"BT\"></td>",1+Txt_NUM_LANGUAGES);
"<td rowspan=\"%u\" class=\"BT\"></td>",
1 + Txt_NUM_LANGUAGES);
/***** Numerical country code (ISO 3166-1) *****/
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" align=\"right\" valign=\"top\">"
fprintf (Gbl.F.Out,"<td rowspan=\"%u\""
" style=\"text-align:right; vertical-align:top;\">"
"<input type=\"text\" name=\"OthCtyCod\" size=\"3\" maxlength=\"10\" value=\"",
1+Txt_NUM_LANGUAGES);
1 + Txt_NUM_LANGUAGES);
if (Cty->CtyCod > 0)
fprintf (Gbl.F.Out,"%03ld",Cty->CtyCod);
fprintf (Gbl.F.Out,"\" /></td>");
/***** Alphabetic country code with 2 letters (ISO 3166-1) *****/
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" align=\"right\" valign=\"top\">"
fprintf (Gbl.F.Out,"<td rowspan=\"%u\""
" style=\"text-align:right; vertical-align:top;\">"
"<input type=\"text\" name=\"Alpha2\" size=\"2\" maxlength=\"2\" value=\"%s\" />"
"</td>",
1+Txt_NUM_LANGUAGES,Cty->Alpha2);
1 + Txt_NUM_LANGUAGES,Cty->Alpha2);
fprintf (Gbl.F.Out,"<td></td>"
"<td></td>"
"<td></td>");
/* Number of users */
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" align=\"right\" valign=\"top\" class=\"DAT\">0</td>",
1+Txt_NUM_LANGUAGES);
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT\""
" style=\"text-align:right; vertical-align:top;\">"
"0"
"</td>",
1 + Txt_NUM_LANGUAGES);
/* Number of institutions */
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" align=\"right\" valign=\"top\" class=\"DAT\">0</td>"
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT\""
" style=\"text-align:right; vertical-align:top;\">"
"0"
"</td>"
"</tr>",
1+Txt_NUM_LANGUAGES);
1 + Txt_NUM_LANGUAGES);
/***** Country name in several languages *****/
for (Lan = (Txt_Language_t) 0;
@ -1587,17 +1709,22 @@ static void Cty_PutFormToCreateCountry (void)
{
/* Language */
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"right\" valign=\"top\" class=\"DAT\">%s</td>",
"<td class=\"DAT\""
" style=\"text-align:right; vertical-align:top;\">"
"%s"
"</td>",
Txt_STR_LANG_NAME[Lan]);
/* Name */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\">"
fprintf (Gbl.F.Out,"<td style=\"text-align:left;"
" vertical-align:middle;\">"
"<input type=\"text\" name=\"Name_%s\" size=\"15\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Txt_STR_LANG_ID[Lan],Cty_MAX_LENGTH_COUNTRY_NAME,Cty->Name[Lan]);
/* WWW */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"middle\">"
fprintf (Gbl.F.Out,"<td style=\"text-align:left;"
" vertical-align:middle;\">"
"<input type=\"text\" name=\"WWW_%s\" size=\"15\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
@ -1606,7 +1733,7 @@ static void Cty_PutFormToCreateCountry (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" colspan=\"8\">"
"<td colspan=\"8\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",

2
swad_course.c
View File

@ -1361,7 +1361,7 @@ static void Crs_PutFormToCreateCourse (void)
/***** Institutional code of the course *****/
fprintf (Gbl.F.Out,"<td align=\"center\" valign=\"middle\">"
"<input type=\"text\" name=\"InsCrsCod\" size=\%u\" maxlength=\"%u\" value=\"%s\" />"
"<input type=\"text\" name=\"InsCrsCod\" size=\"%u\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Crs_LENGTH_INSTITUTIONAL_CRS_COD,
Crs_LENGTH_INSTITUTIONAL_CRS_COD,

4
swad_global.c
View File

@ -428,8 +428,8 @@ void Gbl_InitializeGlobals (void)
/* To alternate colors where listing rows */
Gbl.RowEvenOdd = 0;
Gbl.ColorRows[0] = "F4F2EA"; // Darker
Gbl.ColorRows[1] = "FBFAF7"; // Lighter
Gbl.ColorRows[0] = "#F4F2EA"; // Darker
Gbl.ColorRows[1] = "#FBFAF7"; // Lighter
/* Related to imported data from external site */
Gbl.Imported.ExternalUsrId[0] = '\0';