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

This commit is contained in:
Antonio Cañas Vargas 2019-10-09 15:44:12 +02:00
parent 3e2260a8a9
commit 3d75c62e19
10 changed files with 176 additions and 213 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:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.31.28 (2019-10-08)"
#define Log_PLATFORM_VERSION "SWAD 19.31.29 (2019-10-08)"
#define CSS_FILE "swad19.29.css"
#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: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
Version 19.31.29: Oct 08, 2019 Code refactoring in HTML tables. (246740 lines)
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.26: Oct 08, 2019 Code refactoring in HTML tables. (246850 lines)

8
swad_info.c
View File

@ -1161,11 +1161,11 @@ void Inf_FormsToSelSendInfo (void)
Tbl_EndCell ();
/* Form for this info source */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP");
if (InfoSrc == InfoSrcSelected)
fprintf (Gbl.F.Out," LIGHT_BLUE");
fprintf (Gbl.F.Out,"\">"
"<label for=\"InfoSrc%u\" class=\"%s\">%s</label>",
Tbl_StartCellAttr ("class=\"LEFT_TOP LIGHT_BLUE\"");
else
Tbl_StartCellAttr ("class=\"LEFT_TOP\"");
fprintf (Gbl.F.Out,"<label for=\"InfoSrc%u\" class=\"%s\">%s</label>",
(unsigned) InfoSrc,The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_INFO_SRC_FULL_TEXT[InfoSrc]);
if (Txt_INFO_SRC_HELP[InfoSrc])

30
swad_match.c
View File

@ -558,7 +558,7 @@ static void Mch_ListOneOrMoreMatchesTimes (const struct Match *Match,unsigned Un
" class=\"%s LEFT_TOP COLOR%u\">",
(unsigned) StartEndTime,UniqueId,
Match->Status.QstInd >= Mch_AFTER_LAST_QUESTION ? "DATE_RED" :
"DATE_GREEN",
"DATE_GREEN",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('mch_time_%u_%u',"
@ -660,10 +660,8 @@ static void Mch_GetAndWriteNamesOfGrpsAssociatedToMatch (const struct Match *Mat
static void Mch_ListOneOrMoreMatchesNumPlayers (const struct Match *Match)
{
/***** Number of players who have answered any question in the match ******/
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">"
"%u",
Gbl.RowEvenOdd,
Mch_GetNumUsrsWhoHaveAnswerMch (Match->MchCod));
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%u",Mch_GetNumUsrsWhoHaveAnswerMch (Match->MchCod));
Tbl_EndCell ();
}
@ -1196,14 +1194,13 @@ static void Mch_PutFormNewMatch (struct Game *Game)
/***** Match title *****/
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">"
"<label for=\"Title\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Title);
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">");
fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<input type=\"text\" id=\"Title\" name=\"Title\""
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<input type=\"text\" id=\"Title\" name=\"Title\""
" size=\"45\" maxlength=\"%u\" value=\"%s\""
" required=\"required\" />",
Gam_MAX_CHARS_TITLE,Game->Title);
@ -1254,10 +1251,9 @@ static void Mch_ShowLstGrpsToCreateMatch (void)
/***** Start box and table *****/
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Groups);
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Groups);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">");
@ -1266,8 +1262,8 @@ static void Mch_ShowLstGrpsToCreateMatch (void)
/***** First row: checkbox to select the whole course *****/
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td colspan=\"7\" class=\"DAT LEFT_MIDDLE\">"
"<label>"
fprintf (Gbl.F.Out,"<td colspan=\"7\" class=\"DAT LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<label>"
"<input type=\"checkbox\""
" id=\"WholeCrs\" name=\"WholeCrs\" value=\"Y\""
" checked=\"checked\""

100
swad_match_result.c
View File

@ -207,9 +207,8 @@ void McR_SelUsrsToViewUsrsMchResults (void)
Tbl_StartTableCenterPadding (2);
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Users);
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Users);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"%s LEFT_TOP\">",
@ -456,22 +455,22 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
TimeUTC[StartEndTime] = Dat_GetUNIXTimeFromStr (row[1 + StartEndTime]);
UniqueId++;
fprintf (Gbl.F.Out,"<td id =\"mch_time_%u_%u\""
" class=\"DAT LEFT_TOP COLOR%u\">"
"<script type=\"text/javascript\">"
" class=\"DAT LEFT_TOP COLOR%u\">",
(unsigned) StartEndTime,UniqueId,
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('mch_time_%u_%u',"
"%ld,%u,'<br />','%s',true,false,0x7);"
"</script>",
(unsigned) StartEndTime,UniqueId,
Gbl.RowEvenOdd,
(unsigned) StartEndTime,UniqueId,
(long) TimeUTC[StartEndTime],
(unsigned) Gbl.Prefs.DateFormat,Txt_Today);
Tbl_EndCell ();
}
/* Write match title */
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP COLOR%u\">%s",
Gbl.RowEvenOdd,Match.Title);
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP COLOR%u\">",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%s",Match.Title);
Tbl_EndCell ();
/* Get number of questions (row[3]) */
@ -495,26 +494,24 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
}
/* Write number of questions */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">%u",
Gbl.RowEvenOdd,NumQstsInThisResult);
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%u",NumQstsInThisResult);
Tbl_EndCell ();
/* Write number of questions not blank */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">%u",
Gbl.RowEvenOdd,NumQstsNotBlankInThisResult);
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%u",NumQstsNotBlankInThisResult);
Tbl_EndCell ();
/* Write score */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">",Gbl.RowEvenOdd);
if (ShowResultThisMatch)
fprintf (Gbl.F.Out,"%.2lf",
ScoreInThisResult);
Tbl_EndCell ();
/* Write average score per question */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">",Gbl.RowEvenOdd);
if (ShowResultThisMatch)
fprintf (Gbl.F.Out,"%.2lf",
NumQstsInThisResult ? ScoreInThisResult / (double) NumQstsInThisResult :
@ -522,17 +519,16 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
Tbl_EndCell ();
/* Write score over Tst_SCORE_MAX */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">",Gbl.RowEvenOdd);
if (ShowResultThisMatch)
fprintf (Gbl.F.Out,"%.2lf",
NumQstsInThisResult ? ScoreInThisResult * Tst_SCORE_MAX / (double) NumQstsInThisResult :
NumQstsInThisResult ? ScoreInThisResult * Tst_SCORE_MAX /
(double) NumQstsInThisResult :
0.0);
Tbl_EndCell ();
/* Link to show this result */
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP COLOR%u\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP COLOR%u\">",Gbl.RowEvenOdd);
if (ShowResultThisMatch)
{
Gam_SetParamCurrentGamCod (Match.GamCod); // Used to pass parameter
@ -593,37 +589,30 @@ static void McR_ShowMchResultsSummaryRow (bool ShowSummaryResults,
Tbl_StartRow ();
/***** Row title *****/
fprintf (Gbl.F.Out,"<td colspan=\"3\""
" class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">"
"%s: %u",
Gbl.RowEvenOdd,
Txt_Matches,NumResults);
fprintf (Gbl.F.Out,"<td colspan=\"3\" class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%s: %u",Txt_Matches,NumResults);
Tbl_EndCell ();
/***** Write total number of questions *****/
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",Gbl.RowEvenOdd);
if (NumResults)
fprintf (Gbl.F.Out,"%u",NumTotalQsts);
Tbl_EndCell ();
/***** Write total number of questions not blank *****/
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",Gbl.RowEvenOdd);
if (NumResults)
fprintf (Gbl.F.Out,"%u",NumTotalQstsNotBlank);
Tbl_EndCell ();
/***** Write total score *****/
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",Gbl.RowEvenOdd);
if (ShowSummaryResults)
fprintf (Gbl.F.Out,"%.2lf",TotalScoreOfAllResults);
Tbl_EndCell ();
/***** Write average score per question *****/
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",Gbl.RowEvenOdd);
if (ShowSummaryResults)
fprintf (Gbl.F.Out,"%.2lf",
NumTotalQsts ? TotalScoreOfAllResults / (double) NumTotalQsts :
@ -631,8 +620,7 @@ static void McR_ShowMchResultsSummaryRow (bool ShowSummaryResults,
Tbl_EndCell ();
/***** Write score over Tst_SCORE_MAX *****/
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",Gbl.RowEvenOdd);
if (ShowSummaryResults)
fprintf (Gbl.F.Out,"%.2lf",
NumTotalQsts ? TotalScoreOfAllResults * Tst_SCORE_MAX /
@ -641,8 +629,7 @@ static void McR_ShowMchResultsSummaryRow (bool ShowSummaryResults,
Tbl_EndCell ();
/***** Last cell *****/
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP COLOR%u\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP COLOR%u\">",Gbl.RowEvenOdd);
Tbl_EndCell ();
/***** End row *****/
@ -792,9 +779,8 @@ void McR_ShowOneMchResult (void)
/* User */
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP\">"
"%s:",
Txt_ROLES_SINGUL_Abc[UsrDat->Roles.InCurrentCrs.Role][UsrDat->Sex]);
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP\">");
fprintf (Gbl.F.Out,"%s:",Txt_ROLES_SINGUL_Abc[UsrDat->Roles.InCurrentCrs.Role][UsrDat->Sex]);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\">");
@ -823,18 +809,17 @@ void McR_ShowOneMchResult (void)
{
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP\">"
"%s:",
Txt_START_END_TIME[StartEndTime]);
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP\">");
fprintf (Gbl.F.Out,"%s:",Txt_START_END_TIME[StartEndTime]);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td id=\"match_%u\" class=\"DAT LEFT_TOP\">"
"<script type=\"text/javascript\">"
fprintf (Gbl.F.Out,"<td id=\"match_%u\" class=\"DAT LEFT_TOP\">",
(unsigned) StartEndTime);
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('match_%u',%ld,"
"%u,',&nbsp;','%s',true,true,0x7);"
"</script>",
(unsigned) StartEndTime,
(unsigned) StartEndTime,
TimeUTC[StartEndTime],
(unsigned) Gbl.Prefs.DateFormat,Txt_Today);
Tbl_EndCell ();
@ -845,13 +830,12 @@ void McR_ShowOneMchResult (void)
/* Number of questions */
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP\">"
"%s:",
Txt_Questions);
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP\">");
fprintf (Gbl.F.Out,"%s:",Txt_Questions);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\">"
"%u (%u %s)",
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\">");
fprintf (Gbl.F.Out,"%u (%u %s)",
NumQsts,NumQstsNotBlank,Txt_non_blank_QUESTIONS);
Tbl_EndCell ();
@ -860,9 +844,8 @@ void McR_ShowOneMchResult (void)
/* Score */
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP\">"
"%s:",
Txt_Score);
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP\">");
fprintf (Gbl.F.Out,"%s:",Txt_Score);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\">");
@ -882,9 +865,8 @@ void McR_ShowOneMchResult (void)
/* Tags present in this result */
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP\">"
"%s:",
Txt_Tags);
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP\">");
fprintf (Gbl.F.Out,"%s:",Txt_Tags);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\">");

