Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-03 07:15:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 14.123.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2015-07-28 11:05:10 +02:00
parent a20f5ffd31
commit 051418b5f4
4 changed files with 110 additions and 142 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.123.1 (2015/07/27)" #define Log_PLATFORM_VERSION "SWAD 14.123.2 (2015/07/27)"
// 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.123.2: Jul 28, 2015 Changes in CSS of forms. (184953 lines)
Version 14.123.1: Jul 28, 2015 Changes in CSS of forms. (184984 lines) Version 14.123.1: Jul 28, 2015 Changes in CSS of forms. (184984 lines)
Version 14.123: Jul 28, 2015 Changes in CSS of forms. (184877 lines) Version 14.123: Jul 28, 2015 Changes in CSS of forms. (184877 lines)
Version 14.122: Jul 27, 2015 Changes in CSS of forms. (184892 lines) Version 14.122: Jul 27, 2015 Changes in CSS of forms. (184892 lines)

12
swad_chat.c
View File

@ -256,12 +256,12 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
/***** Table start *****/ /***** Table start *****/
Lay_StartRoundFrameTable (NULL,2,Txt_Rooms_with_users); Lay_StartRoundFrameTable (NULL,2,Txt_Rooms_with_users);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\"" "<td class=\"TIT_TBL CENTER_MIDDLE\""
" style=\"text-align:center; background-color:%s;\">" " style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"TIT_TBL\"" "<td class=\"TIT_TBL LEFT_MIDDLE\""
" style=\"text-align:left; background-color:%s;\">" " style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"</tr>", "</tr>",
@ -276,10 +276,10 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
/* Get next chat room */ /* Get next chat room */
row = mysql_fetch_row (mysql_res); row = mysql_fetch_row (mysql_res);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT\" style=\"text-align:left;\">" "<td class=\"DAT LEFT_MIDDLE\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:right;\">" "<td class=\"DAT RIGHT_MIDDLE\">"
"%s" "%s"
"</td>" "</td>"
"</tr>", "</tr>",

78
swad_connected.c
View File

