Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version19.46.3

This commit is contained in:
Antonio Cañas Vargas 2019-10-29 09:01:05 +01:00
parent 1aa2f512b0
commit 15ba1b0616
11 changed files with 58 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swad_alert.c
View File

@ -421,11 +421,7 @@ static void Ale_ShowFixAlertAndButton1 (Ale_AlertType_t AlertType,const char *Tx
HTM_DIV_Begin ("class=\"ALERT_CLOSE\""); HTM_DIV_Begin ("class=\"ALERT_CLOSE\"");
HTM_A_Begin ("href=\"\" onclick=\"toggleDisplay('%s');return false;\" /", HTM_A_Begin ("href=\"\" onclick=\"toggleDisplay('%s');return false;\" /",
IdAlert); IdAlert);
fprintf (Gbl.F.Out,"<img src=\"%s/close.svg\"" Ico_PutIcon ("close.svg",Txt_Close,"ICO16x16");
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Close,Txt_Close);
HTM_A_End (); HTM_A_End ();
HTM_DIV_End (); HTM_DIV_End ();
} }

4
swad_changelog.h
View File

@ -487,13 +487,15 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 19.46.2 (2019-10-28)" #define Log_PLATFORM_VERSION "SWAD 19.46.3 (2019-10-28)"
#define CSS_FILE "swad19.45.css" #define CSS_FILE "swad19.45.css"
#define JS_FILE "swad19.39.js" #define JS_FILE "swad19.39.js"
/* /*
// TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
// TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: Impedir la creación y edición de proyectos si no son editables.
// TODO: Terminar de sustituir <img.../> por Ico_PutIcon ()
Version 19.46.3: Oct 28, 2019 Code refactoring in HTML images. (246390 lines)
Version 19.46.2: Oct 28, 2019 Code refactoring in HTML images. (246519 lines) Version 19.46.2: Oct 28, 2019 Code refactoring in HTML images. (246519 lines)
Version 19.46.1: Oct 28, 2019 Code refactoring in HTML anchors. (246523 lines) Version 19.46.1: Oct 28, 2019 Code refactoring in HTML anchors. (246523 lines)
Version 19.46: Oct 28, 2019 Code refactoring in HTML anchors. (246541 lines) Version 19.46: Oct 28, 2019 Code refactoring in HTML anchors. (246541 lines)

32
swad_chat.c
View File

@ -130,12 +130,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
/***** Title of top level *****/ /***** Title of top level *****/
HTM_LI_Begin ("class=\"DAT\""); HTM_LI_Begin ("class=\"DAT\"");
fprintf (Gbl.F.Out,"<img src=\"%s/comments.svg\"" Ico_PutIcon ("comments.svg",Txt_Chat_rooms,"ICO16x16");
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Chat_rooms,
Txt_Chat_rooms);
fprintf (Gbl.F.Out," %s",Txt_Chat_rooms); fprintf (Gbl.F.Out," %s",Txt_Chat_rooms);
HTM_LI_End (); HTM_LI_End ();
@ -146,12 +141,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
"%s (%s)", "%s (%s)",
Txt_General,Txt_SEX_PLURAL_abc[Usr_SEX_ALL]); Txt_General,Txt_SEX_PLURAL_abc[Usr_SEX_ALL]);
Cht_WriteLinkToChat1 ("GBL_USR",Txt_SEX_PLURAL_Abc[Usr_SEX_ALL],ThisRoomFullName,1,IsLastItemInLevel); Cht_WriteLinkToChat1 ("GBL_USR",Txt_SEX_PLURAL_Abc[Usr_SEX_ALL],ThisRoomFullName,1,IsLastItemInLevel);
fprintf (Gbl.F.Out,"<img src=\"%s/comments.svg\"" Ico_PutIcon ("comments.svg",ThisRoomFullName,"ICO16x16");
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
ThisRoomFullName,
ThisRoomFullName);
Cht_WriteLinkToChat2 ("GBL_USR",ThisRoomFullName); Cht_WriteLinkToChat2 ("GBL_USR",ThisRoomFullName);
IsLastItemInLevel[1] = !Gbl.Usrs.Me.MyDegs.Num; IsLastItemInLevel[1] = !Gbl.Usrs.Me.MyDegs.Num;
@ -162,11 +152,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
"%s (%s)", "%s (%s)",
Txt_General,Txt_ROLES_PLURAL_abc[Rol_STD][Usr_SEX_ALL]); Txt_General,Txt_ROLES_PLURAL_abc[Rol_STD][Usr_SEX_ALL]);
Cht_WriteLinkToChat1 ("GBL_STD",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],ThisRoomFullName,1,IsLastItemInLevel); Cht_WriteLinkToChat1 ("GBL_STD",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],ThisRoomFullName,1,IsLastItemInLevel);
fprintf (Gbl.F.Out,"<img src=\"%s/comments.svg\"" Ico_PutIcon ("comments.svg",ThisRoomFullName,"ICO16x16");
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
ThisRoomFullName,ThisRoomFullName);
Cht_WriteLinkToChat2 ("GBL_STD",ThisRoomFullName); Cht_WriteLinkToChat2 ("GBL_STD",ThisRoomFullName);
break; break;
case Rol_NET: case Rol_NET:
@ -175,11 +161,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
"%s (%s)", "%s (%s)",
Txt_General,Txt_ROLES_PLURAL_abc[Rol_TCH][Usr_SEX_ALL]); Txt_General,Txt_ROLES_PLURAL_abc[Rol_TCH][Usr_SEX_ALL]);
Cht_WriteLinkToChat1 ("GBL_TCH",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],ThisRoomFullName,1,IsLastItemInLevel); Cht_WriteLinkToChat1 ("GBL_TCH",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],ThisRoomFullName,1,IsLastItemInLevel);
fprintf (Gbl.F.Out,"<img src=\"%s/comments.svg\"" Ico_PutIcon ("comments.svg",ThisRoomFullName,"ICO16x16");
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
ThisRoomFullName,ThisRoomFullName);
Cht_WriteLinkToChat2 ("GBL_TCH",ThisRoomFullName); Cht_WriteLinkToChat2 ("GBL_TCH",ThisRoomFullName);
break; break;
default: default:
@ -238,11 +220,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
"%s %s", "%s %s",
Txt_Course,Crs.ShrtName); Txt_Course,Crs.ShrtName);
Cht_WriteLinkToChat1 (ThisRoomCode,ThisRoomShrtName,ThisRoomFullName,2,IsLastItemInLevel); Cht_WriteLinkToChat1 (ThisRoomCode,ThisRoomShrtName,ThisRoomFullName,2,IsLastItemInLevel);
fprintf (Gbl.F.Out,"<img src=\"%s/list-ol.svg\"" Ico_PutIcon ("list-ol.svg",ThisRoomFullName,"ICO16x16");
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
ThisRoomFullName,ThisRoomFullName);
Cht_WriteLinkToChat2 (ThisRoomCode,ThisRoomFullName); Cht_WriteLinkToChat2 (ThisRoomCode,ThisRoomFullName);
} }
} }

