Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 14.117.6

This commit is contained in:
Antonio Cañas Vargas 2015-07-21 14:28:54 +02:00
parent 9038a3cb7f
commit 4cbed6c862
3 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
swad_action.c
View File

@ -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,"<tr>"
"<td style=\"text-align:left; vertical-align:middle; padding-left:2px;\">");
Act_FormStart (Action);
Act_LinkFormSubmit (Title,The_ClassFormulNB[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s64x64.gif\" alt=\"%s\""
Act_LinkFormSubmit (TabMenuStr,The_ClassFormulNB[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s64x64.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON32x32\" style=\"margin:4px;\" />",
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,
Act_Actions[Action].Icon,Title);
sprintf (ActionStr,"%s &gt; %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</a>",ActionStr);
Act_Actions[Action].Icon,
MenuStr,TabMenuStr);
fprintf (Gbl.F.Out," %s</a>",TabMenuStr);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -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)
"</td>",
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 &gt; %s",TabStr,MenuStr);
/* Icon and text */
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:110px; text-align:left;"
" vertical-align:middle; padding-left:2px;\">");
Act_FormStart (Action);
Act_LinkFormSubmit (Title,"MFU_ACT");
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s64x64.gif\" vspace=\"1\" alt=\"%s\""
" class=\"ICON16x16\" style=\"vertical-align:middle;\" />",
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s64x64.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" style=\"margin:1px; vertical-align:middle;\" />",
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</a>",
ActionStr);
Act_Actions[Action].Icon,
MenuStr,TabMenuStr);
Str_LimitLengthHTMLStr (MenuStr,12);
fprintf (Gbl.F.Out," %s</a>",
MenuStr);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");

2
swad_changelog.h
View File

@ -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)

4
swad_config.h
View File

@ -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