From 85bc4aa690efecaa77255c7e525b869db2adcc4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Fri, 24 Mar 2017 21:29:13 +0100
Subject: [PATCH] Version 16.166

---
 css/{swad16.161.css => swad16.166.css} | 16 ++++++++++++++++
 sql/swad.sql                           |  2 +-
 swad_MFU.c                             |  2 +-
 swad_changelog.h                       |  6 ++++--
 swad_layout.c                          | 18 ++++++++----------
 swad_link.c                            | 16 ++++++++++++----
 6 files changed, 42 insertions(+), 18 deletions(-)
 rename css/{swad16.161.css => swad16.166.css} (99%)

diff --git a/css/swad16.161.css b/css/swad16.166.css
similarity index 99%
rename from css/swad16.161.css
rename to css/swad16.166.css
index d996c0d4..bcc7a3bd 100644
--- a/css/swad16.161.css
+++ b/css/swad16.166.css
@@ -1466,7 +1466,23 @@ a:hover						/* Default ==> underlined */
 	border-radius:4px;
 	font-size:11pt;
 	color:#4D88A1;
+	}
+#institutional_links ul
+	{
+	box-sizing:border-box;
+	width:138px;
+	margin-top:2px;
+	padding-top:2px;
+	border-style:solid;
+	border-width:1px 0 0 0;
+	border-color:#DDECF1;
+	}
+#institutional_links li
+	{
+	width:138px;
+	white-space:nowrap;
 	overflow:hidden;
+	text-overflow:ellipsis;
 	}
 .INS_LNK
 	{
diff --git a/sql/swad.sql b/sql/swad.sql
index 8b7c3536..69f8f860 100644
--- a/sql/swad.sql
+++ b/sql/swad.sql
@@ -699,7 +699,7 @@ CREATE TABLE IF NOT EXISTS log_ws (
 --
 CREATE TABLE IF NOT EXISTS mail_domains (
 	MaiCod INT NOT NULL AUTO_INCREMENT,
-	Domain VARCHAR(2047) NOT NULL,
+	Domain VARCHAR(255) NOT NULL,
 	Info VARCHAR(2047) NOT NULL,
 	UNIQUE INDEX(MaiCod),
 	UNIQUE INDEX(Domain));
diff --git a/swad_MFU.c b/swad_MFU.c
index f80f1d65..3b2b9d11 100644
--- a/swad_MFU.c
+++ b/swad_MFU.c
@@ -284,7 +284,7 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
    /***** Start div and link *****/
    fprintf (Gbl.F.Out,"<div id=\"MFU_actions\">");
    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"
 	              "</a>",
 	    Txt_Frequent_ACTIONS);
diff --git a/swad_changelog.h b/swad_changelog.h
index f7e19a14..20055729 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 8090505a..7ee29514 100644
--- a/swad_layout.c
+++ b/swad_layout.c
@@ -997,16 +997,19 @@ static void Lay_ShowLeftColumn (void)
 
    fprintf (Gbl.F.Out,"<div style=\"width:160px;\">");
 
-   /***** Most frequently used actions *****/
+   fprintf (Gbl.F.Out,"<div class=\"LEFT_RIGHT_CELL\">");
    if (Gbl.Usrs.Me.Logged)
      {
-      fprintf (Gbl.F.Out,"<div class=\"LEFT_RIGHT_CELL\">");
+      /***** Most frequently used actions *****/
       MFU_AllocateMFUActions (&ListMFUActions,6);
       MFU_GetMFUActions (&ListMFUActions,6);
       MFU_WriteSmallMFUActions (&ListMFUActions);
       MFU_FreeMFUActions (&ListMFUActions);
-      fprintf (Gbl.F.Out,"</div>");
      }
+   else
+      /***** Institutional links *****/
+      Lnk_WriteMenuWithInstitutionalLinks ();
+   fprintf (Gbl.F.Out,"</div>");
 
    /***** Month *****/
    fprintf (Gbl.F.Out,"<div class=\"LEFT_RIGHT_CELL\">");
@@ -1061,10 +1064,8 @@ static void Lay_ShowRightColumn (void)
       fprintf (Gbl.F.Out,"</div>");
      }
 
-   /***** 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,"<div class=\"LEFT_RIGHT_CELL\">"
 			 "<a href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\""
 			 " target=\"_blank\" title=\"%s\">"
@@ -1075,9 +1076,6 @@ static void Lay_ShowRightColumn (void)
 			 "</div>",
 	       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 ac6386c3..adf16bae 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,"<div class=\"LEFT_RIGHT_CELL\">"
-			 "<div id=\"institutional_links\" class=\"INS_LNK\">");
+      fprintf (Gbl.F.Out,"<div id=\"institutional_links\">");
+
+      Act_FormStart (ActSeeLnk);
+      Act_LinkFormSubmit (Txt_Links,NULL,NULL);
+      fprintf (Gbl.F.Out," %s"
+			 "</a>",
+	       Txt_Links);
+      Act_FormEnd ();
+
       Lnk_WriteListOfLinks ();
-      fprintf (Gbl.F.Out,"</div>"
-			 "</div>");
+      fprintf (Gbl.F.Out,"</div>");
      }
 
    /***** Free list of links *****/