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

This commit is contained in:
Antonio Cañas Vargas 2015-01-28 20:30:47 +01:00
parent 1cce703146
commit b25b244028
5 changed files with 55 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
swad_centre.c
View File

@ -237,11 +237,11 @@ void Ctr_PrintConfiguration (void)
static void Ctr_Configuration (bool PrintView)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Degrees;
extern const char *Txt_Centre;
extern const char *Txt_Short_Name;
extern const char *Txt_Shortcut_to_this_centre;
extern const char *Txt_QR_code;
extern const char *Txt_Degrees;
extern const char *Txt_Courses;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
char PathPhoto[PATH_MAX+1];
@ -259,11 +259,18 @@ static void Ctr_Configuration (bool PrintView)
(unsigned) Gbl.CurrentCtr.Ctr.CtrCod);
PhotoExists = Fil_CheckIfPathExists (PathPhoto);
/***** Links to print view, upload logo and upload photo *****/
/***** Links to show degrees, to print view
and to upload photo and logo *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/* Link to show degrees */
Act_FormStart (ActSeeDeg);
Act_LinkFormSubmit (Txt_Degrees,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("deg",Txt_Degrees,Txt_Degrees);
fprintf (Gbl.F.Out,"</form>");
if (!PrintView)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/* Link to print view */
Lay_PutLinkToPrintView1 (ActPrnCtrInf);
Lay_PutLinkToPrintView2 ();
@ -274,10 +281,10 @@ static void Ctr_Configuration (bool PrintView)
Log_PutFormToChangeLogo (Sco_SCOPE_CENTRE);
Ctr_PutFormToChangeCtrPhoto (PhotoExists);
}
fprintf (Gbl.F.Out,"</div>");
}
fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);

5
swad_changelog.h
View File

@ -39,12 +39,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.70.5 (2015/01/28)"
#define Log_PLATFORM_VERSION "SWAD 14.70.6 (2015/01/28)"
// 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.70.5: Jan 28, 2015 Links in list of institutions, centres and degrees now go to information options. (176219 lines)
Version 14.70.6: Jan 28, 2015 Buttons to view list of institutions, centres, degrees and courses in information options. (176242 lines)
Version 14.70.5: Jan 28, 2015 Links in list of countries, institutions, centres and degrees now go to information options. (176219 lines)
Version 14.70.4: Jan 28, 2015 Links in breadcrumbs now go to information options. (176218 lines)
Version 14.70.3: Jan 28, 2015 Some button messages changed.
Buttons to view when editing. (176217 lines)

21
swad_country.c
View File

@ -217,10 +217,10 @@ void Cty_PrintConfiguration (void)
static void Cty_Configuration (bool PrintView)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Institutions;
extern const char *Txt_Country;
extern const char *Txt_Shortcut_to_this_country;
extern const char *Txt_QR_code;
extern const char *Txt_Institutions;
extern const char *Txt_Centres;
extern const char *Txt_Degrees;
extern const char *Txt_Courses;
@ -230,15 +230,24 @@ static void Cty_Configuration (bool PrintView)
if (Gbl.CurrentCty.Cty.CtyCod > 0)
{
/***** Link to print view *****/
/***** Links to show institutions and to print view *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/* Link to show institutions */
Act_FormStart (ActSeeIns);
Act_LinkFormSubmit (Txt_Institutions,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("ins",Txt_Institutions,Txt_Institutions);
fprintf (Gbl.F.Out,"</form>");
/* Link to print view */
if (!PrintView)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Lay_PutLinkToPrintView1 (ActPrnCtyInf);
Lay_PutLinkToPrintView2 ();
fprintf (Gbl.F.Out,"</div>");
}
fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
@ -559,7 +568,7 @@ void Cty_ListCountries2 (void)
if (Cty_CheckIfCountryMapExists (&Gbl.Ctys.Lst[NumCty]))
{
/* Map image */
Act_FormGoToStart (ActSeeIns);
Act_FormGoToStart (ActSeeCtyInf);
Cty_PutParamCtyCod (Gbl.Ctys.Lst[NumCty].CtyCod);
sprintf (Gbl.Title,Txt_Go_to_X,
Gbl.Ctys.Lst[NumCty].Name[Gbl.Prefs.Language]);
@ -574,7 +583,7 @@ void Cty_ListCountries2 (void)
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:left; background-color:%s;\">",
BgColor);
Act_FormGoToStart (ActSeeIns);
Act_FormGoToStart (ActSeeCtyInf);
Cty_PutParamCtyCod (Gbl.Ctys.Lst[NumCty].CtyCod);
sprintf (Gbl.Title,Txt_Go_to_X,
Gbl.Ctys.Lst[NumCty].Name[Gbl.Prefs.Language]);

18
swad_degree.c
View File

@ -287,21 +287,27 @@ void Deg_PrintConfiguration (void)
static void Deg_Configuration (bool PrintView)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Courses;
extern const char *Txt_Degree;
extern const char *Txt_Short_Name;
extern const char *Txt_Shortcut_to_this_degree;
extern const char *Txt_QR_code;
extern const char *Txt_Courses;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
bool PutLink = !PrintView && Gbl.CurrentDeg.Deg.WWW[0];
if (Gbl.CurrentDeg.Deg.DegCod > 0)
{
/***** Links to print view and upload logo *****/
/***** 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 ("deg",Txt_Courses,Txt_Courses);
fprintf (Gbl.F.Out,"</form>");
if (!PrintView)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/* Link to print view */
Lay_PutLinkToPrintView1 (ActPrnDegInf);
Lay_PutLinkToPrintView2 ();
@ -309,10 +315,10 @@ static void Deg_Configuration (bool PrintView)
/* Link to upload logo */
if (Gbl.Usrs.Me.LoggedRole >= Rol_ROLE_DEG_ADMIN)
Log_PutFormToChangeLogo (Sco_SCOPE_DEGREE);
fprintf (Gbl.F.Out,"</div>");
}
fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);

18
swad_institution.c
View File

@ -226,11 +226,11 @@ void Ins_PrintConfiguration (void)
static void Ins_Configuration (bool PrintView)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Centres;
extern const char *Txt_Institution;
extern const char *Txt_Short_Name;
extern const char *Txt_Shortcut_to_this_institution;
extern const char *Txt_QR_code;
extern const char *Txt_Centres;
extern const char *Txt_Degrees;
extern const char *Txt_Courses;
extern const char *Txt_Departments;
@ -239,11 +239,17 @@ static void Ins_Configuration (bool PrintView)
if (Gbl.CurrentIns.Ins.InsCod > 0)
{
/***** Links to print view and upload logo *****/
/***** 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 print view */
Lay_PutLinkToPrintView1 (ActPrnInsInf);
Lay_PutLinkToPrintView2 ();
@ -251,10 +257,10 @@ static void Ins_Configuration (bool PrintView)
/* Link to upload logo */
if (Gbl.Usrs.Me.LoggedRole >= Rol_ROLE_INS_ADMIN)
Log_PutFormToChangeLogo (Sco_SCOPE_INSTITUTION);
fprintf (Gbl.F.Out,"</div>");
}
fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);