From b25b244028eb6cbe796d492cb8b013862e931dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 28 Jan 2015 20:30:47 +0100 Subject: [PATCH] Version 14.70.6 --- swad_centre.c | 19 +++++++++++++------ swad_changelog.h | 5 +++-- swad_country.c | 21 +++++++++++++++------ swad_degree.c | 18 ++++++++++++------ swad_institution.c | 18 ++++++++++++------ 5 files changed, 55 insertions(+), 26 deletions(-) diff --git a/swad_centre.c b/swad_centre.c index d00cb9d75..b2cca58c9 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -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,"
"); + + /* 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,""); + if (!PrintView) { - fprintf (Gbl.F.Out,"
"); - /* 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,"
"); } + fprintf (Gbl.F.Out,"
"); + /***** Start frame *****/ Lay_StartRoundFrameTable10 (NULL,2,NULL); diff --git a/swad_changelog.h b/swad_changelog.h index beb7f2035..62808252f 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -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) diff --git a/swad_country.c b/swad_country.c index d50cb8034..42bbeda43 100644 --- a/swad_country.c +++ b/swad_country.c @@ -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,"
"); + + /* 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,""); + + /* Link to print view */ if (!PrintView) { - fprintf (Gbl.F.Out,"
"); Lay_PutLinkToPrintView1 (ActPrnCtyInf); Lay_PutLinkToPrintView2 (); - fprintf (Gbl.F.Out,"
"); } + fprintf (Gbl.F.Out,"
"); + /***** 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,"", 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]); diff --git a/swad_degree.c b/swad_degree.c index 241c37539..d21680090 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -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,"
"); + + /* 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,""); + if (!PrintView) { - fprintf (Gbl.F.Out,"
"); - /* 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,"
"); } + fprintf (Gbl.F.Out,"
"); + /***** Start frame *****/ Lay_StartRoundFrameTable10 (NULL,2,NULL); diff --git a/swad_institution.c b/swad_institution.c index 7ecbd7d3f..03abceda8 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -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,"
"); + + /* 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,""); + if (!PrintView) { - fprintf (Gbl.F.Out,"
"); - /* 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,"
"); } + fprintf (Gbl.F.Out,"
"); + /***** Start frame *****/ Lay_StartRoundFrameTable10 (NULL,2,NULL);