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 14.73.4

This commit is contained in:
Antonio Cañas Vargas 2015-02-04 20:11:41 +01:00
parent f2df867ce5
commit 53cf1c3097
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -41,11 +41,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.73.3 (2015/02/04)"
#define Log_PLATFORM_VERSION "SWAD 14.73.4 (2015/02/04)"
// 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 | tail -1
/*
Version 14.73.4: Feb 04, 2015 Changes in institution configuration. (177103 lines)
Version 14.73.3: Feb 04, 2015 Changes in degree configuration. (177080 lines)
Version 14.73.2: Feb 04, 2015 Changes in centre configuration. (177057 lines)
Version 14.73.1: Feb 04, 2015 Fixed bug in logo of centre. (177012 lines)

45
swad_institution.c
View File

@ -229,6 +229,7 @@ static void Ins_Configuration (bool PrintView)
extern const char *Txt_Centres;
extern const char *Txt_Institution;
extern const char *Txt_Short_name;
extern const char *Txt_Web;
extern const char *Txt_Shortcut_to_this_institution;
extern const char *Txt_QR_code;
extern const char *Txt_Degrees;
@ -240,16 +241,16 @@ static void Ins_Configuration (bool PrintView)
if (Gbl.CurrentIns.Ins.InsCod > 0)
{
/***** Links to show centres, to print view and to upload logo *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/* Link to show centres */
Act_FormStart (ActSeeCtr);
Act_LinkFormSubmit (Txt_Centres,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("ctr",Txt_Centres,Txt_Centres);
fprintf (Gbl.F.Out,"</form>");
if (!PrintView)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/* Link to show centres */
Act_FormStart (ActSeeCtr);
Act_LinkFormSubmit (Txt_Centres,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("ctr",Txt_Centres,Txt_Centres);
fprintf (Gbl.F.Out,"</form>");
/* Link to print view */
Lay_PutLinkToPrintView1 (ActPrnInsInf);
Lay_PutLinkToPrintView2 ();
@ -257,9 +258,9 @@ static void Ins_Configuration (bool PrintView)
/* Link to upload logo */
if (Gbl.Usrs.Me.LoggedRole >= Rol_ROLE_INS_ADM)
Log_PutFormToChangeLogo (Sco_SCOPE_INS);
}
fprintf (Gbl.F.Out,"</div>");
fprintf (Gbl.F.Out,"</div>");
}
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
@ -318,7 +319,29 @@ static void Ins_Configuration (bool PrintView)
Txt_Short_name,
Gbl.CurrentIns.Ins.ShortName);
/***** Link to the institution *****/
/***** Institution WWW *****/
if (Gbl.CurrentIns.Ins.WWW[0])
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
"<a href=\"%s\" target=\"_blank\" class=\"DAT\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Web,
Gbl.CurrentIns.Ins.WWW);
Str_LimitLengthHTMLStr (Gbl.CurrentIns.Ins.WWW,20);
fprintf (Gbl.F.Out,"%s"
"</a>"
"</td>"
"</tr>",
Gbl.CurrentIns.Ins.WWW);
}
/***** Shortcut to the institution *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"