mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-11 11:15:27 +02:00
Version 15.146.5
This commit is contained in:
parent
0b280f3a35
commit
49b14e33a1
|
@ -633,7 +633,7 @@ static void Ctr_ListCentresForSeeing (bool ICanEdit)
|
||||||
|
|
||||||
/***** Table end *****/
|
/***** Table end *****/
|
||||||
fprintf (Gbl.F.Out,"</table>");
|
fprintf (Gbl.F.Out,"</table>");
|
||||||
Lay_EndRoundFrameTable ();
|
Lay_EndRoundFrame ();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -727,7 +727,6 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
|
||||||
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
|
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/********************** Put link (form) to edit centres **********************/
|
/********************** Put link (form) to edit centres **********************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -129,13 +129,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 15.146.4 (2016-03-16)"
|
#define Log_PLATFORM_VERSION "SWAD 15.146.5 (2016-03-16)"
|
||||||
#define CSS_FILE "swad15.146.css"
|
#define CSS_FILE "swad15.146.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.146.5: Mar 16, 2016 Icons to edit degrees integrated in frame. (195806 lines)
|
||||||
Version 15.146.4: Mar 16, 2016 Icons to edit centres integrated in frame. (195798 lines)
|
Version 15.146.4: Mar 16, 2016 Icons to edit centres integrated in frame. (195798 lines)
|
||||||
Version 15.146.3: Mar 16, 2016 Icons to edit institutions integrated in frame. (195790 lines)
|
Version 15.146.3: Mar 16, 2016 Icons to edit institutions integrated in frame. (195790 lines)
|
||||||
Version 15.146.2: Mar 16, 2016 Icons to edit countries integrated in frame. (195781 lines)
|
Version 15.146.2: Mar 16, 2016 Icons to edit countries integrated in frame. (195781 lines)
|
||||||
|
|
|
@ -91,7 +91,7 @@ static void Deg_WriteSelectorOfDegree (void);
|
||||||
static void Deg_EditDegreeTypes (void);
|
static void Deg_EditDegreeTypes (void);
|
||||||
static void Deg_ListDegreeTypesForSeeing (void);
|
static void Deg_ListDegreeTypesForSeeing (void);
|
||||||
static void Deg_ListDegreeTypesForEdition (void);
|
static void Deg_ListDegreeTypesForEdition (void);
|
||||||
static void Deg_ListDegreesForSeeing (void);
|
static void Deg_ListDegreesForSeeing (bool ICanEdit);
|
||||||
static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg);
|
static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg);
|
||||||
static void Deg_ListDegreesForEdition (void);
|
static void Deg_ListDegreesForEdition (void);
|
||||||
static bool Deg_CheckIfICanEdit (struct Degree *Deg);
|
static bool Deg_CheckIfICanEdit (struct Degree *Deg);
|
||||||
|
@ -101,6 +101,7 @@ static void Deg_PutFormToCreateDegType (void);
|
||||||
static void Deg_PutFormToCreateDegree (void);
|
static void Deg_PutFormToCreateDegree (void);
|
||||||
static void Deg_PutHeadDegreeTypesForSeeing (void);
|
static void Deg_PutHeadDegreeTypesForSeeing (void);
|
||||||
static void Deg_PutHeadDegreeTypesForEdition (void);
|
static void Deg_PutHeadDegreeTypesForEdition (void);
|
||||||
|
static void Deg_PutIconToEdit (void);
|
||||||
static void Deg_PutHeadDegreesForSeeing (void);
|
static void Deg_PutHeadDegreesForSeeing (void);
|
||||||
static void Deg_PutHeadDegreesForEdition (void);
|
static void Deg_PutHeadDegreesForEdition (void);
|
||||||
static void Deg_CreateDegreeType (struct DegreeType *DegTyp);
|
static void Deg_CreateDegreeType (struct DegreeType *DegTyp);
|
||||||
|
@ -1266,7 +1267,7 @@ static void Deg_ListDegreeTypesForEdition (void)
|
||||||
/********************** List current degrees for seeing **********************/
|
/********************** List current degrees for seeing **********************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
static void Deg_ListDegreesForSeeing (void)
|
static void Deg_ListDegreesForSeeing (bool ICanEdit)
|
||||||
{
|
{
|
||||||
extern const char *Txt_Degrees_of_CENTRE_X;
|
extern const char *Txt_Degrees_of_CENTRE_X;
|
||||||
unsigned NumDeg;
|
unsigned NumDeg;
|
||||||
|
@ -1274,7 +1275,10 @@ static void Deg_ListDegreesForSeeing (void)
|
||||||
/***** Write heading *****/
|
/***** Write heading *****/
|
||||||
sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,
|
sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,
|
||||||
Gbl.CurrentCtr.Ctr.ShortName);
|
Gbl.CurrentCtr.Ctr.ShortName);
|
||||||
Lay_StartRoundFrameTable (NULL,2,Gbl.Title);
|
Lay_StartRoundFrame (NULL,Gbl.Title,
|
||||||
|
ICanEdit ? Deg_PutIconToEdit :
|
||||||
|
NULL);
|
||||||
|
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">");
|
||||||
Deg_PutHeadDegreesForSeeing ();
|
Deg_PutHeadDegreesForSeeing ();
|
||||||
|
|
||||||
/***** List the degrees *****/
|
/***** List the degrees *****/
|
||||||
|
@ -1284,7 +1288,8 @@ static void Deg_ListDegreesForSeeing (void)
|
||||||
Deg_ListOneDegreeForSeeing (&(Gbl.CurrentCtr.LstDegs[NumDeg]),NumDeg + 1);
|
Deg_ListOneDegreeForSeeing (&(Gbl.CurrentCtr.LstDegs[NumDeg]),NumDeg + 1);
|
||||||
|
|
||||||
/***** Table end *****/
|
/***** Table end *****/
|
||||||
Lay_EndRoundFrameTable ();
|
fprintf (Gbl.F.Out,"</table>");
|
||||||
|
Lay_EndRoundFrame ();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -1871,6 +1876,17 @@ static void Deg_PutHeadDegreeTypesForEdition (void)
|
||||||
Txt_Degrees_ABBREVIATION);
|
Txt_Degrees_ABBREVIATION);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/********************** Put link (form) to edit centres **********************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
static void Deg_PutIconToEdit (void)
|
||||||
|
{
|
||||||
|
extern const char *Txt_Edit;
|
||||||
|
|
||||||
|
Lay_PutContextualLink (ActEdiDeg,NULL,"edit64x64.png",Txt_Edit,NULL);
|
||||||
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/******************** Write header with fields of a degree *******************/
|
/******************** Write header with fields of a degree *******************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -2037,20 +2053,15 @@ static void Deg_ListDegrees (void)
|
||||||
bool ICanEdit = (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_);
|
bool ICanEdit = (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_);
|
||||||
|
|
||||||
if (Gbl.CurrentCtr.Ctr.NumDegs) // There are degrees in the current centre
|
if (Gbl.CurrentCtr.Ctr.NumDegs) // There are degrees in the current centre
|
||||||
{
|
Deg_ListDegreesForSeeing (ICanEdit);
|
||||||
if (ICanEdit)
|
|
||||||
Lay_PutFormToEdit (ActEdiDeg);
|
|
||||||
Deg_ListDegreesForSeeing ();
|
|
||||||
}
|
|
||||||
else // No degrees created in the current centre
|
else // No degrees created in the current centre
|
||||||
{
|
|
||||||
Lay_ShowAlert (Lay_INFO,Txt_No_degrees_have_been_created_in_this_centre);
|
Lay_ShowAlert (Lay_INFO,Txt_No_degrees_have_been_created_in_this_centre);
|
||||||
if (ICanEdit)
|
|
||||||
{
|
if (ICanEdit)
|
||||||
Act_FormStart (ActEdiDeg);
|
{
|
||||||
Lay_PutConfirmButton (Txt_Create_degree);
|
Act_FormStart (ActEdiDeg);
|
||||||
Act_FormEnd ();
|
Lay_PutConfirmButton (Txt_Create_degree);
|
||||||
}
|
Act_FormEnd ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user