From c0bc40c61a202cb15e3056f1733070f5e0531879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sat, 5 Sep 2015 19:19:39 +0200 Subject: [PATCH] Version 14.127 --- css/swad_desktop.css | 33 ++++-- css/swad_mobile.css | 30 ++++-- swad_attendance.c | 22 ++-- swad_banner.c | 18 ++-- swad_centre.c | 4 +- swad_changelog.h | 3 +- swad_chat.c | 8 +- swad_course.c | 4 +- swad_degree.c | 3 +- swad_department.c | 32 +++--- swad_exam.c | 11 +- swad_file_browser.c | 15 ++- swad_follow.c | 5 +- swad_forum.c | 33 +++--- swad_group.c | 18 ++-- swad_holiday.c | 58 +++++------ swad_import.c | 2 +- swad_indicator.c | 239 +++++++++++++++++++++---------------------- swad_institution.c | 4 +- swad_layout.c | 6 +- swad_link.c | 18 ++-- swad_mail.c | 30 +++--- swad_message.c | 4 +- swad_network.c | 12 +-- swad_notification.c | 3 +- swad_photo.c | 12 +-- swad_place.c | 30 +++--- swad_plugin.c | 18 ++-- swad_preference.c | 7 +- swad_record.c | 27 ++--- swad_statistic.c | 138 ++++++++++++------------- swad_survey.c | 14 +-- swad_user.c | 78 +++++++------- 33 files changed, 477 insertions(+), 462 deletions(-) diff --git a/css/swad_desktop.css b/css/swad_desktop.css index 228d6ecf0..c26331335 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -384,11 +384,15 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} /*********************************** Icons ***********************************/ .ICON16x16 {width:16px; height:16px; vertical-align:middle;} .ICON16x16B {width:16px; height:16px; vertical-align:middle; display:block;} +.ICON20x20 {width:20px; height:20px; vertical-align:middle;} .ICON28x28 {width:28px; height:28px; vertical-align:middle;} .ICON32x32 {width:32px; height:32px; vertical-align:middle;} .ICON32x32B {width:32px; height:32px; vertical-align:middle; display:block;} .ICON48x48 {width:48px; height:48px; vertical-align:middle;} .ICON64x64 {width:64px; height:64px; vertical-align:middle;} +.ICON128x128 {width:128px; height:128px; vertical-align:middle;} +.BANNER {width:120px; height:40px;} +.BANNER_SMALL {width:60px; height:20px;} /****** Contextual links with small icons and text to go to some action ******/ .CONTEXT_MENU @@ -447,7 +451,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} .CELLS_PAD_4 td {padding:4px;} .CELLS_PAD_8 th {padding:8px;} .CELLS_PAD_8 td {padding:8px;} - + /*********************************** Title ***********************************/ .TIT { @@ -939,11 +943,11 @@ a:hover img.CENTRE_PHOTO_SHOW .DAT_SMALL_N {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#404040; font-size:10pt;} .DAT_SMALL_NOBR_N {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#404040; font-size:10pt; white-space:nowrap;} -.DAT_SMALL_GREY {text-align:left; font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#707070; font-size:10pt;} -.DAT_SMALL_RED {text-align:left; font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#FF0000; font-size:10pt;} -.DAT_SMALL_GREEN {text-align:left; font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#008000; font-size:10pt;} -.DAT_SMALL_BLUE {text-align:left; font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#0080FF; font-size:10pt;} -.DAT_SMALL_YELLOW {text-align:left; font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#C0C000; font-size:10pt;} +.DAT_SMALL_GREY {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#707070; font-size:10pt;} +.DAT_SMALL_RED {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#FF0000; font-size:10pt;} +.DAT_SMALL_GREEN {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#008000; font-size:10pt;} +.DAT_SMALL_BLUE {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#0080FF; font-size:10pt;} +.DAT_SMALL_YELLOW {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#C0C000; font-size:10pt;} .HEAD_REC {font-family:Georgia, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#808080; font-size:10pt;} .HEAD_REC_SMALL {font-family:Georgia, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#808080; font-size:9pt;} @@ -953,7 +957,7 @@ a:hover img.CENTRE_PHOTO_SHOW .DAT_REC_SMALL {color:#808080; font-size:9pt; line-height:110%;} .DAT_REC_SMALL_BOLD {color:#202020; font-size:9pt; line-height:110%;} .MSJ_AVISO {color:#632921; font-size:10pt;} -.TIT_TBL {color:#4D88A1; font-size:10pt;} +.TIT_TBL {color:#4D88A1; font-size:10pt; font-weight:bold;} .TIT_CLASSPHOTO {font-family:Georgia, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#606060; font-size:11pt;} .CLASSPHOTO {color:#606060; font-size:8pt; line-height:100%; white-space:nowrap;} @@ -1109,6 +1113,21 @@ a:hover img.CENTRE_PHOTO_SHOW .CON {color:#B8D070; font-size:9pt; line-height:110%; white-space:nowrap;} .CON_CRS {color:#398000; font-size:9pt; line-height:110%; white-space:nowrap;} +/*************************** Indicators about courses ************************/ +.INDICATORS td,.INDICATORS th + { + border:1px solid silver; + border-collapse:collapse; + padding:1px; + } +.INDICATORS th + { + color:#4D88A1; + font-size:10pt; + font-weight:bold; + } + +/********************************** Page foot ********************************/ .FOOT_LIST_CONTAINER { position:relative; diff --git a/css/swad_mobile.css b/css/swad_mobile.css index 5351d09cc..f63ca2639 100644 --- a/css/swad_mobile.css +++ b/css/swad_mobile.css @@ -349,10 +349,14 @@ form {margin:0; display:inline;} /*********************************** Icons ***********************************/ .ICON16x16 {width:16px; height:16px; vertical-align:middle;} .ICON16x16B {width:16px; height:16px; vertical-align:middle; display:block;} +.ICON20x20 {width:20px; height:20px; vertical-align:middle;} .ICON32x32 {width:32px; height:32px; vertical-align:middle;} .ICON32x32B {width:32px; height:32px; vertical-align:middle; display:block;} .ICON48x48 {width:48px; height:48px; vertical-align:middle;} .ICON64x64 {width:64px; height:64px; vertical-align:middle;} +.ICON128x128 {width:128px; height:128px; vertical-align:middle;} +.BANNER {width:120px; height:40px;} +.BANNER_SMALL {width:60px; height:20px;} /****** Contextual links with small icons and text to go to some action ******/ .CONTEXT_MENU @@ -748,11 +752,11 @@ a:hover img.CENTRE_PHOTO_SHOW .DAT_SMALL_N {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#404040; font-size:14pt;} .DAT_SMALL_NOBR_N {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#404040; font-size:14pt; white-space:nowrap;} -.DAT_SMALL_GREY {text-align:left; font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#707070; font-size:14pt;} -.DAT_SMALL_RED {text-align:left; font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#FF0000; font-size:14pt;} -.DAT_SMALL_GREEN {text-align:left; font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#008000; font-size:14pt;} -.DAT_SMALL_BLUE {text-align:left; font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#0080FF; font-size:14pt;} -.DAT_SMALL_YELLOW {text-align:left; font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#C0C000; font-size:14pt;} +.DAT_SMALL_GREY {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#707070; font-size:14pt;} +.DAT_SMALL_RED {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#FF0000; font-size:14pt;} +.DAT_SMALL_GREEN {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#008000; font-size:14pt;} +.DAT_SMALL_BLUE {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#0080FF; font-size:14pt;} +.DAT_SMALL_YELLOW {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#C0C000; font-size:14pt;} .HEAD_REC {font-Family:Georgia, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#808080; font-size:16pt;} .HEAD_REC_SMALL {font-Family:Georgia, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#808080; font-size:12pt;} @@ -762,7 +766,7 @@ a:hover img.CENTRE_PHOTO_SHOW .DAT_REC_SMALL {color:#808080; font-size:14pt; line-height:110%;} .DAT_REC_SMALL_BOLD {color:#202020; font-size:14pt; line-height:110%;} .MSJ_AVISO {color:#632921; font-size:12pt;} -.TIT_TBL {color:#4D88A1; font-size:14pt;} +.TIT_TBL {color:#4D88A1; font-size:14pt; font-weight:bold;} .TIT_CLASSPHOTO {font-Family:Georgia, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#606060; font-size:11pt;} .CLASSPHOTO {color:#606060; font-size:11pt; line-height:100%; white-space:nowrap;} @@ -918,3 +922,17 @@ a:hover img.CENTRE_PHOTO_SHOW .CON {color:#B8D070; font-size:9pt; line-height:110%; white-space:nowrap;} .CON_CRS {color:#398000; font-size:9pt; line-height:110%; white-space:nowrap;} + +/*************************** Indicators about courses ************************/ +.INDICATORS td,.INDICATORS th + { + border:1px solid silver; + border-collapse:collapse; + padding:1px; + } +.INDICATORS th + { + color:#4D88A1; + font-size:10pt; + font-weight:bold; + } diff --git a/swad_attendance.c b/swad_attendance.c index d3962bb10..74bc9d9de 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -1007,6 +1007,7 @@ static bool Att_CheckIfSimilarAttEventExists (const char *Field,const char *Valu void Att_RequestCreatOrEditAttEvent (void) { + extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_New_event; extern const char *Txt_Edit_event; extern const char *Txt_Teachers_comment; @@ -1084,14 +1085,14 @@ void Att_RequestCreatOrEditAttEvent (void) /***** Attendance event title *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "" "" "" "", - Txt_Title, + The_ClassForm[Gbl.Prefs.Theme],Txt_Title, Att_MAX_LENGTH_ATTENDANCE_EVENT_TITLE,Att.Title); /***** Attendance event start and end dates *****/ @@ -1100,14 +1101,14 @@ void Att_RequestCreatOrEditAttEvent (void) StartOrEndTime++) { fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "" "" "" "" - "" "" "" - "" "" "", @@ -789,13 +789,13 @@ static void Ban_PutHeadBanners (void) extern const char *Txt_WWW; fprintf (Gbl.F.Out,"" - "" - "" - "" - "" - "" - "" - "" + "" + "" + "" + "" + "" + "" + "" "", Txt_Code, Txt_Short_name, @@ -914,7 +914,7 @@ void Ban_WriteMenuWithBanners (void) " title=\"%s\">" "\"%s\"" + " class=\"BANNER\" />" "", Gbl.FormId, Gbl.Banners.Lst[NumBan].FullName, diff --git a/swad_centre.c b/swad_centre.c index 373685f1d..00812f750 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -2416,12 +2416,12 @@ unsigned Ctr_ListCtrsFound (const char *Query) /* Number of centres found */ fprintf (Gbl.F.Out,"" - "" ""); Ctr_PutHeadCentresForSeeing (false); // Order not selectable diff --git a/swad_changelog.h b/swad_changelog.h index c31b51825..40b4df63f 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.126.2 (2015/09/05)" +#define Log_PLATFORM_VERSION "SWAD 14.127 (2015/09/05)" // 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 /* + Version 14.127: Sep 05, 2015 Changes in styles. (184273 lines) Version 14.126.2: Sep 05, 2015 Changes in styles. (184250 lines) Version 14.126.1: Sep 05, 2015 Changes in styles. (184213 lines) Version 14.126: Sep 04, 2015 Changes in styles. (184213 lines) diff --git a/swad_chat.c b/swad_chat.c index 46c1c55fd..cd6ee9f51 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -256,12 +256,12 @@ void Cht_ShowListOfChatRoomsWithUsrs (void) /***** Table start *****/ Lay_StartRoundFrameTable (NULL,2,Txt_Rooms_with_users); fprintf (Gbl.F.Out,"" - "" "", Txt_CHAT_Room_code, Txt_No_of_users); diff --git a/swad_course.c b/swad_course.c index c81daca4c..646c078b0 100644 --- a/swad_course.c +++ b/swad_course.c @@ -3178,12 +3178,12 @@ unsigned Crs_ListCrssFound (const char *Query) /* Number of courses found */ fprintf (Gbl.F.Out,"" - "" ""); /* Heading row */ diff --git a/swad_degree.c b/swad_degree.c index 4d18c4f7f..bbc35ead9 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -3927,8 +3927,7 @@ void Deg_GetAndWriteDegreesAdminBy (long UsrCod,unsigned ColSpan) "", Gbl.RowEvenOdd,Gbl.Prefs.IconsURL, NumRow == NumRows ? "subend" : diff --git a/swad_department.c b/swad_department.c index ebb3fe1cc..a0adc70e3 100644 --- a/swad_department.c +++ b/swad_department.c @@ -106,7 +106,7 @@ void Dpt_SeeDepts (void) Order <= Dpt_ORDER_BY_NUM_TCHS; Order++) { - fprintf (Gbl.F.Out,""); } fprintf (Gbl.F.Out,""); @@ -951,26 +951,26 @@ static void Dpt_PutHeadDepartments (void) extern const char *Txt_Teachers_ABBREVIATION; fprintf (Gbl.F.Out,"" - "" - "" + "" "", Txt_Code, Txt_Institution, diff --git a/swad_exam.c b/swad_exam.c index 89618de75..b478989f0 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -804,7 +804,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_ } fprintf (Gbl.F.Out,"
", - Dates[StartOrEndTime]); + The_ClassForm[Gbl.Prefs.Theme],Dates[StartOrEndTime]); /* Date */ Dat_WriteFormDate (Gbl.Now.Date.Year-1,Gbl.Now.Date.Year+1, @@ -1133,12 +1134,12 @@ void Att_RequestCreatOrEditAttEvent (void) /***** Visibility of comments *****/ fprintf (Gbl.F.Out,"
" + "" "%s:" "" "" + "" "%s:" "" "" @@ -1192,6 +1193,7 @@ void Att_RequestCreatOrEditAttEvent (void) static void Att_ShowLstGrpsToEditAttEvent (long AttCod) { + extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_Groups; extern const char *Txt_The_whole_course; unsigned NumGrpTyp; @@ -1203,11 +1205,11 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod) { /***** Start table *****/ fprintf (Gbl.F.Out,"
" + "" "%s:" "", - Txt_Groups); + The_ClassForm[Gbl.Prefs.Theme],Txt_Groups); Lay_StartRoundFrameTable ("100%",0,NULL); /***** First row: checkbox to select the whole course *****/ diff --git a/swad_banner.c b/swad_banner.c index b07e13b96..cb952ba7c 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -102,7 +102,7 @@ void Ban_SeeBanners (void) "" "\"%s\"" + " class=\"BANNER\" />" "" "
%s%s%s%s%s%s%s%s%s%s
"); + ""); if (NumCtrs == 1) fprintf (Gbl.F.Out,"1 %s",Txt_centre); else fprintf (Gbl.F.Out,"%u %s",NumCtrs,Txt_centres); - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"
" + "" "%s" - "" - "" + "" + "" "%s" - "" + "
"); + ""); if (NumCrss == 1) fprintf (Gbl.F.Out,"1 %s",Txt_course); else fprintf (Gbl.F.Out,"%u %s",NumCrss,Txt_courses); - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"
" "\"\"" + " class=\"ICON20x20\" />" ""); + fprintf (Gbl.F.Out,""); Act_FormStart (ActSeeDpt); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Act_LinkFormSubmit (Txt_DEPARTMENTS_HELP_ORDER[Order],"TIT_TBL"); @@ -117,7 +117,7 @@ void Dpt_SeeDepts (void) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); Act_FormEnd (); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "
"); + " style=\"width:100%%;" + " padding:20px 20px 100px 20px;\">"); // Bottom space used for signatures /***** Institution logo *****/ fprintf (Gbl.F.Out,"" \ @@ -1200,17 +1201,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_ "" \ "
"); - if (TypeViewExamAnnouncement == Exa_PRINT_VIEW) - /* Bottom space used for signatures */ - fprintf (Gbl.F.Out,"
"); - /***** End frame *****/ fprintf (Gbl.F.Out,"" \ ""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) Lay_EndRoundFrameTableWithButton ((ExaCod > 0) ? Lay_CONFIRM_BUTTON : - Lay_CREATE_BUTTON, - Txt_Publish_announcement_OF_EXAM); + Lay_CREATE_BUTTON, + Txt_Publish_announcement_OF_EXAM); else Lay_EndRoundFrameTable (); diff --git a/swad_file_browser.c b/swad_file_browser.c index f00bc88b7..c8a015ef7 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -3084,9 +3084,8 @@ static void Brw_FormToChangeCrsGrpZone (void) fprintf (Gbl.F.Out,"
  • " "\"\"" + " class=\"ICON20x20\"" + " style=\"margin-left:5px;\" />" "" - ""); + ""); if (NumDocs == 1) fprintf (Gbl.F.Out,"1 %s",Txt_document); else fprintf (Gbl.F.Out,"%u %s",NumDocs,Txt_documents); - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" ""); /* Heading row */ @@ -10899,7 +10898,7 @@ unsigned Brw_ListDocsFound (const char *Query,const char *Title) /***** Write footer *****/ /* Number of documents not hidden found */ fprintf (Gbl.F.Out,"" - "" + "" "("); NumDocsHidden = NumDocs - NumDocsNotHidden; if (NumDocsHidden == 1) @@ -10907,7 +10906,7 @@ unsigned Brw_ListDocsFound (const char *Query,const char *Title) else fprintf (Gbl.F.Out,"%u %s",NumDocsHidden,Txt_DOCUM_hidden); fprintf (Gbl.F.Out,")" - "" + "" ""); /* Table end */ diff --git a/swad_follow.c b/swad_follow.c index 3e658b189..c2e376c57 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -387,7 +387,7 @@ static void Fol_ShowFollowedOrFollowed (const struct UsrData *UsrDat) fprintf (Gbl.F.Out,"
    " "\"%s\"" + " class=\"ICON16x16\" />" "
    " "", Gbl.Prefs.IconsURL, @@ -402,8 +402,7 @@ static void Fol_ShowFollowedOrFollowed (const struct UsrData *UsrDat) fprintf (Gbl.F.Out,"
    " "\"%s\"" + " class=\"ICON16x16\" />" "
    " "", Gbl.Prefs.IconsURL, diff --git a/swad_forum.c b/swad_forum.c index abbbb095b..e94590419 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -2487,23 +2487,22 @@ void For_ShowForumThrs (void) /***** Heading row *****/ fprintf (Gbl.F.Out,"" - "" - " " - "" - "" + "" " " - "" - "" + "" + "" "%s" - "", + "", Txt_MSG_Subject); for (Order = For_FIRST_MSG; Order <= For_LAST_MSG; Order++) { - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (For_ActionsSeeFor[Gbl.Forum.ForumType]); Pag_PutHiddenParamPagNum (PaginationThrs.CurrentPage); For_PutParamWhichForum (); @@ -2517,20 +2516,20 @@ void For_ShowForumThrs (void) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); Act_FormEnd (); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); } - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "" "", Txt_No_BR_msgs, Txt_Unread_BR_msgs, diff --git a/swad_group.c b/swad_group.c index 5904404fc..7a1cf03d7 100644 --- a/swad_group.c +++ b/swad_group.c @@ -1927,19 +1927,19 @@ static void Grp_WriteGrpHead (struct GroupType *GrpTyp) /***** Head row with title of each column *****/ fprintf (Gbl.F.Out,"" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "" "", Txt_Group, Txt_Max_BR_students, diff --git a/swad_holiday.c b/swad_holiday.c index 0874669ec..a4497925b 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -102,7 +102,7 @@ void Hld_SeeHolidays (void) Order <= Hld_ORDER_BY_START_DATE; Order++) { - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (ActSeeHld); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Act_LinkFormSubmit (Txt_HOLIDAYS_HELP_ORDER[Order],"TIT_TBL"); @@ -113,14 +113,14 @@ void Hld_SeeHolidays (void) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); Act_FormEnd (); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); } - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" " %s " - "" - "" + "" + "" "%s" - "" + "" "", Txt_End_date, Txt_Holiday); @@ -912,21 +912,21 @@ static void Hld_PutFormToCreateHoliday (void) /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "" "", Txt_Place, Txt_Type, @@ -1014,25 +1014,25 @@ static void Hld_PutHeadHolidays (void) extern const char *Txt_Holiday; fprintf (Gbl.F.Out,"" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "" "", Txt_Code, Txt_Place, diff --git a/swad_import.c b/swad_import.c index 639e7c8b9..73d57d981 100644 --- a/swad_import.c +++ b/swad_import.c @@ -545,7 +545,7 @@ static unsigned Imp_GetAndListImpGrpsAndStdsFromDB (bool ItsAFormToRegRemStds) GrpCod,ExternalCrsCod); /* Write degree, course and group */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s
    %s %s
    %s %s (%s)" "" \ "", diff --git a/swad_indicator.c b/swad_indicator.c index d0435eee4..ab02c724b 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -541,85 +541,80 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat struct Ind_IndicatorsCrs Indicators; /***** Table start *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
    "); /***** Write table heading *****/ switch (IndicatorsLayout) { case Ind_INDICATORS_BRIEF: fprintf (Gbl.F.Out,"" - "" "" "" - "" "" "" - "" "", Txt_Degree, Txt_Course, @@ -651,122 +646,118 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat break; case Ind_INDICATORS_FULL: fprintf (Gbl.F.Out,"" - "" "" "" - "" "" "" - "" "", Txt_Degree, Txt_Course, diff --git a/swad_institution.c b/swad_institution.c index 3bf7e255f..ab1836f13 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -2083,12 +2083,12 @@ unsigned Ins_ListInssFound (const char *Query) /* Number of institutions found */ fprintf (Gbl.F.Out,"" - "" ""); Ins_PutHeadInstitutionsForSeeing (false); // Order not selectable diff --git a/swad_layout.c b/swad_layout.c index fdd41d9fc..07784cb49 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1691,8 +1691,7 @@ void Lay_IndentDependingOnLevel (unsigned Level,bool IsLastItemInLevel[]) i++) fprintf (Gbl.F.Out,"\"\"", + " class=\"ICON20x20\" />", Gbl.Prefs.IconsURL, IsLastItemInLevel[i] ? "tr" : "subleft"); @@ -1700,8 +1699,7 @@ void Lay_IndentDependingOnLevel (unsigned Level,bool IsLastItemInLevel[]) /***** Level *****/ fprintf (Gbl.F.Out,"\"\"", + " class=\"ICON20x20\" />", Gbl.Prefs.IconsURL, IsLastItemInLevel[Level] ? "subend" : "submid"); diff --git a/swad_link.c b/swad_link.c index 30650c6d4..14ee5809f 100644 --- a/swad_link.c +++ b/swad_link.c @@ -672,19 +672,19 @@ static void Lnk_PutHeadLinks (void) extern const char *Txt_WWW; fprintf (Gbl.F.Out,"" - "" - "" + "" "", Txt_Code, Txt_Short_name, diff --git a/swad_mail.c b/swad_mail.c index 2532c75e7..f1f88d6f6 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -107,7 +107,7 @@ void Mai_SeeMailDomains (void) Order <= Mai_ORDER_BY_USERS; Order++) { - fprintf (Gbl.F.Out,""); } fprintf (Gbl.F.Out,""); @@ -642,12 +642,12 @@ static void Mai_PutFormToCreateMailDomain (void) /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "" "", Txt_MAIL_DOMAIN_ORDER[Mai_ORDER_BY_DOMAIN], Txt_MAIL_DOMAIN_ORDER[Mai_ORDER_BY_INFO ]); @@ -685,19 +685,19 @@ static void Mai_PutHeadMailDomains (void) extern const char *Txt_MAIL_DOMAIN_ORDER[3]; fprintf (Gbl.F.Out,"" - "" - "" + "" "", Txt_Code, Txt_MAIL_DOMAIN_ORDER[Mai_ORDER_BY_DOMAIN], diff --git a/swad_message.c b/swad_message.c index 621915fe2..99509169a 100644 --- a/swad_message.c +++ b/swad_message.c @@ -384,7 +384,7 @@ void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (bool IsReply) /***** Textarea with users' @nicknames, e-mails or IDs *****/ fprintf (Gbl.F.Out,"" - "" + "" "" "" "" "\"%s\"" + " class=\"ICON16x16\" />" "" "", URL,Title, @@ -261,9 +261,8 @@ void Net_ShowFormMyWebsAndSocialNets (void) "" "" "" - "", Txt_No_INDEX, Txt_Degree); for (Sex = (Usr_Sex_t) 0; Sex < Usr_NUM_SEXS; Sex++) - fprintf (Gbl.F.Out,"", Txt_SEX_PLURAL_Abc[Sex]); fprintf (Gbl.F.Out,""); diff --git a/swad_place.c b/swad_place.c index a35cb35c9..7083cb7de 100644 --- a/swad_place.c +++ b/swad_place.c @@ -103,7 +103,7 @@ void Plc_SeePlaces (void) Order <= Plc_ORDER_BY_NUM_CTRS; Order++) { - fprintf (Gbl.F.Out,""); } fprintf (Gbl.F.Out,""); @@ -679,12 +679,12 @@ static void Plc_PutFormToCreatePlace (void) /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "" "", Txt_Short_name, Txt_Full_name); @@ -723,19 +723,19 @@ static void Plc_PutHeadPlaces (void) extern const char *Txt_Centres; fprintf (Gbl.F.Out,"" - "" - "" + "" "", Txt_Code, Txt_Short_name, diff --git a/swad_plugin.c b/swad_plugin.c index 0892bb0bf..e86e349cd 100644 --- a/swad_plugin.c +++ b/swad_plugin.c @@ -99,11 +99,11 @@ void Plg_ListPlugins (void) /***** Write table heading *****/ fprintf (Gbl.F.Out,"" - "" - "" + "" "", Txt_Plugin); @@ -117,12 +117,13 @@ void Plg_ListPlugins (void) sprintf (URL,"%s%s",Plg->URL,Gbl.Session.Id); /* Plugin logo */ + // TODO: Change plugin icons to 32x32 fprintf (Gbl.F.Out,"" - "" "", Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_PLUGINS, Gbl.Plugins.Lst[NumPlg].Logo, diff --git a/swad_preference.c b/swad_preference.c index bd0d48323..6ca863e4d 100644 --- a/swad_preference.c +++ b/swad_preference.c @@ -344,14 +344,15 @@ static void Pre_PutIconsToSelectSideCols (void) SideCols <= Lay_SHOW_BOTH_COLUMNS; SideCols++) { - fprintf (Gbl.F.Out,"" - "" "", Txt_No_INDEX, Txt_Photo, @@ -1849,15 +1849,15 @@ static void Sta_ShowNumAccessesPerDays (unsigned long NumRows,MYSQL_RES *mysql_r /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "" "", Txt_Date, Txt_Day, @@ -2055,16 +2055,16 @@ static void Sta_ShowDistrAccessesPerDaysAndHour (unsigned long NumRows,MYSQL_RES /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "" "", Txt_Date, Txt_Day, @@ -2431,12 +2431,12 @@ static void Sta_ShowNumAccessesPerWeeks (unsigned long NumRows,MYSQL_RES *mysql_ /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "" "", Txt_Week, Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); @@ -2536,12 +2536,12 @@ static void Sta_ShowNumAccessesPerMonths (unsigned long NumRows,MYSQL_RES *mysql /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "" "", Txt_Month, Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); @@ -2713,14 +2713,14 @@ static void Sta_WriteAccessHour (unsigned Hour,float NumPagesGenerated,float Max AltoBarra = 1; fprintf (Gbl.F.Out,"\"\"
    ", + " style=\"width:8px; height:%upx;\" />", Gbl.Prefs.IconsURL,AltoBarra); } else - fprintf (Gbl.F.Out,"0%%
    0
    "); + fprintf (Gbl.F.Out,"0%%
    0"); /* Write the hour */ - fprintf (Gbl.F.Out,"%uh",Hour); + fprintf (Gbl.F.Out,"
    %uh",Hour); } /*****************************************************************************/ @@ -2949,12 +2949,12 @@ static void Sta_ShowNumAccessesPerAction (unsigned long NumRows,MYSQL_RES *mysql /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "" "", Txt_Action, Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); @@ -3019,12 +3019,12 @@ static void Sta_ShowNumAccessesPerPlugin (unsigned long NumRows,MYSQL_RES *mysql /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "" "", Txt_Plugin, Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); @@ -3085,12 +3085,12 @@ static void Sta_ShowNumAccessesPerWSFunction (unsigned long NumRows,MYSQL_RES *m /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "" "", Txt_Function, Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); @@ -3149,12 +3149,12 @@ static void Sta_ShowNumAccessesPerBanner (unsigned long NumRows,MYSQL_RES *mysql /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "" "", Txt_Banner, Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); @@ -3190,8 +3190,8 @@ static void Sta_ShowNumAccessesPerBanner (unsigned long NumRows,MYSQL_RES *mysql "" "\"%s\"" + " class=\"BANNER_SMALL\"" + " style=\"margin:0 8px 4px 0;\" />" "", Ban.WWW, Ban.FullName, @@ -3224,15 +3224,15 @@ static void Sta_ShowNumAccessesPerDegree (unsigned long NumRows,MYSQL_RES *mysql /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "" "", Txt_No_INDEX, Txt_Degree, @@ -3306,21 +3306,21 @@ static void Sta_ShowNumAccessesPerCourse (unsigned long NumRows,MYSQL_RES *mysql /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "" "", Txt_No_INDEX, Txt_Degree, diff --git a/swad_survey.c b/swad_survey.c index ac9d803d9..fb7166a27 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -2947,16 +2947,16 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ /***** Write the heading *****/ fprintf (Gbl.F.Out,""); if (Svy->Status.ICanEdit) - fprintf (Gbl.F.Out,""); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"" "", Txt_No_INDEX, Txt_Type, diff --git a/swad_user.c b/swad_user.c index de1d2aafb..f209fc6e9 100644 --- a/swad_user.c +++ b/swad_user.c @@ -1461,7 +1461,7 @@ void Usr_WelcomeUsr (void) Usr_InsertMyBirthday (); fprintf (Gbl.F.Out,"\"%s\"", + " class=\"ICON128x128\" />", Gbl.Prefs.PathIconSet,Cfg_ICON_128x128, Txt_Happy_birthday, Txt_Happy_birthday); @@ -4865,7 +4865,7 @@ void Usr_PutCheckboxToSelectAllTheUsers (Rol_Role_t Role) Usr_Sex_t Sex; fprintf (Gbl.F.Out,"" - "" "", LstUsrs->NumUsrs == 1 ? Txt_ROLES_SINGUL_Abc[Role][Sex] : Txt_ROLES_PLURAL_Abc [Role][Sex]); @@ -5006,18 +5007,18 @@ static void Usr_ListMainDataGsts (bool PutCheckBoxToSelectUsr) /* First column used for selection */ if (PutCheckBoxToSelectUsr) - fprintf (Gbl.F.Out,""); /* Columns for the data */ for (NumCol = 0; NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR; NumCol++) if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column - fprintf (Gbl.F.Out,"", Usr_UsrDatMainFieldNames[NumCol]); /* End row */ @@ -5089,18 +5090,18 @@ static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr) /* First column used for selection */ if (PutCheckBoxToSelectUsr) - fprintf (Gbl.F.Out,""); /* Columns for the data */ for (NumCol = 0; NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR; NumCol++) if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column - fprintf (Gbl.F.Out,"", Usr_UsrDatMainFieldNames[NumCol]); /* End row */ @@ -5160,18 +5161,18 @@ static void Usr_ListMainDataTchs (bool PutCheckBoxToSelectUsr) /* First column used for selection */ if (PutCheckBoxToSelectUsr) - fprintf (Gbl.F.Out,""); /* Columns for the data */ for (NumCol = 0; NumCol < NumColumns; NumCol++) if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column - fprintf (Gbl.F.Out,"", Usr_UsrDatMainFieldNames[NumCol]); /* End row */ @@ -5275,9 +5276,9 @@ void Usr_ListAllDataGsts (void) 1); NumCol < NumColumnsCommonCard; NumCol++) - fprintf (Gbl.F.Out,"", FieldNames[NumCol]); /* End row */ @@ -5421,9 +5422,9 @@ void Usr_ListAllDataStds (void) 1); NumCol < NumColumnsCommonCard; NumCol++) - fprintf (Gbl.F.Out,"", FieldNames[NumCol]); /* 2. Columns for the groups */ @@ -5434,9 +5435,9 @@ void Usr_ListAllDataStds (void) NumGrpTyp < Gbl.CurrentCrs.Grps.GrpTypes.Num; NumGrpTyp++) if (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps) // If current course tiene groups of este type - fprintf (Gbl.F.Out,"", Txt_Group, Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypName); @@ -5446,13 +5447,14 @@ void Usr_ListAllDataStds (void) for (NumField = 0; NumField < Gbl.CurrentCrs.Records.LstFields.Num; NumField++) - fprintf (Gbl.F.Out,"", Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Name); /* 4. Visibility type for the record fields that depend on the course, in other row */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"" + ""); for (NumCol = 0; NumCol < NumColumnsCardAndGroups; NumCol++) @@ -5462,9 +5464,9 @@ void Usr_ListAllDataStds (void) for (NumField = 0; NumField < Gbl.CurrentCrs.Records.LstFields.Num; NumField++) - fprintf (Gbl.F.Out,"", Txt_RECORD_FIELD_VISIBILITY_RECORD[Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Visibility]); } } @@ -5527,18 +5529,18 @@ void Usr_ListUsrsForSelection (Rol_Role_t Role) /***** Heading row with column names *****/ /* Start row and first column used for selection */ fprintf (Gbl.F.Out,"" - ""); /* Columns for the data */ for (NumCol = 0; NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR; NumCol++) if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column - fprintf (Gbl.F.Out,"", Usr_UsrDatMainFieldNames[NumCol]); /* End row */ @@ -5650,9 +5652,9 @@ void Usr_ListAllDataTchs (void) 1); NumCol < NumColumns; NumCol++) - fprintf (Gbl.F.Out,"", FieldNames[NumCol]); /* End row */ @@ -5722,7 +5724,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *UsrQuery) /* Number of users found */ fprintf (Gbl.F.Out,"" - "" ""); /***** Heading row with column names *****/ @@ -5740,9 +5742,9 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *UsrQuery) for (NumCol = 0; NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR; NumCol++) - fprintf (Gbl.F.Out,"", Usr_UsrDatMainFieldNames[NumCol]); /* End row */ @@ -5880,9 +5882,9 @@ void Usr_ListDataAdms (void) NumCol < NumColumns; NumCol++) if (NumCol != 1 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column - fprintf (Gbl.F.Out,"", FieldNames[NumCol]); /* End row */
    " + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "
    " + "" "%s" - "" - "" + "" + "" "(A) %s" - "" - "" + "" + "" "(B) %s" - "" - "" + "" + "" "(C) %s" - "" - "" + "" + "" "(D) %s" - "" - "" + "" + "" "(E) %s" - "" + "
    " + "" "%s" - "" - "" + "" + "" "%s" - "" - - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "
    " + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "
    " + "" "%s" - "" - "" + "" + "" "(A) %s" - "" - "" + "" + "" "(B) %s" - "" - "" + "" + "" "(C) %s" - "" - "" + "" + "" "(D) %s" - "" - "" + "" + "" "(E) %s" - "" + "
    " + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "
    "); + ""); if (NumInss == 1) fprintf (Gbl.F.Out,"1 %s",Txt_institution); else fprintf (Gbl.F.Out,"%u %s",NumInss,Txt_institutions); - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"
    " + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "
    "); + fprintf (Gbl.F.Out,""); Act_FormStart (ActSeeMai); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Act_LinkFormSubmit (Txt_MAIL_DOMAIN_HELP_ORDER[Order],"TIT_TBL"); @@ -118,7 +118,7 @@ void Mai_SeeMailDomains (void) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); Act_FormEnd (); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
    " + "" "%s" - "" - "" + "" + "" "%s" - "" + "
    " + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "
    %s:", @@ -393,7 +393,7 @@ void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (bool IsReply) fprintf (Gbl.F.Out," >%s:", Txt_Recipients); fprintf (Gbl.F.Out," (%s)" - "
    " "\"%s\"" + " class=\"ICON16x16\"" + " style=\"margin-right:10px;\" />" "%s:", The_ClassForm[Gbl.Prefs.Theme], @@ -480,9 +479,8 @@ void Net_ShowWebAndSocialNetworksStats (void) "" "\"%s\"" + " class=\"ICON16x16\"" + " style=\"margin-right:10px;\" />" "%s" "%u" diff --git a/swad_notification.c b/swad_notification.c index 520f02da1..d6c303edf 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -1828,8 +1828,7 @@ void Ntf_WriteNumberOfNewNtfs (void) fprintf (Gbl.F.Out,"
    " "\"%s\" ", + " class=\"ICON16x16\" /> ", Gbl.Prefs.PathTheme, Txt_Notifications, Txt_Notifications); diff --git a/swad_photo.c b/swad_photo.c index 0af6c7fcf..9fbdfcefb 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -1957,20 +1957,20 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) /***** Write heading *****/ fprintf (Gbl.F.Out,"
    " + "" "%s" - "" - "" + "" + "" "%s" - "", + "" + fprintf (Gbl.F.Out,"" "%s" - "", + "
    "); + fprintf (Gbl.F.Out,""); Act_FormStart (ActSeePlc); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Act_LinkFormSubmit (Txt_PLACES_HELP_ORDER[Order],"TIT_TBL"); @@ -114,7 +114,7 @@ void Plc_SeePlaces (void) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); Act_FormEnd (); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
    " + "" "%s" - "" - "" + "" + "" "%s" - "" + "
    " + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "
    " - "" + "" + "" "%s" - "" + "
    " + "" "" "\"%s\"" + " class=\"ICON32x32\" />" "" "" @@ -381,10 +382,11 @@ static void Plg_ListPluginsForEdition (void) Plg->PlgCod); /* Plugin logo */ - fprintf (Gbl.F.Out,"" + // TODO: Change plugin icons to 32x32 + fprintf (Gbl.F.Out,"" "\"%s\"" + " class=\"ICON32x32\" />" "", + fprintf (Gbl.F.Out,"", SideCols == Gbl.Prefs.SideCols ? "LAYOUT_ON" : "LAYOUT_OFF"); Act_FormStart (ActChgCol); Par_PutHiddenParamUnsigned ("SideCols",SideCols); fprintf (Gbl.F.Out,"", + " alt=\"%s\" title=\"%s\"" + " style=\"display:block;" + " width:32px; height:20px;\" />", Gbl.Prefs.IconsURL, SideCols >> 1,SideCols & 1, Txt_LAYOUT_SIDE_COLUMNS[SideCols], diff --git a/swad_record.c b/swad_record.c index 75cb1b815..4a428a8e9 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2183,8 +2183,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, " style=\"display:inline;\" >" "\"%s\"" + " class=\"ICON16x16\" />" "" "", Gbl.Prefs.IconsURL, @@ -2209,8 +2208,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, " style=\"display:inline;\" >" "\"%s\"" + " class=\"ICON16x16\" />" "" "", Gbl.Prefs.IconsURL, @@ -2234,8 +2232,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, " style=\"display:inline;\" >" "\"%s\"" + " class=\"ICON16x16\" />" "" "", Gbl.Prefs.IconsURL, @@ -2263,8 +2260,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, " style=\"display:inline;\" >" "\"%s\"" + " class=\"ICON16x16\" />" "" "", Gbl.Prefs.IconsURL, @@ -2286,8 +2282,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, " style=\"display:inline;\" >" "\"%s\"" + " class=\"ICON16x16\" />" "" "", Gbl.Prefs.IconsURL, @@ -2307,8 +2302,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, " style=\"display:inline;\" >" "\"%s\"" + " class=\"ICON16x16\" />" "" "", Gbl.Prefs.IconsURL, @@ -2330,8 +2324,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, " style=\"display:inline;\" >" "\"%s\"" + " class=\"ICON16x16\" />" "" "", Gbl.Prefs.IconsURL, @@ -2352,8 +2345,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, " style=\"display:inline;\" >" "\"%s\"" + " class=\"ICON16x16\" />" "" "", Gbl.Prefs.IconsURL, @@ -2370,8 +2362,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, " style=\"display:inline;\" >" "\"%s\"" + " class=\"ICON16x16\" />" "" "", Gbl.Prefs.IconsURL, diff --git a/swad_statistic.c b/swad_statistic.c index 10c1a79ab..c13cea020 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -1723,24 +1723,24 @@ static void Sta_ShowNumAccessesPerUsr (unsigned long NumRows,MYSQL_RES *mysql_re /***** Write heading *****/ fprintf (Gbl.F.Out,"
    " + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "
    " + "" "%s " - "" - "" + "" + "" "%s " - "" - "" + "" + "" "%s" - "" + "
    " + "" "%s " - "" - "" + "" + "" "%s " - "" - "" + "" "%s" - "" + "
    " + "" "%s " - "" - "" + "" + "" "%s" - "" + "
    " + "" "%s " - "" - "" + "" + "" "%s" - "" + "
    " + "" "%s " - "" - "" + "" + "" "%s" - "" + "
    " + "" "%s " - "" - "" + "" + "" "%s" - "" + "
    " + "" "%s " - "" - "" + "" + "" "%s" - "" + "
    " + "" "%s " - "" - "" + "" + "" "%s" - "" + "
    " + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "
    " + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "
    " + fprintf (Gbl.F.Out,"" "%s" - "" - "" + "" + "" "%s" - "" - "" + "" + "" "%s" - "" + "
    ", + "", Usr_GetColumnsForSelectUsrs ()); if (Role == Rol_STUDENT) { @@ -4878,7 +4878,8 @@ void Usr_PutCheckboxToSelectAllTheUsers (Rol_Role_t Role) LstUsrs = &Gbl.Usrs.LstTchs; } Sex = Usr_GetSexOfUsrsLst (LstUsrs); - fprintf (Gbl.F.Out,"%s:" + fprintf (Gbl.F.Out,"%s:" + "
    " + fprintf (Gbl.F.Out,"" " " - ""); + "" + fprintf (Gbl.F.Out,"" "%s " - "", + "" + fprintf (Gbl.F.Out,"" " " - ""); + "" + fprintf (Gbl.F.Out,"" "%s " - "", + "" + fprintf (Gbl.F.Out,"" " " - ""); + "" + fprintf (Gbl.F.Out,"" "%s " - "", + "" + fprintf (Gbl.F.Out,"" "%s " - "", + "" + fprintf (Gbl.F.Out,"" "%s " - "", + "" + fprintf (Gbl.F.Out,"" "%s %s " - "", + "" + fprintf (Gbl.F.Out,"" "%s " - "", + "
    " + fprintf (Gbl.F.Out,"" "(%s) " - "", + "
    " + "" " " - ""); + "" + fprintf (Gbl.F.Out,"" "%s " - "", + "" + fprintf (Gbl.F.Out,"" "%s " - "", + "
    ", + "", Usr_NUM_MAIN_FIELDS_DATA_USR); if (NumUsrs == 1) fprintf (Gbl.F.Out,"1 %s", @@ -5731,7 +5733,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *UsrQuery) fprintf (Gbl.F.Out,"%u %s", NumUsrs, Txt_ROLES_PLURAL_abc[Role][Sex]); - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"
    " + fprintf (Gbl.F.Out,"" "%s " - "", + "" + fprintf (Gbl.F.Out,"" "%s " - "", + "