5
swad_connected.c
View File

@ -413,10 +413,7 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentCrsOnRightColumn (Ro
// is dynamically updated via AJAX // is dynamically updated via AJAX
Sco_PutParamScope ("ScopeCon",Hie_CRS); Sco_PutParamScope ("ScopeCon",Hie_CRS);
Frm_LinkFormSubmitUnique (Txt_Connected_users,"CONNECTED_TXT"); Frm_LinkFormSubmitUnique (Txt_Connected_users,"CONNECTED_TXT");
fprintf (Gbl.F.Out,"<img src=\"%s/ellipsis-h.svg\"" Ico_PutIcon ("ellipsis-h.svg",Txt_Connected_users,"ICO16x16");
" alt=\"%s\" title=\"%s\" class=\"ICO40x40\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Connected_users,Txt_Connected_users);
Frm_LinkFormEnd (); Frm_LinkFormEnd ();
Frm_EndForm (); Frm_EndForm ();
HTM_TD_End (); HTM_TD_End ();

25
swad_course.c
View File

@ -483,13 +483,10 @@ static void Crs_Configuration (bool PrintView)
Indicators.NumIndicators, Indicators.NumIndicators,
Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS); Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS);
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL);
fprintf (Gbl.F.Out,"%s " fprintf (Gbl.F.Out,"%s ",Gbl.Title);
"<img src=\"%s/%s\" alt=\"%s\" class=\"ICO16x16\" />", Ico_PutIcon ((Indicators.NumIndicators == Ind_NUM_INDICATORS) ? "check-circle.svg" :
Gbl.Title, "exclamation-triangle.svg",
Cfg_URL_ICON_PUBLIC, Gbl.Title,"ICO16x16");
(Indicators.NumIndicators == Ind_NUM_INDICATORS) ? "check-circle.svg" :
"exclamation-triangle.svg",
Gbl.Title);
Frm_EndForm (); Frm_EndForm ();
HTM_TD_End (); HTM_TD_End ();
@ -595,12 +592,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Highlight ? ClassHighlight : Highlight ? ClassHighlight :
ClassNormal, ClassNormal,
NULL); NULL);
fprintf (Gbl.F.Out,"<img src=\"%s/sitemap.svg\"" Ico_PutIcon ("sitemap.svg",Txt_System,"ICO16x16");
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />);",
Cfg_URL_ICON_PUBLIC,
Txt_System,
Txt_System);
fprintf (Gbl.F.Out,"&nbsp;%s",Txt_System); fprintf (Gbl.F.Out,"&nbsp;%s",Txt_System);
Frm_LinkFormEnd (); Frm_LinkFormEnd ();
Frm_EndForm (); Frm_EndForm ();
@ -775,12 +767,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Frm_LinkFormSubmit (Gbl.Title, Frm_LinkFormSubmit (Gbl.Title,
Highlight ? ClassHighlight : Highlight ? ClassHighlight :
ClassNormal,NULL); ClassNormal,NULL);
fprintf (Gbl.F.Out,"<img src=\"%s/list-ol.svg\"" Ico_PutIcon ("list-ol.svg",Crs.FullName,"ICO16x16");
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
Crs.ShrtName,
Crs.FullName);
fprintf (Gbl.F.Out,"&nbsp;%s",Crs.FullName); fprintf (Gbl.F.Out,"&nbsp;%s",Crs.FullName);
Frm_LinkFormEnd (); Frm_LinkFormEnd ();
Frm_EndForm (); Frm_EndForm ();

