diff --git a/swad_action.c b/swad_action.c index 895a5ecf9..134e6d2c5 100644 --- a/swad_action.c +++ b/swad_action.c @@ -2560,10 +2560,6 @@ const struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = [ActChg1stDay ] = {1484,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Set_EditSettings ,NULL}, [ActChgDatFmt ] = {1638,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Dat_ChangeDateFormat ,Set_EditSettings ,NULL}, [ActChgCol ] = { 674,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Set_ChangeSideCols ,Set_EditSettings ,NULL}, - [ActHidLftCol ] = { 668,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Set_HideLeftCol ,Set_EditSettings ,NULL}, - [ActHidRgtCol ] = { 669,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Set_HideRightCol ,Set_EditSettings ,NULL}, - [ActShoLftCol ] = { 670,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Set_ShowLeftCol ,Set_EditSettings ,NULL}, - [ActShoRgtCol ] = { 671,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Set_ShowRightCol ,Set_EditSettings ,NULL}, [ActChgIco ] = {1092,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Ico_ChangeIconSet ,Set_EditSettings ,NULL}, [ActChgMnu ] = {1243,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Mnu_ChangeMenu ,Set_EditSettings ,NULL}, [ActChgPriPho ] = { 774,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pho_ChangePhotoVisibility ,NULL}, @@ -3250,10 +3246,10 @@ Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse un ActReqSndNewPwd, // #665 -1, // #666 (obsolete action) -1, // #667 (obsolete action) - ActHidLftCol, // #668 - ActHidRgtCol, // #669 - ActShoLftCol, // #670 - ActShoRgtCol, // #671 + -1, // #668 (obsolete action) + -1, // #669 (obsolete action) + -1, // #670 (obsolete action) + -1, // #671 (obsolete action) -1, // #672 (obsolete action) ActReqEdiSet, // #673 ActChgCol, // #674 diff --git a/swad_action.h b/swad_action.h index 3c4a73333..85d3d2600 100644 --- a/swad_action.h +++ b/swad_action.h @@ -64,11 +64,9 @@ typedef enum typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to indicate obsolete action -#define Act_NUM_ACTIONS (1 + 4 + 66 + 38 + 12 + 42 + 39 + 19 + 110 + 186 + 437 + 176 + 169 + 16 + 68) +#define Act_MAX_ACTION_COD 1817 -#define Act_MAX_ACTION_COD 1817 - -#define Act_MAX_OPTIONS_IN_MENU_PER_TAB 13 +#define Act_MAX_OPTIONS_IN_MENU_PER_TAB 13 /*****************************************************************************/ /************************* Not asociates with tabs ***************************/ @@ -1632,24 +1630,22 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to #define ActChg1stDay (ActSeeMyUsgRep + 50) #define ActChgDatFmt (ActSeeMyUsgRep + 51) #define ActChgCol (ActSeeMyUsgRep + 52) -#define ActHidLftCol (ActSeeMyUsgRep + 53) -#define ActHidRgtCol (ActSeeMyUsgRep + 54) -#define ActShoLftCol (ActSeeMyUsgRep + 55) -#define ActShoRgtCol (ActSeeMyUsgRep + 56) -#define ActChgIco (ActSeeMyUsgRep + 57) -#define ActChgMnu (ActSeeMyUsgRep + 58) -#define ActChgPriPho (ActSeeMyUsgRep + 59) -#define ActChgBasPriPrf (ActSeeMyUsgRep + 60) -#define ActChgExtPriPrf (ActSeeMyUsgRep + 61) -#define ActChgCooPrf (ActSeeMyUsgRep + 62) -#define ActChgNtfPrf (ActSeeMyUsgRep + 63) +#define ActChgIco (ActSeeMyUsgRep + 53) +#define ActChgMnu (ActSeeMyUsgRep + 54) +#define ActChgPriPho (ActSeeMyUsgRep + 55) +#define ActChgBasPriPrf (ActSeeMyUsgRep + 56) +#define ActChgExtPriPrf (ActSeeMyUsgRep + 57) +#define ActChgCooPrf (ActSeeMyUsgRep + 58) +#define ActChgNtfPrf (ActSeeMyUsgRep + 59) -#define ActPrnUsrQR (ActSeeMyUsgRep + 64) +#define ActPrnUsrQR (ActSeeMyUsgRep + 60) -#define ActPrnMyTT (ActSeeMyUsgRep + 65) -#define ActEdiTut (ActSeeMyUsgRep + 66) -#define ActChgTut (ActSeeMyUsgRep + 67) -#define ActChgMyTT1stDay (ActSeeMyUsgRep + 68) +#define ActPrnMyTT (ActSeeMyUsgRep + 61) +#define ActEdiTut (ActSeeMyUsgRep + 62) +#define ActChgTut (ActSeeMyUsgRep + 63) +#define ActChgMyTT1stDay (ActSeeMyUsgRep + 64) + +#define Act_NUM_ACTIONS (ActChgMyTT1stDay + 1) /*****************************************************************************/ /******************************** Public types *******************************/ diff --git a/swad_changelog.h b/swad_changelog.h index 17e0df8cf..e14561f49 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -492,7 +492,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.109.8 (2020-01-03)" +#define Log_PLATFORM_VERSION "SWAD 19.109.9 (2020-01-03)" #define CSS_FILE "swad19.101.5.css" #define JS_FILE "swad19.91.1.js" /* @@ -502,6 +502,7 @@ ps2pdf source.ps destination.pdf // TODO: Version 19.1xx: Jan xx, 2020 Map in country information. (? lines) // TODO: Version 19.1xx: Jan xx, 2020 Map in institution information. (? lines) + Version 19.109.9: Jan 03, 2020 Removed unused actions. (278046 lines) Version 19.109.8: Jan 03, 2020 Changing action descriptions from database to swad-core. Not finished. (278185 lines) Version 19.109.7: Jan 02, 2020 Changing action descriptions from database to swad-core. Not finished. (278368 lines) Version 19.109.6: Jan 02, 2020 Changing action descriptions from database to swad-core. Not finished. (278570 lines) diff --git a/swad_setting.c b/swad_setting.c index 843dbdfb7..3beb20e23 100644 --- a/swad_setting.c +++ b/swad_setting.c @@ -298,62 +298,6 @@ void Set_ChangeSideCols (void) Set_SetSettingsFromIP (); } -/*****************************************************************************/ -/*************************** Hide left side column ***************************/ -/*****************************************************************************/ - -void Set_HideLeftCol (void) - { - Gbl.Prefs.SideCols &= ~Lay_SHOW_LEFT_COLUMN; // And with 1...101 to hide left column - if (Gbl.Usrs.Me.Logged) - Set_UpdateSideColsOnUsrDataTable (); - - /***** Set settings from current IP *****/ - Set_SetSettingsFromIP (); - } - -/*****************************************************************************/ -/*************************** Hide right side column **************************/ -/*****************************************************************************/ - -void Set_HideRightCol (void) - { - Gbl.Prefs.SideCols &= ~Lay_SHOW_RIGHT_COLUMN; // And with 1...110 to hide right column - if (Gbl.Usrs.Me.Logged) - Set_UpdateSideColsOnUsrDataTable (); - - /***** Set settings from current IP *****/ - Set_SetSettingsFromIP (); - } - -/*****************************************************************************/ -/**************************** Show left side column **************************/ -/*****************************************************************************/ - -void Set_ShowLeftCol (void) - { - Gbl.Prefs.SideCols |= Lay_SHOW_LEFT_COLUMN; // Or with 10 to show left column - if (Gbl.Usrs.Me.Logged) - Set_UpdateSideColsOnUsrDataTable (); - - /***** Set settings from current IP *****/ - Set_SetSettingsFromIP (); - } - -/*****************************************************************************/ -/**************************** Show right side column *************************/ -/*****************************************************************************/ - -void Set_ShowRightCol (void) - { - Gbl.Prefs.SideCols |= Lay_SHOW_RIGHT_COLUMN; // Or with 01 to show right column - if (Gbl.Usrs.Me.Logged) - Set_UpdateSideColsOnUsrDataTable (); - - /***** Set settings from current IP *****/ - Set_SetSettingsFromIP (); - } - /*****************************************************************************/ /************** Update layout of side colums on user data table **************/ /*****************************************************************************/ diff --git a/swad_setting.h b/swad_setting.h index 46374ca19..1b651eefc 100644 --- a/swad_setting.h +++ b/swad_setting.h @@ -46,10 +46,6 @@ void Set_SetSettingsFromIP (void); void Set_RemoveOldSettingsFromIP (void); void Set_ChangeSideCols (void); -void Set_HideLeftCol (void); -void Set_HideRightCol (void); -void Set_ShowLeftCol (void); -void Set_ShowRightCol (void); unsigned Set_GetParamSideCols (void); void Set_StartSettingsHead (void); diff --git a/swad_text_action.c b/swad_text_action.c index 99c146767..995558478 100644 --- a/swad_text_action.c +++ b/swad_text_action.c @@ -28746,90 +28746,6 @@ const char *Txt_Actions[Act_NUM_ACTIONS] = "" // Potrzebujesz tlumaczenie #elif L==9 // pt "" // Precisa de tradução -#endif - , - [ActHidLftCol] = -#if L==1 // ca - "" // Necessita traducció -#elif L==2 // de - "" // Need Übersetzung -#elif L==3 // en - "Hide left side column" -#elif L==4 // es - "" -#elif L==5 // fr - "" // Besoin de traduction -#elif L==6 // gn - "" // Okoteve traducción -#elif L==7 // it - "" // Bisogno di traduzione -#elif L==8 // pl - "" // Potrzebujesz tlumaczenie -#elif L==9 // pt - "" // Precisa de tradução -#endif - , - [ActHidRgtCol] = -#if L==1 // ca - "" // Necessita traducció -#elif L==2 // de - "" // Need Übersetzung -#elif L==3 // en - "Hide right side column" -#elif L==4 // es - "" -#elif L==5 // fr - "" // Besoin de traduction -#elif L==6 // gn - "" // Okoteve traducción -#elif L==7 // it - "" // Bisogno di traduzione -#elif L==8 // pl - "" // Potrzebujesz tlumaczenie -#elif L==9 // pt - "" // Precisa de tradução -#endif - , - [ActShoLftCol] = -#if L==1 // ca - "" // Necessita traducció -#elif L==2 // de - "" // Need Übersetzung -#elif L==3 // en - "Show left side column" -#elif L==4 // es - "" -#elif L==5 // fr - "" // Besoin de traduction -#elif L==6 // gn - "" // Okoteve traducción -#elif L==7 // it - "" // Bisogno di traduzione -#elif L==8 // pl - "" // Potrzebujesz tlumaczenie -#elif L==9 // pt - "" // Precisa de tradução -#endif - , - [ActShoRgtCol] = -#if L==1 // ca - "" // Necessita traducció -#elif L==2 // de - "" // Need Übersetzung -#elif L==3 // en - "Show right side column" -#elif L==4 // es - "" -#elif L==5 // fr - "" // Besoin de traduction -#elif L==6 // gn - "" // Okoteve traducción -#elif L==7 // it - "" // Bisogno di traduzione -#elif L==8 // pl - "" // Potrzebujesz tlumaczenie -#elif L==9 // pt - "" // Precisa de tradução #endif , [ActChgIco] =