From cd992925bccdbdd17d31b9374e121cb9a327e3ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 13 Nov 2016 01:21:35 +0100 Subject: [PATCH] Version 16.54 --- swad_calendar.c | 5 ++++- swad_changelog.h | 3 ++- swad_help.c | 17 +++++++++++++++++ swad_icon.c | 4 +++- swad_menu.c | 4 +++- swad_notification.c | 5 ++++- swad_preference.c | 9 +++++++-- swad_privacy.c | 4 +++- swad_theme.c | 4 +++- 9 files changed, 46 insertions(+), 9 deletions(-) diff --git a/swad_calendar.c b/swad_calendar.c index d019cc9ee..dc1d9681c 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -71,9 +71,12 @@ static void Cal_PutIconToPrintCalendar (void); void Cal_PutIconsToSelectFirstDayOfWeek (void) { + extern const char *Hlp_PROFILE_Preferences_calendar; extern const char *Txt_Calendar; - Lay_StartRoundFrame (NULL,Txt_Calendar,Cal_PutIconsFirstDayOfWeek,NULL); + Lay_StartRoundFrame (NULL,Txt_Calendar, + Cal_PutIconsFirstDayOfWeek, + Hlp_PROFILE_Preferences_calendar); Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,"ICON40x40B"); Lay_EndRoundFrame (); } diff --git a/swad_changelog.h b/swad_changelog.h index f681a4c21..beb64c63d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -156,13 +156,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.53.1 (2016-11-13)" +#define Log_PLATFORM_VERSION "SWAD 16.54 (2016-11-13)" #define CSS_FILE "swad16.51.css" #define JS_FILE "swad16.46.1.js" // 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 16.54: Nov 13, 2016 Contextual help on user's preferences. (206722 lines) Version 16.53.1: Nov 13, 2016 Contextual help on user's photo. (206686 lines) Version 16.53: Nov 13, 2016 Contextual help on surveys. (206681 lines) Version 16.52: Nov 12, 2016 Code refactoring in frames to include contextual help. (206653 lines) diff --git a/swad_help.c b/swad_help.c index b55918100..aa0c9c9c2 100644 --- a/swad_help.c +++ b/swad_help.c @@ -49,6 +49,23 @@ const char *Hlp_STATS_Surveys_questions = const char *Hlp_PROFILE_Photo = "https://github.com/acanas/swad-core/wiki/PROFILE.Photo"; +const char *Hlp_PROFILE_Preferences_language = + "https://github.com/acanas/swad-core/wiki/PROFILE.Preferences#language"; +const char *Hlp_PROFILE_Preferences_calendar = + "https://github.com/acanas/swad-core/wiki/PROFILE.Preferences#calendar"; +const char *Hlp_PROFILE_Preferences_icons = + "https://github.com/acanas/swad-core/wiki/PROFILE.Preferences#icons"; +const char *Hlp_PROFILE_Preferences_theme = + "https://github.com/acanas/swad-core/wiki/PROFILE.Preferences#theme"; +const char *Hlp_PROFILE_Preferences_menu = + "https://github.com/acanas/swad-core/wiki/PROFILE.Preferences#menu"; +const char *Hlp_PROFILE_Preferences_columns = + "https://github.com/acanas/swad-core/wiki/PROFILE.Preferences#columns"; +const char *Hlp_PROFILE_Preferences_privacy = + "https://github.com/acanas/swad-core/wiki/PROFILE.Preferences#privacy"; +const char *Hlp_PROFILE_Preferences_notifications = + "https://github.com/acanas/swad-core/wiki/PROFILE.Preferences#notifications"; + /*****************************************************************************/ /***************************** Private constants *****************************/ /*****************************************************************************/ diff --git a/swad_icon.c b/swad_icon.c index 4e598992b..78df9eacf 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -72,10 +72,12 @@ static void Ico_PutIconsIconSet (void); void Ico_PutIconsToSelectIconSet (void) { + extern const char *Hlp_PROFILE_Preferences_icons; extern const char *Txt_Icons; Ico_IconSet_t IconSet; - Lay_StartRoundFrame (NULL,Txt_Icons,Ico_PutIconsIconSet,NULL); + Lay_StartRoundFrame (NULL,Txt_Icons, + Ico_PutIconsIconSet,Hlp_PROFILE_Preferences_icons); fprintf (Gbl.F.Out,"" ""); for (IconSet = (Ico_IconSet_t) 0; diff --git a/swad_menu.c b/swad_menu.c index 80e210a6c..8f4c98fe9 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -307,11 +307,13 @@ void Mnu_WriteMenuThisTab (void) void Mnu_PutIconsToSelectMenu (void) { + extern const char *Hlp_PROFILE_Preferences_menu; extern const char *Txt_Menu; extern const char *Txt_MENU_NAMES[Mnu_NUM_MENUS]; Mnu_Menu_t Menu; - Lay_StartRoundFrame (NULL,Txt_Menu,Mnu_PutIconsMenu,NULL); + Lay_StartRoundFrame (NULL,Txt_Menu, + Mnu_PutIconsMenu,Hlp_PROFILE_Preferences_menu); fprintf (Gbl.F.Out,"
" ""); for (Menu = (Mnu_Menu_t) 0; diff --git a/swad_notification.c b/swad_notification.c index 6c7f69675..cc23d0161 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -1871,6 +1871,7 @@ void Ntf_MarkAllNotifAsSeen (void) void Ntf_PutFormChangeNotifSentByEMail (void) { + extern const char *Hlp_PROFILE_Preferences_notifications; extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_Save_changes; extern const char *Txt_Notifications; @@ -1880,7 +1881,9 @@ void Ntf_PutFormChangeNotifSentByEMail (void) Ntf_NotifyEvent_t NotifyEvent; /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif,NULL); + Lay_StartRoundFrame (NULL,Txt_Notifications, + Ntf_PutIconsNotif, + Hlp_PROFILE_Preferences_notifications); /***** Start form *****/ Act_FormStart (ActChgNtfPrf); diff --git a/swad_preference.c b/swad_preference.c index 9d247a5e7..633bd111a 100644 --- a/swad_preference.c +++ b/swad_preference.c @@ -67,13 +67,15 @@ static void Pre_UpdateSideColsOnUsrDataTable (void); void Pre_EditPrefs (void) { + extern const char *Hlp_PROFILE_Preferences_language; extern const char *Txt_Language; /***** Language, first day of week *****/ fprintf (Gbl.F.Out,"
" "" "
"); - Lay_StartRoundFrame (NULL,Txt_Language,Pre_PutIconsLanguage,NULL); + Lay_StartRoundFrame (NULL,Txt_Language, + Pre_PutIconsLanguage,Hlp_PROFILE_Preferences_language); fprintf (Gbl.F.Out,"
"); Pre_PutSelectorToSelectLanguage (); // 1. Language fprintf (Gbl.F.Out,"
"); @@ -376,11 +378,14 @@ Txt_Language_t Pre_GetParamLanguage (void) static void Pre_PutIconsToSelectSideCols (void) { + extern const char *Hlp_PROFILE_Preferences_columns; extern const char *Txt_Columns; extern const char *Txt_LAYOUT_SIDE_COLUMNS[4]; unsigned SideCols; - Lay_StartRoundFrame (NULL,Txt_Columns,Pre_PutIconsSideColumns,NULL); + Lay_StartRoundFrame (NULL,Txt_Columns, + Pre_PutIconsSideColumns, + Hlp_PROFILE_Preferences_columns); fprintf (Gbl.F.Out,"" ""); for (SideCols = 0; diff --git a/swad_privacy.c b/swad_privacy.c index 186d1122e..345556393 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -89,6 +89,7 @@ void Pri_PutLinkToChangeMyPrivacy (void) void Pri_EditMyPrivacy (void) { + extern const char *Hlp_PROFILE_Preferences_privacy; extern const char *Txt_Please_review_your_privacy_preferences; extern const char *Txt_Privacy; extern const char *Txt_Photo; @@ -101,7 +102,8 @@ void Pri_EditMyPrivacy (void) Lay_ShowAlert (Lay_WARNING,Txt_Please_review_your_privacy_preferences); /***** Start table *****/ - Lay_StartRoundFrame (NULL,Txt_Privacy,Pri_PutIconsPrivacy,NULL); + Lay_StartRoundFrame (NULL,Txt_Privacy, + Pri_PutIconsPrivacy,Hlp_PROFILE_Preferences_privacy); fprintf (Gbl.F.Out,"
"); /***** Edit photo visibility *****/ diff --git a/swad_theme.c b/swad_theme.c index 092141794..e43a6d388 100644 --- a/swad_theme.c +++ b/swad_theme.c @@ -251,10 +251,12 @@ static void The_PutIconsTheme (void); void The_PutIconsToSelectTheme (void) { + extern const char *Hlp_PROFILE_Preferences_theme; extern const char *Txt_Theme_SKIN; The_Theme_t Theme; - Lay_StartRoundFrame (NULL,Txt_Theme_SKIN,The_PutIconsTheme,NULL); + Lay_StartRoundFrame (NULL,Txt_Theme_SKIN, + The_PutIconsTheme,Hlp_PROFILE_Preferences_theme); fprintf (Gbl.F.Out,"
" ""); for (Theme = (The_Theme_t) 0;