16
swad_degree.c
View File

@ -2500,12 +2500,9 @@ void Hie_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan)
/***** Indent *****/ /***** Indent *****/
HTM_TD_Begin ("class=\"RT COLOR%u\"",Gbl.RowEvenOdd); HTM_TD_Begin ("class=\"RT COLOR%u\"",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<img src=\"%s/%s20x20.gif\"" Ico_PutIcon (NumRow == NumRows ? "subend20x20.gif" :
" alt=\"\" title=\"\"" "submid20x20.gif",
" class=\"ICO25x25\" />", "","ICO25x25");
Cfg_URL_ICON_PUBLIC,
NumRow == NumRows ? "subend" :
"submid");
HTM_TD_End (); HTM_TD_End ();
/***** Write institution, centre, degree *****/ /***** Write institution, centre, degree *****/
@ -2519,12 +2516,7 @@ void Hie_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan)
switch (Sco_GetScopeFromUnsignedStr (row[0])) switch (Sco_GetScopeFromUnsignedStr (row[0]))
{ {
case Hie_SYS: // System case Hie_SYS: // System
fprintf (Gbl.F.Out,"<img src=\"%s/swad64x64.png\"" Ico_PutIcon ("swad64x64.png",Txt_all_degrees,"ICO16x16");
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_all_degrees,
Txt_all_degrees);
fprintf (Gbl.F.Out,"&nbsp;%s",Txt_all_degrees); fprintf (Gbl.F.Out,"&nbsp;%s",Txt_all_degrees);
break; break;
case Hie_INS: // Institution case Hie_INS: // Institution

49
swad_figure.c
View File

@ -596,52 +596,27 @@ static void Fig_WriteHeadHierarchy (void)
HTM_TH_Empty (1); HTM_TH_Empty (1);
HTM_TH_Begin (1,1,"RM"); HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"<img src=\"%s/globe.svg\"" Ico_PutIcon ("globe.svg",Txt_Countries,"CONTEXT_ICO_x16");
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Countries,
Txt_Countries);
fprintf (Gbl.F.Out,"<br />%s",Txt_Countries); fprintf (Gbl.F.Out,"<br />%s",Txt_Countries);
HTM_TH_End (); HTM_TH_End ();
HTM_TH_Begin (1,1,"RM"); HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"<img src=\"%s/university.svg\"" Ico_PutIcon ("university.svg",Txt_Institutions,"CONTEXT_ICO_x16");
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Institutions,
Txt_Institutions);
fprintf (Gbl.F.Out,"<br />%s",Txt_Institutions); fprintf (Gbl.F.Out,"<br />%s",Txt_Institutions);
HTM_TH_End (); HTM_TH_End ();
HTM_TH_Begin (1,1,"RM"); HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"<img src=\"%s/building.svg\"" Ico_PutIcon ("building.svg",Txt_Centres,"CONTEXT_ICO_x16");
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Centres,
Txt_Centres);
fprintf (Gbl.F.Out,"<br />%s",Txt_Centres); fprintf (Gbl.F.Out,"<br />%s",Txt_Centres);
HTM_TH_End (); HTM_TH_End ();
HTM_TH_Begin (1,1,"RM"); HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"<img src=\"%s/graduation-cap.svg\"" Ico_PutIcon ("graduation-cap.svg",Txt_Degrees,"CONTEXT_ICO_x16");
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Degrees,
Txt_Degrees);
fprintf (Gbl.F.Out,"<br />%s",Txt_Degrees); fprintf (Gbl.F.Out,"<br />%s",Txt_Degrees);
HTM_TH_End (); HTM_TH_End ();
HTM_TH_Begin (1,1,"RM"); HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"<img src=\"%s/list-ol.svg\"" Ico_PutIcon ("list-ol.svg",Txt_Courses,"CONTEXT_ICO_x16");
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Courses,
Txt_Courses);
fprintf (Gbl.F.Out,"<br />%s",Txt_Courses); fprintf (Gbl.F.Out,"<br />%s",Txt_Courses);
HTM_TH_End (); HTM_TH_End ();
@ -3874,12 +3849,7 @@ static void Fig_GetAndShowForumStats (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH_Begin (1,1,"BT"); HTM_TH_Begin (1,1,"BT");
fprintf (Gbl.F.Out,"<img src=\"%s/comments.svg\"" Ico_PutIcon ("comments.svg",Txt_Scope,"ICO16x16");
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Scope,
Txt_Scope);
HTM_TH_End (); HTM_TH_End ();
HTM_TH (1,1,"LT",Txt_Forums); HTM_TH (1,1,"LT",Txt_Forums);
HTM_TH (1,1,"RT",Txt_No_of_forums); HTM_TH (1,1,"RT",Txt_No_of_forums);
@ -5217,12 +5187,7 @@ static void Fig_GetAndShowNumUsrsPerMenu (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"CM\""); HTM_TD_Begin ("class=\"CM\"");
fprintf (Gbl.F.Out,"<img src=\"%s/%s\"" Ico_PutIcon (Mnu_MenuIcons[Menu],Txt_MENU_NAMES[Menu],"ICO40x40");
" alt=\"%s\" title=\"%s\""
" class=\"ICO40x40\" />",
Cfg_URL_ICON_PUBLIC,Mnu_MenuIcons[Menu],
Txt_MENU_NAMES[Menu],
Txt_MENU_NAMES[Menu]);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"DAT RM\""); HTM_TD_Begin ("class=\"DAT RM\"");