117
swad_message.c
View File

@ -292,9 +292,8 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
/***** "To:" section (recipients) *****/
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_MSG_To);
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_MSG_To);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">");
@ -495,11 +494,11 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void)
/***** Textarea with users' @nicknames, emails or IDs *****/
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td");
if (Colspan > 1)
fprintf (Gbl.F.Out," colspan=\"%u\"",Colspan);
fprintf (Gbl.F.Out," class=\"LEFT_MIDDLE\">"
"<textarea id=\"OtherRecipients\" name=\"OtherRecipients\""
fprintf (Gbl.F.Out,"<td colspan=\"%u\" class=\"LEFT_MIDDLE\">",Colspan);
else
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<textarea id=\"OtherRecipients\" name=\"OtherRecipients\""
" class=\"MSG_RECIPIENTS\" rows=\"2\""
" placeholder=\"%s\">",
Txt_nicks_emails_or_IDs_separated_by_commas);
@ -538,16 +537,16 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
/***** Message subject *****/
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"
"<label for=\"MsgSubject\" class=\"%s\">"
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">");
fprintf (Gbl.F.Out,"<label for=\"MsgSubject\" class=\"%s\">"
"%s:"
"</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_MSG_Subject);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<textarea id=\"MsgSubject\" name=\"Subject\""
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<textarea id=\"MsgSubject\" name=\"Subject\""
" class=\"MSG_SUBJECT\" rows=\"2\">");
/* If message is a reply ==> get original message */
@ -591,15 +590,15 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
/***** Message content *****/
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"
"<label for=\"MsgContent\" class=\"%s\">"
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">");
fprintf (Gbl.F.Out,"<label for=\"MsgContent\" class=\"%s\">"
"%s:"
"</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_MSG_Content);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<textarea id=\"MsgContent\" name=\"Content\""
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<textarea id=\"MsgContent\" name=\"Content\""
" class=\"MSG_CONTENT\" rows=\"20\">");
/* Start textarea with a '\n', that will be not visible in textarea.
@ -626,16 +625,16 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
/***** Message content *****/
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"
"<label for=\"MsgContent\" class=\"%s\">"
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">");
fprintf (Gbl.F.Out,"<label for=\"MsgContent\" class=\"%s\">"
"%s:"
"</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_MSG_Content);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<textarea id=\"MsgContent\" name=\"Content\""
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<textarea id=\"MsgContent\" name=\"Content\""
" class=\"MSG_CONTENT\" rows=\"20\">");
/* Start textarea with a '\n', that will be not visible in textarea.
@ -2660,8 +2659,8 @@ void Msg_ShowFormToFilterMsgs (void)
Tbl_StartRow ();
/***** Filter authors/recipients *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<label class=\"%s\">"
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
"<input type=\"search\" name=\"FilterFromTo\""
" size=\"20\" maxlength=\"%u\" value=\"%s\" />"
@ -2672,8 +2671,8 @@ void Msg_ShowFormToFilterMsgs (void)
Tbl_EndCell ();
/***** Filter message content *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<label class=\"%s\">"
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
"<input type=\"search\" name=\"FilterContent\""
" size=\"20\" maxlength=\"%u\" value=\"%s\" />"
@ -2967,14 +2966,14 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod)
}
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"CONTEXT_COL %s\">"
"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />",
fprintf (Gbl.F.Out,"<td class=\"CONTEXT_COL %s\">",
Gbl.Msg.TypeOfMessages == Msg_MESSAGES_RECEIVED ? (Open ? "BG_MSG_BLUE" :
"BG_MSG_GREEN") :
"BG_MSG_BLUE",
"BG_MSG_BLUE");
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
Gbl.Msg.TypeOfMessages == Msg_MESSAGES_RECEIVED ? (Open ? (Replied ? "reply.svg" :
"envelope-open-text.svg") :
@ -3013,6 +3012,7 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod)
if (Expanded)
{
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td rowspan=\"3\" colspan=\"2\" class=\"LEFT_TOP\">");
Tbl_StartTablePadding (2);
@ -3037,9 +3037,8 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod)
Tbl_EndCell ();
/***** Write "From:" *****/
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP MSG_TIT\">"
"%s:&nbsp;",
Txt_MSG_From);
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP MSG_TIT\">");
fprintf (Gbl.F.Out,"%s:&nbsp;",Txt_MSG_From);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"LEFT_TOP\">");
@ -3051,9 +3050,8 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod)
/***** Write "To:" *****/
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP MSG_TIT\">"
"%s:&nbsp;",
Txt_MSG_To);
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP MSG_TIT\">");
fprintf (Gbl.F.Out,"%s:&nbsp;",Txt_MSG_To);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"LEFT_TOP\">");
@ -3065,9 +3063,8 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod)
/***** Write "Content:" *****/
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP MSG_TIT\">"
"%s:&nbsp;",
Txt_MSG_Content);
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP MSG_TIT\">");
fprintf (Gbl.F.Out,"%s:&nbsp;",Txt_MSG_Content);
Tbl_EndCell ();
/***** Initialize image *****/
@ -3150,11 +3147,10 @@ void Msg_GetNotifMessage (char SummaryStr[Ntf_MAX_BYTES_SUMMARY + 1],
void Msg_WriteMsgNumber (unsigned long MsgNum,bool NewMsg)
{
fprintf (Gbl.F.Out,"<td class=\"%s CENTER_TOP\" style=\"width:45px;\">"
"%lu:",
fprintf (Gbl.F.Out,"<td class=\"%s CENTER_TOP\" style=\"width:45px;\">",
NewMsg ? "MSG_TIT_BG_NEW" :
"MSG_TIT_BG",
MsgNum);
"MSG_TIT_BG");
fprintf (Gbl.F.Out,"%lu:",MsgNum);
Tbl_EndCell ();
}
@ -3254,10 +3250,10 @@ void Msg_WriteMsgAuthor (struct UsrData *UsrDat,bool Enabled,const char *BgColor
Txt_Unknown_or_without_photo);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE");
if (BgColor)
fprintf (Gbl.F.Out," %s",BgColor);
fprintf (Gbl.F.Out,"\">");
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE %s\">",BgColor);
else
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
}
/***** End second column *****/
@ -3375,8 +3371,8 @@ static void Msg_WriteMsgFrom (struct UsrData *UsrDat,bool Deleted)
Tbl_StartRow ();
/***** Put an icon to show if user has read the message *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:20px;\">"
"<img src=\"%s/%s\""
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:20px;\">");
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
@ -3537,9 +3533,9 @@ static void Msg_WriteMsgTo (long MsgCod)
(Deleted ? Txt_MSG_Deleted_without_opening :
Txt_MSG_Unopened);
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:20px;\">"
"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:20px;\">");
fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
OpenByDst ? (Deleted ? "envelope-open-text-red.svg" :
@ -3567,6 +3563,7 @@ static void Msg_WriteMsgTo (long MsgCod)
else
fprintf (Gbl.F.Out,"[%s]",Txt_unknown_recipient); // User not found, likely a user who has been removed
Tbl_EndCell ();
Tbl_EndRow ();
}
@ -3576,8 +3573,8 @@ static void Msg_WriteMsgTo (long MsgCod)
/***** Start form to show all the users *****/
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td colspan=\"3\" class=\"AUTHOR_TXT LEFT_MIDDLE\">"
"[%u %s]",
fprintf (Gbl.F.Out,"<td colspan=\"3\" class=\"AUTHOR_TXT LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"[%u %s]",
NumRecipientsUnknown,
(NumRecipientsUnknown == 1) ? Txt_unknown_recipient :
Txt_unknown_recipients);
@ -3591,6 +3588,7 @@ static void Msg_WriteMsgTo (long MsgCod)
{
/***** Start form to show all the users *****/
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td colspan=\"3\" class=\"AUTHOR_TXT LEFT_MIDDLE\">");
Frm_StartForm (ActionSee[Gbl.Msg.TypeOfMessages]);
Gbl.Msg.MsgCod = MsgCod; // Message to be expanded with all recipients visible
@ -3602,6 +3600,7 @@ static void Msg_WriteMsgTo (long MsgCod)
fprintf (Gbl.F.Out,"</a>");
Frm_EndForm ();
Tbl_EndCell ();
Tbl_EndRow ();
}
@ -3629,8 +3628,7 @@ void Msg_WriteMsgDate (time_t TimeUTC,const char *ClassBackground)
UniqueId++;
/***** Start cell *****/
fprintf (Gbl.F.Out,"<td id=\"msg_date_%u\" class=\"%s RIGHT_TOP\""
" style=\"width:106px;\">",
fprintf (Gbl.F.Out,"<td id=\"msg_date_%u\" class=\"%s RIGHT_TOP\" style=\"width:106px;\">",
UniqueId,ClassBackground);
/***** Write date and time *****/
@ -3876,8 +3874,9 @@ void Msg_ListBannedUsrs (void)
/* Get user's data from database */
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat,Usr_DONT_GET_PREFS))
{
/* Put form to unban user */
Tbl_StartRow ();
/* Put form to unban user */
fprintf (Gbl.F.Out,"<td class=\"BM\">");
Frm_StartForm (ActUnbUsrLst);
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
@ -3886,8 +3885,7 @@ void Msg_ListBannedUsrs (void)
Tbl_EndCell ();
/* Show photo */
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\""
" style=\"width:30px;\">");
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:30px;\">");
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
@ -3895,9 +3893,8 @@ void Msg_ListBannedUsrs (void)
Tbl_EndCell ();
/* Write user's full name */
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"
"%s",
UsrDat.FullName);
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"%s",UsrDat.FullName);
Tbl_EndCell ();
Tbl_EndRow ();

