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

This commit is contained in:
Antonio Cañas Vargas 2015-09-04 17:43:18 +02:00
parent 3eae59bf5a
commit 9f0e64f886
6 changed files with 148 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.125.2 (2015/09/04)" #define Log_PLATFORM_VERSION "SWAD 14.125.3 (2015/09/04)"
// Number of lines (includes comments but not blank lines) has been got with the following command: // Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 14.125.3: Sep 04, 2015 Changes in styles. (184263 lines)
Version 14.125.2: Sep 04, 2015 Changes in styles. (184344 lines) Version 14.125.2: Sep 04, 2015 Changes in styles. (184344 lines)
Version 14.125.1: Sep 03, 2015 Changes in styles. (184399 lines) Version 14.125.1: Sep 03, 2015 Changes in styles. (184399 lines)
Version 14.125: Sep 03, 2015 Changes in styles. (184521 lines) Version 14.125: Sep 03, 2015 Changes in styles. (184521 lines)

4
swad_file_browser.c
View File

@ -5586,10 +5586,10 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic,Brw_FileType_t FileT
{ {
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"NewFolderName\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"NewFolderName\""
" size=\"40\" maxlength=\"40\" value=\"%s\"" " size=\"40\" maxlength=\"40\" value=\"%s\""
" class=\"%s\" style=\"background-color:%s\"" " class=\"%s %s\""
" onchange=\"javascript:document.getElementById('%s').submit();\" />", " onchange=\"javascript:document.getElementById('%s').submit();\" />",
FileName,Gbl.FileBrowser.InputStyle, FileName,Gbl.FileBrowser.InputStyle,
Gbl.FileBrowser.Clipboard.IsThisFile ? LIGHT_GREEN : Gbl.FileBrowser.Clipboard.IsThisFile ? "LIGHT_GREEN" :
Gbl.ColorRows[Gbl.RowEvenOdd], Gbl.ColorRows[Gbl.RowEvenOdd],
Gbl.FormId); Gbl.FormId);
Act_FormEnd (); Act_FormEnd ();

68
swad_forum.c
View File