54
swad_file_browser.c
View File

@ -5834,10 +5834,7 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,
switch (IconThisRow) switch (IconThisRow)
{ {
case Brw_ICON_TREE_NOTHING: case Brw_ICON_TREE_NOTHING:
fprintf (Gbl.F.Out,"<img src=\"%s/tr16x16.gif\"" Ico_PutIcon ("tr16x16.gif","","ICO20x20");
" alt=\"\" title=\"\""
" class=\"ICO20x20\" />",
Cfg_URL_ICON_PUBLIC);
break; break;
case Brw_ICON_TREE_EXPAND: case Brw_ICON_TREE_EXPAND:
/***** Visible icon to expand folder *****/ /***** Visible icon to expand folder *****/
@ -5878,10 +5875,7 @@ static void Brw_IndentDependingOnLevel (unsigned Level)
i++) i++)
{ {
HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<img src=\"%s/tr16x16.gif\"" Ico_PutIcon ("tr16x16.gif","","ICO20x20");
" alt=\"\" title=\"\""
" class=\"ICO20x20\" />",
Cfg_URL_ICON_PUBLIC);
HTM_TD_End (); HTM_TD_End ();
} }
} }
@ -6084,14 +6078,9 @@ static void Brw_PutIconFolderWithoutPlus (const char *FileBrowserId,const char *
FileBrowserId,RowId); FileBrowserId,RowId);
/***** Icon *****/ /***** Icon *****/
fprintf (Gbl.F.Out,"<img src=\"%s/%s\"" Ico_PutIcon (Open ? "folder-open-yellow.png" :
" alt=\"%s\" title=\"%s\"" "folder-yellow.png",
" class=\"CONTEXT_OPT CONTEXT_ICO_16x16\" />", Txt_Folder,"CONTEXT_OPT CONTEXT_ICO_16x16");
Cfg_URL_ICON_PUBLIC,
Open ? "folder-open-yellow.png" :
"folder-yellow.png",
Txt_Folder,
Txt_Folder);
/***** End container *****/ /***** End container *****/
HTM_DIV_End (); HTM_DIV_End ();
@ -6135,12 +6124,7 @@ static void Brw_PutIconNewFileOrFolder (void)
/***** Icon that indicates new file *****/ /***** Icon that indicates new file *****/
HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<img src=\"%s/star16x16.gif\"" Ico_PutIcon ("star16x16.gif",Txt_New_FILE_OR_FOLDER,"ICO20x20");
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
Cfg_URL_ICON_PUBLIC,
Txt_New_FILE_OR_FOLDER,
Txt_New_FILE_OR_FOLDER);
HTM_TD_End (); HTM_TD_End ();
} }
@ -6501,12 +6485,7 @@ static void Brw_WriteFileOrFolderPublisher (unsigned Level,unsigned long UsrCod)
"PHOTO15x20B",Pho_ZOOM,false); "PHOTO15x20B",Pho_ZOOM,false);
} }
else else
fprintf (Gbl.F.Out,"<img src=\"%s/usr_bl.jpg\"" Ico_PutIcon ("usr_bl.jpg",Txt_Unknown_or_without_photo,"PHOTO15x20B");
" alt=\"%s\" title=\"%s\""
" class=\"PHOTO15x20B\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Unknown_or_without_photo,
Txt_Unknown_or_without_photo);
HTM_TD_End (); HTM_TD_End ();
@ -10051,12 +10030,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
/* Name of the file of marks, link end and form end */ /* Name of the file of marks, link end and form end */
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;",FileNameToShow); fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;",FileNameToShow);
fprintf (Gbl.F.Out,"<img src=\"%s/grades32x32.gif\"" Ico_PutIcon ("grades32x32.gif",Txt_Check_marks_in_the_file,"ICO40x40");
" alt=\"%s\" title=\"%s\""
" class=\"ICO40x40\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Check_marks_in_the_file,
Txt_Check_marks_in_the_file);
Frm_LinkFormEnd (); Frm_LinkFormEnd ();
Frm_EndForm (); Frm_EndForm ();
} }
@ -10070,11 +10044,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
URL,Title); URL,Title);
Brw_PutIconFile (32,FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name); Brw_PutIconFile (32,FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name);
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;",FileNameToShow); fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;",FileNameToShow);
fprintf (Gbl.F.Out,"<img src=\"%s/download.svg\"" Ico_PutIcon ("download.svg",Title,"ICO40x40");
" alt=\"%s\" title=\"%s\""
" class=\"ICO40x40\" />",
Cfg_URL_ICON_PUBLIC,
Title,Title);
HTM_A_End (); HTM_A_End ();
} }
} }
@ -12116,11 +12086,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
Frm_LinkFormSubmit (FileNameToShow,"DAT_N",NULL); Frm_LinkFormSubmit (FileNameToShow,"DAT_N",NULL);
if (FileMetadata.FilFolLnk.Type == Brw_IS_FOLDER) if (FileMetadata.FilFolLnk.Type == Brw_IS_FOLDER)
/* Icon with folder */ /* Icon with folder */
fprintf (Gbl.F.Out,"<img src=\"%s/folder-yellow.png\"" Ico_PutIcon ("folder-yellow.png",Txt_Folder,"CONTEXT_ICO_16x16");
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_16x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Folder,Txt_Folder);
else else
/* Icon with file type or link */ /* Icon with file type or link */
Brw_PutIconFile (16,FileMetadata.FilFolLnk.Type,FileMetadata.FilFolLnk.Name); Brw_PutIconFile (16,FileMetadata.FilFolLnk.Type,FileMetadata.FilFolLnk.Name);

