Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.150.5

This commit is contained in:
Antonio Cañas Vargas 2016-03-18 20:07:40 +01:00
parent 98577246f6
commit 37e1663d3e
3 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -135,13 +135,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.150.4 (2016-03-18)"
#define Log_PLATFORM_VERSION "SWAD 15.150.5 (2016-03-18)"
#define CSS_FILE "swad15.150.2.css"
#define JS_FILE "swad15.131.3.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 15.150.5: Mar 18, 2016 Icon to print institution configuration integrated in frame. (195961 lines)
Version 15.150.4: Mar 18, 2016 Icon to print country configuration integrated in frame. (195952 lines)
Version 15.150.3: Mar 18, 2016 Changes in layout of course info. (195956 lines)
Version 15.150.2: Mar 18, 2016 Icon to print course configuration integrated in frame.

2
swad_country.c
View File

@ -447,7 +447,7 @@ static void Cty_Configuration (bool PrintView)
}
/*****************************************************************************/
/************* Put icon to print the configuration of a course ***************/
/************* Put icon to print the configuration of a country **************/
/*****************************************************************************/
static void Cty_PutIconToPrint (void)

44
swad_institution.c
View File

@ -64,6 +64,7 @@ extern struct Globals Gbl;
/*****************************************************************************/
static void Ins_Configuration (bool PrintView);
static void Ins_PutIconToPrint (void);
static void Ins_ListInstitutions (void);
static void Ins_ListInstitutionsForSeeing (bool ICanEdit);
@ -242,7 +243,6 @@ static void Ins_Configuration (bool PrintView)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Centres;
extern const char *Txt_Print;
extern const char *Txt_Institution;
extern const char *Txt_Short_name;
extern const char *Txt_Web;
@ -258,28 +258,24 @@ static void Ins_Configuration (bool PrintView)
if (Gbl.CurrentIns.Ins.InsCod > 0)
{
/***** Links to show centres, to print view and to upload logo *****/
if (!PrintView)
/***** Contextual links *****/
if (!PrintView &&
Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to print view */
Lay_PutContextualLink (ActPrnInsInf,NULL,"print64x64.png",
Txt_Print,Txt_Print);
/* Link to upload logo */
if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM)
Log_PutFormToChangeLogo (Sco_SCOPE_INS);
Log_PutFormToChangeLogo (Sco_SCOPE_INS);
fprintf (Gbl.F.Out,"</div>");
}
/***** Start frame *****/
Lay_StartRoundFrameTable (NULL,2,NULL);
Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL :
Ins_PutIconToPrint);
/***** Title *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"TITLE_LOCATION\">");
fprintf (Gbl.F.Out,"<div class=\"TITLE_LOCATION\">");
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">",
@ -290,8 +286,10 @@ static void Ins_Configuration (bool PrintView)
fprintf (Gbl.F.Out,"<br />%s",Gbl.CurrentIns.Ins.FullName);
if (PutLink)
fprintf (Gbl.F.Out,"</a>");
fprintf (Gbl.F.Out,"</td>"
"</tr>");
fprintf (Gbl.F.Out,"</div>");
/***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
/***** Institution full name *****/
fprintf (Gbl.F.Out,"<tr>"
@ -488,11 +486,25 @@ static void Ins_Configuration (bool PrintView)
Usr_GetNumUsrsInCrssOfIns (Rol_UNKNOWN,Gbl.CurrentIns.Ins.InsCod));
}
/***** End of the frame *****/
Lay_EndRoundFrameTable ();
/***** End table *****/
fprintf (Gbl.F.Out,"</table>");
/***** End frame *****/
Lay_EndRoundFrame ();
}
}
/*****************************************************************************/
/********** Put icon to print the configuration of an institution ************/
/*****************************************************************************/
static void Ins_PutIconToPrint (void)
{
extern const char *Txt_Print;
Lay_PutContextualLink (ActPrnInsInf,NULL,"print64x64.png",Txt_Print,NULL);
}
/*****************************************************************************/
/**************** List the institutions of the current country ***************/
/*****************************************************************************/