21
swad_network.c
View File

@ -325,8 +325,8 @@ void Net_ShowFormMyWebsAndSocialNets (void)
/***** Row for this web / social network *****/
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"REC_C1_BOT LEFT_MIDDLE\">"
"<label for=\"URL%u\" class=\"%s\">"
fprintf (Gbl.F.Out,"<td class=\"REC_C1_BOT LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<label for=\"URL%u\" class=\"%s\">"
"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_16x16\""
@ -340,8 +340,8 @@ void Net_ShowFormMyWebsAndSocialNets (void)
Net_WebsAndSocialNetworksTitle[NumURL]);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"REC_C2_BOT LEFT_MIDDLE\">"
"<input type=\"url\" id=\"URL%u\" name=\"URL%u\""
fprintf (Gbl.F.Out,"<td class=\"REC_C2_BOT LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<input type=\"url\" id=\"URL%u\" name=\"URL%u\""
" maxlength=\"%u\" value=\"%s\""
" class=\"REC_C2_BOT_INPUT\" />",
(unsigned) NumURL,(unsigned) NumURL,
@ -594,8 +594,8 @@ void Net_ShowWebAndSocialNetworksStats (void)
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"
"<img src=\"%s/%s\""
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_16x16\""
" style=\"margin-right:6px;\" />"
@ -606,13 +606,12 @@ void Net_ShowWebAndSocialNetworksStats (void)
Net_WebsAndSocialNetworksTitle[Web]);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"%u",
NumUsrs);
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">");
fprintf (Gbl.F.Out,"%u",NumUsrs);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"%.2f%%",
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">");
fprintf (Gbl.F.Out,"%.2f%%",
NumUsrsTotal ? 100.0 * (float) NumUsrs / (float) NumUsrsTotal :
0.0);
Tbl_EndCell ();