@ -90,7 +90,8 @@ void Con_ShowConnectedUsrs (void)
/***** Put form to update connected users *****/ /***** Put form to update connected users *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td style=\"padding-bottom:10px; text-align:center;\">"); "<td class=\"CENTER_MIDDLE\""
" style=\"padding-bottom:10px;\">");
Act_FormStart (ActLstCon); Act_FormStart (ActLstCon);
Gbl.Scope.Current = Sco_SCOPE_CRS; Gbl.Scope.Current = Sco_SCOPE_CRS;
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
@ -108,7 +109,7 @@ void Con_ShowConnectedUsrs (void)
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>" "</tr>"
"<tr>" "<tr>"
"<td style=\"text-align:center;\">"); "<td class=\"CENTER_MIDDLE\">");
/* Number of connected users in the whole platform */ /* Number of connected users in the whole platform */
Con_ShowGlobalConnectedUsrs (); Con_ShowGlobalConnectedUsrs ();
@ -134,7 +135,7 @@ void Con_ShowLastClicks (void)
Lay_StartRoundFrame (NULL,Txt_Last_clicks_in_real_time); Lay_StartRoundFrame (NULL,Txt_Last_clicks_in_real_time);
fprintf (Gbl.F.Out,"<div id=\"lastclicks\"" // Used for AJAX based refresh fprintf (Gbl.F.Out,"<div id=\"lastclicks\"" // Used for AJAX based refresh
" style=\"text-align:center;\">"); " class=\"CENTER_MIDDLE\">");
Con_GetAndShowLastClicks (); Con_GetAndShowLastClicks ();
fprintf (Gbl.F.Out,"</div>"); // Used for AJAX based refresh fprintf (Gbl.F.Out,"</div>"); // Used for AJAX based refresh
@ -177,24 +178,24 @@ void Con_GetAndShowLastClicks (void)
/***** Write list of connected users *****/ /***** Write list of connected users *****/
fprintf (Gbl.F.Out,"<table class=\"TABLE10\">" fprintf (Gbl.F.Out,"<table class=\"TABLE10\">"
"<tr>" "<tr>"
"<th class=\"TIT_TBL\"" "<th class=\"TIT_TBL LEFT_MIDDLE\""
" style=\"width:70px; text-align:left;\">" " style=\"width:70px;\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"TIT_TBL\"" "<th class=\"TIT_TBL LEFT_MIDDLE\""
" style=\"width:60px; text-align:left;\">" " style=\"width:60px;\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"TIT_TBL\"" "<th class=\"TIT_TBL LEFT_MIDDLE\""
" style=\"width:100px; text-align:left;\">" " style=\"width:100px;\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"TIT_TBL\"" "<th class=\"TIT_TBL LEFT_MIDDLE\""
" style=\"width:150px; text-align:left;\">" " style=\"width:150px;\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"TIT_TBL\"" "<th class=\"TIT_TBL LEFT_MIDDLE\""
" style=\"width:220px; text-align:left;\">" " style=\"width:220px;\">"
"%s" "%s"
"</th>" "</th>"
"</tr>", "</tr>",
@ -272,7 +273,6 @@ void Con_ShowGlobalConnectedUsrs (void)
unsigned WithoutCoursesTotal = Con_GetConnectedGuestsTotal (); unsigned WithoutCoursesTotal = Con_GetConnectedGuestsTotal ();
unsigned UsrsTotal = StdsTotal + TchsTotal + WithoutCoursesTotal; unsigned UsrsTotal = StdsTotal + TchsTotal + WithoutCoursesTotal;
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<div class=\"CONNECTED\"" fprintf (Gbl.F.Out,"<div class=\"CONNECTED\""
" style=\"width:110px;" " style=\"width:110px;"
@ -281,8 +281,7 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Write total number of sessions *****/ /***** Write total number of sessions *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:110px;" "<td class=\"CENTER_TOP\" style=\"width:110px;\">"
" text-align:center; vertical-align:top;\">"
"%u %s" "%u %s"
"</td>" "</td>"
"</tr>", "</tr>",
@ -292,8 +291,7 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Write total number of users *****/ /***** Write total number of users *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:110px;" "<td class=\"CENTER_TOP\" style=\"width:110px;\">"
" text-align:center; vertical-align:top;\">"
"%u %s:" "%u %s:"
"</td>" "</td>"
"</tr>", "</tr>",
@ -303,8 +301,7 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Write total number of students *****/ /***** Write total number of students *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:110px;" "<td class=\"CENTER_TOP\" style=\"width:110px;\">"
" text-align:center; vertical-align:top;\">"
"%u %s" "%u %s"
"</td>" "</td>"
"</tr>", "</tr>",
@ -314,8 +311,7 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Write total number of teachers *****/ /***** Write total number of teachers *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:110px;" "<td class=\"CENTER_TOP\" style=\"width:110px;\">"
" text-align:center; vertical-align:top;\">"
"%u %s" "%u %s"
"</td>" "</td>"
"</tr>", "</tr>",
@ -326,8 +322,7 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Write total number of users who do not belong to any course *****/ /***** Write total number of users who do not belong to any course *****/
if (WithoutCoursesTotal) if (WithoutCoursesTotal)
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:110px;" "<td class=\"CENTER_TOP\" style=\"width:110px;\">"
" text-align:center; vertical-align:top;\">"
"%u %s" "%u %s"
"</td>" "</td>"
"</tr>", "</tr>",
@ -511,8 +506,7 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnMainZone (
/***** Write number of connected users who belong to current course *****/ /***** Write number of connected users who belong to current course *****/
NumUsrsThisRole = Con_GetNumConnectedUsrsWithARoleBelongingCurrentLocation (Role,&UsrSex); NumUsrsThisRole = Con_GetNumConnectedUsrsWithARoleBelongingCurrentLocation (Role,&UsrSex);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"3\"" "<td colspan=\"3\" class=\"CENTER_TOP\">"
" style=\"text-align:center; vertical-align:top;\">"
"%u %s" "%u %s"
"</td>" "</td>"
"</tr>", "</tr>",
@ -589,8 +583,8 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnRightColum
if (Gbl.Usrs.Connected.NumUsrsToList > Cfg_MAX_CONNECTED_SHOWN) if (Gbl.Usrs.Connected.NumUsrsToList > Cfg_MAX_CONNECTED_SHOWN)
Gbl.Usrs.Connected.NumUsrsToList = Cfg_MAX_CONNECTED_SHOWN; Gbl.Usrs.Connected.NumUsrsToList = Cfg_MAX_CONNECTED_SHOWN;
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"3\" style=\"width:110px;" "<td colspan=\"3\" class=\"CENTER_TOP\""
" text-align:center; vertical-align:top;\">" " style=\"width:110px;\">"
"%u %s" "%u %s"
"</td>" "</td>"
"</tr>", "</tr>",
@ -641,7 +635,7 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnRightColum
{ {
sprintf (Gbl.FormId,"form_con_%d",++Gbl.NumFormConnectedUsrs); sprintf (Gbl.FormId,"form_con_%d",++Gbl.NumFormConnectedUsrs);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"3\" style=\"text-align:center;\">"); "<td colspan=\"3\" class=\"CENTER_TOP\">");
Act_FormStartId (ActLstCon,Gbl.FormId); Act_FormStartId (ActLstCon,Gbl.FormId);
Sco_PutParamScope (Sco_SCOPE_CRS); Sco_PutParamScope (Sco_SCOPE_CRS);
Act_LinkFormSubmitId (Txt_Connected_users,The_ClassConnected[Gbl.Prefs.Theme],Gbl.FormId); Act_LinkFormSubmitId (Txt_Connected_users,The_ClassConnected[Gbl.Prefs.Theme],Gbl.FormId);
@ -1008,8 +1002,8 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
/***** Show photo *****/ /***** Show photo *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:18px; text-align:left;" "<td class=\"LEFT_MIDDLE\""
" vertical-align:middle; background-color:%s;\">", " style=\"width:18px; background-color:%s;\">",
Color); Color);
sprintf (Gbl.FormId,"form_con_%d",++Gbl.NumFormConnectedUsrs); sprintf (Gbl.FormId,"form_con_%d",++Gbl.NumFormConnectedUsrs);
Act_FormStartId (ActSeePubPrf,Gbl.FormId); Act_FormStartId (ActSeePubPrf,Gbl.FormId);
@ -1024,8 +1018,8 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Write full name and link *****/ /***** Write full name and link *****/
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"width:54px; text-align:left;" fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE\""
" vertical-align:middle; background-color:%s;\">", " style=\"width:54px; background-color:%s;\">",
Font,Color); Font,Color);
sprintf (Gbl.FormId,"form_con_%d",++Gbl.NumFormConnectedUsrs); sprintf (Gbl.FormId,"form_con_%d",++Gbl.NumFormConnectedUsrs);
Act_FormStartId ((Role == Rol_STUDENT) ? ActSeeRecOneStd : Act_FormStartId ((Role == Rol_STUDENT) ? ActSeeRecOneStd :
@ -1039,8 +1033,8 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Write time from last access *****/ /***** Write time from last access *****/
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"width:38px; text-align:right;" fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\""
" vertical-align:middle; background-color:%s;\">", " style=\"width:38px; background-color:%s;\">",
Font,Color); Font,Color);
fprintf (Gbl.F.Out,"<div id=\"hm%u\">", fprintf (Gbl.F.Out,"<div id=\"hm%u\">",
@ -1205,8 +1199,8 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
/***** Show photo *****/ /***** Show photo *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:18px; text-align:left;" "<td class=\"LEFT_MIDDLE\""
" vertical-align:middle; background-color:%s;\">", " style=\"width:18px; background-color:%s;\">",
Gbl.ColorRows[Gbl.RowEvenOdd]); Gbl.ColorRows[Gbl.RowEvenOdd]);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL : Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
@ -1215,9 +1209,8 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Write full name and link *****/ /***** Write full name and link *****/
fprintf (Gbl.F.Out,"<td class=\"%s\"" fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE\""
" style=\"width:256px; text-align:left;" " style=\"width:256px; background-color:%s;\">",
" vertical-align:middle; background-color:%s;\">",
Font,Gbl.ColorRows[Gbl.RowEvenOdd]); Font,Gbl.ColorRows[Gbl.RowEvenOdd]);
if (PutLinkToRecord) if (PutLinkToRecord)
{ {
@ -1235,9 +1228,8 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Write time from last access *****/ /***** Write time from last access *****/
fprintf (Gbl.F.Out,"<td class=\"%s\"" fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:38px; text-align:right;" " style=\"width:38px; background-color:%s;\">",
" vertical-align:middle; background-color:%s;\">",
Font,Gbl.ColorRows[Gbl.RowEvenOdd]); Font,Gbl.ColorRows[Gbl.RowEvenOdd]);
Hours = Seconds / (60 * 60); Hours = Seconds / (60 * 60);
Minutes = (Seconds / 60) % 60; Minutes = (Seconds / 60) % 60;

159
swad_country.c
View File

@ -119,10 +119,10 @@ void Cty_SeeCtyWithPendingInss (void)
Lay_StartRoundFrameTable (NULL,2,Txt_Countries_with_pending_institutions); Lay_StartRoundFrameTable (NULL,2,Txt_Countries_with_pending_institutions);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<th></th>" "<th></th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">" "<th class=\"TIT_TBL LEFT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"TIT_TBL\" style=\"text-align:right;\">" "<th class=\"TIT_TBL RIGHT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"</tr>", "</tr>",
@ -147,8 +147,8 @@ void Cty_SeeCtyWithPendingInss (void)
/* Country map */ /* Country map */
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;" "<td class=\"CENTER_MIDDLE\""
" vertical-align:middle; background-color:%s;\">", " style=\"background-color:%s;\">",
BgColor); BgColor);
if (Cty_CheckIfCountryMapExists (&Cty)) if (Cty_CheckIfCountryMapExists (&Cty))
{ {
@ -160,8 +160,8 @@ void Cty_SeeCtyWithPendingInss (void)
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* Country name */ /* Country name */
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:left;" fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\""
" vertical-align:middle; background-color:%s;\">", " style=\"background-color:%s;\">",
BgColor); BgColor);
Act_FormGoToStart (ActSeeIns); Act_FormGoToStart (ActSeeIns);
Cty_PutParamCtyCod (Cty.CtyCod); Cty_PutParamCtyCod (Cty.CtyCod);
@ -173,8 +173,8 @@ void Cty_SeeCtyWithPendingInss (void)
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* Number of pending institutions (row[1]) */ /* Number of pending institutions (row[1]) */
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;" fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\""
" vertical-align:middle; background-color:%s;\">" " style=\"background-color:%s;\">"
"%s" "%s"
"</td>" "</td>"
"</tr>", "</tr>",
@ -269,8 +269,8 @@ static void Cty_Configuration (bool PrintView)
/* Map image */ /* Map image */
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"DAT_SMALL\"" "<td colspan=\"2\""
" style=\"text-align:center;\">"); " class=\"DAT_SMALL CENTER_MIDDLE\">");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">", fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">",
Gbl.CurrentCty.Cty.WWW[Gbl.Prefs.Language]); Gbl.CurrentCty.Cty.WWW[Gbl.Prefs.Language]);
@ -285,8 +285,7 @@ static void Cty_Configuration (bool PrintView)
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM && !PrintView) if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM && !PrintView)
{ {
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\"" "<td colspan=\"2\" class=\"CENTER_MIDDLE\">");
" style=\"text-align:center;\">");
Act_FormStart (ActChgCtyMapAtt); Act_FormStart (ActChgCtyMapAtt);
fprintf (Gbl.F.Out,"<textarea name=\"Attribution\" cols=\"50\" rows=\"2\"" fprintf (Gbl.F.Out,"<textarea name=\"Attribution\" cols=\"50\" rows=\"2\""
" onchange=\"javascript:document.getElementById('%s').submit();\">", " onchange=\"javascript:document.getElementById('%s').submit();\">",
@ -315,8 +314,7 @@ static void Cty_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">" "<td class=\"%s RIGHT_MIDDLE\">"
"%s:" "%s:"
"</td>" "</td>"
"<td class=\"DAT_N\"" "<td class=\"DAT_N LEFT_MIDDLE\">",
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassForm[Gbl.Prefs.Theme], The_ClassForm[Gbl.Prefs.Theme],
Txt_Country); Txt_Country);
if (!PrintView && Gbl.CurrentCty.Cty.WWW[Gbl.Prefs.Language][0]) if (!PrintView && Gbl.CurrentCty.Cty.WWW[Gbl.Prefs.Language][0])
@ -333,8 +331,7 @@ static void Cty_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">" "<td class=\"%s RIGHT_MIDDLE\">"
"%s:" "%s:"
"</td>" "</td>"
"<td class=\"DAT\"" "<td class=\"DAT LEFT_MIDDLE\">"
" style=\"text-align:left; vertical-align:middle;\">"
"<a href=\"%s/%s?cty=%ld\" class=\"DAT\" target=\"_blank\">" "<a href=\"%s/%s?cty=%ld\" class=\"DAT\" target=\"_blank\">"
"%s/%s?cty=%ld</a>" "%s/%s?cty=%ld</a>"
"</td>" "</td>"
@ -351,8 +348,7 @@ static void Cty_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">" "<td class=\"%s RIGHT_MIDDLE\">"
"%s:" "%s:"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:left;" "<td class=\"DAT LEFT_MIDDLE\">",
" vertical-align:middle;\">",
The_ClassForm[Gbl.Prefs.Theme], The_ClassForm[Gbl.Prefs.Theme],
Txt_QR_code); Txt_QR_code);
QR_LinkTo (200,"cty",Gbl.CurrentCty.Cty.CtyCod); QR_LinkTo (200,"cty",Gbl.CurrentCty.Cty.CtyCod);
@ -366,8 +362,7 @@ static void Cty_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">" "<td class=\"%s RIGHT_MIDDLE\">"
"%s:" "%s:"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:left;" "<td class=\"DAT LEFT_MIDDLE\">"
" vertical-align:middle;\">"
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
@ -380,8 +375,7 @@ static void Cty_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">" "<td class=\"%s RIGHT_MIDDLE\">"
"%s:" "%s:"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:left;" "<td class=\"DAT LEFT_MIDDLE\">"
" vertical-align:middle;\">"
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
@ -394,8 +388,7 @@ static void Cty_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">" "<td class=\"%s RIGHT_MIDDLE\">"
"%s:" "%s:"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:left;" "<td class=\"DAT LEFT_MIDDLE\">"
" vertical-align:middle;\">"
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
@ -408,8 +401,7 @@ static void Cty_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">" "<td class=\"%s RIGHT_MIDDLE\">"
"%s:" "%s:"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:left;" "<td class=\"DAT LEFT_MIDDLE\">"
" vertical-align:middle;\">"
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
@ -422,8 +414,7 @@ static void Cty_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">" "<td class=\"%s RIGHT_MIDDLE\">"
"%s:" "%s:"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:left;" "<td class=\"DAT LEFT_MIDDLE\">"
" vertical-align:middle;\">"
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
@ -436,8 +427,7 @@ static void Cty_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">" "<td class=\"%s RIGHT_MIDDLE\">"
"%s:" "%s:"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:left;" "<td class=\"DAT LEFT_MIDDLE\">"
" vertical-align:middle;\">"
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
@ -510,7 +500,7 @@ void Cty_ListCountries2 (void)
Order <= Cty_ORDER_BY_NUM_USRS; Order <= Cty_ORDER_BY_NUM_USRS;
Order++) Order++)
{ {
fprintf (Gbl.F.Out,"<th class=\"TIT_TBL\" style=\"text-align:left;\">"); fprintf (Gbl.F.Out,"<th class=\"TIT_TBL LEFT_MIDDLE\">");
Act_FormStart (ActSeeCty); Act_FormStart (ActSeeCty);
Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order);
Act_LinkFormSubmit (Txt_COUNTRIES_HELP_ORDER[Order],"TIT_TBL"); Act_LinkFormSubmit (Txt_COUNTRIES_HELP_ORDER[Order],"TIT_TBL");
@ -523,13 +513,13 @@ void Cty_ListCountries2 (void)
Act_FormEnd (); Act_FormEnd ();
fprintf (Gbl.F.Out,"</th>"); fprintf (Gbl.F.Out,"</th>");
} }
fprintf (Gbl.F.Out,"<th class=\"TIT_TBL\" style=\"text-align:right;\">" fprintf (Gbl.F.Out,"<th class=\"TIT_TBL RIGHT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"TIT_TBL\" style=\"text-align:right;\">" "<th class=\"TIT_TBL RIGHT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"TIT_TBL\" style=\"text-align:right;\">" "<th class=\"TIT_TBL RIGHT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"</tr>", "</tr>",
@ -548,8 +538,8 @@ void Cty_ListCountries2 (void)
/***** Country map (and link to WWW if exists) *****/ /***** Country map (and link to WWW if exists) *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"COUNTRY_MAP_SMALL\"" "<td class=\"COUNTRY_MAP_SMALL CENTER_MIDDLE\""
" style=\"text-align:center; background-color:%s;\">", " style=\"background-color:%s;\">",
BgColor); BgColor);
if (Cty_CheckIfCountryMapExists (&Gbl.Ctys.Lst[NumCty])) if (Cty_CheckIfCountryMapExists (&Gbl.Ctys.Lst[NumCty]))
{ {
@ -566,8 +556,8 @@ void Cty_ListCountries2 (void)
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* Name and link to go to this country */ /* Name and link to go to this country */
fprintf (Gbl.F.Out,"<td class=\"DAT\"" fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\""
" style=\"text-align:left; background-color:%s;\">", " style=\"background-color:%s;\">",
BgColor); BgColor);
Act_FormGoToStart (ActSeeCtyInf); Act_FormGoToStart (ActSeeCtyInf);
Cty_PutParamCtyCod (Gbl.Ctys.Lst[NumCty].CtyCod); Cty_PutParamCtyCod (Gbl.Ctys.Lst[NumCty].CtyCod);
@ -583,20 +573,20 @@ void Cty_ListCountries2 (void)
/* Write stats of this country */ /* Write stats of this country */
NumStds = Usr_GetNumUsrsInCountry (Rol_STUDENT,Gbl.Ctys.Lst[NumCty].CtyCod); NumStds = Usr_GetNumUsrsInCountry (Rol_STUDENT,Gbl.Ctys.Lst[NumCty].CtyCod);
NumTchs = Usr_GetNumUsrsInCountry (Rol_TEACHER,Gbl.Ctys.Lst[NumCty].CtyCod); NumTchs = Usr_GetNumUsrsInCountry (Rol_TEACHER,Gbl.Ctys.Lst[NumCty].CtyCod);
fprintf (Gbl.F.Out,"<td class=\"DAT\"" fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\""
" style=\"text-align:right; background-color:%s;\">" " style=\"background-color:%s;\">"
"%u" "%u"
"</td>" "</td>"
"<td class=\"DAT\"" "<td class=\"DAT RIGHT_MIDDLE\""
" style=\"text-align:right; background-color:%s;\">" " style=\"background-color:%s;\">"
"%u" "%u"
"</td>" "</td>"
"<td class=\"DAT\"" "<td class=\"DAT RIGHT_MIDDLE\""
" style=\"text-align:right; background-color:%s;\">" " style=\"background-color:%s;\">"
"%u" "%u"
"</td>" "</td>"
"<td class=\"DAT\"" "<td class=\"DAT RIGHT_MIDDLE\""
" style=\"text-align:right; background-color:%s;\">" " style=\"background-color:%s;\">"
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
@ -614,8 +604,7 @@ void Cty_ListCountries2 (void)
/***** Separation row *****/ /***** Separation row *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"6\" class=\"DAT\"" "<td colspan=\"6\" class=\"DAT CENTER_MIDDLE\">"
" style=\"text-align:center;\">"
"&nbsp;" "&nbsp;"
"</td>" "</td>"
"</tr>"); "</tr>");
@ -627,19 +616,19 @@ void Cty_ListCountries2 (void)
NumInssInOtherCtys = Ins_GetNumInssInCty (0); NumInssInOtherCtys = Ins_GetNumInssInCty (0);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td></td>" "<td></td>"
"<td class=\"DAT\" style=\"text-align:left;\">" "<td class=\"DAT LEFT_MIDDLE\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:right;\">" "<td class=\"DAT RIGHT_MIDDLE\">"
"%u" "%u"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:right;\">" "<td class=\"DAT RIGHT_MIDDLE\">"
"%u" "%u"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:right;\">" "<td class=\"DAT RIGHT_MIDDLE\">"
"%u" "%u"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:right;\">" "<td class=\"DAT RIGHT_MIDDLE\">"
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
@ -656,19 +645,19 @@ void Cty_ListCountries2 (void)
NumUsrs = Sta_GetTotalNumberOfUsers (Sco_SCOPE_SYS,Rol_UNKNOWN); // NumUsrs >= NumStds + NumTchs NumUsrs = Sta_GetTotalNumberOfUsers (Sco_SCOPE_SYS,Rol_UNKNOWN); // NumUsrs >= NumStds + NumTchs
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td></td>" "<td></td>"
"<td class=\"DAT\" style=\"text-align:left;\">" "<td class=\"DAT LEFT_MIDDLE\">"
"%s" "%s"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:right;\">" "<td class=\"DAT RIGHT_MIDDLE\">"
"%u" "%u"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:right;\">" "<td class=\"DAT RIGHT_MIDDLE\">"
"%u" "%u"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:right;\">" "<td class=\"DAT RIGHT_MIDDLE\">"
"%u" "%u"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:right;\">" "<td class=\"DAT RIGHT_MIDDLE\">"
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
@ -1296,15 +1285,13 @@ static void Cty_ListCountriesForEdition (void)
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* Numerical country code (ISO 3166-1) */ /* Numerical country code (ISO 3166-1) */
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT\"" fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT RIGHT_TOP\">"
" style=\"text-align:right; vertical-align:top;\">"
"%03ld" "%03ld"
"</td>", "</td>",
1 + Txt_NUM_LANGUAGES,Cty->CtyCod); 1 + Txt_NUM_LANGUAGES,Cty->CtyCod);
/* Alphabetic country code with 2 letters (ISO 3166-1) */ /* Alphabetic country code with 2 letters (ISO 3166-1) */
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT\"" fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT RIGHT_TOP\">"
" style=\"text-align:right; vertical-align:top;\">"
"%s" "%s"
"</td>", "</td>",
1 + Txt_NUM_LANGUAGES,Cty->Alpha2); 1 + Txt_NUM_LANGUAGES,Cty->Alpha2);
@ -1314,15 +1301,13 @@ static void Cty_ListCountriesForEdition (void)
"<td></td>"); "<td></td>");
/* Number of users */ /* Number of users */
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT\"" fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT RIGHT_TOP\">"
" style=\"text-align:right; vertical-align:top;\">"
"%u" "%u"
"</td>", "</td>",
1 + Txt_NUM_LANGUAGES,Cty->NumUsrs); 1 + Txt_NUM_LANGUAGES,Cty->NumUsrs);
/* Number of institutions */ /* Number of institutions */
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT\"" fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT RIGHT_TOP\">"
" style=\"text-align:right; vertical-align:top;\">"
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
@ -1335,15 +1320,13 @@ static void Cty_ListCountriesForEdition (void)
{ {
/* Language */ /* Language */
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT\" style=\"text-align:right;" "<td class=\"DAT RIGHT_MIDDLE\">"
" vertical-align:middle;\">"
"%s:" "%s:"
"</td>", "</td>",
Txt_STR_LANG_NAME[Lan]); Txt_STR_LANG_NAME[Lan]);
/* Name */ /* Name */
fprintf (Gbl.F.Out,"<td style=\"text-align:left;" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">");
" vertical-align:top;\">");
Act_FormStart (ActRenCty); Act_FormStart (ActRenCty);
Cty_PutParamOtherCtyCod (Cty->CtyCod); Cty_PutParamOtherCtyCod (Cty->CtyCod);
Par_PutHiddenParamUnsigned ("Lan",(unsigned) Lan); Par_PutHiddenParamUnsigned ("Lan",(unsigned) Lan);
@ -1355,8 +1338,7 @@ static void Cty_ListCountriesForEdition (void)
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* WWW */ /* WWW */
fprintf (Gbl.F.Out,"<td style=\"text-align:left;" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">");
" vertical-align:top;\">");
Act_FormStart (ActChgCtyWWW); Act_FormStart (ActChgCtyWWW);
Cty_PutParamOtherCtyCod (Cty->CtyCod); Cty_PutParamOtherCtyCod (Cty->CtyCod);
Par_PutHiddenParamUnsigned ("Lan",(unsigned) Lan); Par_PutHiddenParamUnsigned ("Lan",(unsigned) Lan);
@ -1660,8 +1642,7 @@ static void Cty_PutFormToCreateCountry (void)
1 + Txt_NUM_LANGUAGES); 1 + Txt_NUM_LANGUAGES);
/***** Numerical country code (ISO 3166-1) *****/ /***** Numerical country code (ISO 3166-1) *****/
fprintf (Gbl.F.Out,"<td rowspan=\"%u\"" fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"RIGHT_TOP\">"
" style=\"text-align:right; vertical-align:top;\">"
"<input type=\"text\" name=\"OthCtyCod\" size=\"3\" maxlength=\"10\" value=\"", "<input type=\"text\" name=\"OthCtyCod\" size=\"3\" maxlength=\"10\" value=\"",
1 + Txt_NUM_LANGUAGES); 1 + Txt_NUM_LANGUAGES);
if (Cty->CtyCod > 0) if (Cty->CtyCod > 0)
@ -1669,8 +1650,7 @@ static void Cty_PutFormToCreateCountry (void)
fprintf (Gbl.F.Out,"\" /></td>"); fprintf (Gbl.F.Out,"\" /></td>");
/***** Alphabetic country code with 2 letters (ISO 3166-1) *****/ /***** Alphabetic country code with 2 letters (ISO 3166-1) *****/
fprintf (Gbl.F.Out,"<td rowspan=\"%u\"" fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"RIGHT_TOP\">"
" style=\"text-align:right; vertical-align:top;\">"
"<input type=\"text\" name=\"Alpha2\" size=\"2\" maxlength=\"2\" value=\"%s\" />" "<input type=\"text\" name=\"Alpha2\" size=\"2\" maxlength=\"2\" value=\"%s\" />"
"</td>", "</td>",
1 + Txt_NUM_LANGUAGES,Cty->Alpha2); 1 + Txt_NUM_LANGUAGES,Cty->Alpha2);
@ -1680,15 +1660,13 @@ static void Cty_PutFormToCreateCountry (void)
"<td></td>"); "<td></td>");
/* Number of users */ /* Number of users */
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT\"" fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT RIGHT_TOP\">"
" style=\"text-align:right; vertical-align:top;\">"
"0" "0"
"</td>", "</td>",
1 + Txt_NUM_LANGUAGES); 1 + Txt_NUM_LANGUAGES);
/* Number of institutions */ /* Number of institutions */
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT\"" fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"DAT RIGHT_TOP\">"
" style=\"text-align:right; vertical-align:top;\">"
"0" "0"
"</td>" "</td>"
"</tr>", "</tr>",
@ -1701,22 +1679,19 @@ static void Cty_PutFormToCreateCountry (void)
{ {
/* Language */ /* Language */
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT\"" "<td class=\"DAT RIGHT_TOP\">"
" style=\"text-align:right; vertical-align:top;\">"
"%s" "%s"
"</td>", "</td>",
Txt_STR_LANG_NAME[Lan]); Txt_STR_LANG_NAME[Lan]);
/* Name */ /* Name */
fprintf (Gbl.F.Out,"<td style=\"text-align:left;" fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
" vertical-align:middle;\">"
"<input type=\"text\" name=\"Name_%s\" size=\"15\" maxlength=\"%u\" value=\"%s\" />" "<input type=\"text\" name=\"Name_%s\" size=\"15\" maxlength=\"%u\" value=\"%s\" />"
"</td>", "</td>",
Txt_STR_LANG_ID[Lan],Cty_MAX_LENGTH_COUNTRY_NAME,Cty->Name[Lan]); Txt_STR_LANG_ID[Lan],Cty_MAX_LENGTH_COUNTRY_NAME,Cty->Name[Lan]);
/* WWW */ /* WWW */
fprintf (Gbl.F.Out,"<td style=\"text-align:left;" fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
" vertical-align:middle;\">"
"<input type=\"text\" name=\"WWW_%s\" size=\"15\" maxlength=\"%u\" value=\"%s\" />" "<input type=\"text\" name=\"WWW_%s\" size=\"15\" maxlength=\"%u\" value=\"%s\" />"
"</td>" "</td>"
"</tr>", "</tr>",
@ -1745,23 +1720,23 @@ static void Cty_PutHeadCountries (void)
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<th class=\"BM\"></th>" "<th class=\"BM\"></th>"
"<th class=\"TIT_TBL\" style=\"text-align:right;\">" "<th class=\"TIT_TBL RIGHT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"TIT_TBL\" style=\"text-align:right;\">" "<th class=\"TIT_TBL RIGHT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"<th></th>" "<th></th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">" "<th class=\"TIT_TBL LEFT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">" "<th class=\"TIT_TBL LEFT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"TIT_TBL\" style=\"text-align:right;\">" "<th class=\"TIT_TBL RIGHT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"TIT_TBL\" style=\"text-align:right;\">" "<th class=\"TIT_TBL RIGHT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"</tr>", "</tr>",