@ -3219,8 +3219,8 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi
const char *Style; const char *Style;
bool ICanMoveThreads = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM); // If I have permission to move threads... bool ICanMoveThreads = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM); // If I have permission to move threads...
long ThreadInMyClipboard = -1L; long ThreadInMyClipboard = -1L;
bool ThisThreadIsInMyClipboard;
unsigned Column; unsigned Column;
const char *BgColor;
/***** Get if there is a thread ready to be moved *****/ /***** Get if there is a thread ready to be moved *****/
if (ICanMoveThreads) if (ICanMoveThreads)
@ -3238,14 +3238,13 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi
For_GetThrData (&Thr); For_GetThrData (&Thr);
Style = (Thr.NumUnreadPosts ? "MSG_AUT_NEW" : Style = (Thr.NumUnreadPosts ? "MSG_AUT_NEW" :
"MSG_AUT"); "MSG_AUT");
ThisThreadIsInMyClipboard = (Thr.ThrCod == ThreadInMyClipboard); BgColor = (Thr.ThrCod == ThreadInMyClipboard) ? "LIGHT_GREEN" :
Gbl.ColorRows[Gbl.RowEvenOdd];
/***** Show my photo if I have any posts in this thread *****/ /***** Show my photo if I have any posts in this thread *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"RIGHT_TOP\"" "<td class=\"RIGHT_TOP %s\" style=\"width:14px;>",
" style=\"width:14px; background-color:%s;\">", BgColor);
ThisThreadIsInMyClipboard ? LIGHT_GREEN :
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (Thr.NumMyPosts) if (Thr.NumMyPosts)
{ {
fprintf (Gbl.F.Out,"<span title=\""); fprintf (Gbl.F.Out,"<span title=\"");
@ -3271,13 +3270,11 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Put an icon with thread status *****/ /***** Put an icon with thread status *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\"" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP %s\" style=\"width:24px;\">"
" style=\"width:24px; background-color:%s;\">"
"<img src=\"%s/%s16x16.gif\"" "<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />", " class=\"ICON16x16\" />",
ThisThreadIsInMyClipboard ? LIGHT_GREEN : BgColor,
Gbl.ColorRows[Gbl.RowEvenOdd],
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
Thr.NumUnreadPosts ? "msg-unread" : Thr.NumUnreadPosts ? "msg-unread" :
"msg-open", "msg-open",
@ -3316,10 +3313,7 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Write subject and links to thread pages *****/ /***** Write subject and links to thread pages *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\"" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP %s\">",BgColor);
" style=\"background-color:%s;\">",
ThisThreadIsInMyClipboard ? LIGHT_GREEN :
Gbl.ColorRows[Gbl.RowEvenOdd]);
PaginationPsts.NumItems = Thr.NumPosts; PaginationPsts.NumItems = Thr.NumPosts;
PaginationPsts.CurrentPage = 1; // First page PaginationPsts.CurrentPage = 1; // First page
Pag_CalculatePagination (&PaginationPsts); Pag_CalculatePagination (&PaginationPsts);
@ -3342,16 +3336,11 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi
/* Write the author of first or last message */ /* Write the author of first or last message */
UsrDat.UsrCod = Thr.UsrCod[Order]; UsrDat.UsrCod = Thr.UsrCod[Order];
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
Msg_WriteMsgAuthor (&UsrDat,55,9,Style,Thr.Enabled[Order], Msg_WriteMsgAuthor (&UsrDat,55,9,Style,Thr.Enabled[Order],BgColor);
ThisThreadIsInMyClipboard ? LIGHT_GREEN :
Gbl.ColorRows[Gbl.RowEvenOdd]);
/* Write the date of first or last message (it's in YYYYMMDDHHMMSS format) */ /* Write the date of first or last message (it's in YYYYMMDDHHMMSS format) */
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP\"" fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP %s\">",
" style=\"background-color:%s;\">", Style,BgColor);
Style,
ThisThreadIsInMyClipboard ? LIGHT_GREEN :
Gbl.ColorRows[Gbl.RowEvenOdd]);
DateTime = Thr.WriteTime[Order]; DateTime = Thr.WriteTime[Order];
Dat_WriteDate (DateTime); Dat_WriteDate (DateTime);
fprintf (Gbl.F.Out,"<br />"); fprintf (Gbl.F.Out,"<br />");
@ -3362,53 +3351,38 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi
for (Column = 1; for (Column = 1;
Column <= 3; Column <= 3;
Column++) Column++)
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP\"" fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP %s\">"
" style=\"background-color:%s;\">"
"</td>", "</td>",
Style, Style,BgColor);
ThisThreadIsInMyClipboard ? LIGHT_GREEN :
Gbl.ColorRows[Gbl.RowEvenOdd]);
} }
/***** Write number of posts in this thread *****/ /***** Write number of posts in this thread *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\"" fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP %s\">"
" style=\"background-color:%s;\">"
"%u&nbsp;" "%u&nbsp;"
"</td>", "</td>",
Style, Style,BgColor,
ThisThreadIsInMyClipboard ? LIGHT_GREEN :
Gbl.ColorRows[Gbl.RowEvenOdd],
Thr.NumPosts); Thr.NumPosts);
/***** Write number of new posts in this thread *****/ /***** Write number of new posts in this thread *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\"" fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP %s\">"
" style=\"background-color:%s;\">"
"%u&nbsp;" "%u&nbsp;"
"</td>", "</td>",
Style, Style,BgColor,
ThisThreadIsInMyClipboard ? LIGHT_GREEN :
Gbl.ColorRows[Gbl.RowEvenOdd],
Thr.NumUnreadPosts); Thr.NumUnreadPosts);
/***** Write number of users who have write posts in this thread *****/ /***** Write number of users who have write posts in this thread *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\"" fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP %s\">"
" style=\"background-color:%s;\">"
"%u&nbsp;" "%u&nbsp;"
"</td>", "</td>",
Style, Style,BgColor,
ThisThreadIsInMyClipboard ? LIGHT_GREEN :
Gbl.ColorRows[Gbl.RowEvenOdd],
Thr.NumWriters); Thr.NumWriters);
/***** Write number of users who have read this thread *****/ /***** Write number of users who have read this thread *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\"" fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP %s\">"
" style=\"background-color:%s;\">"
"%u&nbsp;" "%u&nbsp;"
"</td>" "</td>"
"</tr>", "</tr>",
Style, Style,BgColor,
ThisThreadIsInMyClipboard ? LIGHT_GREEN :
Gbl.ColorRows[Gbl.RowEvenOdd],
Thr.NumReaders); Thr.NumReaders);
} }

4
swad_global.c
View File

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

285
swad_indicator.c
View File

@ -551,324 +551,267 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat
{ {
case Ind_INDICATORS_BRIEF: case Ind_INDICATORS_BRIEF:
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE\"" "<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE\"" "<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE\"" "<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE\"" "<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td colspan=\"11\" class=\"TIT_TBL CENTER_MIDDLE\"" "<td colspan=\"11\" class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"</tr>" "</tr>"
"<tr>" "<tr>"
"<td rowspan=\"2\" class=\"TIT_TBL CENTER_TOP\"" "<td rowspan=\"2\" class=\"TIT_TBL CENTER_TOP COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td colspan=\"2\" class=\"TIT_TBL CENTER_TOP\"" "<td colspan=\"2\" class=\"TIT_TBL CENTER_TOP COLOR0\">"
" style=\"background-color:%s;\">"
"(A) %s" "(A) %s"
"</td>" "</td>"
"<td colspan=\"2\" class=\"TIT_TBL CENTER_TOP\"" "<td colspan=\"2\" class=\"TIT_TBL CENTER_TOP COLOR0\">"
" style=\"background-color:%s;\">"
"(B) %s" "(B) %s"
"</td>" "</td>"
"<td colspan=\"2\" class=\"TIT_TBL CENTER_TOP\"" "<td colspan=\"2\" class=\"TIT_TBL CENTER_TOP COLOR0\">"
" style=\"background-color:%s;\">"
"(C) %s" "(C) %s"
"</td>" "</td>"
"<td colspan=\"2\" class=\"TIT_TBL CENTER_TOP\"" "<td colspan=\"2\" class=\"TIT_TBL CENTER_TOP COLOR0\">"
" style=\"background-color:%s;\">"
"(D) %s" "(D) %s"
"</td>" "</td>"
"<td colspan=\"2\" class=\"TIT_TBL CENTER_TOP\"" "<td colspan=\"2\" class=\"TIT_TBL CENTER_TOP COLOR0\">"
" style=\"background-color:%s;\">"
"(E) %s" "(E) %s"
"</td>" "</td>"
"</tr>" "</tr>"
"<tr>" "<tr>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"</tr>", "</tr>",
Gbl.ColorRows[0],Txt_Degree, Txt_Degree,
Gbl.ColorRows[0],Txt_Course, Txt_Course,
Gbl.ColorRows[0],Txt_Institutional_BR_code, Txt_Institutional_BR_code,
Gbl.ColorRows[0],Txt_Web_page_of_the_course, Txt_Web_page_of_the_course,
Gbl.ColorRows[0],Txt_Indicators, Txt_Indicators,
Gbl.ColorRows[0],Txt_No_INDEX, Txt_No_INDEX,
Gbl.ColorRows[0],Txt_Syllabus_of_the_course, Txt_Syllabus_of_the_course,
Gbl.ColorRows[0],Txt_Guided_academic_assignments, Txt_Guided_academic_assignments,
Gbl.ColorRows[0],Txt_Online_tutoring, Txt_Online_tutoring,
Gbl.ColorRows[0],Txt_Materials, Txt_Materials,
Gbl.ColorRows[0],Txt_Assessment_criteria, Txt_Assessment_criteria,
Gbl.ColorRows[0],Txt_YES, Txt_YES,
Gbl.ColorRows[0],Txt_NO, Txt_NO,
Gbl.ColorRows[0],Txt_YES, Txt_YES,
Gbl.ColorRows[0],Txt_NO, Txt_NO,
Gbl.ColorRows[0],Txt_YES, Txt_YES,
Gbl.ColorRows[0],Txt_NO, Txt_NO,
Gbl.ColorRows[0],Txt_YES, Txt_YES,
Gbl.ColorRows[0],Txt_NO, Txt_NO,
Gbl.ColorRows[0],Txt_YES, Txt_YES,
Gbl.ColorRows[0],Txt_NO); Txt_NO);
break; break;
case Ind_INDICATORS_FULL: case Ind_INDICATORS_FULL:
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE\"" "<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE\"" "<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE\"" "<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE\"" "<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE\"" "<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE\"" "<td rowspan=\"3\" class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td colspan=\"24\" class=\"TIT_TBL CENTER_MIDDLE\"" "<td colspan=\"24\" class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"</tr>" "</tr>"
"<tr>" "<tr>"
"<td rowspan=\"2\" class=\"TIT_TBL CENTER_TOP\"" "<td rowspan=\"2\" class=\"TIT_TBL CENTER_TOP COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td colspan=\"5\" class=\"TIT_TBL CENTER_TOP\"" "<td colspan=\"5\" class=\"TIT_TBL CENTER_TOP COLOR0\">"
" style=\"background-color:%s;\">"
"(A) %s" "(A) %s"
"</td>" "</td>"
"<td colspan=\"5\" class=\"TIT_TBL CENTER_TOP\"" "<td colspan=\"5\" class=\"TIT_TBL CENTER_TOP COLOR0\">"
" style=\"background-color:%s;\">"
"(B) %s" "(B) %s"
"</td>" "</td>"
"<td colspan=\"5\" class=\"TIT_TBL CENTER_TOP\"" "<td colspan=\"5\" class=\"TIT_TBL CENTER_TOP COLOR0\">"
" style=\"background-color:%s;\">"
"(C) %s" "(C) %s"
"</td>" "</td>"
"<td colspan=\"4\" class=\"TIT_TBL CENTER_TOP\"" "<td colspan=\"4\" class=\"TIT_TBL CENTER_TOP COLOR0\">"
" style=\"background-color:%s;\">"
"(D) %s" "(D) %s"
"</td>" "</td>"
"<td colspan=\"4\" class=\"TIT_TBL CENTER_TOP\"" "<td colspan=\"4\" class=\"TIT_TBL CENTER_TOP COLOR0\">"
" style=\"background-color:%s;\">"
"(E) %s" "(E) %s"
"</td>" "</td>"
"</tr>" "</tr>"
"<tr>" "<tr>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL LEFT_MIDDLE\"" "<td class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL LEFT_MIDDLE\"" "<td class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL LEFT_MIDDLE\"" "<td class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL RIGHT_MIDDLE\"" "<td class=\"TIT_TBL RIGHT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL RIGHT_MIDDLE\"" "<td class=\"TIT_TBL RIGHT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL RIGHT_MIDDLE\"" "<td class=\"TIT_TBL RIGHT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL RIGHT_MIDDLE\"" "<td class=\"TIT_TBL RIGHT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL RIGHT_MIDDLE\"" "<td class=\"TIT_TBL RIGHT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL RIGHT_MIDDLE\"" "<td class=\"TIT_TBL RIGHT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL RIGHT_MIDDLE\"" "<td class=\"TIT_TBL RIGHT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL RIGHT_MIDDLE\"" "<td class=\"TIT_TBL RIGHT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL CENTER_MIDDLE\"" "<td class=\"TIT_TBL CENTER_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL LEFT_MIDDLE\"" "<td class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL LEFT_MIDDLE\"" "<td class=\"TIT_TBL LEFT_MIDDLE COLOR0\">"
" style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"</tr>", "</tr>",
Gbl.ColorRows[0],Txt_Degree, Txt_Degree,
Gbl.ColorRows[0],Txt_Course, Txt_Course,
Gbl.ColorRows[0],Txt_Institutional_BR_code, Txt_Institutional_BR_code,
Gbl.ColorRows[0],Txt_Web_page_of_the_course, Txt_Web_page_of_the_course,
Gbl.ColorRows[0],Txt_Teachers_ABBREVIATION, Txt_Teachers_ABBREVIATION,
Gbl.ColorRows[0],Txt_Students_ABBREVIATION, Txt_Students_ABBREVIATION,
Gbl.ColorRows[0],Txt_Indicators, Txt_Indicators,
Gbl.ColorRows[0],Txt_No_INDEX, Txt_No_INDEX,
Gbl.ColorRows[0],Txt_Syllabus_of_the_course, Txt_Syllabus_of_the_course,
Gbl.ColorRows[0],Txt_Guided_academic_assignments, Txt_Guided_academic_assignments,
Gbl.ColorRows[0],Txt_Online_tutoring, Txt_Online_tutoring,
Gbl.ColorRows[0],Txt_Materials, Txt_Materials,
Gbl.ColorRows[0],Txt_Assessment_criteria, Txt_Assessment_criteria,
Gbl.ColorRows[0],Txt_YES, Txt_YES,
Gbl.ColorRows[0],Txt_NO, Txt_NO,
Gbl.ColorRows[0],Txt_INFO_TITLE[Inf_LECTURES], Txt_INFO_TITLE[Inf_LECTURES],
Gbl.ColorRows[0],Txt_INFO_TITLE[Inf_PRACTICALS], Txt_INFO_TITLE[Inf_PRACTICALS],
Gbl.ColorRows[0],Txt_INFO_TITLE[Inf_TEACHING_GUIDE], Txt_INFO_TITLE[Inf_TEACHING_GUIDE],
Gbl.ColorRows[0],Txt_YES, Txt_YES,
Gbl.ColorRows[0],Txt_NO, Txt_NO,
Gbl.ColorRows[0],Txt_Assignments, Txt_Assignments,
Gbl.ColorRows[0],Txt_Files_assignments, Txt_Files_assignments,
Gbl.ColorRows[0],Txt_Files_works, Txt_Files_works,
Gbl.ColorRows[0],Txt_YES, Txt_YES,
Gbl.ColorRows[0],Txt_NO, Txt_NO,
Gbl.ColorRows[0],Txt_Forum_threads, Txt_Forum_threads,
Gbl.ColorRows[0],Txt_Forum_posts, Txt_Forum_posts,
Gbl.ColorRows[0],Txt_Messages_sent_by_teachers, Txt_Messages_sent_by_teachers,
Gbl.ColorRows[0],Txt_YES, Txt_YES,
Gbl.ColorRows[0],Txt_NO, Txt_NO,
Gbl.ColorRows[0],Txt_No_of_files_in_DOCUM_zones, Txt_No_of_files_in_DOCUM_zones,
Gbl.ColorRows[0],Txt_No_of_files_in_SHARE_zones, Txt_No_of_files_in_SHARE_zones,
Gbl.ColorRows[0],Txt_YES, Txt_YES,
Gbl.ColorRows[0],Txt_NO, Txt_NO,
Gbl.ColorRows[0],Txt_INFO_TITLE[Inf_ASSESSMENT], Txt_INFO_TITLE[Inf_ASSESSMENT],
Gbl.ColorRows[0],Txt_INFO_TITLE[Inf_TEACHING_GUIDE]); Txt_INFO_TITLE[Inf_TEACHING_GUIDE]);
break; break;
} }

13
swad_user.c
View File

@ -2807,7 +2807,8 @@ static void Usr_WriteRowGstAllData (struct UsrData *UsrDat)
/***** Write rest of guest's main data *****/ /***** Write rest of guest's main data *****/
Ins.InsCod = UsrDat->InsCod; Ins.InsCod = UsrDat->InsCod;
Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_MINIMAL_DATA); Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_MINIMAL_DATA);
Usr_WriteMainUsrDataExceptUsrID (UsrDat,Gbl.ColorRows[Gbl.RowEvenOdd],true,NULL,Ins.ShortName,NULL); Usr_WriteMainUsrDataExceptUsrID (UsrDat,Gbl.ColorRows[Gbl.RowEvenOdd],true,
NULL,Ins.ShortName,NULL);
/***** Write the rest of the data of the guest *****/ /***** Write the rest of the data of the guest *****/
if (UsrDat->Tch.CtrCod > 0) if (UsrDat->Tch.CtrCod > 0)
@ -2914,12 +2915,12 @@ void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GroupNames)
/***** Write the rest of the data of the student *****/ /***** Write the rest of the data of the student *****/
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd], Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
UsrDat->LocalAddress[0] ? (ShowData ? UsrDat->LocalAddress : UsrDat->LocalAddress[0] ? (ShowData ? UsrDat->LocalAddress :
"********") : "********") :
"&nbsp;", "&nbsp;",
NULL,true,UsrDat->Accepted); NULL,true,UsrDat->Accepted);
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd], Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
UsrDat->LocalPhone[0] ? (ShowData ? UsrDat->LocalPhone : UsrDat->LocalPhone[0] ? (ShowData ? UsrDat->LocalPhone :
"********") : "********") :
"&nbsp;", "&nbsp;",
NULL,true,UsrDat->Accepted); NULL,true,UsrDat->Accepted);
@ -2929,17 +2930,17 @@ void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GroupNames)
"&nbsp;", "&nbsp;",
NULL,true,UsrDat->Accepted); NULL,true,UsrDat->Accepted);
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd], Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
UsrDat->FamilyPhone[0] ? (ShowData ? UsrDat->FamilyPhone : UsrDat->FamilyPhone[0] ? (ShowData ? UsrDat->FamilyPhone :
"********") : "********") :
"&nbsp;", "&nbsp;",
NULL,true,UsrDat->Accepted); NULL,true,UsrDat->Accepted);
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd], Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
UsrDat->OriginPlace[0] ? (ShowData ? UsrDat->OriginPlace : UsrDat->OriginPlace[0] ? (ShowData ? UsrDat->OriginPlace :
"********") : "********") :
"&nbsp;", "&nbsp;",
NULL,true,UsrDat->Accepted); NULL,true,UsrDat->Accepted);
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd], Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
UsrDat->StrBirthday[0] ? (ShowData ? UsrDat->StrBirthday : UsrDat->StrBirthday[0] ? (ShowData ? UsrDat->StrBirthday :
"********") : "********") :
"&nbsp;", "&nbsp;",
NULL,true,UsrDat->Accepted); NULL,true,UsrDat->Accepted);