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.2

This commit is contained in:
Antonio Cañas Vargas 2015-02-04 20:05:54 +01:00
parent 07c89b40b5
commit f3db0dd556
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
swad_changelog.h
View File

@ -46,6 +46,7 @@
// 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.3: Feb 04, 2015 Changes in degree configuration. (? 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)
Version 14.73: Feb 03, 2015 New options to remove institution, centre and degree icons. (177007 lines)

44
swad_degree.c
View File

@ -291,6 +291,7 @@ static void Deg_Configuration (bool PrintView)
extern const char *Txt_Courses;
extern const char *Txt_Degree;
extern const char *Txt_Short_name;
extern const char *Txt_Web;
extern const char *Txt_Shortcut_to_this_degree;
extern const char *Txt_QR_code;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
@ -299,16 +300,16 @@ static void Deg_Configuration (bool PrintView)
if (Gbl.CurrentDeg.Deg.DegCod > 0)
{
/***** Links to show courses, to print view and to upload logo *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/* Link to show courses */
Act_FormStart (ActSeeCrs);
Act_LinkFormSubmit (Txt_Courses,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("crs",Txt_Courses,Txt_Courses);
fprintf (Gbl.F.Out,"</form>");
if (!PrintView)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/* Link to show courses */
Act_FormStart (ActSeeCrs);
Act_LinkFormSubmit (Txt_Courses,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("crs",Txt_Courses,Txt_Courses);
fprintf (Gbl.F.Out,"</form>");
/* Link to print view */
Lay_PutLinkToPrintView1 (ActPrnDegInf);
Lay_PutLinkToPrintView2 ();
@ -316,9 +317,10 @@ static void Deg_Configuration (bool PrintView)
/* Link to upload logo */
if (Gbl.Usrs.Me.LoggedRole >= Rol_ROLE_DEG_ADM)
Log_PutFormToChangeLogo (Sco_SCOPE_DEG);
fprintf (Gbl.F.Out,"</div>");
}
fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
@ -378,7 +380,29 @@ static void Deg_Configuration (bool PrintView)
Txt_Short_name,
Gbl.CurrentDeg.Deg.ShortName);
/***** Link to the degree *****/
/***** Degree WWW *****/
if (Gbl.CurrentDeg.Deg.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.CurrentDeg.Deg.WWW);
Str_LimitLengthHTMLStr (Gbl.CurrentDeg.Deg.WWW,20);
fprintf (Gbl.F.Out,"%s"
"</a>"
"</td>"
"</tr>",
Gbl.CurrentDeg.Deg.WWW);
}
/***** Shortcut to the degree *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"