mirror of https://github.com/acanas/swad-core.git
Version 14.119.5
This commit is contained in:
parent
288a672c69
commit
e39fb6a264
|
@ -266,6 +266,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
|
|||
}
|
||||
.INS_LNK
|
||||
{
|
||||
padding:1px;
|
||||
font-family:Arial, "Nimbus Sans L", "DejaVu LGC Sans", "Bitstream Vera Sans", sans-serif;
|
||||
font-size:9pt;
|
||||
color:#4D88A1;
|
||||
|
@ -777,6 +778,24 @@ a:hover img.CENTRE_PHOTO_SHOW
|
|||
font-size:8pt;
|
||||
}
|
||||
|
||||
/*********************************** Lists ***********************************/
|
||||
.LIST_LEFT
|
||||
{
|
||||
list-style-type:none;
|
||||
padding:0;
|
||||
margin:0;
|
||||
text-align:left;
|
||||
vertical-align:middle;
|
||||
}
|
||||
.LIST_CENTER
|
||||
{
|
||||
list-style-type:none;
|
||||
padding:0;
|
||||
margin:0;
|
||||
text-align:center;
|
||||
vertical-align:middle;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
.FILENAME {color:#404040; font-size:14pt; font-weight:bold;}
|
||||
|
|
|
@ -213,6 +213,7 @@ form {margin:0; display:inline;}
|
|||
}
|
||||
.INS_LNK
|
||||
{
|
||||
padding:1px;
|
||||
font-family:Arial, "Nimbus Sans L", "DejaVu LGC Sans", "Bitstream Vera Sans", sans-serif;
|
||||
font-size:9pt;
|
||||
color:#4D88A1;
|
||||
|
@ -588,6 +589,24 @@ a:hover img.CENTRE_PHOTO_SHOW
|
|||
font-size:10pt;
|
||||
}
|
||||
|
||||
/*********************************** Lists ***********************************/
|
||||
.LIST_LEFT
|
||||
{
|
||||
list-style-type:none;
|
||||
padding:0;
|
||||
margin:0;
|
||||
text-align:left;
|
||||
vertical-align:middle;
|
||||
}
|
||||
.LIST_CENTER
|
||||
{
|
||||
list-style-type:none;
|
||||
padding:0;
|
||||
margin:0;
|
||||
text-align:center;
|
||||
vertical-align:middle;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
.FILENAME {color:#404040; font-size:18pt; font-weight:bold;}
|
||||
|
|
|
@ -4772,9 +4772,7 @@ void Act_WriteSmallMFUActions (struct Act_ListMFUActions *ListMFUActions)
|
|||
Act_FormEnd ();
|
||||
|
||||
fprintf (Gbl.F.Out,"<div id=\"MFU_actions\">"
|
||||
"<ul style=\"list-style-type:none;"
|
||||
" padding:0 0 2px 0; margin:0;"
|
||||
" text-align:left; vertical-align:middle;\">");
|
||||
"<ul class=\"LIST_LEFT\">");
|
||||
|
||||
/***** Write list of frequently used actions *****/
|
||||
for (NumAct = 0;
|
||||
|
|
|
@ -103,11 +103,13 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 14.119.3 (2015/07/24)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 14.119.5 (2015/07/24)"
|
||||
|
||||
// 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.119.5: Jul 24, 2015 Changes in CSS of lists. (184902 lines)
|
||||
Version 14.119.4: Jul 24, 2015 New layout of institutional links as a list. (184872 lines)
|
||||
Version 14.119.3: Jul 24, 2015 New layout of MFU actions as a list. (184875 lines)
|
||||
Version 14.119.2: Jul 22, 2015 Changes in page title and platform name. (184880 lines)
|
||||
Version 14.119.1: Jul 22, 2015 Undo some changes in file browsers. (184883 lines)
|
||||
|
|
|
@ -3055,8 +3055,7 @@ static void Brw_FormToChangeCrsGrpZone (void)
|
|||
Act_FormStart (Brw_ActChgZone[Gbl.FileBrowser.Type]);
|
||||
|
||||
/***** List start *****/
|
||||
fprintf (Gbl.F.Out,"<ul style=\"list-style-type:none;"
|
||||
" padding-top:0; margin-top:0; text-align:left;\">");
|
||||
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">");
|
||||
|
||||
/***** Select the complete course, not a group *****/
|
||||
fprintf (Gbl.F.Out,"<li class=\"%s\">"
|
||||
|
|
|
@ -1760,8 +1760,8 @@ static void For_PutFormWhichForums (void)
|
|||
Act_FormStart (ActSeeFor);
|
||||
For_PutParamForumOrder ();
|
||||
For_PutParamsForumInsDegCrs ();
|
||||
fprintf (Gbl.F.Out,"<ul style=\"list-style-type:none;"
|
||||
" padding:0; margin:10px auto;\">");
|
||||
fprintf (Gbl.F.Out,"<div style=\"margin:10px 0;\">"
|
||||
"<ul class=\"LIST_CENTER\">");
|
||||
|
||||
for (WhichForums = (For_WhichForums_t) 0;
|
||||
WhichForums < For_NUM_WHICH_FORUMS;
|
||||
|
@ -1778,7 +1778,8 @@ static void For_PutFormWhichForums (void)
|
|||
"</li>",
|
||||
Gbl.FormId,Txt_FORUM_WHICH_FORUM[WhichForums]);
|
||||
}
|
||||
fprintf (Gbl.F.Out,"</ul>");
|
||||
fprintf (Gbl.F.Out,"</ul>"
|
||||
"</div>");
|
||||
Act_FormEnd ();
|
||||
}
|
||||
|
||||
|
|
|
@ -4188,8 +4188,8 @@ void Grp_ShowSelectorWhichGrps (void)
|
|||
extern const char *Txt_Show_WHICH_groups[2];
|
||||
Grp_WhichGroups_t WhichGrps;
|
||||
|
||||
fprintf (Gbl.F.Out,"<ul style=\"list-style-type:none;"
|
||||
" padding:0; margin:0 auto 10px auto;\">");
|
||||
fprintf (Gbl.F.Out,"<div style=\"margin:10px 0;\">"
|
||||
"<ul class=\"LIST_CENTER\">");
|
||||
for (WhichGrps = Grp_ONLY_MY_GROUPS;
|
||||
WhichGrps <= Grp_ALL_GROUPS;
|
||||
WhichGrps++)
|
||||
|
@ -4205,7 +4205,8 @@ void Grp_ShowSelectorWhichGrps (void)
|
|||
"</li>",
|
||||
Gbl.FormId,Txt_Show_WHICH_groups[WhichGrps]);
|
||||
}
|
||||
fprintf (Gbl.F.Out,"</ul>");
|
||||
fprintf (Gbl.F.Out,"</ul>"
|
||||
"</div>");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
132
swad_link.c
132
swad_link.c
|
@ -58,6 +58,8 @@ extern struct Globals Gbl;
|
|||
/***************************** Private prototypes ****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void Lnk_WriteListOfLinks (void);
|
||||
|
||||
static void Lnk_PutFormToEditLinks (void);
|
||||
static void Lnk_ListLinksForEdition (void);
|
||||
static void Lnk_PutParamLnkCod (long LnkCod);
|
||||
|
@ -74,7 +76,6 @@ static void Lnk_CreateLink (struct Link *Lnk);
|
|||
void Lnk_SeeLinks (void)
|
||||
{
|
||||
extern const char *Txt_Links;
|
||||
unsigned NumLnk;
|
||||
|
||||
/***** Get list of links *****/
|
||||
Lnk_GetListLinks ();
|
||||
|
@ -83,35 +84,75 @@ void Lnk_SeeLinks (void)
|
|||
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
|
||||
Lnk_PutFormToEditLinks ();
|
||||
|
||||
/***** Table head *****/
|
||||
/***** Write all the links *****/
|
||||
if (Gbl.Links.Num)
|
||||
{
|
||||
Lay_StartRoundFrameTable (NULL,2,Txt_Links);
|
||||
|
||||
/***** Write all the links *****/
|
||||
for (NumLnk = 0;
|
||||
NumLnk < Gbl.Links.Num;
|
||||
NumLnk++)
|
||||
/* Write data of this link */
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"INS_LNK\" style=\"text-align:left;\">"
|
||||
"<a href=\"%s\" title=\"%s\" class=\"INS_LNK\" target=\"_blank\">"
|
||||
"%s"
|
||||
"</a>"
|
||||
"</td>"
|
||||
"</tr>",
|
||||
Gbl.Links.Lst[NumLnk].WWW,
|
||||
Gbl.Links.Lst[NumLnk].FullName,
|
||||
Gbl.Links.Lst[NumLnk].ShortName);
|
||||
|
||||
/***** Table end *****/
|
||||
Lay_EndRoundFrameTable ();
|
||||
Lay_StartRoundFrame (NULL,Txt_Links);
|
||||
Lnk_WriteListOfLinks ();
|
||||
Lay_EndRoundFrame ();
|
||||
}
|
||||
|
||||
/***** Free list of links *****/
|
||||
Lnk_FreeListLinks ();
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/***************** Write menu with some institutional links ******************/
|
||||
/*****************************************************************************/
|
||||
|
||||
void Lnk_WriteMenuWithInstitutionalLinks (void)
|
||||
{
|
||||
/***** Get list of links *****/
|
||||
Lnk_GetListLinks ();
|
||||
|
||||
/***** Write all the links *****/
|
||||
if (Gbl.Links.Num)
|
||||
{
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"INS_LNK\" style=\"width:120px;"
|
||||
" text-align:center;\">"
|
||||
"<div id=\"institutional_links\">");
|
||||
Lnk_WriteListOfLinks ();
|
||||
fprintf (Gbl.F.Out,"</div>"
|
||||
"</td>"
|
||||
"</tr>");
|
||||
}
|
||||
|
||||
/***** Free list of links *****/
|
||||
Lnk_FreeListLinks ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/*************************** Write list of links *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void Lnk_WriteListOfLinks (void)
|
||||
{
|
||||
unsigned NumLnk;
|
||||
|
||||
/***** List start *****/
|
||||
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">");
|
||||
|
||||
/***** Write all links *****/
|
||||
for (NumLnk = 0;
|
||||
NumLnk < Gbl.Links.Num;
|
||||
NumLnk++)
|
||||
/* Write data of this link */
|
||||
fprintf (Gbl.F.Out,"<li class=\"INS_LNK\">"
|
||||
"<a href=\"%s\" title=\"%s\" class=\"INS_LNK\""
|
||||
" target=\"_blank\">"
|
||||
"%s"
|
||||
"</a>"
|
||||
"</li>",
|
||||
Gbl.Links.Lst[NumLnk].WWW,
|
||||
Gbl.Links.Lst[NumLnk].FullName,
|
||||
Gbl.Links.Lst[NumLnk].ShortName);
|
||||
|
||||
/***** List end *****/
|
||||
fprintf (Gbl.F.Out,"</ul>");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/********************** Put a link (form) to edit links **********************/
|
||||
/*****************************************************************************/
|
||||
|
@ -721,50 +762,3 @@ static void Lnk_CreateLink (struct Link *Lnk)
|
|||
Lnk->ShortName);
|
||||
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/***************** Write menu with some institutional links ******************/
|
||||
/*****************************************************************************/
|
||||
|
||||
void Lnk_WriteMenuWithInstitutionalLinks (void)
|
||||
{
|
||||
unsigned NumLnk;
|
||||
|
||||
/***** Get list of links *****/
|
||||
Lnk_GetListLinks ();
|
||||
|
||||
if (Gbl.Links.Num)
|
||||
{
|
||||
/***** Header *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"INS_LNK\" style=\"width:120px;"
|
||||
" text-align:center;\">"
|
||||
"<div id=\"institutional_links\">"
|
||||
"<table style=\"width:110px;\">");
|
||||
|
||||
/***** Write all the links *****/
|
||||
for (NumLnk = 0;
|
||||
NumLnk < Gbl.Links.Num;
|
||||
NumLnk++)
|
||||
/* Write data of this link */
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td style=\"width:110px; text-align:left;\">"
|
||||
"<a href=\"%s\" title=\"%s\" class=\"INS_LNK\" target=\"_blank\">"
|
||||
"%s"
|
||||
"</a>"
|
||||
"</td>"
|
||||
"</tr>",
|
||||
Gbl.Links.Lst[NumLnk].WWW,
|
||||
Gbl.Links.Lst[NumLnk].FullName,
|
||||
Gbl.Links.Lst[NumLnk].ShortName);
|
||||
|
||||
/***** End table *****/
|
||||
fprintf (Gbl.F.Out,"</table>"
|
||||
"</div>"
|
||||
"</td>"
|
||||
"</tr>");
|
||||
}
|
||||
|
||||
/***** Free list of links *****/
|
||||
Lnk_FreeListLinks ();
|
||||
}
|
||||
|
|
|
@ -47,6 +47,8 @@ struct Link
|
|||
/*****************************************************************************/
|
||||
|
||||
void Lnk_SeeLinks (void);
|
||||
void Lnk_WriteMenuWithInstitutionalLinks (void);
|
||||
|
||||
void Lnk_EditLinks (void);
|
||||
void Lnk_GetListLinks (void);
|
||||
void Lnk_FreeListLinks (void);
|
||||
|
@ -57,6 +59,5 @@ void Lnk_RenameLinkShort (void);
|
|||
void Lnk_RenameLinkFull (void);
|
||||
void Lnk_ChangeLinkWWW (void);
|
||||
void Lnk_RecFormNewLink (void);
|
||||
void Lnk_WriteMenuWithInstitutionalLinks (void);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -399,8 +399,8 @@ void Rol_PutAllRolesRegRemUsrsCrs (void)
|
|||
extern const char *The_ClassFormul[The_NUM_THEMES];
|
||||
|
||||
/***** Students or teachers *****/
|
||||
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:0 auto;\">"
|
||||
"<ul style=\"list-style-type:none; text-align:left;\" class=\"%s\">",
|
||||
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:10px auto;\">"
|
||||
"<ul class=\"LIST_LEFT %s\">",
|
||||
The_ClassFormul[Gbl.Prefs.Theme]);
|
||||
Rol_PutOneRoleRegRemUsrsCrs (Rol_STUDENT,true);
|
||||
Rol_PutOneRoleRegRemUsrsCrs (Rol_TEACHER,false);
|
||||
|
|
|
@ -135,10 +135,9 @@ void Syl_PutFormWhichSyllabus (void)
|
|||
|
||||
/***** Form to select which forums I want to see
|
||||
(all my forums or only the forums of current institution/degree/course) *****/
|
||||
fprintf (Gbl.F.Out,"<div style=\"text-align:center\">");
|
||||
Act_FormStart (ActSeeSyl);
|
||||
fprintf (Gbl.F.Out,"<ul style=\"list-style-type:none;"
|
||||
" padding:0; margin:10px auto;\">");
|
||||
fprintf (Gbl.F.Out,"<div style=\"margin:10px 0;\">"
|
||||
"<ul class=\"LIST_CENTER\">");
|
||||
|
||||
for (WhichSyllabus = (Syl_WhichSyllabus_t) 0;
|
||||
WhichSyllabus < For_NUM_WHICH_FORUMS;
|
||||
|
@ -155,9 +154,9 @@ void Syl_PutFormWhichSyllabus (void)
|
|||
"</li>",
|
||||
Gbl.FormId,Txt_SYLLABUS_WHICH_SYLLABUS[WhichSyllabus]);
|
||||
}
|
||||
fprintf (Gbl.F.Out,"</ul>");
|
||||
fprintf (Gbl.F.Out,"</ul>"
|
||||
"</div>");
|
||||
Act_FormEnd ();
|
||||
fprintf (Gbl.F.Out,"</div>");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -127,7 +127,7 @@ static void Tab_DrawTabsDeskTop (void)
|
|||
bool ICanViewTab;
|
||||
|
||||
/***** Table start *****/
|
||||
fprintf (Gbl.F.Out,"<ul style=\"list-style-type:none; padding:0; margin:0;\">");
|
||||
fprintf (Gbl.F.Out,"<ul class=\"LIST_CENTER\">");
|
||||
|
||||
/***** Draw the tabs *****/
|
||||
for (NumTab = (Act_Tab_t) 1;
|
||||
|
|
Loading…
Reference in New Issue