From 1a65b1fd20d3346974f00f3b5cd9601d247ae454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 15 Nov 2018 18:51:13 +0100 Subject: [PATCH] Version 18.17.7 --- swad_changelog.h | 3 ++- swad_course.c | 29 ++++++++++++++++++++++++++--- swad_degree.c | 8 ++++++-- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index b9953221d..247d20965 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -348,10 +348,11 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.17.6 (2018-11-15)" +#define Log_PLATFORM_VERSION "SWAD 18.17.7 (2018-11-15)" #define CSS_FILE "swad18.4.css" #define JS_FILE "swad17.17.1.js" /* + Version 18.17.7: Nov 15, 2018 Changes in contextual icons related to courses. (236994 lines) Version 18.17.6: Nov 15, 2018 Changes in contextual icons related to degrees. (236972 lines) Version 18.17.5: Nov 15, 2018 Changes in contextual icons related to institutions. (236951 lines) Version 18.17.4: Nov 15, 2018 Changes in contextual icons related to places. (236936 lines) diff --git a/swad_course.c b/swad_course.c index b80ab4415..0f73dc31c 100644 --- a/swad_course.c +++ b/swad_course.c @@ -90,6 +90,7 @@ static void Crs_PutIconsListCourses (void); static void Crs_PutIconToEditCourses (void); static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year); +static void Crs_PutIconsEditingCourses (void); static void Crs_PutIconToViewCourses (void); static void Crs_ListCoursesForEdition (void); static void Crs_ListCoursesOfAYearForEdition (unsigned Year); @@ -1203,7 +1204,7 @@ static void Crs_PutIconsListCourses (void) } /*****************************************************************************/ -/********************** Put link (form) to edit courses **********************/ +/************************* Put icon to edit courses **************************/ /*****************************************************************************/ static void Crs_PutIconToEditCourses (void) @@ -1343,11 +1344,14 @@ void Crs_EditCourses (void) /***** Get list of degrees in this centre *****/ Deg_GetListDegsOfCurrentCtr (); + /***** Write menu to select country, institution, centre and degree *****/ + Hie_WriteMenuHierarchy (); + /***** Start box *****/ snprintf (Gbl.Alert.Txt,sizeof (Gbl.Alert.Txt), Txt_Courses_of_DEGREE_X, Gbl.CurrentDeg.Deg.ShrtName); - Box_StartBox (NULL,Gbl.Alert.Txt,Crs_PutIconToViewCourses, + Box_StartBox (NULL,Gbl.Alert.Txt,Crs_PutIconsEditingCourses, Hlp_DEGREE_Courses,Box_NOT_CLOSABLE); /***** Put a form to create or request a new course *****/ @@ -1371,9 +1375,28 @@ void Crs_EditCourses (void) /**************** Put contextual icons in edition of courses *****************/ /*****************************************************************************/ +static void Crs_PutIconsEditingCourses (void) + { + /***** Put icon to view degrees *****/ + Crs_PutIconToViewCourses (); + + /***** Put icon to show a figure *****/ + Gbl.Stat.FigureType = Sta_HIERARCHY; + Sta_PutIconToShowFigure (); + } + +/*****************************************************************************/ +/************************* Put icon to view courses **************************/ +/*****************************************************************************/ + static void Crs_PutIconToViewCourses (void) { - Ico_PutContextualIconToView (ActSeeCrs,NULL); + extern const char *Txt_Courses; + + Lay_PutContextualLink (ActSeeCrs,NULL,NULL, + "crs64x64.gif", + Txt_Courses,NULL, + NULL); } /*****************************************************************************/ diff --git a/swad_degree.c b/swad_degree.c index 592dcd7de..63fadce99 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -1182,7 +1182,7 @@ static void Deg_ListDegrees (void) /***** Start box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Degrees_of_CENTRE_X, - Gbl.CurrentCtr.Ctr.FullName); + Gbl.CurrentCtr.Ctr.ShrtName); Box_StartBox (NULL,Gbl.Title,Deg_PutIconsListingDegrees, Hlp_CENTRE_Degrees,Box_NOT_CLOSABLE); @@ -1365,7 +1365,7 @@ void Deg_EditDegrees (void) /***** Start box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Degrees_of_CENTRE_X, - Gbl.CurrentCtr.Ctr.FullName); + Gbl.CurrentCtr.Ctr.ShrtName); Box_StartBox (NULL,Gbl.Title,Deg_PutIconsEditingDegrees, Hlp_CENTRE_Degrees,Box_NOT_CLOSABLE); @@ -1415,6 +1415,10 @@ static void Deg_PutIconsEditingDegrees (void) Sta_PutIconToShowFigure (); } +/*****************************************************************************/ +/*********************** Put icon to view degrees ****************************/ +/*****************************************************************************/ + void Deg_PutIconToViewDegrees (void) { extern const char *Txt_Degrees;