mirror of
https://github.com/acanas/swad-core.git
synced 2024-09-20 00:02:42 +02:00
Version 14.49.2
This commit is contained in:
parent
7cd3d217d2
commit
d1729f2a53
|
@ -3538,28 +3538,17 @@ bool Act_CheckIfIHavePermissionToExecuteAction (Act_Action_t Action)
|
||||||
(Gbl.CurrentCrs.Crs.CrsCod < 0 && (Act_Actions[Action].PermisIfNoCrsSelected & (1 << Gbl.Usrs.Me.LoggedRole))));
|
(Gbl.CurrentCrs.Crs.CrsCod < 0 && (Act_Actions[Action].PermisIfNoCrsSelected & (1 << Gbl.Usrs.Me.LoggedRole))));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
|
||||||
/*************** Get the text for menu associated to an action ***************/
|
|
||||||
/*****************************************************************************/
|
|
||||||
|
|
||||||
const char *Act_GetMenuTxtAction (Act_Action_t Action)
|
|
||||||
{
|
|
||||||
extern const char *Txt_MENU_NO_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
|
||||||
|
|
||||||
return Txt_MENU_NO_BR[Act_Actions[Act_Actions[Action].SuperAction].Tab][Act_Actions[Act_Actions[Action].SuperAction].IndexInMenu];
|
|
||||||
}
|
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/******************* Get the title associated to an action *******************/
|
/******************* Get the title associated to an action *******************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
const char *Act_GetTitleAction (Act_Action_t Action)
|
const char *Act_GetTitleAction (Act_Action_t Action)
|
||||||
{
|
{
|
||||||
extern const char *Txt_MENU_NO_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
extern const char *Txt_MENU_TITLE[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
||||||
|
|
||||||
if (Action < 0 || Action >= Act_NUM_ACTIONS)
|
if (Action < 0 || Action >= Act_NUM_ACTIONS)
|
||||||
return NULL;
|
return NULL;
|
||||||
return Txt_MENU_NO_BR[Act_Actions[Act_Actions[Action].SuperAction].Tab][Act_Actions[Act_Actions[Action].SuperAction].IndexInMenu];
|
return Txt_MENU_TITLE[Act_Actions[Act_Actions[Action].SuperAction].Tab][Act_Actions[Act_Actions[Action].SuperAction].IndexInMenu];
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -3582,7 +3571,7 @@ const char *Act_GetSubtitleAction (Act_Action_t Action)
|
||||||
void Act_GetBreadcrumbStrForAction (Act_Action_t Action,bool HTML,char *BreadcrumbStr)
|
void Act_GetBreadcrumbStrForAction (Act_Action_t Action,bool HTML,char *BreadcrumbStr)
|
||||||
{
|
{
|
||||||
extern const char *Txt_TABS_FULL_TXT[Act_NUM_TABS];
|
extern const char *Txt_TABS_FULL_TXT[Act_NUM_TABS];
|
||||||
extern const char *Txt_MENU_NO_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
extern const char *Txt_MENU_TITLE[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
||||||
Act_Action_t Superaction = Act_Actions[Action].SuperAction;
|
Act_Action_t Superaction = Act_Actions[Action].SuperAction;
|
||||||
char *Arrow;
|
char *Arrow;
|
||||||
|
|
||||||
|
@ -3591,7 +3580,7 @@ void Act_GetBreadcrumbStrForAction (Act_Action_t Action,bool HTML,char *Breadcru
|
||||||
sprintf (BreadcrumbStr,"%s %s %s %s %s",
|
sprintf (BreadcrumbStr,"%s %s %s %s %s",
|
||||||
Cfg_HTTPS_URL_SWAD_CGI,Arrow,
|
Cfg_HTTPS_URL_SWAD_CGI,Arrow,
|
||||||
Txt_TABS_FULL_TXT[Act_Actions[Superaction].Tab],Arrow,
|
Txt_TABS_FULL_TXT[Act_Actions[Superaction].Tab],Arrow,
|
||||||
Txt_MENU_NO_BR[Act_Actions[Superaction].Tab][Act_Actions[Superaction].IndexInMenu]);
|
Txt_MENU_TITLE[Act_Actions[Superaction].Tab][Act_Actions[Superaction].IndexInMenu]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -4074,7 +4063,7 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions)
|
||||||
extern const char *The_ClassFormulNB[The_NUM_THEMES];
|
extern const char *The_ClassFormulNB[The_NUM_THEMES];
|
||||||
extern const char *Txt_Frequent_actions;
|
extern const char *Txt_Frequent_actions;
|
||||||
extern const char *Txt_TABS_FULL_TXT[Act_NUM_TABS];
|
extern const char *Txt_TABS_FULL_TXT[Act_NUM_TABS];
|
||||||
extern const char *Txt_MENU_NO_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
extern const char *Txt_MENU_TITLE[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
||||||
unsigned NumAct;
|
unsigned NumAct;
|
||||||
Act_Action_t Action;
|
Act_Action_t Action;
|
||||||
const char *Title;
|
const char *Title;
|
||||||
|
@ -4104,7 +4093,7 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions)
|
||||||
Act_Actions[Action].Icon,Title);
|
Act_Actions[Action].Icon,Title);
|
||||||
sprintf (ActionStr,"%s > %s",
|
sprintf (ActionStr,"%s > %s",
|
||||||
Txt_TABS_FULL_TXT[Act_Actions[Action].Tab],
|
Txt_TABS_FULL_TXT[Act_Actions[Action].Tab],
|
||||||
Txt_MENU_NO_BR[Act_Actions[Action].Tab][Act_Actions[Action].IndexInMenu]);
|
Txt_MENU_TITLE[Act_Actions[Action].Tab][Act_Actions[Action].IndexInMenu]);
|
||||||
Str_LimitLengthHTMLStr (ActionStr,40);
|
Str_LimitLengthHTMLStr (ActionStr,40);
|
||||||
fprintf (Gbl.F.Out," %s</a>"
|
fprintf (Gbl.F.Out," %s</a>"
|
||||||
"</form>"
|
"</form>"
|
||||||
|
@ -4125,7 +4114,7 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions)
|
||||||
void Act_WriteSmallMFUActions (struct Act_ListMFUActions *ListMFUActions)
|
void Act_WriteSmallMFUActions (struct Act_ListMFUActions *ListMFUActions)
|
||||||
{
|
{
|
||||||
extern const char *Txt_Frequent_actions;
|
extern const char *Txt_Frequent_actions;
|
||||||
extern const char *Txt_MENU_NO_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
extern const char *Txt_MENU_TITLE[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
||||||
unsigned NumAct;
|
unsigned NumAct;
|
||||||
Act_Action_t Action;
|
Act_Action_t Action;
|
||||||
const char *Title;
|
const char *Title;
|
||||||
|
@ -4169,7 +4158,7 @@ void Act_WriteSmallMFUActions (struct Act_ListMFUActions *ListMFUActions)
|
||||||
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION_16x16,
|
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION_16x16,
|
||||||
Act_Actions[Action].Icon,Title);
|
Act_Actions[Action].Icon,Title);
|
||||||
|
|
||||||
strcpy (ActionStr,Txt_MENU_NO_BR[Act_Actions[Action].Tab][Act_Actions[Action].IndexInMenu]);
|
strcpy (ActionStr,Txt_MENU_TITLE[Act_Actions[Action].Tab][Act_Actions[Action].IndexInMenu]);
|
||||||
Str_LimitLengthHTMLStr (ActionStr,12);
|
Str_LimitLengthHTMLStr (ActionStr,12);
|
||||||
fprintf (Gbl.F.Out," %s</a>"
|
fprintf (Gbl.F.Out," %s</a>"
|
||||||
"</form>"
|
"</form>"
|
||||||
|
|
|
@ -1154,7 +1154,6 @@ struct Act_ListMFUActions
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
bool Act_CheckIfIHavePermissionToExecuteAction (Act_Action_t Action);
|
bool Act_CheckIfIHavePermissionToExecuteAction (Act_Action_t Action);
|
||||||
const char *Act_GetMenuTxtAction (Act_Action_t Action);
|
|
||||||
const char *Act_GetTitleAction (Act_Action_t Action);
|
const char *Act_GetTitleAction (Act_Action_t Action);
|
||||||
const char *Act_GetSubtitleAction (Act_Action_t Action);
|
const char *Act_GetSubtitleAction (Act_Action_t Action);
|
||||||
void Act_GetBreadcrumbStrForAction (Act_Action_t Action,bool HTML,char *BreadcrumbStr);
|
void Act_GetBreadcrumbStrForAction (Act_Action_t Action,bool HTML,char *BreadcrumbStr);
|
||||||
|
|
|
@ -35,11 +35,12 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 14.49.1 (2014/12/31)"
|
#define Log_PLATFORM_VERSION "SWAD 14.49.2 (2014/12/31)"
|
||||||
|
|
||||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
// 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 | tail -1
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h | tail -1
|
||||||
/*
|
/*
|
||||||
|
Version 14.49.2 :Dec 31, 2014 Removed text of menu options whit BR. (172611 lines)
|
||||||
Version 14.49.1 :Dec 31, 2014 Changes in layout. (174432 lines)
|
Version 14.49.1 :Dec 31, 2014 Changes in layout. (174432 lines)
|
||||||
Version 14.49 :Dec 31, 2014 Option to admin one user removed from main menu.
|
Version 14.49 :Dec 31, 2014 Option to admin one user removed from main menu.
|
||||||
Fixed bugs in layout.
|
Fixed bugs in layout.
|
||||||
|
|
|
@ -134,7 +134,7 @@ static void Crs_Configuration (bool PrintView)
|
||||||
extern const char *The_ClassFormul[The_NUM_THEMES];
|
extern const char *The_ClassFormul[The_NUM_THEMES];
|
||||||
extern const char *Txt_This_course_fulfills_X_out_of_Y_indicators_;
|
extern const char *Txt_This_course_fulfills_X_out_of_Y_indicators_;
|
||||||
extern const char *Txt_TABS_FULL_TXT[Act_NUM_TABS];
|
extern const char *Txt_TABS_FULL_TXT[Act_NUM_TABS];
|
||||||
extern const char *Txt_MENU_NO_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
extern const char *Txt_MENU_TITLE[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
||||||
extern const char *Txt_Show_more_details;
|
extern const char *Txt_Show_more_details;
|
||||||
extern const char *Txt_NO;
|
extern const char *Txt_NO;
|
||||||
extern const char *Txt_Course;
|
extern const char *Txt_Course;
|
||||||
|
@ -173,7 +173,7 @@ static void Crs_Configuration (bool PrintView)
|
||||||
Ind_NUM_INDICATORS,
|
Ind_NUM_INDICATORS,
|
||||||
Cfg_HTTPS_URL_SWAD_CGI,Gbl.CurrentCrs.Crs.CrsCod,Act_Actions[ActSeeAllStaCrs].ActCod,
|
Cfg_HTTPS_URL_SWAD_CGI,Gbl.CurrentCrs.Crs.CrsCod,Act_Actions[ActSeeAllStaCrs].ActCod,
|
||||||
Txt_TABS_FULL_TXT[Act_Actions[Superaction].Tab],
|
Txt_TABS_FULL_TXT[Act_Actions[Superaction].Tab],
|
||||||
Txt_MENU_NO_BR[Act_Actions[Superaction].Tab][Act_Actions[Superaction].IndexInMenu],
|
Txt_MENU_TITLE[Act_Actions[Superaction].Tab][Act_Actions[Superaction].IndexInMenu],
|
||||||
Txt_Show_more_details,
|
Txt_Show_more_details,
|
||||||
Txt_NO);
|
Txt_NO);
|
||||||
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
|
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
|
||||||
|
|
|
@ -1119,7 +1119,7 @@ static void Lay_WriteMenuThisTabDesktop (void)
|
||||||
extern const char *The_ClassMenuOff[The_NUM_THEMES];
|
extern const char *The_ClassMenuOff[The_NUM_THEMES];
|
||||||
extern const char *The_ClassSeparator[The_NUM_THEMES];
|
extern const char *The_ClassSeparator[The_NUM_THEMES];
|
||||||
extern const struct Act_Menu Act_Menu[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
extern const struct Act_Menu Act_Menu[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
||||||
extern const char *Txt_MENU_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
extern const char *Txt_MENU_TITLE[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
||||||
unsigned NumOptInMenu;
|
unsigned NumOptInMenu;
|
||||||
Act_Action_t NumAct;
|
Act_Action_t NumAct;
|
||||||
const char *Title;
|
const char *Title;
|
||||||
|
@ -1177,7 +1177,7 @@ static void Lay_WriteMenuThisTabDesktop (void)
|
||||||
"<span class=\"%s\">%s</span>",
|
"<span class=\"%s\">%s</span>",
|
||||||
IsTheSelectedAction ? The_ClassMenuOn[Gbl.Prefs.Theme] :
|
IsTheSelectedAction ? The_ClassMenuOn[Gbl.Prefs.Theme] :
|
||||||
The_ClassMenuOff[Gbl.Prefs.Theme],
|
The_ClassMenuOff[Gbl.Prefs.Theme],
|
||||||
Txt_MENU_BR[Gbl.CurrentTab][NumOptInMenu]);
|
Txt_MENU_TITLE[Gbl.CurrentTab][NumOptInMenu]);
|
||||||
|
|
||||||
/***** End of link and form *****/
|
/***** End of link and form *****/
|
||||||
fprintf (Gbl.F.Out,"</div>"
|
fprintf (Gbl.F.Out,"</div>"
|
||||||
|
@ -1210,7 +1210,7 @@ static void Lay_WriteMenuThisTabMobile (void)
|
||||||
extern const char *The_ClassMenuOn[The_NUM_THEMES];
|
extern const char *The_ClassMenuOn[The_NUM_THEMES];
|
||||||
extern const char *The_ClassMenuOff[The_NUM_THEMES];
|
extern const char *The_ClassMenuOff[The_NUM_THEMES];
|
||||||
extern const struct Act_Menu Act_Menu[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
extern const struct Act_Menu Act_Menu[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
||||||
extern const char *Txt_MENU_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
extern const char *Txt_MENU_TITLE[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
|
||||||
unsigned NumOptInMenu;
|
unsigned NumOptInMenu;
|
||||||
unsigned NumOptVisible; // Only options I can see
|
unsigned NumOptVisible; // Only options I can see
|
||||||
Act_Action_t NumAct;
|
Act_Action_t NumAct;
|
||||||
|
@ -1252,7 +1252,7 @@ static void Lay_WriteMenuThisTabMobile (void)
|
||||||
"</td>",
|
"</td>",
|
||||||
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION_64x64,
|
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION_64x64,
|
||||||
Act_Actions[NumAct].Icon,
|
Act_Actions[NumAct].Icon,
|
||||||
Txt_MENU_BR[Gbl.CurrentTab][NumOptInMenu]);
|
Txt_MENU_TITLE[Gbl.CurrentTab][NumOptInMenu]);
|
||||||
|
|
||||||
if ((NumOptVisible % Cfg_LAYOUT_MOBILE_NUM_COLUMNS) ==
|
if ((NumOptVisible % Cfg_LAYOUT_MOBILE_NUM_COLUMNS) ==
|
||||||
(Cfg_LAYOUT_MOBILE_NUM_COLUMNS - 1))
|
(Cfg_LAYOUT_MOBILE_NUM_COLUMNS - 1))
|
||||||
|
@ -1309,7 +1309,7 @@ static void Lay_WriteBreadcrumbTab (void)
|
||||||
static void Lay_WriteBreadcrumbAction (void)
|
static void Lay_WriteBreadcrumbAction (void)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassTabOn[The_NUM_THEMES];
|
extern const char *The_ClassTabOn[The_NUM_THEMES];
|
||||||
const char *Title = Act_GetMenuTxtAction (Gbl.CurrentAct);
|
const char *Title = Act_GetTitleAction (Gbl.CurrentAct);
|
||||||
|
|
||||||
/***** Start form *****/
|
/***** Start form *****/
|
||||||
Act_FormStart (Act_Actions[Gbl.CurrentAct].SuperAction);
|
Act_FormStart (Act_Actions[Gbl.CurrentAct].SuperAction);
|
||||||
|
|
1816
swad_text.c
1816
swad_text.c
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user