From e5721c456001d7112532637fd8343099a10e4257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sat, 12 Jan 2019 19:46:33 +0100 Subject: [PATCH] Version 18.33 --- css/{swad18.32.css => swad18.33.css} | 23 +---- icon/arrow-right-green.svg | 1 + icon/arrow-right-red.svg | 1 + icon/check-square.svg | 1 + icon/square.svg | 1 + icon/unlock.svg | 1 + swad_ID.c | 3 +- swad_account.c | 1 - swad_agenda.c | 4 +- swad_announcement.c | 1 - swad_attendance.c | 35 ++++--- swad_changelog.h | 19 +++- swad_course.c | 1 - swad_duplicate.c | 1 - swad_enrolment.c | 5 - swad_file_browser.c | 63 +++++------- swad_follow.c | 1 - swad_group.c | 58 +++++------ swad_icon.c | 65 +++++------- swad_icon.h | 8 +- swad_info.c | 3 +- swad_language.c | 1 - swad_layout.c | 14 +-- swad_layout.h | 2 - swad_logo.c | 1 - swad_mail.c | 3 +- swad_message.c | 6 +- swad_notification.c | 6 -- swad_password.c | 1 - swad_photo.c | 6 +- swad_profile.c | 4 +- swad_project.c | 19 ++-- swad_record.c | 4 +- swad_statistic.c | 3 - swad_test.c | 5 +- swad_test_import.c | 22 ++-- swad_text.c | 147 --------------------------- swad_theme.c | 8 -- swad_user.c | 29 +----- swad_zip.c | 1 - 40 files changed, 162 insertions(+), 416 deletions(-) rename css/{swad18.32.css => swad18.33.css} (98%) create mode 100644 icon/arrow-right-green.svg create mode 100644 icon/arrow-right-red.svg create mode 100644 icon/check-square.svg create mode 100644 icon/square.svg create mode 100644 icon/unlock.svg diff --git a/css/swad18.32.css b/css/swad18.33.css similarity index 98% rename from css/swad18.32.css rename to css/swad18.33.css index 3ce668f65..b164af17f 100644 --- a/css/swad18.32.css +++ b/css/swad18.33.css @@ -246,17 +246,6 @@ a:hover /* Default ==> underlined */ display:inline; padding:0 10px; } -@media only screen and (max-width: 1024px) - { /* For mobile phones and tablets */ - #login_txt - { - display:none; - } - } -.WHITE_HEAD {color:#E0E0E0; font-size:12pt; white-space:nowrap;} -.GREY_HEAD {color:#E0E0E0; font-size:12pt; white-space:nowrap;} -.BLUE_HEAD {color:white; font-size:12pt; white-space:nowrap;} -.YELLOW_HEAD {color:#B3B0B3; font-size:12pt; white-space:nowrap;} /************************ Layout (second heading row) ************************/ #head_row_2 @@ -1564,13 +1553,11 @@ a:hover /* Default ==> underlined */ } /*********************************** Icons ***********************************/ -.ICO20x15 {width:20px; height:15px; vertical-align:middle;} -.ICOx16 { height:16px; vertical-align:middle;} +.ICOx16 {height:16px; vertical-align:middle;} .ICO16x16 {width:16px; height:16px; vertical-align:middle;} .ICO20x20 {width:20px; height:20px; vertical-align:middle;} .ICO25x25 {width:25px; height:25px; vertical-align:middle;} -.ICOx25 { height:25px; vertical-align:middle;} -.ICO40x25 {width:40px; height:25px; vertical-align:middle;} +.ICOx25 {height:25px; vertical-align:middle; margin:0 auto;} .ICO40x40 {width:40px; height:40px; vertical-align:middle;} .ICO64x64 {width:64px; height:64px; vertical-align:middle;} .ICO160x160 {width:160px; height:160px; vertical-align:middle;} @@ -1956,15 +1943,15 @@ a:hover img.CENTRE_PHOTO_SHOW .USR_LIST_NUM_N {color:#404040; font-size:15pt; font-weight:bold;} /*****************************************************************************/ -.WHITE_TITLE {color:#505050; font-size:18pt;} +.WHITE_TITLE {color:#505050; font-size:18pt;} .GREY_TITLE {color:#505050; font-size:18pt;} .BLUE_TITLE {color:#4D88A1; font-size:18pt;} -.YELLOW_TITLE {color:#BD4815; font-size:18pt;} +.YELLOW_TITLE {color:#BD4815; font-size:18pt;} /*********************** Icon and checkbox highlighting **********************/ .ICO_HIDDEN { - opacity:0.2; + opacity:0.3; } .ICO_HIGHLIGHT, .CHECKBOX_UNCHECKED { diff --git a/icon/arrow-right-green.svg b/icon/arrow-right-green.svg new file mode 100644 index 000000000..41c584943 --- /dev/null +++ b/icon/arrow-right-green.svg @@ -0,0 +1 @@ + diff --git a/icon/arrow-right-red.svg b/icon/arrow-right-red.svg new file mode 100644 index 000000000..2fa0d87bb --- /dev/null +++ b/icon/arrow-right-red.svg @@ -0,0 +1 @@ + diff --git a/icon/check-square.svg b/icon/check-square.svg new file mode 100644 index 000000000..30397cafe --- /dev/null +++ b/icon/check-square.svg @@ -0,0 +1 @@ + diff --git a/icon/square.svg b/icon/square.svg new file mode 100644 index 000000000..986f9efd0 --- /dev/null +++ b/icon/square.svg @@ -0,0 +1 @@ + diff --git a/icon/unlock.svg b/icon/unlock.svg new file mode 100644 index 000000000..6984136a0 --- /dev/null +++ b/icon/unlock.svg @@ -0,0 +1 @@ + diff --git a/swad_ID.c b/swad_ID.c index 7e37fad08..476ba2a3a 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -499,7 +499,8 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID, /***** Put link *****/ Frm_LinkFormSubmit (Txt_Confirm_ID,The_ClassFormBold[Gbl.Prefs.Theme],NULL); - Ico_PutIconWithText ("check.svg",Txt_Confirm_ID,Txt_Confirm_ID); + Ico_PutIconTextLink ("check.svg", + Txt_Confirm_ID); fprintf (Gbl.F.Out,""); /***** End form *****/ diff --git a/swad_account.c b/swad_account.c index ee18ba832..4b72279a4 100644 --- a/swad_account.c +++ b/swad_account.c @@ -99,7 +99,6 @@ void Acc_PutLinkToCreateAccount (void) Lay_PutContextualLinkIconText (ActFrmMyAcc,NULL,NULL, "at.svg", - Txt_Create_account, Txt_Create_account); } diff --git a/swad_agenda.c b/swad_agenda.c index 13368672b..60a116579 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -218,7 +218,7 @@ static void Agd_ShowFormToSelPrivatPublicEvents (void) static const char *Image[2] = { "lock.svg", // Agd_PRIVAT_EVENTS - "lock-open.svg", // Agd_PUBLIC_EVENTS + "unlock.svg", // Agd_PUBLIC_EVENTS }; fprintf (Gbl.F.Out,"
"); @@ -846,7 +846,7 @@ static void Agd_PutFormsToRemEditOneEvent (struct AgendaEvent *AgdEvent) if (AgdEvent->Public) Lay_PutContextualLinkOnlyIcon (ActPrvEvtMyAgd,NULL, Agd_PutCurrentParamsMyAgenda, - "lock-open.svg", + "unlock.svg", Txt_Event_visible_to_the_users_of_your_courses_click_to_make_it_private); else Lay_PutContextualLinkOnlyIcon (ActPubEvtMyAgd,NULL, diff --git a/swad_announcement.c b/swad_announcement.c index 050dcaf53..67a1a7b64 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -360,7 +360,6 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status, /***** Put form to mark announcement as seen *****/ Lay_PutContextualLinkIconText (ActAnnSee,NULL,Ann_PutParams, "trash.svg", - Txt_Do_not_show_again, Txt_Do_not_show_again); fprintf (Gbl.F.Out,"
"); diff --git a/swad_attendance.c b/swad_attendance.c index 4e3ec771f..280e425b8 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -537,7 +537,6 @@ static void Att_PutFormToListMyAttendance (void) Lay_PutContextualLinkIconText (ActSeeLstMyAtt,NULL,NULL, "list-ol.svg", - Txt_Attendance_list, Txt_Attendance_list); } @@ -552,7 +551,6 @@ static void Att_PutFormToListStdsAttendance (void) Lay_PutContextualLinkIconText (ActReqLstStdAtt,NULL, Att_PutFormToListStdsParams, "list-ol.svg", - Txt_Attendance_list, Txt_Attendance_list); } @@ -2094,14 +2092,15 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd, fprintf (Gbl.F.Out,"" "" "" "", Gbl.RowEvenOdd,NumStd, Gbl.Prefs.URLIcons, - Present ? "check" : - "check-empty", + Present ? "check-square.svg" : + "square.svg", Present ? Txt_Present : Txt_Absent, Present ? Txt_Present : @@ -3168,7 +3167,6 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView) extern const char *Txt_Event; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_Today; - extern const char *Txt_Update_attendance_according_to_selected_events; extern const char *Txt_Update_attendance; unsigned UniqueId; unsigned NumAttEvent; @@ -3259,11 +3257,10 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView) { fprintf (Gbl.F.Out,"" ""); - Frm_LinkFormSubmitAnimated (Txt_Update_attendance_according_to_selected_events, + Frm_LinkFormSubmitAnimated (Txt_Update_attendance, The_ClassFormBold[Gbl.Prefs.Theme], NULL); - Ico_PutCalculateIconWithText (Txt_Update_attendance_according_to_selected_events, - Txt_Update_attendance); + Ico_PutCalculateIconWithText (Txt_Update_attendance); fprintf (Gbl.F.Out,"" ""); } @@ -3496,13 +3493,14 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr Present = Att_CheckIfUsrIsPresentInAttEvent (Gbl.AttEvents.Lst[NumAttEvent].AttCod,UsrDat->UsrCod); fprintf (Gbl.F.Out,"" - "\"%s\"" + "\"%s\"" "", Gbl.RowEvenOdd, Gbl.Prefs.URLIcons, - Present ? "check" : - "check-empty", + Present ? "check-square.svg" : + "square.svg", Present ? Txt_Present : Txt_Absent, Present ? Txt_Present : @@ -3658,8 +3656,9 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat) "%u:" "" "" - "\"%s\"" + "\"%s\"" " %s" "", - UniqueId,(long) Gbl.FileBrowser.Asg.TimeUTC[Dat_START_TIME], - (unsigned) Gbl.Prefs.DateFormat,Txt_Today); - fprintf (Gbl.F.Out,""); - - /***** Arrow *****/ - fprintf (Gbl.F.Out,"\"\"", - Gbl.Prefs.URLIcons, - Gbl.FileBrowser.Asg.Open ? "green" : - "red"); - - /***** Write end date *****/ - fprintf (Gbl.F.Out,"", - UniqueId, - Gbl.FileBrowser.Asg.Open ? "ASG_LST_DATE_GREEN" : - "ASG_LST_DATE_RED"); - fprintf (Gbl.F.Out,"" + "" + "→" + "" + "", + "" + "", + UniqueId, + UniqueId,(long) Gbl.FileBrowser.Asg.TimeUTC[Dat_START_TIME], + (unsigned) Gbl.Prefs.DateFormat,Txt_Today, + UniqueId, UniqueId,(long) Gbl.FileBrowser.Asg.TimeUTC[Dat_END_TIME], (unsigned) Gbl.Prefs.DateFormat,Txt_Today); - fprintf (Gbl.F.Out,""); } else fprintf (Gbl.F.Out," (%s)", @@ -12500,7 +12484,6 @@ static void Brw_PutLinkToAskRemOldFiles (void) Lay_PutContextualLinkIconText (ActReqRemOldBrf,NULL, Brw_PutHiddenParamFullTreeIfSelected, "trash.svg", - Txt_Remove_old_files, Txt_Remove_old_files); } diff --git a/swad_follow.c b/swad_follow.c index 34cc957a3..fc1266704 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -101,7 +101,6 @@ void Fol_PutLinkWhoToFollow (void) Lay_PutContextualLinkIconText (ActSeeSocPrf,NULL,NULL, "user-plus.svg", - Txt_Who_to_follow, Txt_Who_to_follow); } diff --git a/swad_group.c b/swad_group.c index b04ef013a..274f39881 100644 --- a/swad_group.c +++ b/swad_group.c @@ -367,7 +367,6 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction, extern const char *Hlp_USERS_Groups; extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_Groups; - extern const char *Txt_Update_users_according_to_selected_groups; extern const char *Txt_Update_users; unsigned NumGrpTyp; bool ICanEdit; @@ -413,11 +412,10 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction, /***** Submit button *****/ fprintf (Gbl.F.Out,"
"); - Frm_LinkFormSubmitAnimated (Txt_Update_users_according_to_selected_groups, + Frm_LinkFormSubmitAnimated (Txt_Update_users, The_ClassFormBold[Gbl.Prefs.Theme], "CopyMessageToHiddenFields()"); - Ico_PutCalculateIconWithText (Txt_Update_users_according_to_selected_groups, - Txt_Update_users); + Ico_PutCalculateIconWithText (Txt_Update_users); fprintf (Gbl.F.Out,"
"); /***** End form *****/ @@ -1385,7 +1383,7 @@ static void Grp_ListGroupTypesForEdition (void) "" "\"%s\"" + " class=\"%sCONTEXT_ICO_16x16\" />" "" "", Gbl.Prefs.URLIcons, @@ -1545,7 +1543,7 @@ static void Grp_ListGroupsForEdition (void) Grp->Open ? Txt_Group_X_open_click_to_close_it : Txt_Group_X_closed_click_to_open_it, Grp->GrpName); - Ico_PutIconLink (Grp->Open ? "lock-open.svg" : + Ico_PutIconLink (Grp->Open ? "unlock.svg" : "lock.svg", Gbl.Title); Frm_EndForm (); @@ -2454,18 +2452,14 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight) Grp->Open ? Txt_Group_X_open : Txt_Group_X_closed, Grp->GrpName); - fprintf (Gbl.F.Out,"" - "\"%s\"" - "", - Gbl.Prefs.URLIcons, - Grp->Open ? "lock-open.svg" : - "lock.svg", - Gbl.Title,Gbl.Title); + fprintf (Gbl.F.Out,"\" >"); + Ico_PutIconOff (Grp->Open ? "unlock.svg" : + "lock.svg", + Gbl.Title); + fprintf (Gbl.F.Out,""); /***** Group name *****/ fprintf (Gbl.F.Out,"" "\"%s\"" + " class=\"%sCONTEXT_ICO_16x16\" />" "" "", Gbl.Prefs.URLIcons, @@ -2669,25 +2663,19 @@ static void Grp_PutFormToCreateGroup (void) /***** Write heading *****/ Grp_WriteHeadingGroups (); - /***** Put disabled icons to open group and archive zone *****/ + /***** Empty column to remove *****/ fprintf (Gbl.F.Out,"" - "" - "" - "\"%s\"" - "" - "" - "\"%s\"" - "", - Gbl.Prefs.URLIcons, - Txt_Group_closed, - Txt_Group_closed, - Gbl.Prefs.URLIcons, - Txt_File_zones_disabled, - Txt_File_zones_disabled); + ""); + + /***** Disabled icon to open group *****/ + fprintf (Gbl.F.Out,""); + Ico_PutIconOff ("lock.svg",Txt_Group_closed); + fprintf (Gbl.F.Out,""); + + /***** Disabled icon for archive zone *****/ + fprintf (Gbl.F.Out,""); + Ico_PutIconOff ("folder-red.svg",Txt_File_zones_disabled); + fprintf (Gbl.F.Out,""); /***** Group type *****/ /* Start selector */ diff --git a/swad_icon.c b/swad_icon.c index f555a267b..b10dda188 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -311,15 +311,9 @@ void Ico_PutDivIcon (const char *DivClass,const char *Icon,const char *Title) void Ico_PutDivIconLink (const char *DivClass,const char *Icon,const char *Title) { - fprintf (Gbl.F.Out,"
" - "" - "
", - DivClass, - Gbl.Prefs.URLIcons,Icon, - Title,Title); + fprintf (Gbl.F.Out,"
",DivClass); + Ico_PutIconLink (Icon,Title); + fprintf (Gbl.F.Out,"
"); } /*****************************************************************************/ @@ -335,6 +329,22 @@ void Ico_PutIconLink (const char *Icon,const char *Title) Title,Title); } +/*****************************************************************************/ +/******************* Show an icon with a link (with text) ********************/ +/*****************************************************************************/ + +void Ico_PutIconTextLink (const char *Icon,const char *Text) + { + /***** Print icon and optional text *****/ + fprintf (Gbl.F.Out,"
" + "\"%s\"" + " %s" + "
", + Gbl.Prefs.URLIcons,Icon,Text,Text, + Text); + } + /*****************************************************************************/ /************************** Show a preference selector ***********************/ /*****************************************************************************/ @@ -343,8 +353,7 @@ void Ico_PutPrefIconLink (const char *Icon,const char *Title) { fprintf (Gbl.F.Out,"", + " class=\"ICO_HIGHLIGHT ICOx25\" />", Gbl.Prefs.URLIcons,Icon, Title,Title); } @@ -353,29 +362,11 @@ void Ico_PutPrefIconLink (const char *Icon,const char *Title) /********************** Put an inactive/disabled icon ************************/ /*****************************************************************************/ -void Ico_PutIconOff (const char *Icon,const char *Alt) +void Ico_PutIconOff (const char *Icon,const char *Title) { fprintf (Gbl.F.Out,"\"%s\"", - Gbl.Prefs.URLIcons,Icon,Alt,Alt); - } - -/*****************************************************************************/ -/**************** Put a icon with a text to submit a form ********************/ -/*****************************************************************************/ - -void Ico_PutIconWithText (const char *Icon,const char *Alt,const char *Text) - { - /***** Print icon and optional text *****/ - fprintf (Gbl.F.Out,"
" - "\"%s\"", - Gbl.Prefs.URLIcons,Icon,Alt,Text ? Text : - Alt); - if (Text) - if (Text[0]) - fprintf (Gbl.F.Out," %s",Text); - fprintf (Gbl.F.Out,"
"); + Gbl.Prefs.URLIcons,Icon,Title,Title); } /*****************************************************************************/ @@ -383,7 +374,7 @@ void Ico_PutIconWithText (const char *Icon,const char *Alt,const char *Text) /********** When clicked, the icon will be replaced by an animation **********/ /*****************************************************************************/ -void Ico_PutCalculateIcon (const char *Alt) +void Ico_PutCalculateIcon (const char *Title) { fprintf (Gbl.F.Out,"
" "" // Animated icon hidden "
" "", - Gbl.Form.Num,Gbl.Prefs.URLIcons,Alt,Alt, - Gbl.Form.Num,Gbl.Prefs.URLIcons,Alt,Alt); + Gbl.Form.Num,Gbl.Prefs.URLIcons,Title,Title, + Gbl.Form.Num,Gbl.Prefs.URLIcons,Title,Title); } /*****************************************************************************/ @@ -403,7 +394,7 @@ void Ico_PutCalculateIcon (const char *Alt) /********** When clicked, the icon will be replaced by an animation **********/ /*****************************************************************************/ -void Ico_PutCalculateIconWithText (const char *Alt,const char *Text) +void Ico_PutCalculateIconWithText (const char *Text) { fprintf (Gbl.F.Out,"
" @@ -416,8 +407,8 @@ void Ico_PutCalculateIconWithText (const char *Alt,const char *Text) " %s" "
" "", - Gbl.Form.Num,Gbl.Prefs.URLIcons,Alt,Text, - Gbl.Form.Num,Gbl.Prefs.URLIcons,Alt,Text, + Gbl.Form.Num,Gbl.Prefs.URLIcons,Text,Text, + Gbl.Form.Num,Gbl.Prefs.URLIcons,Text,Text, Text); } diff --git a/swad_icon.h b/swad_icon.h index ee99b3222..c6022c627 100644 --- a/swad_icon.h +++ b/swad_icon.h @@ -69,12 +69,12 @@ void Ico_PutContextualIconToPrint (Act_Action_t NextAction,void (*FuncParams) () void Ico_PutDivIcon (const char *DivClass,const char *Icon,const char *Title); void Ico_PutDivIconLink (const char *DivClass,const char *Icon,const char *Title); void Ico_PutIconLink (const char *Icon,const char *Title); +void Ico_PutIconTextLink (const char *Icon,const char *Text); void Ico_PutPrefIconLink (const char *Icon,const char *Title); -void Ico_PutIconOff (const char *Icon,const char *Alt); -void Ico_PutIconWithText (const char *Icon,const char *Alt,const char *Text); +void Ico_PutIconOff (const char *Icon,const char *Title); -void Ico_PutCalculateIcon (const char *Alt); -void Ico_PutCalculateIconWithText (const char *Alt,const char *Text); +void Ico_PutCalculateIcon (const char *Title); +void Ico_PutCalculateIconWithText (const char *Text); void Ico_PutIconRemovalNotAllowed (void); void Ico_PutIconRemove (void); diff --git a/swad_info.c b/swad_info.c index c55bcfcbd..df7790337 100644 --- a/swad_info.c +++ b/swad_info.c @@ -1050,8 +1050,7 @@ static void Inf_ShowPage (const char *URL) /***** Link to view in a new window *****/ fprintf (Gbl.F.Out,"", URL,The_ClassFormBold[Gbl.Prefs.Theme]); - Ico_PutIconWithText ("expand-arrows-alt.svg", - Txt_View_in_a_new_window, + Ico_PutIconTextLink ("expand-arrows-alt.svg", Txt_View_in_a_new_window); fprintf (Gbl.F.Out,""); diff --git a/swad_language.c b/swad_language.c index 2f28d5bc5..caedabce8 100644 --- a/swad_language.c +++ b/swad_language.c @@ -79,7 +79,6 @@ void Lan_PutLinkToChangeLanguage (void) { Lay_PutContextualLinkIconText (ActEdiPrf,NULL,NULL, "globe.svg", - "Change language", "Change language"); } diff --git a/swad_layout.c b/swad_layout.c index a92404a1b..f5e2db333 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -831,7 +831,6 @@ static void Lay_WriteScriptCustomDropzone (void) static void Lay_WritePageTopHeading (void) { - extern const char *The_ClassHead[The_NUM_THEMES]; extern const char *The_ClassTagline[The_NUM_THEMES]; extern const char *Txt_System; extern const char *Txt_TAGLINE; @@ -902,8 +901,7 @@ static void Lay_WritePageTopHeading (void) /* 1st. row, 3rd. column: logged user or language selection, and link to open/close session */ - fprintf (Gbl.F.Out,"
", - The_ClassHead[Gbl.Prefs.Theme]); + fprintf (Gbl.F.Out,"
"); if (Gbl.Usrs.Me.Logged) Usr_WriteLoggedUsrHead (); else @@ -1113,7 +1111,6 @@ void Lay_PutContextualLinkOnlyIcon (Act_Action_t NextAction,const char *Anchor, void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor, void (*FuncParams) (), const char *Icon, - const char *Title, const char *Text) { extern const char *The_ClassFormBold[The_NUM_THEMES]; @@ -1128,8 +1125,8 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor, FuncParams (); /***** Put icon and text with link *****/ - Frm_LinkFormSubmit (Title,The_ClassFormBold[Gbl.Prefs.Theme],NULL); - Ico_PutIconWithText (Icon,Title,Text); + Frm_LinkFormSubmit (Text,The_ClassFormBold[Gbl.Prefs.Theme],NULL); + Ico_PutIconTextLink (Icon,Text); fprintf (Gbl.F.Out,""); /***** End form *****/ @@ -1147,7 +1144,6 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor, void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *Anchor, void (*FuncParams) (), const char *Icon, - const char *Title, const char *Text, const char *OnSubmit) { @@ -1163,8 +1159,8 @@ void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char * FuncParams (); /***** Put icon with link *****/ - Frm_LinkFormSubmit (Title,The_ClassFormBold[Gbl.Prefs.Theme],OnSubmit); - Ico_PutIconWithText (Icon,Title,Text); + Frm_LinkFormSubmit (Text,The_ClassFormBold[Gbl.Prefs.Theme],OnSubmit); + Ico_PutIconTextLink (Icon,Text); fprintf (Gbl.F.Out,""); /***** End form *****/ diff --git a/swad_layout.h b/swad_layout.h index b88067d2f..833e4378e 100644 --- a/swad_layout.h +++ b/swad_layout.h @@ -59,12 +59,10 @@ void Lay_PutContextualLinkOnlyIcon (Act_Action_t NextAction,const char *Anchor, void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor, void (*FuncParams) (), const char *Icon, - const char *Title, const char *Text); void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *Anchor, void (*FuncParams) (), const char *Icon, - const char *Title, const char *Text, const char *OnSubmit); void Lay_PutContextualCheckbox (Act_Action_t NextAction, diff --git a/swad_logo.c b/swad_logo.c index 811922838..11a4dfa1a 100644 --- a/swad_logo.c +++ b/swad_logo.c @@ -280,7 +280,6 @@ void Log_RequestLogo (Sco_Scope_t Scope) fprintf (Gbl.F.Out,"
"); Lay_PutContextualLinkIconText (ActionRem,NULL,NULL, "trash.svg", - Txt_Remove_logo, Txt_Remove_logo); fprintf (Gbl.F.Out,"
"); } diff --git a/swad_mail.c b/swad_mail.c index 33c3ad777..0cc477e32 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -985,8 +985,7 @@ void Mai_ListEmails (void) StrAddresses, Txt_Create_email_message, The_ClassFormBold[Gbl.Prefs.Theme]); - Ico_PutIconWithText ("pen.svg", - Txt_Create_email_message, + Ico_PutIconTextLink ("pen.svg", Txt_Create_email_message); fprintf (Gbl.F.Out,"" "
"); diff --git a/swad_message.c b/swad_message.c index 56fe38cb0..14d7d2066 100644 --- a/swad_message.c +++ b/swad_message.c @@ -367,7 +367,6 @@ static void Msg_PutLinkToShowMorePotentialRecipients (void) Msg_PutParamsShowMorePotentialRecipients, "users.svg", Txt_Show_more_recipients, - Txt_Show_more_recipients, "CopyMessageToHiddenFields()"); fprintf (Gbl.F.Out,"
"); } @@ -1773,7 +1772,7 @@ static void Msg_ShowSentOrReceivedMessages (void) Frm_LinkFormSubmitAnimated (Txt_Update_messages, The_ClassFormBold[Gbl.Prefs.Theme], NULL); - Ico_PutCalculateIconWithText (Txt_Update_messages,Txt_Update_messages); + Ico_PutCalculateIconWithText (Txt_Update_messages); fprintf (Gbl.F.Out,""); Frm_EndForm (); @@ -1875,7 +1874,6 @@ static void Msg_PutLinkToViewBannedUsers(void) Lay_PutContextualLinkIconText (ActLstBanUsr,NULL,NULL, "lock.svg", - Txt_Banned_users, Txt_Banned_users); } @@ -3675,7 +3673,7 @@ static void Msg_PutFormToBanSender (struct UsrData *UsrDat) Gbl.Msg.CurrentPage); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Msg_PutHiddenParamsMsgsFilters (); - Ico_PutIconLink ("lock-open.svg",Txt_Sender_permitted_click_to_ban_him); + Ico_PutIconLink ("unlock.svg",Txt_Sender_permitted_click_to_ban_him); Frm_EndForm (); } diff --git a/swad_notification.c b/swad_notification.c index e8ac0228c..0d5a89284 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -302,11 +302,8 @@ static unsigned Ntf_GetNumberOfMyNewUnseenNtfs (void); void Ntf_ShowMyNotifications (void) { extern const char *Hlp_MESSAGES_Notifications; - extern const char *Txt_Change_preferences; extern const char *Txt_Settings; - extern const char *Txt_Email_domains_allowed_for_notifications; extern const char *Txt_Domains; - extern const char *Txt_Mark_all_notifications_as_read; extern const char *Txt_Mark_all_NOTIFICATIONS_as_read; extern const char *Txt_Notifications; extern const char *Txt_Date; @@ -373,19 +370,16 @@ void Ntf_ShowMyNotifications (void) /* Put form to change notification preferences */ Lay_PutContextualLinkIconText (ActMrkNtfSee,NULL,NULL, "eye.svg", - Txt_Mark_all_notifications_as_read, Txt_Mark_all_NOTIFICATIONS_as_read); /* Put form to change notification preferences */ Lay_PutContextualLinkIconText (ActEdiPrf,NULL,NULL, "cog.svg", - Txt_Change_preferences, Txt_Settings); /* Put form to view allowed mail domains */ Lay_PutContextualLinkIconText (ActSeeMai,NULL,NULL, "envelope.svg", - Txt_Email_domains_allowed_for_notifications, Txt_Domains); fprintf (Gbl.F.Out,""); diff --git a/swad_password.c b/swad_password.c index 64a1e191d..392d6331b 100644 --- a/swad_password.c +++ b/swad_password.c @@ -262,7 +262,6 @@ void Pwd_PutLinkToSendNewPasswd (void) Lay_PutContextualLinkIconText (ActReqSndNewPwd,NULL, Pwd_PutLinkToSendNewPasswdParams, "key.svg", - Txt_Forgotten_password, Txt_Forgotten_password); } diff --git a/swad_photo.c b/swad_photo.c index 365bac52f..c1ea0932b 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -1993,7 +1993,6 @@ static void Pho_PutLinkToPrintViewOfDegreeStatsParams (void) static void Pho_PutLinkToCalculateDegreeStats (void) { extern const char *The_ClassFormBold[The_NUM_THEMES]; - extern const char *Txt_Calculate_average_photo_of_a_degree; extern const char *Txt_Calculate_average_photo_of_THE_DEGREE_X; extern const char *Txt_unknown_TIME; extern const char *Txt_time; @@ -2020,11 +2019,10 @@ static void Pho_PutLinkToCalculateDegreeStats (void) Pho_PutHiddenParamPhotoSize (); Pho_PutHiddenParamOrderDegrees (); Usr_PutParamsPrefsAboutUsrList (); - Frm_LinkFormSubmitAnimated (Txt_Calculate_average_photo_of_a_degree, + Frm_LinkFormSubmitAnimated (Txt_Calculate_average_photo_of_THE_DEGREE_X, The_ClassFormBold[Gbl.Prefs.Theme], NULL); - Ico_PutCalculateIconWithText (Txt_Calculate_average_photo_of_a_degree, - Txt_Calculate_average_photo_of_THE_DEGREE_X); + Ico_PutCalculateIconWithText (Txt_Calculate_average_photo_of_THE_DEGREE_X); /***** Put selector with all the degrees with students *****/ fprintf (Gbl.F.Out,"", diff --git a/swad_statistic.c b/swad_statistic.c index 7c8b14294..d2db197e8 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -754,7 +754,6 @@ static void Sta_PutLinkToCourseHits (void) case Rol_SYS_ADM: Lay_PutContextualLinkIconText (ActReqAccCrs,NULL,NULL, "chart-line.svg", - Txt_Visits_to_course, Txt_Visits_to_course); break; default: @@ -772,7 +771,6 @@ static void Sta_PutLinkToGlobalHits (void) Lay_PutContextualLinkIconText (ActReqAccGbl,NULL,NULL, "chart-line.svg", - Txt_Global_visits, Txt_Global_visits); } @@ -9666,7 +9664,6 @@ void Con_PutLinkToLastClicks (void) Lay_PutContextualLinkIconText (ActLstClk,NULL,NULL, "mouse-pointer.svg", - Txt_Last_clicks, Txt_Last_clicks); } diff --git a/swad_test.c b/swad_test.c index d2f01d435..c32e60acf 100644 --- a/swad_test.c +++ b/swad_test.c @@ -414,7 +414,6 @@ static void Tst_PutFormToViewResultsOfUsersTests (Act_Action_t Action) fprintf (Gbl.F.Out,"
"); Lay_PutContextualLinkIconText (Action,NULL,NULL, "tasks.svg", - Txt_Test_results, Txt_Test_results); fprintf (Gbl.F.Out,"
"); } @@ -3440,9 +3439,9 @@ static void Tst_WriteAnswersEdit (long QstCod) "", Gbl.RowEvenOdd); if (row[6][0] == 'Y') - fprintf (Gbl.F.Out,"\"%s\"", + " class=\"CONTEXT_ICO_16x16\" />", Gbl.Prefs.URLIcons, Txt_TST_Answer_given_by_the_teachers, Txt_TST_Answer_given_by_the_teachers); diff --git a/swad_test_import.c b/swad_test_import.c index 5b03f9d1f..18dcb5e7e 100644 --- a/swad_test_import.c +++ b/swad_test_import.c @@ -87,13 +87,11 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem, void TsI_PutFormToExportQuestions (void) { - extern const char *Txt_Export_questions_to_XML_file; extern const char *Txt_Export_questions; /***** Put a link to create a file with questions *****/ Lay_PutContextualLinkIconText (ActLstTstQst,NULL,TsI_PutParamsExportQsts, "file-import.svg", - Txt_Export_questions_to_XML_file, Txt_Export_questions); } @@ -116,13 +114,11 @@ static void TsI_PutParamsExportQsts (void) void TsI_PutFormToImportQuestions (void) { - extern const char *Txt_Import_questions_from_XML_file; extern const char *Txt_Import_questions; /***** Put a link to create a file with questions *****/ Lay_PutContextualLinkIconText (ActReqImpTstQst,NULL,NULL, "file-export.svg", - Txt_Import_questions_from_XML_file, Txt_Import_questions); } @@ -268,7 +264,8 @@ void TsI_CreateXML (unsigned long NumRows,MYSQL_RES *mysql_res) Cfg_URL_SWAD_PUBLIC,Cfg_FOLDER_FILE_BROWSER_TMP, Gbl.FileBrowser.TmpPubDir, The_ClassFormBold[Gbl.Prefs.Theme]); - Ico_PutIconWithText ("file.svg",Txt_XML_file,Txt_XML_file); + Ico_PutIconTextLink ("file.svg", + Txt_XML_file); fprintf (Gbl.F.Out,""); } @@ -1028,7 +1025,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem, "" "\"%s\"" + " class=\"CONTEXT_ICO_16x16\" />" "", Gbl.RowEvenOdd, Gbl.Prefs.URLIcons, @@ -1155,16 +1152,17 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem, /* Put an icon that indicates whether the answer is correct or wrong */ fprintf (Gbl.F.Out,"" - "",Gbl.RowEvenOdd); + "", + Gbl.RowEvenOdd); if (Gbl.Test.Answer.Options[NumOpt].Correct) - fprintf (Gbl.F.Out,"\"%s\"", + " class=\"%sCONTEXT_ICO_16x16\" />", Gbl.Prefs.URLIcons, - QuestionExists ? "ok_off" : - "ok_on", Txt_TST_Answer_given_by_the_teachers, - Txt_TST_Answer_given_by_the_teachers); + Txt_TST_Answer_given_by_the_teachers, + QuestionExists ? "ICO_HIDDEN " : + ""); fprintf (Gbl.F.Out,""); /* Write the number of option */ diff --git a/swad_text.c b/swad_text.c index b0598729e..7905bd871 100644 --- a/swad_text.c +++ b/swad_text.c @@ -2954,27 +2954,6 @@ const char *Txt_Calculate = "Calcular"; #endif -const char *Txt_Calculate_average_photo_of_a_degree = -#if L==1 // ca - "Calcular fotografia mitjana d'una titulació"; -#elif L==2 // de - "Calculate average photo of a degree"; // Need Übersetzung -#elif L==3 // en - "Calculate average photo of a degree"; -#elif L==4 // es - "Calcular fotografía promedio de una titulación"; -#elif L==5 // fr - "Calculate average photo of a degree"; // Besoin de traduction -#elif L==6 // gn - "Calcular fotografía promedio de una titulación"; // Okoteve traducción -#elif L==7 // it - "Calcolare la media delle foto di laurea"; -#elif L==8 // pl - "Obliczyc średnia zdjec stopnia"; -#elif L==9 // pt - "Calcular a foto média de um grau"; -#endif - const char *Txt_Calculate_average_photo_of_THE_DEGREE_X = #if L==1 // ca "Calcular fotografia mitjana de"; @@ -3726,27 +3705,6 @@ const char *Txt_Change_photo = "Alterar foto"; #endif -const char *Txt_Change_preferences = -#if L==1 // ca - "Canviar preferències"; -#elif L==2 // de - "Einstellungen ändern"; -#elif L==3 // en - "Change preferences"; -#elif L==4 // es - "Cambiar preferencias"; -#elif L==5 // fr - "Changer mes préférences"; -#elif L==6 // gn - "Cambiar preferencias"; // Okoteve traducción -#elif L==7 // it - "Cambiare preferenze"; -#elif L==8 // pl - "Zmiana preferencji"; -#elif L==9 // pt - "Alterar preferências"; -#endif - const char *Txt_CHAT_Room = #if L==1 // ca "Sala"; @@ -11273,27 +11231,6 @@ const char *Txt_Export_questions = "Exportar perguntas"; #endif -const char *Txt_Export_questions_to_XML_file = -#if L==1 // ca - "Exportar preguntas a un archivo XML"; // Necessita traduccio -#elif L==2 // de - "Export questions to XML file"; // Need Übersetzung -#elif L==3 // en - "Export questions to XML file"; -#elif L==4 // es - "Exportar preguntas a un archivo XML"; -#elif L==5 // fr - "Exporter des questions vers un fichier XML"; -#elif L==6 // gn - "Exportar preguntas a un archivo XML"; // Okoteve traducción -#elif L==7 // it - "Export questions to XML file"; // Bisogno di traduzione -#elif L==8 // pl - "Export questions to XML file"; // Potrzebujesz tlumaczenie -#elif L==9 // pt - "Exportar perguntas para um arquivo XML"; -#endif - const char *Txt_X_faces_have_been_detected_in_front_position_1_Z_ = // Warning: it is very important to include two %u in the following sentences #if L==1 // ca "Se han detectado %u rostros en posición frontal:
" @@ -15192,27 +15129,6 @@ const char *Txt_Import_questions = "Importar perguntas"; #endif -const char *Txt_Import_questions_from_XML_file = -#if L==1 // ca - "Importar preguntas de un archivo XML"; // Necessita traduccio -#elif L==2 // de - "Import questions from XML file"; // Need Übersetzung -#elif L==3 // en - "Import questions from XML file"; -#elif L==4 // es - "Importar preguntas de un archivo XML"; -#elif L==5 // fr - "Import questions from XML file"; // Besoin de traduction -#elif L==6 // gn - "Importar preguntas de un archivo XML"; // Okoteve traducción -#elif L==7 // it - "Import questions from XML file"; // Bisogno di traduzione -#elif L==8 // pl - "Import questions from XML file"; // Potrzebujesz tlumaczenie -#elif L==9 // pt - "Importar perguntas de um arquivo XML"; -#endif - const char *Txt_Imported_questions = #if L==1 // ca "Preguntas importadas"; // Necessita traduccio @@ -17511,27 +17427,6 @@ const char *Txt_Mark_all_NOTIFICATIONS_as_read = "Marcar todas como lidas"; #endif -const char *Txt_Mark_all_notifications_as_read = -#if L==1 // ca - "Marca totes les notificacions com llegides"; -#elif L==2 // de - "Markieren Sie alle Anmeldungen als gelesen"; -#elif L==3 // en - "Mark all notifications as read"; -#elif L==4 // es - "Marcar todas las notificaciones como leídas"; -#elif L==5 // fr - "Marquer tous les notifications comme lus"; -#elif L==6 // gn - "Marcar todas las notificaciones como leídas"; // Okoteve traducción -#elif L==7 // it - "Segnare tutte le notifiche come gi` letti"; -#elif L==8 // pl - "Mark all notifications as read"; // Potrzebujesz tlumaczenie -#elif L==9 // pt - "Marcar todas as notificações como lidas"; -#endif - const char *Txt_Mark_as_favourite = #if L==1 // ca "Marca com favorit"; @@ -51364,27 +51259,6 @@ const char *Txt_Update_attendance = "Atualizar presença"; #endif -const char *Txt_Update_attendance_according_to_selected_events = -#if L==1 // ca - "Actualitzar assistència segons els esdeveniments seleccionats"; -#elif L==2 // de - "Update Anwesenheit nach ausgewählten Ereignisse"; -#elif L==3 // en - "Update attendance according to selected events"; -#elif L==4 // es - "Actualizar asistencia según los eventos seleccionados"; -#elif L==5 // fr - "Mise à jour présence en fonction d'événements sélectionnes"; -#elif L==6 // gn - "Actualizar asistencia según los eventos seleccionados"; // Okoteve traducción -#elif L==7 // it - "Aggiornamento presenza in base a eventi selezionati"; -#elif L==8 // pl - "Update bytność according to selected events"; // Potrzebujesz tlumaczenie -#elif L==9 // pt - "Atualizar presença de acordo com eventos selecionados"; -#endif - const char *Txt_Update_messages = #if L==1 // ca "Actualitzar missatges"; @@ -51427,27 +51301,6 @@ const char *Txt_Update_users = "Atualizar os utilizadores"; #endif -const char *Txt_Update_users_according_to_selected_groups = -#if L==1 // ca - "Actualitzar usuaris segons els grups seleccionats"; -#elif L==2 // de - "Update Benutzer nach ausgewählten Gruppen"; -#elif L==3 // en - "Update users according to selected groups"; -#elif L==4 // es - "Actualizar usuarios según los grupos seleccionados"; -#elif L==5 // fr - "Mise à jour des étudiants en fonction de groupes sélectionnes"; -#elif L==6 // gn - "Actualizar usuarios según los grupos seleccionados"; // Okoteve traducción -#elif L==7 // it - "Aggiornamento utenti in base a gruppi selezionati"; -#elif L==8 // pl - "Zaktualizuj użytkowników według wybranych grup"; -#elif L==9 // pt - "Atualizar os utilizadores de acordo com grupos selecionados"; -#endif - const char *Txt_UPLOAD_FILE_Invalid_link = #if L==1 // ca "Enlace no válido."; // Necessita traduccio diff --git a/swad_theme.c b/swad_theme.c index 8006889ce..330a17664 100644 --- a/swad_theme.c +++ b/swad_theme.c @@ -82,14 +82,6 @@ const char *The_TabOffBgColors[The_NUM_THEMES] = "TAB_OFF_YELLOW", }; -const char *The_ClassHead[The_NUM_THEMES] = - { - "WHITE_HEAD", - "GREY_HEAD", - "BLUE_HEAD", - "YELLOW_HEAD", - }; - const char *The_ClassTagline[The_NUM_THEMES] = { "WHITE_TAGLINE", diff --git a/swad_user.c b/swad_user.c index e7eea7d12..8d3ecdd70 100644 --- a/swad_user.c +++ b/swad_user.c @@ -2421,7 +2421,6 @@ void Usr_PutLinkToLogin (void) Lay_PutContextualLinkIconText (ActFrmLogIn,NULL,NULL, "sign-in-alt-green.svg", - Txt_Log_in, Txt_Log_in); } @@ -2647,21 +2646,11 @@ static void Usr_InsertMyBirthday (void) void Usr_PutFormLogIn (void) { - extern const char *The_ClassHead[The_NUM_THEMES]; extern const char *Txt_Log_in; /***** Link to log in form *****/ Frm_StartForm (ActFrmLogIn); - Frm_LinkFormSubmit (Txt_Log_in,The_ClassHead[Gbl.Prefs.Theme],NULL); - fprintf (Gbl.F.Out,"\"%s\"" - " %s" - "", - Gbl.Prefs.URLIcons, - Txt_Log_in, - Txt_Log_in, - Txt_Log_in); + Ico_PutIconLink ("sign-in-alt-green.svg",Txt_Log_in); Frm_EndForm (); } @@ -2672,7 +2661,6 @@ void Usr_PutFormLogIn (void) void Usr_WriteLoggedUsrHead (void) { extern const char *The_ClassUsr[The_NUM_THEMES]; - extern const char *The_ClassHead[The_NUM_THEMES]; extern const char *Txt_Role; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; bool ShowPhoto; @@ -2717,20 +2705,11 @@ void Usr_WriteLoggedUsrHead (void) void Usr_PutFormLogOut (void) { - extern const char *The_ClassHead[The_NUM_THEMES]; extern const char *Txt_Log_out; + /***** Link to log out form *****/ Frm_StartForm (ActLogOut); - Frm_LinkFormSubmit (Txt_Log_out,The_ClassHead[Gbl.Prefs.Theme],NULL); - fprintf (Gbl.F.Out,"\"%s\"" - " %s" - "", - Gbl.Prefs.URLIcons, - Txt_Log_out, - Txt_Log_out, - Txt_Log_out); + Ico_PutIconLink ("sign-out-alt-red.svg",Txt_Log_out); Frm_EndForm (); } @@ -7531,7 +7510,6 @@ static void Usr_PutLinkToSeeAdmins (void) /***** Put form to list admins *****/ Lay_PutContextualLinkIconText (ActLstOth,NULL,NULL, "user-tie.svg", - Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN], Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN]); } @@ -7546,7 +7524,6 @@ static void Usr_PutLinkToSeeGuests (void) /***** Put form to list guests *****/ Lay_PutContextualLinkIconText (ActLstGst,NULL,NULL, "users.svg", - Txt_ROLES_PLURAL_Abc[Rol_GST][Usr_SEX_UNKNOWN], Txt_ROLES_PLURAL_Abc[Rol_GST][Usr_SEX_UNKNOWN]); } diff --git a/swad_zip.c b/swad_zip.c index 8cbdd100a..31cb01af1 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -127,7 +127,6 @@ void ZIP_PutLinkToCreateZIPAsgWrk (void) Lay_PutContextualLinkIconText (ActAdmAsgWrkCrs,NULL, ZIP_PutLinkToCreateZIPAsgWrkParams, "download.svg", - Txt_Create_ZIP_file, Txt_Create_ZIP_file); }