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

This commit is contained in:
Antonio Cañas Vargas 2014-12-29 13:26:39 +01:00
parent dea61286ec
commit 6c035aaf87
12 changed files with 193 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_changelog.h
View File

@ -35,11 +35,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.47 (2014/12/29)"
#define Log_PLATFORM_VERSION "SWAD 14.47.1 (2014/12/29)"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h | tail -1
/*
Version 14.47.1 :Dic 29, 2014 Changes in listing of chat rooms, forums and user's courses.
Fixed bugs in CSS. (174619 lines)
Version 14.47 :Dic 29, 2014 Changes in listing of user's courses. (174659 lines)
Version 14.46.2 :Dic 28, 2014 Code refactoring in forums. (174400 lines)
Version 14.46.1 :Dic 28, 2014 Changes in listing of forums. (174342 lines)

30
swad_chat.c
View File

@ -116,19 +116,20 @@ void Cht_ShowListOfAvailableChatRooms (void)
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_Chat_rooms);
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:left;\">",
"<td class=\"%s\" style=\"height:20px;"
" text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
/***** Title of top level *****/
fprintf (Gbl.F.Out,"<img src=\"%s/chat16x16.gif\""
" class=\"ICON16x16\" style=\"vertical-align:top;\" />"
" class=\"ICON16x16\" style=\"vertical-align:middle;\" />"
" %s</td>"
"</tr>",
Gbl.Prefs.IconsURL,Txt_Chat_rooms);
/***** Link to chat available for all the users *****/
sprintf (Icon,"<img src=\"%s/chat16x16.gif\""
" class=\"ICON16x16\" style=\"vertical-align:top;\" />",
" class=\"ICON16x16\" style=\"vertical-align:middle;\" />",
Gbl.Prefs.IconsURL);
IsLastItemInLevel[1] = (Gbl.Usrs.Me.LoggedRole != Rol_ROLE_STUDENT &&
@ -165,7 +166,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
/* Link to the room of this degree */
IsLastItemInLevel[1] = (NumMyDeg == Gbl.Usrs.Me.MyDegrees.Num-1);
sprintf (Icon,"<img src=\"%s/%s/%s16x16.gif\""
" class=\"ICON16x16\" style=\"vertical-align:top;\" />",
" class=\"ICON16x16\" style=\"vertical-align:middle;\" />",
Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_DEGREES,Deg.Logo);
sprintf (ThisRoomCode,"DEG_%ld",Deg.DegCod);
sprintf (ThisRoomShortName,"%s",Deg.ShortName);
@ -190,7 +191,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
/* Link to the room of this course */
IsLastItemInLevel[2] = (NumRow == NumRows-1);
sprintf (Icon,"<img src=\"%s/dot16x16.gif\""
" class=\"ICON16x16\" style=\"vertical-align:top;\" />",
" class=\"ICON16x16\" style=\"vertical-align:middle;\" />",
Gbl.Prefs.IconsURL);
sprintf (ThisRoomCode,"CRS_%ld",Crs.CrsCod);
sprintf (ThisRoomShortName,"%s",Crs.ShortName);
@ -281,21 +282,21 @@ static void Cht_WriteLinkToChat (const char *Icon,const char *RoomCode,const cha
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_connected_PLURAL;
extern const char *Txt_connected_SINGULAR;
const char *Style;
int NumUsrsInRoom = Cht_GetNumUsrsInChatRoom (RoomCode);
sprintf (Gbl.Chat.WindowName,"%s_%s",RoomCode,Gbl.UniqueNameEncrypted);
Style = (NumUsrsInRoom > 0 ? The_ClassFormulB[Gbl.Prefs.Theme] :
The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<table>"
"<tr>");
Msg_IndentDependingOnLevel (Level,IsLastItemInLevel);
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:middle;\">");
"<td class=\"%s\" style=\"height:20px;"
" text-align:left; vertical-align:middle;\">",
Style);
Lay_IndentDependingOnLevel (Level,IsLastItemInLevel);
Act_FormStart (ActCht);
Cht_WriteParamsRoomCodeAndNames (RoomCode,RoomShortName,RoomFullName);
Act_LinkFormSubmit (RoomFullName,(NumUsrsInRoom > 0) ? The_ClassFormulB[Gbl.Prefs.Theme] :
The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (RoomFullName,Style);
fprintf (Gbl.F.Out,"%s&nbsp;%s",Icon,RoomFullName);
if (NumUsrsInRoom > 1)
fprintf (Gbl.F.Out," [%d %s]",
@ -306,9 +307,6 @@ static void Cht_WriteLinkToChat (const char *Icon,const char *RoomCode,const cha
fprintf (Gbl.F.Out,"</a>"
"</form>"
"</td>"
"</tr>"
"</table>"
"</td>"
"</tr>");
}

142
swad_course.c
View File

@ -557,10 +557,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
unsigned NumCtr,NumCtrs;
unsigned NumDeg,NumDegs;
unsigned NumCrs,NumCrss;
char PathRelRSSFile[PATH_MAX+1];
char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1];
char Icon[512];
char PathRelRSSFile[PATH_MAX+1];
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_My_courses);
@ -568,7 +566,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
/***** Write link to country *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:middle;\">",
" style=\"height:20px; text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
Act_FormGoToStart (ActMnu);
Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) TabSys);
@ -576,7 +575,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
The_ClassFormul[Gbl.Prefs.Theme]);
/* Country map */
fprintf (Gbl.F.Out,"<img src=\"%s/sys16x16.gif\" alt=\"%s\" title=\"%s\""
" style=\"width:16px; height:16px;\" />",
" style=\"width:16px; height:16px;"
" vertical-align:middle;\" />",
Gbl.Prefs.IconsURL,
Txt_TABS_FULL_TXT[TabSys],
Txt_TABS_FULL_TXT[TabSys]);
@ -600,27 +600,22 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
if (!Cty_GetDataOfCountryByCod (&Cty))
Lay_ShowErrorAndExit ("Country not found.");
/***** Start row *****/
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<table>"
"<tr>");
/***** Indent country *****/
IsLastItemInLevel[1] = (NumCty == NumCtys - 1);
Msg_IndentDependingOnLevel (1,IsLastItemInLevel);
/***** Write link to country *****/
fprintf (Gbl.F.Out,"<td class=\"%s\""
" style=\"text-align:left; vertical-align:middle;\">",
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"height:20px; text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
IsLastItemInLevel[1] = (NumCty == NumCtys - 1);
Lay_IndentDependingOnLevel (1,IsLastItemInLevel);
Act_FormStart (ActSeeCtyInf);
Cty_PutParamCtyCod (Cty.CtyCod);
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeCtyInf].ActCod,ActTxt),
The_ClassFormul[Gbl.Prefs.Theme]);
/* Country map */
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s/%s.png\" alt=\"%s\" title=\"%s\""
" style=\"width:16px; height:16px;\" />",
" style=\"width:16px; height:16px;"
" vertical-align:middle;\" />",
Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_COUNTRIES,
Cty.Alpha2,
Cty.Alpha2,
@ -630,9 +625,6 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
fprintf (Gbl.F.Out,"</a>"
"</form>"
"</td>"
"</tr>"
"</table>"
"</td>"
"</tr>");
/***** Get my institutions in this country *****/
@ -649,32 +641,23 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
if (!Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_MINIMAL_DATA))
Lay_ShowErrorAndExit ("Institution not found.");
/***** Start row *****/
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<table>"
"<tr>");
/***** Indent institution *****/
IsLastItemInLevel[2] = (NumIns == NumInss - 1);
Msg_IndentDependingOnLevel (2,IsLastItemInLevel);
/***** Write link to institution *****/
fprintf (Gbl.F.Out,"<td class=\"%s\""
" style=\"text-align:left; vertical-align:middle;\">",
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"height:20px; text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
IsLastItemInLevel[2] = (NumIns == NumInss - 1);
Lay_IndentDependingOnLevel (2,IsLastItemInLevel);
Act_FormStart (ActSeeInsInf);
Ins_PutParamInsCod (Ins.InsCod);
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeInsInf].ActCod,ActTxt),
The_ClassFormul[Gbl.Prefs.Theme]);
Ins_DrawInstitutionLogo (Ins.Logo,Ins.ShortName,16,"vertical-align:top;");
Ins_DrawInstitutionLogo (Ins.Logo,Ins.ShortName,16,"vertical-align:middle;");
fprintf (Gbl.F.Out,"&nbsp;%s",Ins.FullName);
fprintf (Gbl.F.Out,"</a>"
"</form>"
"</td>"
"</tr>"
"</table>"
"</td>"
"</tr>");
/***** Get my centres in this institution *****/
@ -691,32 +674,23 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
if (!Ctr_GetDataOfCentreByCod (&Ctr))
Lay_ShowErrorAndExit ("Centre not found.");
/***** Start row *****/
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<table>"
"<tr>");
/***** Indent centre *****/
IsLastItemInLevel[3] = (NumCtr == NumCtrs - 1);
Msg_IndentDependingOnLevel (3,IsLastItemInLevel);
/***** Write link to centre *****/
fprintf (Gbl.F.Out,"<td class=\"%s\""
" style=\"text-align:left; vertical-align:middle;\">",
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"height:20px; text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
IsLastItemInLevel[3] = (NumCtr == NumCtrs - 1);
Lay_IndentDependingOnLevel (3,IsLastItemInLevel);
Act_FormStart (ActSeeCtrInf);
Ctr_PutParamCtrCod (Ctr.CtrCod);
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeCtrInf].ActCod,ActTxt),
The_ClassFormul[Gbl.Prefs.Theme]);
Ctr_DrawCentreLogo (Ctr.Logo,Ctr.ShortName,16,"vertical-align:top;");
Ctr_DrawCentreLogo (Ctr.Logo,Ctr.ShortName,16,"vertical-align:middle;");
fprintf (Gbl.F.Out,"&nbsp;%s",Ctr.FullName);
fprintf (Gbl.F.Out,"</a>"
"</form>"
"</td>"
"</tr>"
"</table>"
"</td>"
"</tr>");
/***** Get my degrees in this centre *****/
@ -733,32 +707,23 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
if (!Deg_GetDataOfDegreeByCod (&Deg))
Lay_ShowErrorAndExit ("Degree not found.");
/***** Start row *****/
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<table>"
"<tr>");
/***** Indent degree *****/
IsLastItemInLevel[4] = (NumDeg == NumDegs - 1);
Msg_IndentDependingOnLevel (4,IsLastItemInLevel);
/***** Write link to degree *****/
fprintf (Gbl.F.Out,"<td class=\"%s\""
" style=\"text-align:left; vertical-align:middle;\">",
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"height:20px; text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
IsLastItemInLevel[4] = (NumDeg == NumDegs - 1);
Lay_IndentDependingOnLevel (4,IsLastItemInLevel);
Act_FormStart (ActSeeDegInf);
Deg_PutParamDegCod (Deg.DegCod);
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeDegInf].ActCod,ActTxt),
The_ClassFormul[Gbl.Prefs.Theme]);
Deg_DrawDegreeLogo (Deg.Logo,Deg.ShortName,16,"vertical-align:top;");
Deg_DrawDegreeLogo (Deg.Logo,Deg.ShortName,16,"vertical-align:middle;");
fprintf (Gbl.F.Out,"&nbsp;%s",Deg.FullName);
fprintf (Gbl.F.Out,"</a>"
"</form>"
"</td>"
"</tr>"
"</table>"
"</td>"
"</tr>");
/***** Get my courses in this degree *****/
@ -775,31 +740,27 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
if (!Crs_GetDataOfCourseByCod (&Crs))
Lay_ShowErrorAndExit ("Course not found.");
/***** Start row *****/
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<table>"
"<tr>");
/***** Indent course *****/
IsLastItemInLevel[5] = (NumCrs == NumCrss - 1);
Msg_IndentDependingOnLevel (5,IsLastItemInLevel);
/***** Write link to course *****/
fprintf (Gbl.F.Out,"<td class=\"%s\""
" style=\"text-align:left; vertical-align:middle;\">",
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"height:20px; text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
IsLastItemInLevel[5] = (NumCrs == NumCrss - 1);
Lay_IndentDependingOnLevel (5,IsLastItemInLevel);
Act_FormStart (ActSeeCrsInf);
Crs_PutParamCrsCod (Crs.CrsCod);
sprintf (Gbl.Title,Txt_Go_to_X,Crs.ShortName);
Act_LinkFormSubmit (Gbl.Title,
The_ClassFormul[Gbl.Prefs.Theme]);
sprintf (Icon,"<img src=\"%s/dot16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\" style=\"vertical-align:top;\" />",
Gbl.Prefs.IconsURL,
Crs.ShortName);
fprintf (Gbl.F.Out,"%s",Icon);
fprintf (Gbl.F.Out,"&nbsp;%s",Crs.FullName);
fprintf (Gbl.F.Out,"<img src=\"%s/dot16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\""
" style=\"vertical-align:middle;\" />"
"&nbsp;%s"
"</a>"
"</form>",
Gbl.Prefs.IconsURL,Crs.ShortName,
Crs.FullName);
/***** Write link to RSS file *****/
sprintf (PathRelRSSFile,"%s/%s/%ld/%s/%s",
@ -815,12 +776,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
"</a>",
Gbl.Prefs.IconsURL);
fprintf (Gbl.F.Out,"</a>"
"</form>"
"</td>"
"</tr>"
"</table>"
"</td>"
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}

50
swad_forum.c
View File

@ -886,15 +886,13 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
/* Write thread title */
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<table>"
"<tr>");
"<td class=\"TIT\" style=\"height:20px;"
" text-align:left; vertical-align:middle;\">");
IsLastItemInLevel[2] = true;
Msg_IndentDependingOnLevel (2,IsLastItemInLevel);
Lay_IndentDependingOnLevel (2,IsLastItemInLevel);
fprintf (Gbl.F.Out,"<td class=\"TIT\" style=\"text-align:left;\">"
"<img src=\"%s/%s16x16.gif\" alt=\"\""
" class=\"ICON16x16\" style=\"vertical-align:top;\" /> ",
fprintf (Gbl.F.Out,"<img src=\"%s/%s16x16.gif\" alt=\"\""
" class=\"ICON16x16\" style=\"vertical-align:middle;\" /> ",
Gbl.Prefs.IconsURL,
Thr.NumUnreadPosts ? "msg-unread" :
"msg-open");
@ -914,9 +912,6 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
Msg_WriteNumMsgs (NumPsts,0);
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>"
"</td>"
"</tr>");
Lay_EndRoundFrameTable10 ();
@ -1756,14 +1751,15 @@ void For_WriteLinkToTopLevelOfForums (void)
extern const char *Txt_Forums;
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:left;\">",
"<td class=\"%s\" style=\"height:20px;"
" text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
Act_FormStart (ActSeeFor);
For_PutAllHiddenParamsForum ();
Act_LinkFormSubmit (Txt_Forums,The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/forum16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" style=\"vertical-align:top;\" />"
" class=\"ICON16x16\" style=\"vertical-align:middle;\" />"
"&nbsp;%s"
"</a>"
"</form>"
@ -1968,14 +1964,14 @@ static void For_WriteLinkToAForum (For_ForumType_t ForumType,bool ShowNumOfPosts
case For_FORUM_GLOBAL_USRS:
case For_FORUM_GLOBAL_TCHS:
sprintf (Icon,"<img src=\"%s/forum16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\" style=\"vertical-align:top;\" />",
" class=\"ICON16x16\" style=\"vertical-align:middle;\" />",
Gbl.Prefs.IconsURL,
ForumName);
break;
case For_FORUM_SWAD_USRS:
case For_FORUM_SWAD_TCHS:
sprintf (Icon,"<img src=\"%s/swad16x16.gif\""
" class=\"ICON16x16\" style=\"vertical-align:top;\" alt=\"%s\" />",
" class=\"ICON16x16\" style=\"vertical-align:middle;\" alt=\"%s\" />",
Gbl.Prefs.IconsURL,
ForumName);
break;
@ -1989,7 +1985,7 @@ static void For_WriteLinkToAForum (For_ForumType_t ForumType,bool ShowNumOfPosts
case For_FORUM_COURSE_USRS:
case For_FORUM_COURSE_TCHS:
sprintf (Icon,"<img src=\"%s/dot16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\" style=\"vertical-align:top;\" />",
" class=\"ICON16x16\" style=\"vertical-align:middle;\" />",
Gbl.Prefs.IconsURL,
ForumName);
break;
@ -2095,18 +2091,16 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
/***** Start row *****/
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<table>"
"<tr>");
"<td class=\"%s\" style=\"height:20px;"
" text-align:left; vertical-align:middle;\">",
Style);
/***** Indent forum title *****/
Msg_IndentDependingOnLevel (Level,IsLastItemInLevel);
Lay_IndentDependingOnLevel (Level,IsLastItemInLevel);
/***** Write paste button used to move a thread in clipboard to this forum *****/
if (Gbl.Forum.ThreadToMove >= 0) // If I have permission to paste threads and there is a thread ready to be pasted...
{
fprintf (Gbl.F.Out,"<td style=\"width:16px; text-align:center;\">");
/* Check if thread to move is yet in current forum */
if (For_CheckIfThrBelongsToForum (Gbl.Forum.ThreadToMove,ForumType))
fprintf (Gbl.F.Out,"<img src=\"%s/paste_off16x16.gif\""
@ -2125,14 +2119,9 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
Txt_Paste_thread,
Txt_Paste_thread);
}
fprintf (Gbl.F.Out,"</td>");
}
/***** Write link to forum *****/
fprintf (Gbl.F.Out,"<td class=\"%s\""
" style=\"text-align:left; vertical-align:middle;\">",
Style);
Act_FormStart (NextAct);
For_PutAllHiddenParamsForum ();
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[NextAct].ActCod,ActTxt),Style);
@ -2140,15 +2129,15 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
{
case For_FORUM_INSTITUTION_USRS:
case For_FORUM_INSTITUTION_TCHS:
Ins_DrawInstitutionLogo (Gbl.Forum.Ins.Logo,ForumName,16,"vertical-align:top;");
Ins_DrawInstitutionLogo (Gbl.Forum.Ins.Logo,ForumName,16,"vertical-align:middle;");
break;
case For_FORUM_CENTRE_USRS:
case For_FORUM_CENTRE_TCHS:
Ctr_DrawCentreLogo (Gbl.Forum.Ctr.Logo,ForumName,16,"vertical-align:top;");
Ctr_DrawCentreLogo (Gbl.Forum.Ctr.Logo,ForumName,16,"vertical-align:middle;");
break;
case For_FORUM_DEGREE_USRS:
case For_FORUM_DEGREE_TCHS:
Deg_DrawDegreeLogo (Gbl.Forum.Deg.Logo,ForumName,16,"vertical-align:top;");
Deg_DrawDegreeLogo (Gbl.Forum.Deg.Logo,ForumName,16,"vertical-align:middle;");
break;
default:
fprintf (Gbl.F.Out,"%s",Icon);
@ -2169,9 +2158,6 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
fprintf (Gbl.F.Out,"</a>"
"</form>"
"</td>"
"</tr>"
"</table>"
"</td>"
"</tr>");
}

