Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-06 16:55:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.147.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-03-16 14:34:49 +01:00
parent d6ee482477
commit d2297c361d
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
swad_changelog.h
View File

@ -129,20 +129,21 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.147.1 (2016-03-16)"
#define Log_PLATFORM_VERSION "SWAD 15.147.2 (2016-03-16)"
#define CSS_FILE "swad15.146.css"
#define JS_FILE "swad15.131.3.js"
// 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
/*
Version 15.147.2: Mar 16, 2016 Icon to edit degree types integrated in frame. (195866 lines)
Version 15.147.1: Mar 16, 2016 Removed links to view when editing. (195854 lines)
Version 15.147: Mar 16, 2016 New buttons to create another institution / centre / degree / course. (195903 lines)
Version 15.146.6: Mar 16, 2016 Icons to edit courses integrated in frame. (195814 lines)
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.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.6: Mar 16, 2016 Icon to edit courses integrated in frame. (195814 lines)
Version 15.146.5: Mar 16, 2016 Icon to edit degrees integrated in frame. (195806 lines)
Version 15.146.4: Mar 16, 2016 Icon to edit centres integrated in frame. (195798 lines)
Version 15.146.3: Mar 16, 2016 Icon to edit institutions integrated in frame. (195790 lines)
Version 15.146.2: Mar 16, 2016 Icon to edit countries integrated in frame. (195781 lines)
Version 15.146.1: Mar 16, 2016 Icons to remove/edit/print an exam announcement integrated in frame. (195771 lines)
Version 15.146: Mar 16, 2016 Now frame rectangles can have icons at top.
Icon to edit banners integrated in frame. (195772 lines)

40
swad_degree.c
View File

@ -92,7 +92,8 @@ static void Deg_EditDegreeTypes (void);
static void Deg_ListDegreeTypesForSeeing (void);
static void Deg_ListDegreeTypesForEdition (void);
static void Deg_ListDegreesForSeeing (bool ICanEdit);
static void Deg_PutIconToEdit (void);
static void Deg_PutIconToEditDegTyp (void);
static void Deg_PutIconToEditDeg (void);
static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg);
static void Deg_ListDegreesForEdition (void);
static bool Deg_CheckIfICanEdit (struct Degree *Deg);
@ -1049,10 +1050,6 @@ void Deg_WriteSelectorDegTypes (void)
void Deg_SeeDegTypes (void)
{
/***** Put link (form) to edit degree types *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
Lay_PutFormToEdit (ActEdiDegTyp);
/***** Get list of degree types *****/
Deg_GetListDegTypes ();
@ -1149,9 +1146,11 @@ static void Deg_ListDegreeTypesForSeeing (void)
unsigned NumDegTyp;
const char *BgColor;
Lay_StartRoundFrameTable (NULL,2,Txt_Types_of_degree);
/***** Write heading *****/
Lay_StartRoundFrame (NULL,Txt_Types_of_degree,
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Deg_PutIconToEditDegTyp :
NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">");
Deg_PutHeadDegreeTypesForSeeing ();
/***** List degree types with forms for edition *****/
@ -1195,7 +1194,9 @@ static void Deg_ListDegreeTypesForSeeing (void)
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
}
Lay_EndRoundFrameTable ();
/***** Table end *****/
fprintf (Gbl.F.Out,"</table>");
Lay_EndRoundFrame ();
}
/*****************************************************************************/
@ -1273,7 +1274,7 @@ static void Deg_ListDegreesForSeeing (bool ICanEdit)
sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,
Gbl.CurrentCtr.Ctr.ShortName);
Lay_StartRoundFrame (NULL,Gbl.Title,
ICanEdit ? Deg_PutIconToEdit :
ICanEdit ? Deg_PutIconToEditDeg :
NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">");
Deg_PutHeadDegreesForSeeing ();
@ -1289,11 +1290,22 @@ static void Deg_ListDegreesForSeeing (bool ICanEdit)
Lay_EndRoundFrame ();
}
/*****************************************************************************/
/******************* Put link (form) to edit degree types ********************/
/*****************************************************************************/
static void Deg_PutIconToEditDegTyp (void)
{
extern const char *Txt_Edit;
Lay_PutContextualLink (ActEdiDegTyp,NULL,"edit64x64.png",Txt_Edit,NULL);
}
/*****************************************************************************/
/********************** Put link (form) to edit degrees **********************/
/*****************************************************************************/
static void Deg_PutIconToEdit (void)
static void Deg_PutIconToEditDeg (void)
{
extern const char *Txt_Edit;
@ -1842,7 +1854,7 @@ static void Deg_PutFormToCreateDegree (void)
static void Deg_PutHeadDegreeTypesForSeeing (void)
{
extern const char *Txt_Type_of_BR_degree;
extern const char *Txt_Degrees_ABBREVIATION;
extern const char *Txt_Degrees;
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"BM\"></th>"
@ -1854,7 +1866,7 @@ static void Deg_PutHeadDegreeTypesForSeeing (void)
"</th>"
"</tr>",
Txt_Type_of_BR_degree,
Txt_Degrees_ABBREVIATION);
Txt_Degrees);
}
/*****************************************************************************/
@ -1865,7 +1877,7 @@ static void Deg_PutHeadDegreeTypesForEdition (void)
{
extern const char *Txt_Code;
extern const char *Txt_Type_of_BR_degree;
extern const char *Txt_Degrees_ABBREVIATION;
extern const char *Txt_Degrees;
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"BM\"></th>"
@ -1881,7 +1893,7 @@ static void Deg_PutHeadDegreeTypesForEdition (void)
"</tr>",
Txt_Code,
Txt_Type_of_BR_degree,
Txt_Degrees_ABBREVIATION);
Txt_Degrees);
}
/*****************************************************************************/