");
Act_FormStart (ActMFUAct);
- Act_LinkFormSubmit (Txt_My_frequent_actions,"MFU_ACT",NULL);
+ Act_LinkFormSubmit (Txt_My_frequent_actions,NULL,NULL);
fprintf (Gbl.F.Out," %s"
"",
Txt_Frequent_ACTIONS);
diff --git a/swad_changelog.h b/swad_changelog.h
index f7e19a14a..200557294 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -209,13 +209,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 16.165 (2017-03-24)"
-#define CSS_FILE "swad16.161.css"
+#define Log_PLATFORM_VERSION "SWAD 16.166 (2017-03-24)"
+#define CSS_FILE "swad16.166.css"
#define JS_FILE "swad16.144.js"
// 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 16.166: Mar 24, 2017 Changes in layout related with institutional links.
+ Fixed bug in swad.sql reported by user "proxa" in GitHub. (217613 lines)
Version 16.165: Mar 24, 2017 Allowed mail domains option is moved from system tab to messages tab. (217591 lines)
Version 16.164.5: Mar 24, 2017 Link in notifications to allowed mail domains. (217632 lines)
Version 16.164.4: Mar 24, 2017 Link to figures in types of degree. (217604 lines)
diff --git a/swad_layout.c b/swad_layout.c
index 8090505ae..7ee29514a 100644
--- a/swad_layout.c
+++ b/swad_layout.c
@@ -997,16 +997,19 @@ static void Lay_ShowLeftColumn (void)
fprintf (Gbl.F.Out,"
");
- /***** Most frequently used actions *****/
+ fprintf (Gbl.F.Out,"
");
if (Gbl.Usrs.Me.Logged)
{
- fprintf (Gbl.F.Out,"
");
+ /***** Most frequently used actions *****/
MFU_AllocateMFUActions (&ListMFUActions,6);
MFU_GetMFUActions (&ListMFUActions,6);
MFU_WriteSmallMFUActions (&ListMFUActions);
MFU_FreeMFUActions (&ListMFUActions);
- fprintf (Gbl.F.Out,"
");
}
+ else
+ /***** Institutional links *****/
+ Lnk_WriteMenuWithInstitutionalLinks ();
+ fprintf (Gbl.F.Out,"
");
/***** Month *****/
fprintf (Gbl.F.Out,"
");
@@ -1061,10 +1064,8 @@ static void Lay_ShowRightColumn (void)
fprintf (Gbl.F.Out,"
");
}
- /***** SWADroid advertisement *****/
- if (!Gbl.Usrs.Me.Logged ||
- Gbl.Action.Act == ActLogIn ||
- Gbl.Action.Act == ActLogInNew)
+ if (!Gbl.Usrs.Me.Logged)
+ /***** SWADroid advertisement *****/
fprintf (Gbl.F.Out,"
",
Txt_If_you_have_an_Android_device_try_SWADroid,
Gbl.Prefs.IconsURL);
-
- /***** Institutional links *****/
- // Lnk_WriteMenuWithInstitutionalLinks ();
}
/*****************************************************************************/
diff --git a/swad_link.c b/swad_link.c
index ac6386c39..adf16baef 100644
--- a/swad_link.c
+++ b/swad_link.c
@@ -119,17 +119,25 @@ static void Lnk_PutIconToEditLinks (void)
void Lnk_WriteMenuWithInstitutionalLinks (void)
{
+ extern const char *Txt_Links;
+
/***** Get list of links *****/
Lnk_GetListLinks ();
/***** Write all the links *****/
if (Gbl.Links.Num)
{
- fprintf (Gbl.F.Out,"
"
- "
");
+ fprintf (Gbl.F.Out,"
");
+
+ Act_FormStart (ActSeeLnk);
+ Act_LinkFormSubmit (Txt_Links,NULL,NULL);
+ fprintf (Gbl.F.Out," %s"
+ "",
+ Txt_Links);
+ Act_FormEnd ();
+
Lnk_WriteListOfLinks ();
- fprintf (Gbl.F.Out,"
"
- "
");
+ fprintf (Gbl.F.Out,"
");
}
/***** Free list of links *****/