39
swad_layout.c
View File

@ -582,18 +582,20 @@ static void Lay_WritePageTopHeading (void)
Gbl.Prefs.PathTheme);
/***** 1st. row, 1st. column: logo *****/
fprintf (Gbl.F.Out,"<td style=\"width:%upx;\">",
fprintf (Gbl.F.Out,"<td style=\"width:%upx; text-align:center;\">",
LogoLayout[Gbl.Prefs.Layout].Width + 16);
/* Left logo */
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">"
"<img src=\"%s/%s\" width=\"%u\" height=\"%u\" alt=\"%s\" style=\"display:block; margin-left:auto; margin-right:auto;\" />"
"<img src=\"%s/%s\" alt=\"%s\""
" style=\"width:%upx; height:%upx;"
" margin:0 auto; vertical-align:middle;\" />"
"</a>",
Cfg_HTTP_SwAD_HOME_PAGE,Gbl.Prefs.PathTheme,
LogoLayout[Gbl.Prefs.Layout].Icon,
Cfg_PLATFORM_FULL_NAME,
LogoLayout[Gbl.Prefs.Layout].Width,
LogoLayout[Gbl.Prefs.Layout].Height,
Cfg_PLATFORM_FULL_NAME);
LogoLayout[Gbl.Prefs.Layout].Height);
fprintf (Gbl.F.Out,"</td>");
fprintf (Gbl.F.Out,"<td style=\"text-align:center; vertical-align:middle;\">"
"<table style=\"width:100%%;\">"
@ -2035,3 +2037,32 @@ void Lay_AdvertisementMobile (void)
Lay_EndRoundFrameTable10 ();
}
}
/*****************************************************************************/
/*********************** Indent forum or chat title **************************/
/*****************************************************************************/
// IsLastItemInLevel[] is a vector with at least 1+Level booleans
void Lay_IndentDependingOnLevel (unsigned Level,bool IsLastItemInLevel[])
{
unsigned i;
/***** Indent (from 1 to Level-1) *****/
for (i = 1;
i < Level;
i++)
fprintf (Gbl.F.Out,"<img src=\"%s/%s20x20.gif\" alt=\"\""
" style=\"width:20px; height:20px;"
" vertical-align:middle;\" />",
Gbl.Prefs.IconsURL,
IsLastItemInLevel[i] ? "tr" :
"subleft");
/***** Level *****/
fprintf (Gbl.F.Out,"<img src=\"%s/%s20x20.gif\" alt=\"\""
" style=\"width:20px; height:20px;"
" vertical-align:middle;\" />",
Gbl.Prefs.IconsURL,
IsLastItemInLevel[Level] ? "subend" :
"submid");
}

