mirror of https://github.com/acanas/swad-core.git
Version 15.156
This commit is contained in:
parent
6d99cd66cb
commit
2e797b3eef
|
@ -135,13 +135,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 15.155.6 (2016-03-20)"
|
#define Log_PLATFORM_VERSION "SWAD 15.155.7 (2016-03-20)"
|
||||||
#define CSS_FILE "swad15.152.css"
|
#define CSS_FILE "swad15.152.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.155.7: Mar 20, 2016 Changes in layout of listing of institutions. (196051 lines)
|
||||||
Version 15.155.6: Mar 20, 2016 Changes in layout of listing of centres. (196055 lines)
|
Version 15.155.6: Mar 20, 2016 Changes in layout of listing of centres. (196055 lines)
|
||||||
Version 15.155.5: Mar 20, 2016 Changes in behaviour of hierarchy breadcrumb.
|
Version 15.155.5: Mar 20, 2016 Changes in behaviour of hierarchy breadcrumb.
|
||||||
Changes in layout of listing of degrees. (196057 lines)
|
Changes in layout of listing of degrees. (196057 lines)
|
||||||
|
|
|
@ -67,7 +67,6 @@ static void Ins_Configuration (bool PrintView);
|
||||||
static void Ins_PutIconToPrint (void);
|
static void Ins_PutIconToPrint (void);
|
||||||
|
|
||||||
static void Ins_ListInstitutions (void);
|
static void Ins_ListInstitutions (void);
|
||||||
static void Ins_ListInstitutionsForSeeing (bool ICanEdit);
|
|
||||||
static void Ins_PutIconToEditInstitutions (void);
|
static void Ins_PutIconToEditInstitutions (void);
|
||||||
static void Ins_ListOneInstitutionForSeeing (struct Institution *Ins,unsigned NumIns);
|
static void Ins_ListOneInstitutionForSeeing (struct Institution *Ins,unsigned NumIns);
|
||||||
static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable);
|
static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable);
|
||||||
|
@ -536,16 +535,38 @@ void Ins_ShowInssOfCurrentCty (void)
|
||||||
|
|
||||||
static void Ins_ListInstitutions (void)
|
static void Ins_ListInstitutions (void)
|
||||||
{
|
{
|
||||||
extern const char *Txt_No_institutions_have_been_created_in_this_country;
|
extern const char *Txt_Institutions_of_COUNTRY_X;
|
||||||
|
extern const char *Txt_No_institutions;
|
||||||
extern const char *Txt_Create_another_institution;
|
extern const char *Txt_Create_another_institution;
|
||||||
extern const char *Txt_Create_institution;
|
extern const char *Txt_Create_institution;
|
||||||
|
unsigned NumIns;
|
||||||
bool ICanEdit = (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_);
|
bool ICanEdit = (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_);
|
||||||
|
|
||||||
if (Gbl.Inss.Num) // There are institutions in the current country
|
/***** Start frame *****/
|
||||||
Ins_ListInstitutionsForSeeing (ICanEdit);
|
sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
|
||||||
else // No insrtitutions created in the current country
|
Lay_StartRoundFrame (NULL,Gbl.Title,ICanEdit ? Ins_PutIconToEditInstitutions :
|
||||||
Lay_ShowAlert (Lay_INFO,Txt_No_institutions_have_been_created_in_this_country);
|
NULL);
|
||||||
|
|
||||||
|
if (Gbl.Inss.Num) // There are institutions in the current country
|
||||||
|
{
|
||||||
|
/***** Start table *****/
|
||||||
|
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\""
|
||||||
|
" style=\"margin-bottom:20px;\">");
|
||||||
|
Ins_PutHeadInstitutionsForSeeing (true); // Order selectable
|
||||||
|
|
||||||
|
/***** Write all the institutions and their nuber of users *****/
|
||||||
|
for (NumIns = 0;
|
||||||
|
NumIns < Gbl.Inss.Num;
|
||||||
|
NumIns++)
|
||||||
|
Ins_ListOneInstitutionForSeeing (&(Gbl.Inss.Lst[NumIns]),NumIns + 1);
|
||||||
|
|
||||||
|
/***** End table *****/
|
||||||
|
fprintf (Gbl.F.Out,"</table>");
|
||||||
|
}
|
||||||
|
else // No insrtitutions created in the current country
|
||||||
|
Lay_ShowAlert (Lay_INFO,Txt_No_institutions);
|
||||||
|
|
||||||
|
/***** Button to create institution *****/
|
||||||
if (ICanEdit)
|
if (ICanEdit)
|
||||||
{
|
{
|
||||||
Act_FormStart (ActEdiIns);
|
Act_FormStart (ActEdiIns);
|
||||||
|
@ -553,34 +574,7 @@ static void Ins_ListInstitutions (void)
|
||||||
Txt_Create_institution);
|
Txt_Create_institution);
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/*****************************************************************************/
|
|
||||||
/*************** List the institutions of the current country ****************/
|
|
||||||
/*****************************************************************************/
|
|
||||||
|
|
||||||
static void Ins_ListInstitutionsForSeeing (bool ICanEdit)
|
|
||||||
{
|
|
||||||
extern const char *Txt_Institutions_of_COUNTRY_X;
|
|
||||||
unsigned NumIns;
|
|
||||||
|
|
||||||
/***** Table head *****/
|
|
||||||
sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,
|
|
||||||
Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
|
|
||||||
Lay_StartRoundFrame (NULL,Gbl.Title,
|
|
||||||
ICanEdit ? Ins_PutIconToEditInstitutions :
|
|
||||||
NULL);
|
|
||||||
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
|
|
||||||
Ins_PutHeadInstitutionsForSeeing (true); // Order selectable
|
|
||||||
|
|
||||||
/***** Write all the institutions and their nuber of users *****/
|
|
||||||
for (NumIns = 0;
|
|
||||||
NumIns < Gbl.Inss.Num;
|
|
||||||
NumIns++)
|
|
||||||
Ins_ListOneInstitutionForSeeing (&(Gbl.Inss.Lst[NumIns]),NumIns + 1);
|
|
||||||
|
|
||||||
/***** End table *****/
|
|
||||||
fprintf (Gbl.F.Out,"</table>");
|
|
||||||
Lay_EndRoundFrame ();
|
Lay_EndRoundFrame ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
20
swad_text.c
20
swad_text.c
|
@ -23697,25 +23697,25 @@ const char *Txt_No_information =
|
||||||
"Não há informação.";
|
"Não há informação.";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const char *Txt_No_institutions_have_been_created_in_this_country =
|
const char *Txt_No_institutions =
|
||||||
#if L==1
|
#if L==1
|
||||||
"No se han creado instituciones en este país."; // Necessita traduccio
|
"No hi ha institucions.";
|
||||||
#elif L==2
|
#elif L==2
|
||||||
"No institutions have been created in this country."; // Need Übersetzung
|
"Keine Hochschulen.";
|
||||||
#elif L==3
|
#elif L==3
|
||||||
"No institutions have been created in this country.";
|
"No institutions.";
|
||||||
#elif L==4
|
#elif L==4
|
||||||
"No se han creado instituciones en este país.";
|
"No hay instituciones.";
|
||||||
#elif L==5
|
#elif L==5
|
||||||
"No institutions have been created in this country."; // Besoin de traduction
|
"Il n'y a pas d'établissements.";
|
||||||
#elif L==6
|
#elif L==6
|
||||||
"No se han creado instituciones en este país."; // Okoteve traducción
|
"No hay instituciones."; // Okoteve traducción
|
||||||
#elif L==7
|
#elif L==7
|
||||||
"No institutions have been created in this country."; // Bisogno di traduzione
|
"Non ci sono istituzioni.";
|
||||||
#elif L==8
|
#elif L==8
|
||||||
"No institutions have been created in this country."; // Potrzebujesz tlumaczenie
|
"Brak instytucje.";
|
||||||
#elif L==9
|
#elif L==9
|
||||||
"No institutions have been created in this country."; // Necessita de tradução
|
"Não há instituções.";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const char *Txt_No_BR_msgs =
|
const char *Txt_No_BR_msgs =
|
||||||
|
|
Loading…
Reference in New Issue