diff --git a/swad_action.c b/swad_action.c index 3355a1701..0795b9e9b 100644 --- a/swad_action.c +++ b/swad_action.c @@ -4701,7 +4701,9 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions) unsigned NumAct; Act_Action_t Action; const char *Title; - char ActionStr[128]; + char TabStr[128+1]; + char MenuStr[128+1]; + char TabMenuStr[128+6+128+1]; /***** Table head *****/ Lay_StartRoundFrameTable (NULL,0,Txt_Frequent_actions); @@ -4715,21 +4717,25 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions) if ((Title = Act_GetTitleAction (Action)) != NULL) { + /* Action string */ + strncpy (TabStr,Txt_TABS_FULL_TXT[Act_Actions[Action].Tab],128); + TabStr[128] = '\0'; + strncpy (MenuStr,Title,128); + MenuStr[128] = '\0'; + sprintf (TabMenuStr,"%s > %s",TabStr,MenuStr); + /* Icon and text */ fprintf (Gbl.F.Out,"" ""); Act_FormStart (Action); - Act_LinkFormSubmit (Title,The_ClassFormulNB[Gbl.Prefs.Theme]); - - fprintf (Gbl.F.Out,"\"%s\""", Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION, - Act_Actions[Action].Icon,Title); - sprintf (ActionStr,"%s > %s", - Txt_TABS_FULL_TXT[Act_Actions[Action].Tab], - Txt_MENU_TITLE[Act_Actions[Action].Tab][Act_Actions[Action].IndexInMenu]); - Str_LimitLengthHTMLStr (ActionStr,40); - fprintf (Gbl.F.Out," %s",ActionStr); + Act_Actions[Action].Icon, + MenuStr,TabMenuStr); + fprintf (Gbl.F.Out," %s",TabMenuStr); Act_FormEnd (); fprintf (Gbl.F.Out,"" ""); @@ -4747,11 +4753,14 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions) void Act_WriteSmallMFUActions (struct Act_ListMFUActions *ListMFUActions) { extern const char *Txt_Frequent_actions; + extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS]; extern const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB]; unsigned NumAct; Act_Action_t Action; const char *Title; - char ActionStr[128]; + char TabStr[128+1]; + char MenuStr[128+1]; + char TabMenuStr[128+6+128+1]; /***** Start table *****/ Act_FormStart (ActMFUAct); @@ -4780,21 +4789,28 @@ void Act_WriteSmallMFUActions (struct Act_ListMFUActions *ListMFUActions) "", Gbl.Prefs.IconsURL); + /* Action string */ + strncpy (TabStr,Txt_TABS_FULL_TXT[Act_Actions[Action].Tab],128); + TabStr[128] = '\0'; + strncpy (MenuStr,Title,128); + MenuStr[128] = '\0'; + sprintf (TabMenuStr,"%s > %s",TabStr,MenuStr); + /* Icon and text */ fprintf (Gbl.F.Out,"" ""); Act_FormStart (Action); Act_LinkFormSubmit (Title,"MFU_ACT"); - fprintf (Gbl.F.Out,"\"%s\""", + fprintf (Gbl.F.Out,"\"%s\"", Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION, - Act_Actions[Action].Icon,Title); - - strcpy (ActionStr,Txt_MENU_TITLE[Act_Actions[Action].Tab][Act_Actions[Action].IndexInMenu]); - Str_LimitLengthHTMLStr (ActionStr,12); - fprintf (Gbl.F.Out," %s", - ActionStr); + Act_Actions[Action].Icon, + MenuStr,TabMenuStr); + Str_LimitLengthHTMLStr (MenuStr,12); + fprintf (Gbl.F.Out," %s", + MenuStr); Act_FormEnd (); fprintf (Gbl.F.Out,"" ""); diff --git a/swad_changelog.h b/swad_changelog.h index 067c766b8..7687023b3 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -108,6 +108,8 @@ // 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.117.6: Jul 21, 2015 Checking "alt" and "title" in all images. + Changes in most frequent actions. (184948 lines) Version 14.117.5: Jul 21, 2015 Fixed HTML bug in account form. (184930 lines) Version 14.117.4: Jul 17, 2015 Fixed bug in course record, reported by Antonio Peņa Freire. (184929 lines) Version 14.117.3: Jul 17, 2015 Fixed recent bug in cache control. (184893 lines) diff --git a/swad_config.h b/swad_config.h index 5151df613..41e113369 100644 --- a/swad_config.h +++ b/swad_config.h @@ -28,8 +28,8 @@ /** Uncomment one of the following installations of SWAD or create your own **/ /*****************************************************************************/ -//#define LOCALHOST_UBUNTU // Comment this line if not applicable -#define OPENSWAD_ORG // Comment this line if not applicable +#define LOCALHOST_UBUNTU // Comment this line if not applicable +//#define OPENSWAD_ORG // Comment this line if not applicable //#define SWAD_UGR_ES // Comment this line if not applicable //#define WWW_CEVUNA_UNA_PY // Comment this line if not applicable