Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-01 14:25:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.17.17

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-10-09 01:41:36 +02:00
parent 381451548a
commit e0b2173811
6 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_MFU.c
View File

@ -225,7 +225,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
if ((Title = Act_GetTitleAction (Action)) != NULL) if ((Title = Act_GetTitleAction (Action)) != NULL)
{ {
/* Action string */ /* Action string */
strncpy (TabStr,Txt_TABS_FULL_TXT[Act_Actions[Action].Tab],128); strncpy (TabStr,Txt_TABS_FULL_TXT[Act_Actions[Act_Actions[Action].SuperAction].Tab],128);
TabStr[128] = '\0'; TabStr[128] = '\0';
strncpy (MenuStr,Title,128); strncpy (MenuStr,Title,128);
MenuStr[128] = '\0'; MenuStr[128] = '\0';
@ -287,7 +287,7 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
if ((Title = Act_GetTitleAction (Action)) != NULL) if ((Title = Act_GetTitleAction (Action)) != NULL)
{ {
/* Action string */ /* Action string */
strncpy (TabStr,Txt_TABS_FULL_TXT[Act_Actions[Action].Tab],128); strncpy (TabStr,Txt_TABS_FULL_TXT[Act_Actions[Act_Actions[Action].SuperAction].Tab],128);
TabStr[128] = '\0'; TabStr[128] = '\0';
strncpy (MenuStr,Title,128); strncpy (MenuStr,Title,128);
MenuStr[128] = '\0'; MenuStr[128] = '\0';

5
swad_action.c
View File

@ -4501,14 +4501,15 @@ void Act_GetBreadcrumbStrForAction (Act_Action_t Action,bool HTML,char *Breadcru
extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS]; 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]; extern const char *Txt_MENU_TITLE[Tab_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;
Act_Tab_t Tab = Act_Actions[Superaction].Tab;
char *Arrow; char *Arrow;
Arrow = HTML ? ">" : Arrow = HTML ? ">" :
">"; ">";
sprintf (BreadcrumbStr,"%s %s %s %s %s", sprintf (BreadcrumbStr,"%s %s %s %s %s",
Cfg_URL_SWAD_CGI,Arrow, Cfg_URL_SWAD_CGI,Arrow,
Txt_TABS_FULL_TXT[Act_Actions[Superaction].Tab],Arrow, Txt_TABS_FULL_TXT[Tab],Arrow,
Txt_MENU_TITLE[Act_Actions[Superaction].Tab][Act_Actions[Superaction].IndexInMenu]); Txt_MENU_TITLE[Tab][Act_Actions[Superaction].IndexInMenu]);
} }
/*****************************************************************************/ /*****************************************************************************/

3
swad_changelog.h
View File

@ -148,13 +148,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.17.16 (2016-10-09)" #define Log_PLATFORM_VERSION "SWAD 16.17.17 (2016-10-09)"
#define CSS_FILE "swad15.229.css" #define CSS_FILE "swad15.229.css"
#define JS_FILE "swad15.238.1.js" #define JS_FILE "swad15.238.1.js"
// 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 sql/swad*.sql | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 16.17.17: Oct 09, 2016 Fixed bug in user's usage report. (? lines)
Version 16.17.16: Oct 09, 2016 Code refactoring in user's usage report. (206236 lines) Version 16.17.16: Oct 09, 2016 Code refactoring in user's usage report. (206236 lines)
Version 16.17.15: Oct 09, 2016 Code refactoring in user's usage report. (206236 lines) Version 16.17.15: Oct 09, 2016 Code refactoring in user's usage report. (206236 lines)
Version 16.17.14: Oct 09, 2016 Code refactoring in user's usage report. (206268 lines) Version 16.17.14: Oct 09, 2016 Code refactoring in user's usage report. (206268 lines)

4
swad_config.h
View File

@ -28,8 +28,8 @@
/** Uncomment one of the following installations of SWAD or create your own **/ /** Uncomment one of the following installations of SWAD or create your own **/
/*****************************************************************************/ /*****************************************************************************/
#define LOCALHOST_UBUNTU // 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 OPENSWAD_ORG // Comment this line if not applicable
//#define SWAD_UGR_ES // Comment this line if not applicable //#define SWAD_UGR_ES // Comment this line if not applicable
//#define SWADBERRY_UGR_ES // Comment this line if not applicable //#define SWADBERRY_UGR_ES // Comment this line if not applicable

5
swad_layout.c
View File

@ -896,17 +896,18 @@ static void Lay_WriteTitleAction (void)
extern const char *The_ClassTitleAction[The_NUM_THEMES]; extern const char *The_ClassTitleAction[The_NUM_THEMES];
extern const char *The_ClassSubtitleAction[The_NUM_THEMES]; extern const char *The_ClassSubtitleAction[The_NUM_THEMES];
extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS]; extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS];
Act_Action_t SuperAction = Act_Actions[Gbl.Action.Act].SuperAction;
/***** Container start *****/ /***** Container start *****/
fprintf (Gbl.F.Out,"<div id=\"action_title\"" fprintf (Gbl.F.Out,"<div id=\"action_title\""
" style=\"background-image:url('%s/%s/%s');\">", " style=\"background-image:url('%s/%s/%s');\">",
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION, Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,
Act_Actions[Act_Actions[Gbl.Action.Act].SuperAction].Icon); Act_Actions[SuperAction].Icon);
/***** Title *****/ /***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"%s\">%s &gt; %s</div>", fprintf (Gbl.F.Out,"<div class=\"%s\">%s &gt; %s</div>",
The_ClassTitleAction[Gbl.Prefs.Theme], The_ClassTitleAction[Gbl.Prefs.Theme],
Txt_TABS_FULL_TXT[Act_Actions[Gbl.Action.Act].Tab], Txt_TABS_FULL_TXT[Act_Actions[SuperAction].Tab],
Act_GetTitleAction (Gbl.Action.Act)); Act_GetTitleAction (Gbl.Action.Act));
/***** Subtitle *****/ /***** Subtitle *****/

12
swad_report.c
View File

@ -762,6 +762,8 @@ static void Rep_WriteSectionHitsPerAction (struct Rep_Report *Report)
unsigned long NumRows; unsigned long NumRows;
unsigned long NumRow; unsigned long NumRow;
long ActCod; long ActCod;
Act_Action_t Action;
Act_Tab_t Tab;
char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1]; char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1];
unsigned long NumClicks; unsigned long NumClicks;
@ -804,9 +806,13 @@ static void Rep_WriteSectionHitsPerAction (struct Rep_Report *Report)
fprintf (Gbl.F.Rep,"&nbsp;"); fprintf (Gbl.F.Rep,"&nbsp;");
if (ActCod >= 0) if (ActCod >= 0)
{ {
if (Txt_TABS_FULL_TXT[Act_Actions[Act_FromActCodToAction[ActCod]].Tab]) Action = Act_FromActCodToAction[ActCod];
fprintf (Gbl.F.Rep,"%s &gt; ", if (Action >= 0)
Txt_TABS_FULL_TXT[Act_Actions[Act_FromActCodToAction[ActCod]].Tab]); {
Tab = Act_Actions[Act_Actions[Action].SuperAction].Tab;
if (Txt_TABS_FULL_TXT[Tab])
fprintf (Gbl.F.Rep,"%s &gt; ",Txt_TABS_FULL_TXT[Tab]);
}
fprintf (Gbl.F.Rep,"%s",Act_GetActionTextFromDB (ActCod,ActTxt)); fprintf (Gbl.F.Rep,"%s",Act_GetActionTextFromDB (ActCod,ActTxt));
} }
else else