2
swad_layout.h
View File

@ -114,4 +114,6 @@ void Lay_PutLinkToPrintView2 (void);
void Lay_AdvertisementMobile (void);
void Lay_IndentDependingOnLevel (unsigned Level,bool IsLastItemInLevel[]);
#endif

36
swad_message.c
View File

@ -2767,7 +2767,7 @@ void Msg_WriteMsgAuthor (struct UsrData *UsrDat,unsigned WidthOfNameColumn,unsig
fprintf (Gbl.F.Out,"</td>");
/***** Second column with user name (if author has a web page, put a link to it) *****/
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"width:%u;"
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"width:%upx;"
" text-align:left; vertical-align:top;",
Style,WidthOfNameColumn);
if (BgColor)
@ -2781,7 +2781,7 @@ void Msg_WriteMsgAuthor (struct UsrData *UsrDat,unsigned WidthOfNameColumn,unsig
{
fprintf (Gbl.F.Out,"<img src=\"%s/usr_bl.jpg\" class=\"F18x24\" />"
"</td>"
"<td class=\"%s\" style=\"width:%u; text-align:left;",
"<td class=\"%s\" style=\"width:%upx; text-align:left;",
Style,Gbl.Prefs.IconsURL,WidthOfNameColumn);
if (BgColor)
fprintf (Gbl.F.Out," background-color:%s;",BgColor);
@ -3164,7 +3164,8 @@ static void Msg_PutFormToDeleteMessage (long MsgCod,Msg_TypeOfMessages_t TypeOfM
Msg_PutHiddenParamMsgCod (MsgCod);
Msg_PutHiddenParamsMsgsFilters ();
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/delon16x16.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICON16x16\" style=\"display:block;\" />"
" alt=\"%s\" title=\"%s\" class=\"ICON16x16\""
" style=\"display:block;\" />"
"</form>"
"</td>",
Gbl.Prefs.IconsURL,
@ -3189,35 +3190,6 @@ void Msg_WriteMsgContent (char *Content,unsigned long MaxLength,bool InsertLinks
fprintf (Gbl.F.Out,"%s",Content);
}
/*****************************************************************************/
/*********************** Indent forum or chat title **************************/
/*****************************************************************************/
void Msg_IndentDependingOnLevel (int Level,bool IsLastItemInLevel[])
{
int i;
for (i = 1;
i < Level;
i++)
fprintf (Gbl.F.Out,"<td style=\"width:20px; vertical-align:top;\">"
"<img src=\"%s/%s20x20.gif\""
" width=\"20\" height=\"20\" alt=\"\""
" style=\"vertical-align:top;\" />"
"</td>",
Gbl.Prefs.IconsURL,
IsLastItemInLevel[i] ? "tr" :
"subleft");
fprintf (Gbl.F.Out,"<td style=\"width:20px; vertical-align:top;\">"
"<img src=\"%s/%s20x20.gif\""
" width=\"20\" height=\"20\" alt=\"\""
" style=\"vertical-align:top;\" />"
"</td>",
Gbl.Prefs.IconsURL,
IsLastItemInLevel[Level] ? "subend" :
"submid");
}
/*****************************************************************************/
/*************** Get parameter with the code of a message ********************/
/*****************************************************************************/

2
swad_message.h
View File

@ -106,8 +106,6 @@ void Msg_WriteListUsrsDstMsg (long MsgCod);
void Msg_WriteMsgDate (const char *DateTime,const char *ClassBackground);
void Msg_WriteMsgContent (char *Content,unsigned long MaxLength,bool InsertLinks,bool ChangeBRToRet);
void Msg_IndentDependingOnLevel (int Level,bool IsLastItemInLevel[]);
void Msg_PutHiddenParamMsgCod (long MsgCod);
// void Msg_WriteLinkToNetiquette (void);

2
swad_network.c
View File

@ -230,7 +230,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
" style=\"width:16px;height:16px;margin-right:10px;vertical-align:middle;\""
" alt=\"\" title=\"%s\" />"
"%s:</td>"
"<td style=\"width:%u; text-align:left;\">",
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,
Gbl.Prefs.IconsURL,Net_WebsAndSocialNetworksDB[NumURL],
Net_TitleWebsAndSocialNetworks[NumURL],

3
swad_preference.c
View File

@ -399,7 +399,8 @@ void Prf_PutIconsToSelectSideCols (void)
Act_FormStart (ActChgCol);
Par_PutHiddenParamUnsigned ("SideCols",SideCols);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/layout%u%u_32x20.gif\""
" alt=\"%s\" title=\"%s\" style=\"display:block; width:32px; height:20px;\" />"
" alt=\"%s\" title=\"%s\""
" style=\"display:block; width:32px; height:20px;\" />"
"</form>"
"</td>",
Gbl.Prefs.IconsURL,

126
swad_record.c
View File

@ -1527,7 +1527,7 @@ void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat)
" vertical-align:top;\">"
"<table style=\"width:100%%;\">"
"<tr>"
"<td style=\"width:%u; text-align:left;\">",
"<td style=\"width:%upx; text-align:left;\">",
Rec_DEGREE_LOGO_SIZE);
Deg_DrawDegreeLogo (Gbl.CurrentDeg.Deg.Logo,
Gbl.CurrentDeg.Deg.ShortName,
@ -1559,7 +1559,7 @@ void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat)
/* Name of the field */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%u;"
"<td class=\"%s\" style=\"width:%upx;"
" text-align:left; vertical-align:top;"
" background-color:%s;\">"
"%s:",
@ -1582,7 +1582,7 @@ void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat)
ThisFieldHasText = false;
/***** Write form, text, or nothing depending on the user's role and the visibility of the field... */
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"width:%u;"
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"width:%upx;"
" text-align:left; vertical-align:top;"
" background-color:%s;\">",
ClassData,Col2Width,Gbl.ColorRows[Gbl.RowEvenOdd]);
@ -2141,11 +2141,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/***** Institution *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"width:%u;"
"<td colspan=\"2\" style=\"width:%upx;"
" text-align:left; vertical-align:middle;\">"
"<table class=\"CELLS_PAD_2\">"
"<tr>"
"<td style=\"width:%u;"
"<td style=\"width:%upx;"
" text-align:center; vertical-align:middle;\">",
Cols1and2Width,
Rec_INSTITUTION_LOGO_SIZE + 8);
@ -2162,12 +2162,12 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
}
else
fprintf (Gbl.F.Out,"</td>"
"<td style=\"width:%u;\">",
"<td style=\"width:%upx;\">",
Col2Width);
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"<tr>"
"<td style=\"width:%u;"
"<td style=\"width:%upx;"
" text-align:center; vertical-align:top;\">",
Rec_INSTITUTION_LOGO_SIZE + 8);
@ -2225,7 +2225,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/***** Photo *****/
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
fprintf (Gbl.F.Out,"<td rowspan=\"3\" class=\"%s\" style=\"width:%u;"
fprintf (Gbl.F.Out,"<td rowspan=\"3\" class=\"%s\" style=\"width:%upx;"
" text-align:center; vertical-align:top;\">",
TypeOfView == Rec_FORM_MY_COMMON_RECORD ? ClassForm :
ClassData,
@ -2256,11 +2256,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/***** User's nickname *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%u; text-align:left;\">"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td class=\"HEAD_REC_BIG\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,
Txt_Nickname,
Col2Width);
@ -2295,10 +2295,10 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/***** User's e-mail *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%u; text-align:left;\">"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td class=\"%s\" style=\"width:%u; text-align:left;\">",
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_Email,
ClassData,Col2Width);
if (UsrDat->Email[0])
@ -2319,17 +2319,17 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/***** User's ID *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%u; text-align:left;\">"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td class=\"%s\" style=\"width:%u; text-align:left;\">",
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_ID,
ClassData,Col2Width);
ID_WriteUsrIDs (UsrDat,ShowID);
fprintf (Gbl.F.Out,"</td>");
/***** User's web and social networks *****/
fprintf (Gbl.F.Out,"<td rowspan=\"2\" style=\"width:%u;"
fprintf (Gbl.F.Out,"<td rowspan=\"2\" style=\"width:%upx;"
" text-align:center; vertical-align:middle;\">",
Col3Width);
Net_ShowWebsAndSocialNets (UsrDat->UsrCod);
@ -2341,7 +2341,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"%s*",Txt_Sex);
@ -2349,7 +2349,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
fprintf (Gbl.F.Out,"%s",Txt_Role);
fprintf (Gbl.F.Out,":</td>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassData,Col2Width);
switch (TypeOfView)
{
@ -2464,10 +2464,10 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
}
else // RoleForm == false
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%u; text-align:left;\">"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td class=\"%s\" style=\"width:%u; text-align:left;\">"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s"
"</td>"
"</tr>",
@ -2481,14 +2481,14 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/***** Name *****/
/* Surname 1 */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%u; text-align:left;\">"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s",
ClassForm,Col1Width,Txt_Surname_1);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassData,Cols2and3Width);
if (DataForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Surname1\""
@ -2501,11 +2501,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* Surname 2 */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%u; text-align:left;\">"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,
Txt_Surname_2,
ClassData,Cols2and3Width);
@ -2521,14 +2521,14 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* First name */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%u; text-align:left;\">"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s",
ClassForm,Col1Width,Txt_First_name);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":</td>"
"<td class=\"%s\" colspan=\"2\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassData,Cols2and3Width);
if (DataForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FirstName\""
@ -2552,14 +2552,14 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* Country */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s",
ClassForm,Col1Width,Txt_Country);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassData,Cols2and3Width);
if (ShowData)
{
@ -2603,11 +2603,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* Origin place */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_Place_of_origin,
ClassData,Cols2and3Width);
if (ShowData)
@ -2625,11 +2625,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* Date of birth */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_Date_of_birth,
ClassData,Cols2and3Width);
if (ShowData)
@ -2649,11 +2649,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* Local address */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_Local_address,
ClassData,Cols2and3Width);
if (ShowData)
@ -2671,11 +2671,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* Local phone */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_Phone,
ClassData,Cols2and3Width);
if (ShowData)
@ -2693,11 +2693,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* Family address */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_Family_address,
ClassData,Cols2and3Width);
if (ShowData)
@ -2715,11 +2715,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* Family phone */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_Phone,
ClassData,Cols2and3Width);
if (ShowData)
@ -2736,11 +2736,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* Common comments for all the courses */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%u;"
"<td class=\"%s\" style=\"width:%upx;"
" text-align:left; vertical-align:top;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\" style=\"width:%u;"
"<td colspan=\"2\" class=\"%s\" style=\"width:%upx;"
" text-align:left; vertical-align:top;\">",
ClassForm,Col1Width,Txt_USER_comments,
ClassData,Cols2and3Width);
@ -2775,11 +2775,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* Institution */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_Institution,
ClassData,Cols2and3Width);
if (ShowData)
@ -2800,11 +2800,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* Centre */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_Centre,
ClassData,Cols2and3Width);
if (ShowData)
@ -2827,11 +2827,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* Department */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_Department,
ClassData,Cols2and3Width);
if (ShowData)
@ -2854,11 +2854,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* Office */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_Office,
ClassData,Cols2and3Width);
if (ShowData)
@ -2869,11 +2869,11 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/* Phone */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%u; text-align:left;\">",
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_Phone,
ClassData,Cols2and3Width);
if (ShowData)
@ -3104,9 +3104,9 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Country *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%u; text-align:left;\">"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s:</td>"
"<td style=\"width:%u; text-align:left;\">",
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,COL1_WIDTH,Txt_Country_of_institution,
COL2_WIDTH);
@ -3144,10 +3144,10 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Institution *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%u; text-align:left;\">"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td style=\"width:%u; text-align:left;\">",
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,COL1_WIDTH,Txt_Institution,
COL2_WIDTH);
@ -3191,10 +3191,10 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Centre *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td style=\"width:%u; text-align:left;\">",
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,COL1_WIDTH,Txt_Centre,
COL2_WIDTH);
@ -3236,10 +3236,10 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Department *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td style=\"width:%u; text-align:left;\">",
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,COL1_WIDTH,Txt_Department,
COL2_WIDTH);
@ -3281,10 +3281,10 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Office *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%u; text-align:left;\">"
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td style=\"width:%u; text-align:left;\">",
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,COL1_WIDTH,Txt_Office,
COL2_WIDTH);
Act_FormGoToStart (ActChgMyOff);
@ -3300,10 +3300,10 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Phone *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%u; text-align:left;\">"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td style=\"width:%u; text-align:left;\">",
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,COL1_WIDTH,Txt_Phone,
COL2_WIDTH);
Act_FormGoToStart (ActChgMyOffPho);

3
swad_theme.c
View File

@ -244,7 +244,8 @@ void The_PutIconsToSelectTheme (void)
Act_FormStart (ActChgThe);
Par_PutHiddenParamString ("Theme",The_ThemeId[Theme]);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s/%s/theme_32x20.gif\""
" alt=\"%s\" title=\"%s\" style=\"display:block; width:32px; height:20px;\" />"
" alt=\"%s\" title=\"%s\" style=\"display:block;"
" width:32px; height:20px;\" />"
"</form>"
"</td>",
Gbl.Prefs.IconsURL,