15
swad_nickname.c
View File

@ -272,8 +272,8 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
if (NumNick == 1)
{
/* The first nickname is the current one */
fprintf (Gbl.F.Out,"<td class=\"REC_C1_BOT RIGHT_TOP\">"
"<label for=\"Nick\" class=\"%s\">"
fprintf (Gbl.F.Out,"<td class=\"REC_C1_BOT RIGHT_TOP\">");
fprintf (Gbl.F.Out,"<label for=\"Nick\" class=\"%s\">"
"%s:"
"</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],
@ -286,12 +286,11 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
{
if (NumNick == 2)
{
fprintf (Gbl.F.Out,"<td rowspan=\"%u\""
" class=\"REC_C1_BOT RIGHT_TOP\">"
"<label for=\"Nick\" class=\"%s\">"
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"REC_C1_BOT RIGHT_TOP\">",
NumNicks - 1);
fprintf (Gbl.F.Out,"<label for=\"Nick\" class=\"%s\">"
"%s:"
"</label>",
NumNicks - 1,
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Other_nicknames);
Tbl_EndCell ();
@ -372,8 +371,8 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
/***** Form to enter new nickname *****/
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"REC_C1_BOT RIGHT_TOP\">"
"<label for=\"NewNick\" class=\"%s\">"
fprintf (Gbl.F.Out,"<td class=\"REC_C1_BOT RIGHT_TOP\">");
fprintf (Gbl.F.Out,"<label for=\"NewNick\" class=\"%s\">"
"%s:"
"</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],

30
swad_notification.c
View File

@ -510,8 +510,7 @@ void Ntf_ShowMyNotifications (void)
Tbl_EndCell ();
/* Write event type */
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP\">",
ClassBackground);
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP\">",ClassBackground);
if (PutLink)
PutLink = Ntf_StartFormGoToAction (NotifyEvent,Crs.CrsCod,&UsrDat,Cod);
@ -533,8 +532,7 @@ void Ntf_ShowMyNotifications (void)
Tbl_EndCell ();
/* Write location */
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP\">",
ClassBackground);
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP\">",ClassBackground);
if (NotifyEvent == Ntf_EVENT_FORUM_POST_COURSE ||
NotifyEvent == Ntf_EVENT_FORUM_REPLY)
{
@ -589,9 +587,8 @@ void Ntf_ShowMyNotifications (void)
Msg_WriteMsgDate (DateTimeUTC,ClassBackground);
/* Write status (sent by email / pending to be sent by email) */
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP\">"
"%s",
ClassBackground,Txt_NOTIFICATION_STATUS[StatusTxt]);
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP\">",ClassBackground);
fprintf (Gbl.F.Out,"%s",Txt_NOTIFICATION_STATUS[StatusTxt]);
Tbl_EndCell ();
Tbl_EndRow ();
@ -610,9 +607,8 @@ void Ntf_ShowMyNotifications (void)
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td colspan=\"4\" class=\"DAT LEFT_TOP\""
" style=\"padding-bottom:12px;\">"
"%s",
SummaryStr);
" style=\"padding-bottom:12px;\">");
fprintf (Gbl.F.Out,"%s",SummaryStr);
Tbl_EndCell ();
Tbl_EndRow ();
@ -1966,22 +1962,20 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
{
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_NOTIFY_EVENTS_PLURAL[NotifyEvent]);
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_NOTIFY_EVENTS_PLURAL[NotifyEvent]);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<input type=\"checkbox\" name=\"%s\" value=\"Y\"",
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"%s\" value=\"Y\"",
Ntf_ParamNotifMeAboutNotifyEvents[NotifyEvent]);
if ((Gbl.Usrs.Me.UsrDat.NtfEvents.CreateNotif & (1 << NotifyEvent)))
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />");
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<input type=\"checkbox\" name=\"%s\" value=\"Y\"",
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"%s\" value=\"Y\"",
Ntf_ParamEmailMeAboutNotifyEvents[NotifyEvent]);
if ((Gbl.Usrs.Me.UsrDat.NtfEvents.SendEmail & (1 << NotifyEvent)))
fprintf (Gbl.F.Out," checked=\"checked\"");

