diff --git a/swad_centre.c b/swad_centre.c
index 231fb4076..a658d9ec0 100644
--- a/swad_centre.c
+++ b/swad_centre.c
@@ -951,6 +951,7 @@ void Ctr_EditCentres (void)
/***** Get list of centres *****/
Ctr_GetListCentres (Gbl.CurrentIns.Ins.InsCod);
+ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,
Gbl.CurrentIns.Ins.FullName);
Lay_StartRoundFrame (NULL,Gbl.Title,Ctr_PutIconsEditingCentres,
@@ -990,7 +991,7 @@ static void Ctr_PutIconToViewCentres (void)
{
extern const char *Txt_View;
- /***** Put form to create a new type of group *****/
+ /***** Put form to view centres *****/
Lay_PutContextualLink (ActSeeCtr,NULL,NULL,
"eye-on64x64.png",
Txt_View,NULL,
@@ -1621,7 +1622,7 @@ static void Ctr_ListCentresForEdition (void)
}
/***** End table *****/
- Lay_EndRoundFrameTable ();
+ fprintf (Gbl.F.Out,"");
/***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat);
@@ -2441,6 +2442,7 @@ static void Ctr_PutFormToCreateCentre (void)
struct Centre *Ctr;
unsigned NumPlc;
+ /***** Centre data *****/
Ctr = &Gbl.Ctrs.EditingCtr;
/***** Start form *****/
@@ -2457,7 +2459,7 @@ static void Ctr_PutFormToCreateCentre (void)
/***** Write heading *****/
Ctr_PutHeadCentresForEdition ();
- /***** Column to remove institution, disabled here *****/
+ /***** Column to remove centre, disabled here *****/
fprintf (Gbl.F.Out,"
"
" | ");
diff --git a/swad_changelog.h b/swad_changelog.h
index 1c5c0f02d..df2319cbb 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -223,13 +223,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 16.196.1 (2017-04-30)"
+#define Log_PLATFORM_VERSION "SWAD 16.196.2 (2017-04-30)"
#define CSS_FILE "swad16.195.8.css"
#define JS_FILE "swad16.181.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 16.196.2: Apr 30, 2017 Changes in layout of edition of centres. (218537 lines)
Version 16.196.1: Apr 30, 2017 Changes in layout of edition of centres. (218538 lines)
Version 16.196: Apr 30, 2017 Changes in layout of edition of institutions. (218525 lines)
Version 16.195.8: Apr 29, 2017 Changes in layout of file browser. (218511 lines)
diff --git a/swad_degree.c b/swad_degree.c
index 0f7298762..db23f7987 100644
--- a/swad_degree.c
+++ b/swad_degree.c
@@ -100,6 +100,9 @@ static void Deg_PutIconsListDegrees (void);
static void Deg_PutIconToEditDegrees (void);
static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg);
+static void Deg_PutIconsEditingDegrees (void);
+static void Deg_PutIconToViewDegrees (void);
+
static void Deg_RecFormRequestOrCreateDeg (unsigned Status);
static void Deg_PutParamOtherDegCod (long DegCod);
@@ -661,8 +664,6 @@ void Deg_ShowDegsOfCurrentCtr (void)
static void Deg_ListDegreesForEdition (void)
{
- extern const char *Hlp_CENTRE_Degrees_edit;
- extern const char *Txt_Degrees_of_CENTRE_X;
extern const char *Txt_DEGREE_STATUS[Deg_NUM_STATUS_TXT];
unsigned NumDeg;
struct DegreeType *DegTyp;
@@ -678,10 +679,7 @@ static void Deg_ListDegreesForEdition (void)
Usr_UsrDataConstructor (&UsrDat);
/***** Write heading *****/
- sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,
- Gbl.CurrentCtr.Ctr.ShrtName);
- Lay_StartRoundFrameTable (NULL,Gbl.Title,DT_PutIconToViewDegreeTypes,
- Hlp_CENTRE_Degrees_edit,2);
+ fprintf (Gbl.F.Out,"");
Deg_PutHeadDegreesForEdition ();
/***** List the degrees *****/
@@ -859,7 +857,7 @@ static void Deg_ListDegreesForEdition (void)
}
/***** End table *****/
- Lay_EndRoundFrameTable ();
+ fprintf (Gbl.F.Out,"
");
/***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat);
@@ -924,8 +922,7 @@ static Deg_Status_t Deg_GetStatusBitsFromStatusTxt (Deg_StatusTxt_t StatusTxt)
static void Deg_PutFormToCreateDegree (void)
{
- extern const char *Hlp_CENTRE_Degrees_edit;
- extern const char *Txt_New_degree_of_CENTRE_X;
+ extern const char *Txt_New_degree;
extern const char *Txt_Create_degree;
struct Degree *Deg;
struct DegreeType *DegTyp;
@@ -934,12 +931,6 @@ static void Deg_PutFormToCreateDegree (void)
/***** Degree data *****/
Deg = &Gbl.Degs.EditingDeg;
- /***** Start of frame *****/
- sprintf (Gbl.Title,Txt_New_degree_of_CENTRE_X,
- Gbl.CurrentCtr.Ctr.ShrtName);
- Lay_StartRoundFrame (NULL,Gbl.Title,DT_PutIconToViewDegreeTypes,
- Hlp_CENTRE_Degrees_edit);
-
/***** Start form *****/
if (Gbl.Usrs.Me.LoggedRole >= Rol_CTR_ADM)
Act_FormStart (ActNewDeg);
@@ -948,17 +939,15 @@ static void Deg_PutFormToCreateDegree (void)
else
Lay_ShowErrorAndExit ("You can not edit degrees.");
- /***** Start table *****/
- fprintf (Gbl.F.Out,"");
+ /***** Start frame *****/
+ Lay_StartRoundFrameTable (NULL,Txt_New_degree,NULL,NULL,2);
/***** Table head *****/
Deg_PutHeadDegreesForEdition ();
- /***** Put disabled icon to remove degree *****/
+ /***** Column to remove degree, disabled here *****/
fprintf (Gbl.F.Out,""
- "");
- Lay_PutIconRemovalNotAllowed ();
- fprintf (Gbl.F.Out," | ");
+ " | ");
/***** Degree code *****/
fprintf (Gbl.F.Out," | ");
@@ -1034,14 +1023,11 @@ static void Deg_PutFormToCreateDegree (void)
/***** End table *****/
fprintf (Gbl.F.Out,"
");
- /***** Button to send form *****/
- Lay_PutCreateButton (Txt_Create_degree);
+ /***** Send button and end of frame *****/
+ Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_degree);
/***** End form *****/
Act_FormEnd ();
-
- /***** End frame *****/
- Lay_EndRoundFrame ();
}
/*****************************************************************************/
@@ -1357,6 +1343,8 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg)
void Deg_EditDegrees (void)
{
+ extern const char *Hlp_CENTRE_Degrees;
+ extern const char *Txt_Degrees_of_CENTRE_X;
extern const char *Txt_There_are_no_types_of_degree;
/***** Get list of degrees in the current centre *****/
@@ -1365,6 +1353,12 @@ void Deg_EditDegrees (void)
/***** Get list of degree types *****/
DT_GetListDegreeTypes (Sco_SCOPE_SYS,DT_ORDER_BY_DEGREE_TYPE);
+ /***** Start frame *****/
+ sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,
+ Gbl.CurrentCtr.Ctr.FullName);
+ Lay_StartRoundFrame (NULL,Gbl.Title,Deg_PutIconsEditingDegrees,
+ Hlp_CENTRE_Degrees);
+
if (Gbl.Degs.DegTypes.Num)
{
/***** Put a form to create a new degree *****/
@@ -1384,6 +1378,9 @@ void Deg_EditDegrees (void)
DT_PutFormToCreateDegreeType ();
}
+ /***** End frame *****/
+ Lay_EndRoundFrame ();
+
/***** Free list of degree types *****/
DT_FreeListDegreeTypes ();
@@ -1391,6 +1388,30 @@ void Deg_EditDegrees (void)
Deg_FreeListDegs (&Gbl.CurrentCtr.Ctr.Degs);
}
+/*****************************************************************************/
+/**************** Put contextual icons in edition of degrees *****************/
+/*****************************************************************************/
+
+static void Deg_PutIconsEditingDegrees (void)
+ {
+ /***** Put icon to view degrees *****/
+ Deg_PutIconToViewDegrees ();
+
+ /***** Put icon to view types of degree *****/
+ DT_PutIconToViewDegreeTypes ();
+ }
+
+static void Deg_PutIconToViewDegrees (void)
+ {
+ extern const char *Txt_View;
+
+ /***** Put form to view degrees *****/
+ Lay_PutContextualLink (ActSeeDeg,NULL,NULL,
+ "eye-on64x64.png",
+ Txt_View,NULL,
+ NULL);
+ }
+
/*****************************************************************************/
/********** Create a list with all the degrees that have students ************/
/*****************************************************************************/
diff --git a/swad_help_URL.c b/swad_help_URL.c
index f7044879a..6c83e15d8 100644
--- a/swad_help_URL.c
+++ b/swad_help_URL.c
@@ -520,27 +520,6 @@ const char *Hlp_CENTRE_Degrees =
"CENTRE.Degrees.en";
#endif
-const char *Hlp_CENTRE_Degrees_edit =
-#if L==1
- "CENTRE.Degrees.es#editar";
-#elif L==2
- "CENTRE.Degrees.en#edit";
-#elif L==3
- "CENTRE.Degrees.en#edit";
-#elif L==4
- "CENTRE.Degrees.es#editar";
-#elif L==5
- "CENTRE.Degrees.en#edit";
-#elif L==6
- "CENTRE.Degrees.es#editar";
-#elif L==7
- "CENTRE.Degrees.en#edit";
-#elif L==8
- "CENTRE.Degrees.en#edit";
-#elif L==9
- "CENTRE.Degrees.en#edit";
-#endif
-
/***** DEGREE tab *****/
const char *Hlp_DEGREE_Information =
diff --git a/swad_institution.c b/swad_institution.c
index 6dc608ba6..0f994813e 100644
--- a/swad_institution.c
+++ b/swad_institution.c
@@ -960,7 +960,7 @@ static void Ins_PutIconToViewInstitutions (void)
{
extern const char *Txt_View;
- /***** Put form to create a new type of group *****/
+ /***** Put form to view institutions *****/
Lay_PutContextualLink (ActSeeIns,NULL,NULL,
"eye-on64x64.png",
Txt_View,NULL,
@@ -2176,6 +2176,7 @@ static void Ins_PutFormToCreateInstitution (void)
extern const char *Txt_Create_institution;
struct Instit *Ins;
+ /***** Institution data *****/
Ins = &Gbl.Inss.EditingIns;
/***** Start form *****/
diff --git a/swad_text.c b/swad_text.c
index 5f050e2de..08f898dce 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -23817,25 +23817,25 @@ const char *Txt_New_course_of_DEGREE_X = // Warning: it is very important to inc
"Nova disciplina (disciplina, curso...) de %s";
#endif
-const char *Txt_New_degree_of_CENTRE_X = // Warning: it is very important to include %s in the following sentences
+const char *Txt_New_degree =
#if L==1
- "Nova titulació (carrera, llicenciatura, diplomatura, grau, postgrau, màster, cicle, nivell...) de %s";
+ "Nova titulació (carrera, llicenciatura, diplomatura, grau, postgrau, màster, cicle, nivell...)";
#elif L==2
- "Neuer Studiengang (Karriere, Diplom, Grad, Graduierten, Master, Zyklus, Niveau...) von %s";
+ "Neuer Studiengang (Karriere, Diplom, Grad, Graduierten, Master, Zyklus, Niveau...)";
#elif L==3
- "New degree (career, diploma, degree, postgraduate, master, cycle, level...) of %s";
+ "New degree (career, diploma, degree, postgraduate, master, cycle, level...)";
#elif L==4
- "Nueva titulación (carrera, licenciatura, diplomatura, grado, posgrado, máster, ciclo, nivel...) de %s";
+ "Nueva titulación (carrera, licenciatura, diplomatura, grado, posgrado, máster, ciclo, nivel...)";
#elif L==5
- "Nouvel étude (carrière, grade, diplôme, degré, troisiàme cycle, master, cycle, niveau...) de %s";
+ "Nouvel étude (carrière, grade, diplôme, degré, troisiàme cycle, master, cycle, niveau...)";
#elif L==6
- "Nueva titulación (carrera, licenciatura, diplomatura, grado, posgrado, máster, ciclo, nivel...) de %s"; // Okoteve traducción
+ "Nueva titulación (carrera, licenciatura, diplomatura, grado, posgrado, máster, ciclo, nivel...)"; // Okoteve traducción
#elif L==7
- "Nuova laurea (carriera, diploma, laurea, post-laurea, master, ciclo, livello...) di %s";
+ "Nuova laurea (carriera, diploma, laurea, post-laurea, master, ciclo, livello...)";
#elif L==8
- "Nowy stopień (zawodowe, stopień, dyplom, magisterskie, podyplomowe, magisterskie, cykl, poziom...) %s";
+ "Nowy stopień (zawodowe, stopień, dyplom, magisterskie, podyplomowe, magisterskie, cykl, poziom...)";
#elif L==9
- "Nova titulação (carreira, diploma, grau, pós-grau, mestrado, ciclo, nível...) de %s";
+ "Nova titulação (carreira, diploma, grau, pós-grau, mestrado, ciclo, nível...)";
#endif
const char *Txt_New_department =