diff --git a/swad_centre.c b/swad_centre.c
index 1ae60f8db..231fb4076 100644
--- a/swad_centre.c
+++ b/swad_centre.c
@@ -86,6 +86,10 @@ static void Ctr_PutIconsListCentres (void);
static void Ctr_PutIconToEditCentres (void);
static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr);
static void Ctr_GetParamCtrOrder (void);
+
+static void Ctr_PutIconsEditingCentres (void);
+static void Ctr_PutIconToViewCentres (void);
+
static void Ctr_GetPhotoAttribution (long CtrCod,char **PhotoAttribution);
static void Ctr_FreePhotoAttribution (char **PhotoAttribution);
static void Ctr_ListCentresForEdition (void);
@@ -938,12 +942,20 @@ static void Ctr_GetParamCtrOrder (void)
void Ctr_EditCentres (void)
{
+ extern const char *Hlp_INSTITUTION_Centres;
+ extern const char *Txt_Centres_of_INSTITUTION_X;
+
/***** Get list of places *****/
Plc_GetListPlaces ();
/***** Get list of centres *****/
Ctr_GetListCentres (Gbl.CurrentIns.Ins.InsCod);
+ sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,
+ Gbl.CurrentIns.Ins.FullName);
+ Lay_StartRoundFrame (NULL,Gbl.Title,Ctr_PutIconsEditingCentres,
+ Hlp_INSTITUTION_Centres);
+
/***** Put a form to create a new centre *****/
Ctr_PutFormToCreateCentre ();
@@ -951,6 +963,9 @@ void Ctr_EditCentres (void)
if (Gbl.Ctrs.Num)
Ctr_ListCentresForEdition ();
+ /***** End frame *****/
+ Lay_EndRoundFrame ();
+
/***** Free list of centres *****/
Ctr_FreeListCentres ();
@@ -958,6 +973,30 @@ void Ctr_EditCentres (void)
Plc_FreeListPlaces ();
}
+/*****************************************************************************/
+/**************** Put contextual icons in edition of centres *****************/
+/*****************************************************************************/
+
+static void Ctr_PutIconsEditingCentres (void)
+ {
+ /***** Put icon to view centres *****/
+ Ctr_PutIconToViewCentres ();
+
+ /***** Put icon to view places *****/
+ Plc_PutIconToViewPlaces ();
+ }
+
+static void Ctr_PutIconToViewCentres (void)
+ {
+ extern const char *Txt_View;
+
+ /***** Put form to create a new type of group *****/
+ Lay_PutContextualLink (ActSeeCtr,NULL,NULL,
+ "eye-on64x64.png",
+ Txt_View,NULL,
+ NULL);
+ }
+
/*****************************************************************************/
/***** Get a list with all the centres or with those of an institution *******/
/*****************************************************************************/
@@ -1375,8 +1414,6 @@ void Ctr_WriteSelectorOfCentre (void)
static void Ctr_ListCentresForEdition (void)
{
- extern const char *Hlp_INSTITUTION_Centres;
- extern const char *Txt_Centres_of_INSTITUTION_X;
extern const char *Txt_Another_place;
extern const char *Txt_CENTRE_STATUS[Ctr_NUM_STATUS_TXT];
unsigned NumCtr;
@@ -1391,10 +1428,7 @@ static void Ctr_ListCentresForEdition (void)
Usr_UsrDataConstructor (&UsrDat);
/***** Write heading *****/
- sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,
- Gbl.CurrentIns.Ins.FullName);
- Lay_StartRoundFrameTable (NULL,Gbl.Title,Plc_PutIconToViewPlaces,
- Hlp_INSTITUTION_Centres,2);
+ fprintf (Gbl.F.Out,"
");
Ctr_PutHeadCentresForEdition ();
/***** Write all the centres *****/
@@ -2401,8 +2435,7 @@ void Ctr_ChangeCtrPhotoAttribution (void)
static void Ctr_PutFormToCreateCentre (void)
{
- extern const char *Hlp_INSTITUTION_Centres;
- extern const char *Txt_New_centre_of_INSTITUTION_X;
+ extern const char *Txt_New_centre;
extern const char *Txt_Another_place;
extern const char *Txt_Create_centre;
struct Centre *Ctr;
@@ -2410,12 +2443,6 @@ static void Ctr_PutFormToCreateCentre (void)
Ctr = &Gbl.Ctrs.EditingCtr;
- /***** Start frame *****/
- sprintf (Gbl.Title,Txt_New_centre_of_INSTITUTION_X,
- Gbl.CurrentIns.Ins.ShrtName);
- Lay_StartRoundFrame (NULL,Gbl.Title,Plc_PutIconToViewPlaces,
- Hlp_INSTITUTION_Centres);
-
/***** Start form *****/
if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM)
Act_FormStart (ActNewCtr);
@@ -2424,17 +2451,15 @@ static void Ctr_PutFormToCreateCentre (void)
else
Lay_ShowErrorAndExit ("You can not edit centres.");
- /***** Start table *****/
- fprintf (Gbl.F.Out,"");
+ /***** Start frame *****/
+ Lay_StartRoundFrameTable (NULL,Txt_New_centre,NULL,NULL,2);
- /***** Table head *****/
+ /***** Write heading *****/
Ctr_PutHeadCentresForEdition ();
- /***** Put disabled icon to remove centre *****/
+ /***** Column to remove institution, disabled here *****/
fprintf (Gbl.F.Out,""
- "");
- Lay_PutIconRemovalNotAllowed ();
- fprintf (Gbl.F.Out," | ");
+ " | ");
/***** Centre code *****/
fprintf (Gbl.F.Out," | ");
@@ -2518,17 +2543,11 @@ static void Ctr_PutFormToCreateCentre (void)
""
"
");
- /***** End table *****/
- fprintf (Gbl.F.Out,"
");
-
- /***** Button to send form *****/
- Lay_PutCreateButton (Txt_Create_centre);
+ /***** Send button and end of frame *****/
+ Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_centre);
/***** End form *****/
Act_FormEnd ();
-
- /***** End frame *****/
- Lay_EndRoundFrame ();
}
/*****************************************************************************/
diff --git a/swad_changelog.h b/swad_changelog.h
index 2ba7ac1b5..1c5c0f02d 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -223,13 +223,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 16.196 (2017-04-30)"
+#define Log_PLATFORM_VERSION "SWAD 16.196.1 (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.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)
Version 16.195.7: Apr 29, 2017 Fixed bug in tabs. (218511 lines)
diff --git a/swad_institution.c b/swad_institution.c
index c01d9d550..6dc608ba6 100644
--- a/swad_institution.c
+++ b/swad_institution.c
@@ -2186,7 +2186,7 @@ static void Ins_PutFormToCreateInstitution (void)
else
Lay_ShowErrorAndExit ("You can not edit institutions.");
- /***** Start of frame *****/
+ /***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_institution,NULL,NULL,2);
/***** Write heading *****/
@@ -2263,7 +2263,7 @@ static void Ins_PutFormToCreateInstitution (void)
/***** Send button and end of frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_institution);
- /***** End of form *****/
+ /***** End form *****/
Act_FormEnd ();
}
diff --git a/swad_text.c b/swad_text.c
index 5b80b8e37..5f050e2de 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -23754,25 +23754,25 @@ const char *Txt_New_banner =
"Novo banner";
#endif
-const char *Txt_New_centre_of_INSTITUTION_X = // Warning: it is very important to include %s in the following sentences
+const char *Txt_New_centre =
#if L==1
- "Nou centre (facultat, escola, institut, divisió, edifici...) de %s";
+ "Nou centre (facultat, escola, institut, divisió, edifici...)";
#elif L==2
- "Neues Lehrinstitut (Fakultät, Schule, Hochschule, Abteilung, Gebäude...) von %s";
+ "Neues Lehrinstitut (Fakultät, Schule, Hochschule, Abteilung, Gebäude...)";
#elif L==3
- "New centre (faculty, school, college, division, building...) of %s";
+ "New centre (faculty, school, college, division, building...)";
#elif L==4
- "Nuevo centro (facultad, escuela, instituto, división, edificio...) de %s";
+ "Nuevo centro (facultad, escuela, instituto, división, edificio...)";
#elif L==5
- "Nouveau centre (faculté, école, université, division, bâtiment...) de %s";
+ "Nouveau centre (faculté, école, université, division, bâtiment...)";
#elif L==6
- "Nuevo centro (facultad, escuela, instituto, división, edificio...) de %s"; // Okoteve traducción
+ "Nuevo centro (facultad, escuela, instituto, división, edificio...)"; // Okoteve traducción
#elif L==7
- "Nuovo centro (facoltà, scuola, istituto, divisione, costruzione...) di %s";
+ "Nuovo centro (facoltà, scuola, istituto, divisione, costruzione...)";
#elif L==8
- "Nowe centrum (wydział, szkoła, uczelnia, podział, budowa...) %s";
+ "Nowe centrum (wydział, szkoła, uczelnia, podział, budowa...)";
#elif L==9
- "Novo centro (faculdade, escola, faculdade, divisão, construção...) de %s";
+ "Novo centro (faculdade, escola, faculdade, divisão, construção...)";
#endif
const char *Txt_New_country =