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 18.17.7

This commit is contained in:
Antonio Cañas Vargas 2018-11-15 18:51:13 +01:00
parent 2f9d6ca2e6
commit 1a65b1fd20
3 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -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)

29
swad_course.c
View File

@ -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);
}
/*****************************************************************************/

8
swad_degree.c
View File

@ -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;