Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.196

This commit is contained in:
Antonio Cañas Vargas 2017-04-30 01:20:18 +02:00
parent 5800684bf8
commit 528602c19e
3 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -223,13 +223,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.195.8 (2017-04-29)"
#define Log_PLATFORM_VERSION "SWAD 16.196 (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: 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)
Version 16.195.6: Apr 29, 2017 Code refactoring in edition of groups. (218507 lines)

51
swad_institution.c
View File

@ -75,6 +75,8 @@ static void Ins_ListOneInstitutionForSeeing (struct Instit *Ins,unsigned NumIns)
static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable);
static void Ins_GetParamInsOrder (void);
static void Ins_PutIconToViewInstitutions (void);
static void Ins_GetFullNameAndCtyOfInstitutionByCod (struct Instit *Ins,
char CtyName[Hie_MAX_BYTES_FULL_NAME + 1]);
@ -924,9 +926,18 @@ static void Ins_GetParamInsOrder (void)
void Ins_EditInstitutions (void)
{
extern const char *Hlp_COUNTRY_Institutions;
extern const char *Txt_Institutions_of_COUNTRY_X;
/***** Get list of institutions *****/
Ins_GetListInstitutions (Gbl.CurrentCty.Cty.CtyCod,Ins_GET_EXTRA_DATA);
/***** Start frame *****/
sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,
Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
Lay_StartRoundFrame (NULL,Gbl.Title,Ins_PutIconToViewInstitutions,
Hlp_COUNTRY_Institutions);
/***** Put a form to create a new institution *****/
Ins_PutFormToCreateInstitution ();
@ -934,10 +945,28 @@ void Ins_EditInstitutions (void)
if (Gbl.Inss.Num)
Ins_ListInstitutionsForEdition ();
/***** End frame *****/
Lay_EndRoundFrame ();
/***** Free list of institutions *****/
Ins_FreeListInstitutions ();
}
/*****************************************************************************/
/***************** Put contextual icon to view institutions ******************/
/*****************************************************************************/
static void Ins_PutIconToViewInstitutions (void)
{
extern const char *Txt_View;
/***** Put form to create a new type of group *****/
Lay_PutContextualLink (ActSeeIns,NULL,NULL,
"eye-on64x64.png",
Txt_View,NULL,
NULL);
}
/*****************************************************************************/
/********************** Get list of current institutions *********************/
/*****************************************************************************/
@ -1383,8 +1412,6 @@ void Ins_WriteSelectorOfInstitution (void)
static void Ins_ListInstitutionsForEdition (void)
{
extern const char *Hlp_COUNTRY_Institutions;
extern const char *Txt_Institutions_of_COUNTRY_X;
extern const char *Txt_INSTITUTION_STATUS[Ins_NUM_STATUS_TXT];
unsigned NumIns;
struct Instit *Ins;
@ -1397,9 +1424,7 @@ static void Ins_ListInstitutionsForEdition (void)
Usr_UsrDataConstructor (&UsrDat);
/***** Write heading *****/
sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,
Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,Hlp_COUNTRY_Institutions,2);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">");
Ins_PutHeadInstitutionsForEdition ();
/***** Write all the institutions *****/
@ -1563,9 +1588,8 @@ static void Ins_ListInstitutionsForEdition (void)
"</tr>");
}
/***** End table *****/
Lay_EndRoundFrameTable ();
fprintf (Gbl.F.Out,"</table>");
/***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat);
@ -2148,8 +2172,7 @@ void Ins_RemoveLogo (void)
static void Ins_PutFormToCreateInstitution (void)
{
extern const char *Hlp_COUNTRY_Institutions;
extern const char *Txt_New_institution_of_COUNTRY_X;
extern const char *Txt_New_institution;
extern const char *Txt_Create_institution;
struct Instit *Ins;
@ -2164,18 +2187,14 @@ static void Ins_PutFormToCreateInstitution (void)
Lay_ShowErrorAndExit ("You can not edit institutions.");
/***** Start of frame *****/
sprintf (Gbl.Title,Txt_New_institution_of_COUNTRY_X,
Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,Hlp_COUNTRY_Institutions,2);
Lay_StartRoundFrameTable (NULL,Txt_New_institution,NULL,NULL,2);
/***** Write heading *****/
Ins_PutHeadInstitutionsForEdition ();
/***** Put icon to remove institution *****/
/***** Column to remove institution, disabled here *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"BM\">");
Lay_PutIconRemovalNotAllowed ();
fprintf (Gbl.F.Out,"</td>");
"<td class=\"BM\"></td>");
/***** Institution code *****/
fprintf (Gbl.F.Out,"<td class=\"CODE\"></td>");

20
swad_text.c
View File

@ -23985,25 +23985,25 @@ const char *Txt_New_holiday =
"Nova f&eacute;ria";
#endif
const char *Txt_New_institution_of_COUNTRY_X = // Warning: it is very important to include %s in the following sentences
const char *Txt_New_institution =
#if L==1
"Nova instituci&oacute;n (universitat, institut, escola, acad&egrave;mia, organitzaci&oacute;, empresa...) de %s";
"Nova instituci&oacute;n (universitat, institut, escola, acad&egrave;mia, organitzaci&oacute;, empresa...)";
#elif L==2
"Neue Hochschule (Universit&auml;t, Hochschule, Schule, Hochschule, Organisation, Unternehmen...) von %s";
"Neue Hochschule (Universit&auml;t, Hochschule, Schule, Hochschule, Organisation, Unternehmen...)";
#elif L==3
"New institution (university, college, school, academy, organization, company...) of %s";
"New institution (university, college, school, academy, organization, company...)";
#elif L==4
"Nueva instituci&oacute;n (universidad, instituto, colegio, academia, organizaci&oacute;n, empresa...) de %s";
"Nueva instituci&oacute;n (universidad, instituto, colegio, academia, organizaci&oacute;n, empresa...)";
#elif L==5
"Nouvel &eacute;tablissement (universit&eacute;, coll&egrave;ge, &eacute;cole, acad&eacute;mie, organisation, entreprise...) de %s";
"Nouvel &eacute;tablissement (universit&eacute;, coll&egrave;ge, &eacute;cole, acad&eacute;mie, organisation, entreprise...)";
#elif L==6
"Nueva instituci&oacute;n (universidad, instituto, colegio, academia, organizaci&oacute;n, empresa...) de %s"; // Okoteve traducción
"Nueva instituci&oacute;n (universidad, instituto, colegio, academia, organizaci&oacute;n, empresa...)"; // Okoteve traducción
#elif L==7
"Nuova istituzione (universit&agrave;, istituto, scuola, accademia, organizzazione, societ&agrave;...) di %s";
"Nuova istituzione (universit&agrave;, istituto, scuola, accademia, organizzazione, societ&agrave;...)";
#elif L==8
"Nowa instytucja (uniwersytet, uczelnia, szko&lstrok;a, akademia, organizacja, firma...) %s";
"Nowa instytucja (uniwersytet, uczelnia, szko&lstrok;a, akademia, organizacja, firma...)";
#elif L==9
"Nova institu&ccedil;&atilde;o (universidade, faculdade, escola, academia, organiza&ccedil;&atilde;o, empresa...) de %s";
"Nova institu&ccedil;&atilde;o (universidade, faculdade, escola, academia, organiza&ccedil;&atilde;o, empresa...)";
#endif
const char *Txt_New_link =