mirror of https://github.com/acanas/swad-core.git
Version 16.198.1
This commit is contained in:
parent
67d34d28c1
commit
e340302b45
|
@ -223,13 +223,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 16.198 (2017-04-30)"
|
#define Log_PLATFORM_VERSION "SWAD 16.198.1 (2017-04-30)"
|
||||||
#define CSS_FILE "swad16.195.8.css"
|
#define CSS_FILE "swad16.195.8.css"
|
||||||
#define JS_FILE "swad16.181.js"
|
#define JS_FILE "swad16.181.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 16.198.1: Apr 30, 2017 Changes in layout of edition of countries. (218332 lines)
|
||||||
Version 16.198: Apr 30, 2017 Code refactoring related to contextual icons to edit, view and print. (218361 lines)
|
Version 16.198: Apr 30, 2017 Code refactoring related to contextual icons to edit, view and print. (218361 lines)
|
||||||
Version 16.197: Apr 30, 2017 Changes in layout of edition of degree types. (218579 lines)
|
Version 16.197: Apr 30, 2017 Changes in layout of edition of degree types. (218579 lines)
|
||||||
Version 16.196.3: Apr 30, 2017 Changes in layout of edition of courses. (218540 lines)
|
Version 16.196.3: Apr 30, 2017 Changes in layout of edition of courses. (218540 lines)
|
||||||
|
|
|
@ -76,6 +76,9 @@ static void Cty_PutIconToEditCountries (void);
|
||||||
|
|
||||||
static unsigned Cty_GetNumUsrsWhoClaimToBelongToCty (long CtyCod);
|
static unsigned Cty_GetNumUsrsWhoClaimToBelongToCty (long CtyCod);
|
||||||
static void Cty_GetParamCtyOrder (void);
|
static void Cty_GetParamCtyOrder (void);
|
||||||
|
|
||||||
|
static void Cty_PutIconToViewCountries (void);
|
||||||
|
|
||||||
static void Cty_GetMapAttribution (long CtyCod,char **MapAttribution);
|
static void Cty_GetMapAttribution (long CtyCod,char **MapAttribution);
|
||||||
static void Cty_FreeMapAttribution (char **MapAttribution);
|
static void Cty_FreeMapAttribution (char **MapAttribution);
|
||||||
static void Cty_ListCountriesForEdition (void);
|
static void Cty_ListCountriesForEdition (void);
|
||||||
|
@ -940,15 +943,16 @@ static void Cty_GetParamCtyOrder (void)
|
||||||
|
|
||||||
void Cty_EditCountries (void)
|
void Cty_EditCountries (void)
|
||||||
{
|
{
|
||||||
extern const char *Txt_No_countries_have_been_created;
|
extern const char *Hlp_SYSTEM_Countries;
|
||||||
|
extern const char *Txt_Countries;
|
||||||
|
|
||||||
/***** Get list of countries *****/
|
/***** Get list of countries *****/
|
||||||
Gbl.Ctys.SelectedOrder = Cty_ORDER_BY_COUNTRY;
|
Gbl.Ctys.SelectedOrder = Cty_ORDER_BY_COUNTRY;
|
||||||
Cty_GetListCountries (Cty_GET_EXTRA_DATA);
|
Cty_GetListCountries (Cty_GET_EXTRA_DATA);
|
||||||
|
|
||||||
if (!Gbl.Ctys.Num)
|
/***** Start frame *****/
|
||||||
/***** Help message *****/
|
Lay_StartRoundFrame (NULL,Txt_Countries,Cty_PutIconToViewCountries,
|
||||||
Lay_ShowAlert (Lay_INFO,Txt_No_countries_have_been_created);
|
Hlp_SYSTEM_Countries);
|
||||||
|
|
||||||
/***** Put a form to create a new country *****/
|
/***** Put a form to create a new country *****/
|
||||||
Cty_PutFormToCreateCountry ();
|
Cty_PutFormToCreateCountry ();
|
||||||
|
@ -957,10 +961,22 @@ void Cty_EditCountries (void)
|
||||||
if (Gbl.Ctys.Num)
|
if (Gbl.Ctys.Num)
|
||||||
Cty_ListCountriesForEdition ();
|
Cty_ListCountriesForEdition ();
|
||||||
|
|
||||||
|
/***** End frame *****/
|
||||||
|
Lay_EndRoundFrame ();
|
||||||
|
|
||||||
/***** Free list of countries *****/
|
/***** Free list of countries *****/
|
||||||
Cty_FreeListCountries ();
|
Cty_FreeListCountries ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/*************** Put contextual icons in edition of countries ****************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
static void Cty_PutIconToViewCountries (void)
|
||||||
|
{
|
||||||
|
Lay_PutIconToView (ActSeeCty,NULL);
|
||||||
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/************************** List all the countries ***************************/
|
/************************** List all the countries ***************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -1511,16 +1527,13 @@ void Cty_FreeListCountries (void)
|
||||||
|
|
||||||
static void Cty_ListCountriesForEdition (void)
|
static void Cty_ListCountriesForEdition (void)
|
||||||
{
|
{
|
||||||
extern const char *Hlp_SYSTEM_Countries;
|
|
||||||
extern const char *Txt_Countries;
|
|
||||||
extern const char *Txt_STR_LANG_NAME[1 + Txt_NUM_LANGUAGES];
|
extern const char *Txt_STR_LANG_NAME[1 + Txt_NUM_LANGUAGES];
|
||||||
unsigned NumCty;
|
unsigned NumCty;
|
||||||
struct Country *Cty;
|
struct Country *Cty;
|
||||||
Txt_Language_t Lan;
|
Txt_Language_t Lan;
|
||||||
|
|
||||||
Lay_StartRoundFrameTable (NULL,Txt_Countries,NULL,Hlp_SYSTEM_Countries,2);
|
/***** Write heading *****/
|
||||||
|
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">");
|
||||||
/***** Table head *****/
|
|
||||||
Cty_PutHeadCountriesForEdition ();
|
Cty_PutHeadCountriesForEdition ();
|
||||||
|
|
||||||
/***** Write all the countries *****/
|
/***** Write all the countries *****/
|
||||||
|
@ -1618,7 +1631,8 @@ static void Cty_ListCountriesForEdition (void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Lay_EndRoundFrameTable ();
|
/***** End table *****/
|
||||||
|
fprintf (Gbl.F.Out,"</table>");
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -1909,7 +1923,6 @@ void Cty_ChangeCtyMapAttribution (void)
|
||||||
|
|
||||||
static void Cty_PutFormToCreateCountry (void)
|
static void Cty_PutFormToCreateCountry (void)
|
||||||
{
|
{
|
||||||
extern const char *Hlp_SYSTEM_Countries;
|
|
||||||
extern const char *Txt_New_country;
|
extern const char *Txt_New_country;
|
||||||
extern const char *Txt_STR_LANG_NAME[1 + Txt_NUM_LANGUAGES];
|
extern const char *Txt_STR_LANG_NAME[1 + Txt_NUM_LANGUAGES];
|
||||||
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
|
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
|
||||||
|
@ -1917,18 +1930,19 @@ static void Cty_PutFormToCreateCountry (void)
|
||||||
struct Country *Cty;
|
struct Country *Cty;
|
||||||
Txt_Language_t Lan;
|
Txt_Language_t Lan;
|
||||||
|
|
||||||
|
/***** Country data *****/
|
||||||
Cty = &Gbl.Ctys.EditingCty;
|
Cty = &Gbl.Ctys.EditingCty;
|
||||||
|
|
||||||
/***** Start form *****/
|
/***** Start form *****/
|
||||||
Act_FormStart (ActNewCty);
|
Act_FormStart (ActNewCty);
|
||||||
|
|
||||||
/***** Start of frame *****/
|
/***** Start frame *****/
|
||||||
Lay_StartRoundFrameTable (NULL,Txt_New_country,NULL,Hlp_SYSTEM_Countries,2);
|
Lay_StartRoundFrameTable (NULL,Txt_New_country,NULL,NULL,2);
|
||||||
|
|
||||||
/***** Write heading *****/
|
/***** Write heading *****/
|
||||||
Cty_PutHeadCountriesForEdition ();
|
Cty_PutHeadCountriesForEdition ();
|
||||||
|
|
||||||
/***** Firts columns for CtyCod *****/
|
/***** Column to remove country, disabled here *****/
|
||||||
fprintf (Gbl.F.Out,"<tr>"
|
fprintf (Gbl.F.Out,"<tr>"
|
||||||
"<td rowspan=\"%u\" class=\"BT\"></td>",
|
"<td rowspan=\"%u\" class=\"BT\"></td>",
|
||||||
1 + Txt_NUM_LANGUAGES);
|
1 + Txt_NUM_LANGUAGES);
|
||||||
|
|
|
@ -97,7 +97,7 @@ void Hie_WriteMenuHierarchy (void)
|
||||||
extern const char *Txt_Course;
|
extern const char *Txt_Course;
|
||||||
|
|
||||||
/***** Start of table *****/
|
/***** Start of table *****/
|
||||||
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_CENTER_MARGIN CELLS_PAD_2\">");
|
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_CENTER CELLS_PAD_2\">");
|
||||||
|
|
||||||
/***** Write a 1st selector
|
/***** Write a 1st selector
|
||||||
with all the countries *****/
|
with all the countries *****/
|
||||||
|
|
42
swad_text.c
42
swad_text.c
|
@ -10074,27 +10074,6 @@ const char *Txt_Edit_my_webs_networks =
|
||||||
"Editar as minhas webs / redes";
|
"Editar as minhas webs / redes";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const char *Txt_Edit_office_hours =
|
|
||||||
#if L==1
|
|
||||||
"Editar tutories";
|
|
||||||
#elif L==2
|
|
||||||
"Geschäftszeiten bearbeiten";
|
|
||||||
#elif L==3
|
|
||||||
"Edit office hours";
|
|
||||||
#elif L==4
|
|
||||||
"Editar tutorías";
|
|
||||||
#elif L==5
|
|
||||||
"Éditer tuteur";
|
|
||||||
#elif L==6
|
|
||||||
"Editar tutorías"; // Okoteve traducción
|
|
||||||
#elif L==7
|
|
||||||
"Editare tutoraggio";
|
|
||||||
#elif L==8
|
|
||||||
"Edytuj godzin pracy biura";
|
|
||||||
#elif L==9
|
|
||||||
"Editar tutor";
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const char *Txt_Edit_question =
|
const char *Txt_Edit_question =
|
||||||
#if L==1
|
#if L==1
|
||||||
"Editar pregunta";
|
"Editar pregunta";
|
||||||
|
@ -24699,27 +24678,6 @@ const char *Txt_No_centres =
|
||||||
"Não há centros.";
|
"Não há centros.";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const char *Txt_No_countries_have_been_created =
|
|
||||||
#if L==1
|
|
||||||
"No se han creado países."; // Necessita traduccio
|
|
||||||
#elif L==2
|
|
||||||
"No countries have been created."; // Need Übersetzung
|
|
||||||
#elif L==3
|
|
||||||
"No countries have been created.";
|
|
||||||
#elif L==4
|
|
||||||
"No se han creado países.";
|
|
||||||
#elif L==5
|
|
||||||
"No countries have been created."; // Besoin de traduction
|
|
||||||
#elif L==6
|
|
||||||
"No se han creado países."; // Okoteve traducción
|
|
||||||
#elif L==7
|
|
||||||
"No countries have been created."; // Bisogno di traduzione
|
|
||||||
#elif L==8
|
|
||||||
"No countries have been created."; // Potrzebujesz tlumaczenie
|
|
||||||
#elif L==9
|
|
||||||
"No countries have been created."; // Necessita de tradução
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const char *Txt_No_courses =
|
const char *Txt_No_courses =
|
||||||
#if L==1
|
#if L==1
|
||||||
"No hi ha assignatures.";
|
"No hi ha assignatures.";
|
||||||
|
|
Loading…
Reference in New Issue