26
swad_follow.c
View File

@ -512,7 +512,6 @@ void Fol_ShowFollowingAndFollowers (const struct UsrData *UsrDat,
extern const char *Txt_Following; extern const char *Txt_Following;
extern const char *Txt_Followers; extern const char *Txt_Followers;
extern const char *Txt_Following_unfollow; extern const char *Txt_Following_unfollow;
extern const char *Txt_Unfollow;
extern const char *Txt_Follow; extern const char *Txt_Follow;
bool ItsMe = Usr_ItsMe (UsrDat->UsrCod); bool ItsMe = Usr_ItsMe (UsrDat->UsrCod);
@ -558,11 +557,7 @@ void Fol_ShowFollowingAndFollowers (const struct UsrData *UsrDat,
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Frm_LinkFormSubmit (Txt_Following_unfollow,"REC_DAT_BOLD",NULL); Frm_LinkFormSubmit (Txt_Following_unfollow,"REC_DAT_BOLD",NULL);
HTM_DIV_Begin ("class=\"ICO_HIGHLIGHT\" style=\"display:inline;\""); HTM_DIV_Begin ("class=\"ICO_HIGHLIGHT\" style=\"display:inline;\"");
fprintf (Gbl.F.Out,"<img src=\"%s/user-check.svg\"" Ico_PutIcon ("user-check.svg",Txt_Following_unfollow,"ICO40x40");
" alt=\"%s\" title=\"%s\""
" class=\"ICO40x40\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Unfollow,Txt_Following_unfollow);
HTM_DIV_End (); HTM_DIV_End ();
Frm_LinkFormEnd (); Frm_LinkFormEnd ();
Frm_EndForm (); Frm_EndForm ();
@ -573,11 +568,7 @@ void Fol_ShowFollowingAndFollowers (const struct UsrData *UsrDat,
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Frm_LinkFormSubmit (Txt_Follow,"REC_DAT_BOLD",NULL); Frm_LinkFormSubmit (Txt_Follow,"REC_DAT_BOLD",NULL);
HTM_DIV_Begin ("class=\"ICO_HIGHLIGHT\" style=\"display:inline;\""); HTM_DIV_Begin ("class=\"ICO_HIGHLIGHT\" style=\"display:inline;\"");
fprintf (Gbl.F.Out,"<img src=\"%s/user-plus.svg\"" Ico_PutIcon ("user-plus.svg",Txt_Follow,"ICO40x40");
" alt=\"%s\" title=\"%s\""
" class=\"ICO40x40\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Follow,Txt_Follow);
HTM_DIV_End (); HTM_DIV_End ();
Frm_LinkFormEnd (); Frm_LinkFormEnd ();
Frm_EndForm (); Frm_EndForm ();
@ -955,8 +946,7 @@ static void Fol_PutInactiveIconToFollowUnfollow (void)
{ {
/***** Inactive icon to follow/unfollow *****/ /***** Inactive icon to follow/unfollow *****/
HTM_DIV_Begin ("class=\"FOLLOW_USR_ICO ICO_HIDDEN\""); HTM_DIV_Begin ("class=\"FOLLOW_USR_ICO ICO_HIDDEN\"");
fprintf (Gbl.F.Out,"<img src=\"%s/user.svg\" alt=\"\" class=\"ICO16x16\" />", Ico_PutIcon ("user.svg","","ICO16x16");
Cfg_URL_ICON_PUBLIC);
HTM_DIV_End (); HTM_DIV_End ();
} }
@ -973,10 +963,7 @@ static void Fol_PutIconToFollow (struct UsrData *UsrDat)
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Frm_LinkFormSubmit (Txt_Follow,NULL,NULL); Frm_LinkFormSubmit (Txt_Follow,NULL,NULL);
HTM_DIV_Begin ("class=\"FOLLOW_USR_ICO ICO_HIGHLIGHT\""); HTM_DIV_Begin ("class=\"FOLLOW_USR_ICO ICO_HIGHLIGHT\"");
fprintf (Gbl.F.Out,"<img src=\"%s/user-plus.svg\"" Ico_PutIcon ("user-plus.svg",Txt_Follow,"ICO16x16");
" alt=\"%s\" title=\"%s\" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Follow,Txt_Follow);
HTM_DIV_End (); HTM_DIV_End ();
Frm_LinkFormEnd (); Frm_LinkFormEnd ();
Frm_EndForm (); Frm_EndForm ();
@ -995,10 +982,7 @@ static void Fol_PutIconToUnfollow (struct UsrData *UsrDat)
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Frm_LinkFormSubmit (Txt_Unfollow,NULL,NULL); Frm_LinkFormSubmit (Txt_Unfollow,NULL,NULL);
HTM_DIV_Begin ("class=\"FOLLOW_USR_ICO ICO_HIGHLIGHT\""); HTM_DIV_Begin ("class=\"FOLLOW_USR_ICO ICO_HIGHLIGHT\"");
fprintf (Gbl.F.Out,"<img src=\"%s/user-check.svg\"" Ico_PutIcon ("user-check.svg",Txt_Unfollow,"ICO16x16");
" alt=\"%s\" title=\"%s\" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Unfollow,Txt_Unfollow);
HTM_DIV_End (); HTM_DIV_End ();
Frm_LinkFormEnd (); Frm_LinkFormEnd ();
Frm_EndForm (); Frm_EndForm ();

25
swad_icon.c
View File

@ -342,10 +342,7 @@ void Ico_PutContextualIconToZIP (Act_Action_t NextAction,void (*FuncParams) (voi
void Ico_PutDivIcon (const char *DivClass,const char *Icon,const char *Title) void Ico_PutDivIcon (const char *DivClass,const char *Icon,const char *Title)
{ {
HTM_DIV_Begin ("class=\"%s\"",DivClass); HTM_DIV_Begin ("class=\"%s\"",DivClass);
fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\"" Ico_PutIcon (Icon,Title,"CONTEXT_ICO_16x16");
" class=\"CONTEXT_ICO_16x16\" />",
Cfg_URL_ICON_PUBLIC,Icon,
Title,Title);
HTM_DIV_End (); HTM_DIV_End ();
} }
@ -381,9 +378,7 @@ void Ico_PutIconTextLink (const char *Icon,const char *Text)
{ {
/***** Print icon and optional text *****/ /***** Print icon and optional text *****/
HTM_DIV_Begin ("class=\"CONTEXT_OPT ICO_HIGHLIGHT\""); HTM_DIV_Begin ("class=\"CONTEXT_OPT ICO_HIGHLIGHT\"");
fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\"" Ico_PutIcon (Icon,Text,"CONTEXT_ICO_x16");
" class=\"CONTEXT_ICO_x16\" />",
Cfg_URL_ICON_PUBLIC,Icon,Text,Text);
fprintf (Gbl.F.Out,"&nbsp;%s",Text); fprintf (Gbl.F.Out,"&nbsp;%s",Text);
HTM_DIV_End (); HTM_DIV_End ();
} }
@ -407,9 +402,19 @@ void Ico_PutSettingIconLink (const char *Icon,const char *Title)
void Ico_PutIconOff (const char *Icon,const char *Title) void Ico_PutIconOff (const char *Icon,const char *Title)
{ {
fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\"" Ico_PutIcon (Icon,Title,"CONTEXT_OPT ICO_HIDDEN CONTEXT_ICO_16x16");
" class=\"CONTEXT_OPT ICO_HIDDEN CONTEXT_ICO_16x16\" />", }
Cfg_URL_ICON_PUBLIC,Icon,Title,Title);
/*****************************************************************************/
/******************************* Put an icon *********************************/
/*****************************************************************************/
void Ico_PutIcon (const char *Icon,const char *Title,const char *Class)
{
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\" class=\"%s\" />",
Cfg_URL_ICON_PUBLIC,Icon,
Title,Title,Class);
} }
/*****************************************************************************/ /*****************************************************************************/

1
swad_icon.h
View File

@ -77,6 +77,7 @@ void Ico_PutIconLink (const char *Icon,const char *Title);
void Ico_PutIconTextLink (const char *Icon,const char *Text); void Ico_PutIconTextLink (const char *Icon,const char *Text);
void Ico_PutSettingIconLink (const char *Icon,const char *Title); void Ico_PutSettingIconLink (const char *Icon,const char *Title);
void Ico_PutIconOff (const char *Icon,const char *Title); void Ico_PutIconOff (const char *Icon,const char *Title);
void Ico_PutIcon (const char *Icon,const char *Title,const char *Class);
void Ico_PutCalculateIcon (const char *Title); void Ico_PutCalculateIcon (const char *Title);
void Ico_PutCalculateIconWithText (const char *Text); void Ico_PutCalculateIconWithText (const char *Text);