Version 16.166

This commit is contained in:
Antonio Cañas Vargas 2017-03-24 21:29:13 +01:00
parent 055ed8ee01
commit 85bc4aa690
6 changed files with 42 additions and 18 deletions

View File

@ -1466,7 +1466,23 @@ a:hover /* Default ==> underlined */
border-radius:4px; border-radius:4px;
font-size:11pt; font-size:11pt;
color:#4D88A1; 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; overflow:hidden;
text-overflow:ellipsis;
} }
.INS_LNK .INS_LNK
{ {

View File

@ -699,7 +699,7 @@ CREATE TABLE IF NOT EXISTS log_ws (
-- --
CREATE TABLE IF NOT EXISTS mail_domains ( CREATE TABLE IF NOT EXISTS mail_domains (
MaiCod INT NOT NULL AUTO_INCREMENT, MaiCod INT NOT NULL AUTO_INCREMENT,
Domain VARCHAR(2047) NOT NULL, Domain VARCHAR(255) NOT NULL,
Info VARCHAR(2047) NOT NULL, Info VARCHAR(2047) NOT NULL,
UNIQUE INDEX(MaiCod), UNIQUE INDEX(MaiCod),
UNIQUE INDEX(Domain)); UNIQUE INDEX(Domain));

View File

@ -284,7 +284,7 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
/***** Start div and link *****/ /***** Start div and link *****/
fprintf (Gbl.F.Out,"<div id=\"MFU_actions\">"); fprintf (Gbl.F.Out,"<div id=\"MFU_actions\">");
Act_FormStart (ActMFUAct); 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" fprintf (Gbl.F.Out," %s"
"</a>", "</a>",
Txt_Frequent_ACTIONS); Txt_Frequent_ACTIONS);

View File

@ -209,13 +209,15 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.165 (2017-03-24)" #define Log_PLATFORM_VERSION "SWAD 16.166 (2017-03-24)"
#define CSS_FILE "swad16.161.css" #define CSS_FILE "swad16.166.css"
#define JS_FILE "swad16.144.js" #define JS_FILE "swad16.144.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.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.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.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) Version 16.164.4: Mar 24, 2017 Link to figures in types of degree. (217604 lines)

View File

@ -997,16 +997,19 @@ static void Lay_ShowLeftColumn (void)
fprintf (Gbl.F.Out,"<div style=\"width:160px;\">"); 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) if (Gbl.Usrs.Me.Logged)
{ {
fprintf (Gbl.F.Out,"<div class=\"LEFT_RIGHT_CELL\">"); /***** Most frequently used actions *****/
MFU_AllocateMFUActions (&ListMFUActions,6); MFU_AllocateMFUActions (&ListMFUActions,6);
MFU_GetMFUActions (&ListMFUActions,6); MFU_GetMFUActions (&ListMFUActions,6);
MFU_WriteSmallMFUActions (&ListMFUActions); MFU_WriteSmallMFUActions (&ListMFUActions);
MFU_FreeMFUActions (&ListMFUActions); MFU_FreeMFUActions (&ListMFUActions);
fprintf (Gbl.F.Out,"</div>");
} }
else
/***** Institutional links *****/
Lnk_WriteMenuWithInstitutionalLinks ();
fprintf (Gbl.F.Out,"</div>");
/***** Month *****/ /***** Month *****/
fprintf (Gbl.F.Out,"<div class=\"LEFT_RIGHT_CELL\">"); fprintf (Gbl.F.Out,"<div class=\"LEFT_RIGHT_CELL\">");
@ -1061,10 +1064,8 @@ static void Lay_ShowRightColumn (void)
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
/***** SWADroid advertisement *****/ if (!Gbl.Usrs.Me.Logged)
if (!Gbl.Usrs.Me.Logged || /***** SWADroid advertisement *****/
Gbl.Action.Act == ActLogIn ||
Gbl.Action.Act == ActLogInNew)
fprintf (Gbl.F.Out,"<div class=\"LEFT_RIGHT_CELL\">" fprintf (Gbl.F.Out,"<div class=\"LEFT_RIGHT_CELL\">"
"<a href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\"" "<a href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\""
" target=\"_blank\" title=\"%s\">" " target=\"_blank\" title=\"%s\">"
@ -1075,9 +1076,6 @@ static void Lay_ShowRightColumn (void)
"</div>", "</div>",
Txt_If_you_have_an_Android_device_try_SWADroid, Txt_If_you_have_an_Android_device_try_SWADroid,
Gbl.Prefs.IconsURL); Gbl.Prefs.IconsURL);
/***** Institutional links *****/
// Lnk_WriteMenuWithInstitutionalLinks ();
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -119,17 +119,25 @@ static void Lnk_PutIconToEditLinks (void)
void Lnk_WriteMenuWithInstitutionalLinks (void) void Lnk_WriteMenuWithInstitutionalLinks (void)
{ {
extern const char *Txt_Links;
/***** Get list of links *****/ /***** Get list of links *****/
Lnk_GetListLinks (); Lnk_GetListLinks ();
/***** Write all the links *****/ /***** Write all the links *****/
if (Gbl.Links.Num) if (Gbl.Links.Num)
{ {
fprintf (Gbl.F.Out,"<div class=\"LEFT_RIGHT_CELL\">" fprintf (Gbl.F.Out,"<div id=\"institutional_links\">");
"<div id=\"institutional_links\" class=\"INS_LNK\">");
Act_FormStart (ActSeeLnk);
Act_LinkFormSubmit (Txt_Links,NULL,NULL);
fprintf (Gbl.F.Out," %s"
"</a>",
Txt_Links);
Act_FormEnd ();
Lnk_WriteListOfLinks (); Lnk_WriteListOfLinks ();
fprintf (Gbl.F.Out,"</div>" fprintf (Gbl.F.Out,"</div>");
"</div>");
} }
/***** Free list of links *****/ /***** Free list of links *****/