38
swad_password.c
View File

@ -687,14 +687,14 @@ void Pwd_ShowFormChgMyPwd (void)
{
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"REC_C1_BOT RIGHT_MIDDLE\">"
"<label for=\"UsrPwd\" class=\"%s\">%s:</label>",
fprintf (Gbl.F.Out,"<td class=\"REC_C1_BOT RIGHT_MIDDLE\">");
fprintf (Gbl.F.Out,"<label for=\"UsrPwd\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Current_password);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"REC_C2_BOT LEFT_MIDDLE\">"
"<input type=\"password\""
fprintf (Gbl.F.Out,"<td class=\"REC_C2_BOT LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<input type=\"password\""
" id=\"UsrPwd\" name=\"UsrPwd\""
" size=\"18\" maxlength=\"%u\""
" autocomplete=\"off\" required=\"required\" />",
@ -740,14 +740,14 @@ void Pwd_PutFormToGetNewPasswordOnce (void)
Tbl_StartRow ();
/***** Start form element ****/
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">"
"<label for=\"Passwd\" class=\"%s\">%s:</label>",
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">");
fprintf (Gbl.F.Out,"<label for=\"Passwd\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Password);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<input type=\"password\" id=\"Passwd\" name=\"Paswd\""
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<input type=\"password\" id=\"Passwd\" name=\"Paswd\""
" size=\"18\" maxlength=\"%u\" placeholder=\"",
Pwd_MAX_CHARS_PLAIN_PASSWORD);
@ -756,8 +756,7 @@ void Pwd_PutFormToGetNewPasswordOnce (void)
Pwd_MIN_CHARS_PLAIN_PASSWORD);
/***** End form element ****/
fprintf (Gbl.F.Out,"\""
" required=\"required\" />");
fprintf (Gbl.F.Out,"\" required=\"required\" />");
Tbl_EndCell ();
Tbl_EndRow ();
@ -778,14 +777,14 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
/* Start form element */
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"REC_C1_BOT RIGHT_MIDDLE\">"
"<label for=\"Paswd1\" class=\"%s\">%s:</label>",
fprintf (Gbl.F.Out,"<td class=\"REC_C1_BOT RIGHT_MIDDLE\">");
fprintf (Gbl.F.Out,"<label for=\"Paswd1\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_New_password);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"REC_C2_BOT LEFT_MIDDLE\">"
"<input type=\"password\" id=\"Paswd1\" name=\"Paswd1\""
fprintf (Gbl.F.Out,"<td class=\"REC_C2_BOT LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<input type=\"password\" id=\"Paswd1\" name=\"Paswd1\""
" size=\"18\" maxlength=\"%u\""
" placeholder=\"",
Pwd_MAX_CHARS_PLAIN_PASSWORD);
@ -804,21 +803,20 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
/* Start form element */
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"REC_C1_BOT RIGHT_MIDDLE\">"
"<label for=\"Paswd2\" class=\"%s\">%s:</label>",
fprintf (Gbl.F.Out,"<td class=\"REC_C1_BOT RIGHT_MIDDLE\">");
fprintf (Gbl.F.Out,"<label for=\"Paswd2\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Retype_new_password);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"REC_C2_BOT LEFT_MIDDLE\">"
"<input type=\"password\" id=\"Paswd2\" name=\"Paswd2\""
fprintf (Gbl.F.Out,"<td class=\"REC_C2_BOT LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<input type=\"password\" id=\"Paswd2\" name=\"Paswd2\""
" size=\"18\" maxlength=\"%u\""
" placeholder=\"",
Pwd_MAX_CHARS_PLAIN_PASSWORD);
/* Placeholder */
fprintf (Gbl.F.Out,Txt_HELP_password,
Pwd_MIN_CHARS_PLAIN_PASSWORD);
fprintf (Gbl.F.Out,Txt_HELP_password,Pwd_MIN_CHARS_PLAIN_PASSWORD);
/* End form element */
fprintf (Gbl.F.Out,"\" required=\"required\" />");

27
swad_photo.c
View File

@ -897,8 +897,8 @@ static void Pho_UpdatePhoto2 (void)
NumPhoto < 3;
NumPhoto++)
{
fprintf (Gbl.F.Out,"<td class=\"DAT CENTER_TOP\" style=\"width:33%%;\">"
"<img src=\"%s/%s_paso%u.jpg\""
fprintf (Gbl.F.Out,"<td class=\"DAT CENTER_TOP\" style=\"width:33%%;\">");
fprintf (Gbl.F.Out,"<img src=\"%s/%s_paso%u.jpg\""
" alt=\"%s\" title=\"%s\""
" style=\"width:%upx; height:%upx;\" />"
"<br />%s",
@ -1790,8 +1790,8 @@ static void Pho_PutSelectorForTypeOfAvg (void)
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">"
"<label for=\"AvgType\" class=\"%s\">%s:</label>",
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">");
fprintf (Gbl.F.Out,"<label for=\"AvgType\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Average_type);
Tbl_EndCell ();
@ -1854,8 +1854,8 @@ static void Pho_PutSelectorForHowComputePhotoSize (void)
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">"
"<label for=\"PhotoSize\" class=\"%s\">%s:</label>",
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">");
fprintf (Gbl.F.Out,"<label for=\"PhotoSize\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Size_of_photos);
Tbl_EndCell ();
@ -1918,8 +1918,8 @@ static void Pho_PutSelectorForHowOrderDegrees (void)
Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">"
"<label for=\"Order\" class=\"%s\">%s:</label>",
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">");
fprintf (Gbl.F.Out,"<label for=\"Order\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Sort_degrees_by);
Tbl_EndCell ();
@ -2252,14 +2252,12 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
Tbl_StartRow ();
/***** Show logo and name of this degree *****/
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE COLOR%u\">"
"%u",
Gbl.RowEvenOdd,++NumDegsNotEmpty);
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE COLOR%u\">",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%u",++NumDegsNotEmpty);
Tbl_EndCell ();
/***** Show logo and name of this degree *****/
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE COLOR%u\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE COLOR%u\">",Gbl.RowEvenOdd);
if (SeeOrPrint == Pho_DEGREES_SEE)
Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf,
"DAT","CENTER_TOP");
@ -2276,8 +2274,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
{
/***** Show average photo of students belonging to this degree *****/
Pho_GetNumStdsInDegree (Deg.DegCod,Sex,&NumStds,&NumStdsWithPhoto);
fprintf (Gbl.F.Out,"<td class=\"CLASSPHOTO CENTER_MIDDLE COLOR%u\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<td class=\"CLASSPHOTO CENTER_MIDDLE COLOR%u\">",Gbl.RowEvenOdd);
if (Gbl.Usrs.Listing.WithPhotos)
Pho_ShowDegreeAvgPhotoAndStat (&Deg,SeeOrPrint,Sex,NumStds,NumStdsWithPhoto);
else