mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-16 13:44:06 +02:00
Version 15.140.1
This commit is contained in:
parent
169039f21c
commit
ba0de52e9d
|
@ -125,13 +125,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 15.140 (2016-03-01)"
|
#define Log_PLATFORM_VERSION "SWAD 15.140.1 (2016-03-01)"
|
||||||
#define CSS_FILE "swad15.137.2.css"
|
#define CSS_FILE "swad15.137.2.css"
|
||||||
#define JS_FILE "swad15.131.3.js"
|
#define JS_FILE "swad15.131.3.js"
|
||||||
|
|
||||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
// 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 sql/swad*.sql | tail -1
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
|
||||||
/*
|
/*
|
||||||
|
Version 15.140.1: Mar 01, 2016 The link to go to another course after editing is replaced by a button. (195817 lines)
|
||||||
Version 15.140: Mar 01, 2016 New option "landing page". (195817 lines)
|
Version 15.140: Mar 01, 2016 New option "landing page". (195817 lines)
|
||||||
2 changes necessary in database:
|
2 changes necessary in database:
|
||||||
UPDATE actions SET Txt='Formularios cambiar rol y cerrar sesión' WHERE ActCod='843' AND Language='es';
|
UPDATE actions SET Txt='Formularios cambiar rol y cerrar sesión' WHERE ActCod='843' AND Language='es';
|
||||||
|
|
|
@ -97,7 +97,7 @@ static void Crs_CreateCourse (struct Course *Crs,unsigned Status);
|
||||||
static void Crs_GetDataOfCourseFromRow (struct Course *Crs,MYSQL_ROW row);
|
static void Crs_GetDataOfCourseFromRow (struct Course *Crs,MYSQL_ROW row);
|
||||||
static void Crs_EmptyCourseCompletely (long CrsCod);
|
static void Crs_EmptyCourseCompletely (long CrsCod);
|
||||||
static bool Crs_RenameCourse (struct Course *Crs,Cns_ShortOrFullName_t ShortOrFullName);
|
static bool Crs_RenameCourse (struct Course *Crs,Cns_ShortOrFullName_t ShortOrFullName);
|
||||||
static void Crs_PutLinkToGoToCrs (struct Course *Crs);
|
static void Crs_PutButtonToGoToCrs (struct Course *Crs);
|
||||||
|
|
||||||
static void Crs_PutLinkToSearchCourses (void);
|
static void Crs_PutLinkToSearchCourses (void);
|
||||||
static void Crs_PutLinkToSearchCoursesParams (void);
|
static void Crs_PutLinkToSearchCoursesParams (void);
|
||||||
|
@ -1982,8 +1982,8 @@ static void Crs_CreateCourse (struct Course *Crs,unsigned Status)
|
||||||
Crs->FullName);
|
Crs->FullName);
|
||||||
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
|
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
|
||||||
|
|
||||||
/***** Put link to go to course created *****/
|
/***** Put button to go to course created *****/
|
||||||
Crs_PutLinkToGoToCrs (Crs);
|
Crs_PutButtonToGoToCrs (Crs);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -2412,9 +2412,9 @@ void Crs_ChangeInsCrsCod (void)
|
||||||
Lay_ShowAlert (Lay_INFO,Gbl.Message);
|
Lay_ShowAlert (Lay_INFO,Gbl.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
/***** Put link to go to course changed *****/
|
/***** Put button to go to course changed *****/
|
||||||
if (Crs->CrsCod != Gbl.CurrentCrs.Crs.CrsCod) // If changing other course different than the current one...
|
if (Crs->CrsCod != Gbl.CurrentCrs.Crs.CrsCod) // If changing other course different than the current one...
|
||||||
Crs_PutLinkToGoToCrs (Crs);
|
Crs_PutButtonToGoToCrs (Crs);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
Lay_ShowAlert (Lay_WARNING,Txt_You_dont_have_permission_to_edit_this_course);
|
Lay_ShowAlert (Lay_WARNING,Txt_You_dont_have_permission_to_edit_this_course);
|
||||||
|
@ -2495,9 +2495,9 @@ void Crs_ChangeCrsDegree (void)
|
||||||
Crs->FullName,NewDeg.FullName);
|
Crs->FullName,NewDeg.FullName);
|
||||||
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
|
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
|
||||||
|
|
||||||
/***** Put link to go to course changed *****/
|
/***** Put button to go to course changed *****/
|
||||||
if (Crs->CrsCod != Gbl.CurrentCrs.Crs.CrsCod) // If changing other course different than the current one...
|
if (Crs->CrsCod != Gbl.CurrentCrs.Crs.CrsCod) // If changing other course different than the current one...
|
||||||
Crs_PutLinkToGoToCrs (Crs);
|
Crs_PutButtonToGoToCrs (Crs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // New degree has no current course year
|
else // New degree has no current course year
|
||||||
|
@ -2581,9 +2581,9 @@ void Crs_ChangeCrsYear (void)
|
||||||
Crs->ShortName);
|
Crs->ShortName);
|
||||||
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
|
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
|
||||||
|
|
||||||
/***** Put link to go to course changed *****/
|
/***** Put button to go to course changed *****/
|
||||||
if (Crs->CrsCod != Gbl.CurrentCrs.Crs.CrsCod) // If changing other course different than the current one...
|
if (Crs->CrsCod != Gbl.CurrentCrs.Crs.CrsCod) // If changing other course different than the current one...
|
||||||
Crs_PutLinkToGoToCrs (Crs);
|
Crs_PutButtonToGoToCrs (Crs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // Year not valid
|
else // Year not valid
|
||||||
|
@ -2726,10 +2726,14 @@ static bool Crs_RenameCourse (struct Course *Crs,Cns_ShortOrFullName_t ShortOrFu
|
||||||
FieldName,NewCrsName,Crs->CrsCod);
|
FieldName,NewCrsName,Crs->CrsCod);
|
||||||
DB_QueryUPDATE (Query,"can not update the name of a course");
|
DB_QueryUPDATE (Query,"can not update the name of a course");
|
||||||
|
|
||||||
/***** Write message to show the change made *****/
|
/* Write message to show the change made */
|
||||||
sprintf (Gbl.Message,Txt_The_name_of_the_course_X_has_changed_to_Y,
|
sprintf (Gbl.Message,Txt_The_name_of_the_course_X_has_changed_to_Y,
|
||||||
CurrentCrsName,NewCrsName);
|
CurrentCrsName,NewCrsName);
|
||||||
|
|
||||||
|
/* Change current course name in order to display it properly */
|
||||||
|
strncpy (CurrentCrsName,NewCrsName,MaxLength);
|
||||||
|
CurrentCrsName[MaxLength] = '\0';
|
||||||
|
|
||||||
CourseHasBeenRenamed = true;
|
CourseHasBeenRenamed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2786,9 +2790,9 @@ void Crs_ChangeCrsStatus (void)
|
||||||
Crs->ShortName);
|
Crs->ShortName);
|
||||||
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
|
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
|
||||||
|
|
||||||
/***** Put link to go to course changed *****/
|
/***** Put button to go to course changed *****/
|
||||||
if (Crs->CrsCod != Gbl.CurrentCrs.Crs.CrsCod) // If changing other course different than the current one...
|
if (Crs->CrsCod != Gbl.CurrentCrs.Crs.CrsCod) // If changing other course different than the current one...
|
||||||
Crs_PutLinkToGoToCrs (Crs);
|
Crs_PutButtonToGoToCrs (Crs);
|
||||||
|
|
||||||
/***** Show the form again *****/
|
/***** Show the form again *****/
|
||||||
Crs_ReqEditCourses ();
|
Crs_ReqEditCourses ();
|
||||||
|
@ -2805,31 +2809,27 @@ void Crs_ContEditAfterChgCrs (void)
|
||||||
Lay_INFO,
|
Lay_INFO,
|
||||||
Gbl.Message);
|
Gbl.Message);
|
||||||
|
|
||||||
/***** Put link to go to course changed *****/
|
/***** Put button to go to course changed *****/
|
||||||
if (Gbl.Degs.EditingCrs.CrsCod != Gbl.CurrentCrs.Crs.CrsCod) // If changing other course different than the current one...
|
if (Gbl.Degs.EditingCrs.CrsCod != Gbl.CurrentCrs.Crs.CrsCod) // If changing other course different than the current one...
|
||||||
Crs_PutLinkToGoToCrs (&Gbl.Degs.EditingCrs);
|
Crs_PutButtonToGoToCrs (&Gbl.Degs.EditingCrs);
|
||||||
|
|
||||||
/***** Show the form again *****/
|
/***** Show the form again *****/
|
||||||
Crs_ReqEditCourses ();
|
Crs_ReqEditCourses ();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/******************** Put centered link to go to course **********************/
|
/************************ Put button to go to course *************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
static void Crs_PutLinkToGoToCrs (struct Course *Crs)
|
static void Crs_PutButtonToGoToCrs (struct Course *Crs)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassForm[The_NUM_THEMES];
|
|
||||||
extern const char *Txt_Go_to_X;
|
extern const char *Txt_Go_to_X;
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
|
Act_FormStart (ActSeeCrsInf);
|
||||||
Act_FormGoToStart (ActSeeCrsInf);
|
|
||||||
Crs_PutParamCrsCod (Crs->CrsCod);
|
Crs_PutParamCrsCod (Crs->CrsCod);
|
||||||
sprintf (Gbl.Title,Txt_Go_to_X,Crs->ShortName);
|
sprintf (Gbl.Title,Txt_Go_to_X,Crs->ShortName);
|
||||||
Act_LinkFormSubmit (Gbl.Title,The_ClassForm[Gbl.Prefs.Theme]);
|
Lay_PutConfirmButton (Gbl.Title);
|
||||||
fprintf (Gbl.F.Out,"%s</a>",Gbl.Title);
|
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
fprintf (Gbl.F.Out,"</div>");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
Loading…
Reference in New Issue
Block a user