Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-13 12:14:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.171.5

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2017-03-27 13:38:10 +02:00
parent 6811d2c060
commit 48d34b19f2
12 changed files with 42 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swad_banner.c
View File

@ -97,8 +97,7 @@ void Ban_SeeBanners (void)
extern const char *Hlp_SYSTEM_Banners; extern const char *Hlp_SYSTEM_Banners;
extern const char *Txt_Banners; extern const char *Txt_Banners;
extern const char *Txt_No_banners; extern const char *Txt_No_banners;
extern const char *Txt_Create_another_banner; extern const char *Txt_New_banner;
extern const char *Txt_Create_banner;
/***** Get list of banners *****/ /***** Get list of banners *****/
Ban_GetListBanners ("SELECT BanCod,Hidden,ShortName,FullName,Img,WWW" Ban_GetListBanners ("SELECT BanCod,Hidden,ShortName,FullName,Img,WWW"
@ -120,8 +119,7 @@ void Ban_SeeBanners (void)
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
{ {
Act_FormStart (ActEdiBan); Act_FormStart (ActEdiBan);
Lay_PutConfirmButton (Gbl.Banners.Num ? Txt_Create_another_banner : Lay_PutConfirmButton (Txt_New_banner);
Txt_Create_banner);
Act_FormEnd (); Act_FormEnd ();
} }

4
swad_centre.c
View File

@ -117,7 +117,7 @@ static void Ctr_CreateCentre (struct Centre *Ctr,unsigned Status);
void Ctr_SeeCtrWithPendingDegs (void) void Ctr_SeeCtrWithPendingDegs (void)
{ {
extern const char *Hlp_SYSTEM_Pending; extern const char *Hlp_SYSTEM_Hierarchy_pending;
extern const char *Txt_Centres_with_pending_degrees; extern const char *Txt_Centres_with_pending_degrees;
extern const char *Txt_Centre; extern const char *Txt_Centre;
extern const char *Txt_Degrees_ABBREVIATION; extern const char *Txt_Degrees_ABBREVIATION;
@ -160,7 +160,7 @@ void Ctr_SeeCtrWithPendingDegs (void)
{ {
/***** Write heading *****/ /***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_Centres_with_pending_degrees, Lay_StartRoundFrameTable (NULL,Txt_Centres_with_pending_degrees,
NULL,Hlp_SYSTEM_Pending,2); NULL,Hlp_SYSTEM_Hierarchy_pending,2);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\">" "<th class=\"LEFT_MIDDLE\">"
"%s" "%s"

4
swad_changelog.h
View File

@ -211,13 +211,15 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.171.3 (2017-03-27)" #define Log_PLATFORM_VERSION "SWAD 16.171.5 (2017-03-27)"
#define CSS_FILE "swad16.166.css" #define CSS_FILE "swad16.166.css"
#define JS_FILE "swad16.144.js" #define JS_FILE "swad16.144.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.171.5: Mar 27, 2017 Changed buttons to create a new link, banner, place or holiday. (217518 lines)
Version 16.171.4: Mar 27, 2017 Some help URLs translated to spanish. (217605 lines)
Version 16.171.3: Mar 27, 2017 Fixed bug in assignments, reported by Eva Martínez Ortigosa. (217604 lines) Version 16.171.3: Mar 27, 2017 Fixed bug in assignments, reported by Eva Martínez Ortigosa. (217604 lines)
Version 16.171.2: Mar 27, 2017 Some help URLs translated to spanish. (217603 lines) Version 16.171.2: Mar 27, 2017 Some help URLs translated to spanish. (217603 lines)
Version 16.171.1: Mar 27, 2017 Code refactoring in banners. (217602 lines) Version 16.171.1: Mar 27, 2017 Code refactoring in banners. (217602 lines)

4
swad_country.c
View File

@ -97,7 +97,7 @@ static void Cty_CreateCountry (struct Country *Cty);
void Cty_SeeCtyWithPendingInss (void) void Cty_SeeCtyWithPendingInss (void)
{ {
extern const char *Hlp_SYSTEM_Pending; extern const char *Hlp_SYSTEM_Hierarchy_pending;
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES]; extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_Countries_with_pending_institutions; extern const char *Txt_Countries_with_pending_institutions;
extern const char *Txt_Country; extern const char *Txt_Country;
@ -133,7 +133,7 @@ void Cty_SeeCtyWithPendingInss (void)
{ {
/***** Write heading *****/ /***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_Countries_with_pending_institutions, Lay_StartRoundFrameTable (NULL,Txt_Countries_with_pending_institutions,
NULL,Hlp_SYSTEM_Pending,2); NULL,Hlp_SYSTEM_Hierarchy_pending,2);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\">" "<th class=\"LEFT_MIDDLE\">"
"%s" "%s"

4
swad_course.c
View File

@ -3317,7 +3317,7 @@ void Crs_PutLinkToRemoveOldCrss (void)
void Crs_AskRemoveOldCrss (void) void Crs_AskRemoveOldCrss (void)
{ {
extern const char *Hlp_SYSTEM_Old; extern const char *Hlp_SYSTEM_Hierarchy_eliminate_old_courses;
extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Eliminate_old_courses; extern const char *Txt_Eliminate_old_courses;
extern const char *Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2; extern const char *Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2;
@ -3330,7 +3330,7 @@ void Crs_AskRemoveOldCrss (void)
Act_FormStart (ActRemOldCrs); Act_FormStart (ActRemOldCrs);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_courses,NULL,Hlp_SYSTEM_Old); Lay_StartRoundFrame (NULL,Txt_Eliminate_old_courses,NULL,Hlp_SYSTEM_Hierarchy_eliminate_old_courses);
/***** Form to request number of months without clicks *****/ /***** Form to request number of months without clicks *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;" fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;"

4
swad_degree.c
View File

@ -118,7 +118,7 @@ static void Deg_UpdateDegWWWDB (long DegCod,const char NewWWW[Cns_MAX_BYTES_WWW
void Deg_SeeDegWithPendingCrss (void) void Deg_SeeDegWithPendingCrss (void)
{ {
extern const char *Hlp_SYSTEM_Pending; extern const char *Hlp_SYSTEM_Hierarchy_pending;
extern const char *Sco_ScopeDB[Sco_NUM_SCOPES]; extern const char *Sco_ScopeDB[Sco_NUM_SCOPES];
extern const char *Txt_Degrees_with_pending_courses; extern const char *Txt_Degrees_with_pending_courses;
extern const char *Txt_Degree; extern const char *Txt_Degree;
@ -163,7 +163,7 @@ void Deg_SeeDegWithPendingCrss (void)
{ {
/***** Write heading *****/ /***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_Degrees_with_pending_courses, Lay_StartRoundFrameTable (NULL,Txt_Degrees_with_pending_courses,
NULL,Hlp_SYSTEM_Pending,2); NULL,Hlp_SYSTEM_Hierarchy_pending,2);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\">" "<th class=\"LEFT_MIDDLE\">"
"%s" "%s"

40
swad_help_URL.c
View File

@ -94,46 +94,46 @@ const char *Hlp_SYSTEM_Countries =
"SYSTEM.Countries"; "SYSTEM.Countries";
#endif #endif
const char *Hlp_SYSTEM_Pending = const char *Hlp_SYSTEM_Hierarchy_pending =
#if L==1 #if L==1
"SYSTEM.Pending"; "SYSTEM.Hierarchy#pending";
#elif L==2 #elif L==2
"SYSTEM.Pending"; "SYSTEM.Hierarchy#pending";
#elif L==3 #elif L==3
"SYSTEM.Pending"; "SYSTEM.Hierarchy#pending";
#elif L==4 #elif L==4
"SYSTEM.Pending"; "SYSTEM.Hierarchy.es#pendientes";
#elif L==5 #elif L==5
"SYSTEM.Pending"; "SYSTEM.Hierarchy#pending";
#elif L==6 #elif L==6
"SYSTEM.Pending"; "SYSTEM.Hierarchy#pending";
#elif L==7 #elif L==7
"SYSTEM.Pending"; "SYSTEM.Hierarchy#pending";
#elif L==8 #elif L==8
"SYSTEM.Pending"; "SYSTEM.Hierarchy#pending";
#elif L==9 #elif L==9
"SYSTEM.Pending"; "SYSTEM.Hierarchy#pending";
#endif #endif
const char *Hlp_SYSTEM_Old = const char *Hlp_SYSTEM_Hierarchy_eliminate_old_courses =
#if L==1 #if L==1
"SYSTEM.Old"; "SYSTEM.Hierarchy#eliminate-old-courses";
#elif L==2 #elif L==2
"SYSTEM.Old"; "SYSTEM.Hierarchy#eliminate-old-courses";
#elif L==3 #elif L==3
"SYSTEM.Old"; "SYSTEM.Hierarchy#eliminate-old-courses";
#elif L==4 #elif L==4
"SYSTEM.Old"; "SYSTEM.Hierarchy.es#eliminar-asignaturas-antiguas";
#elif L==5 #elif L==5
"SYSTEM.Old"; "SYSTEM.Hierarchy#eliminate-old-courses";
#elif L==6 #elif L==6
"SYSTEM.Old"; "SYSTEM.Hierarchy#eliminate-old-courses";
#elif L==7 #elif L==7
"SYSTEM.Old"; "SYSTEM.Hierarchy#eliminate-old-courses";
#elif L==8 #elif L==8
"SYSTEM.Old"; "SYSTEM.Hierarchy#eliminate-old-courses";
#elif L==9 #elif L==9
"SYSTEM.Old"; "SYSTEM.Hierarchy#eliminate-old-courses";
#endif #endif
const char *Hlp_SYSTEM_Banners = const char *Hlp_SYSTEM_Banners =

6
swad_holiday.c
View File

@ -85,8 +85,7 @@ void Hld_SeeHolidays (void)
extern const char *Txt_Holiday; extern const char *Txt_Holiday;
extern const char *Txt_All_places; extern const char *Txt_All_places;
extern const char *Txt_No_holidays; extern const char *Txt_No_holidays;
extern const char *Txt_Create_another_holiday; extern const char *Txt_New_holiday;
extern const char *Txt_Create_holiday;
Hld_Order_t Order; Hld_Order_t Order;
unsigned NumHld; unsigned NumHld;
@ -181,8 +180,7 @@ void Hld_SeeHolidays (void)
if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM) // Institution admin or system admin if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM) // Institution admin or system admin
{ {
Act_FormStart (ActEdiHld); Act_FormStart (ActEdiHld);
Lay_PutConfirmButton (Gbl.Hlds.Num ? Txt_Create_another_holiday : Lay_PutConfirmButton (Txt_New_holiday);
Txt_Create_holiday);
Act_FormEnd (); Act_FormEnd ();
} }

4
swad_institution.c
View File

@ -105,7 +105,7 @@ static void Ins_CreateInstitution (struct Instit *Ins,unsigned Status);
void Ins_SeeInsWithPendingCtrs (void) void Ins_SeeInsWithPendingCtrs (void)
{ {
extern const char *Hlp_SYSTEM_Pending; extern const char *Hlp_SYSTEM_Hierarchy_pending;
extern const char *Txt_Institutions_with_pending_centres; extern const char *Txt_Institutions_with_pending_centres;
extern const char *Txt_Institution; extern const char *Txt_Institution;
extern const char *Txt_Centres_ABBREVIATION; extern const char *Txt_Centres_ABBREVIATION;
@ -147,7 +147,7 @@ void Ins_SeeInsWithPendingCtrs (void)
{ {
/***** Write heading *****/ /***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_Institutions_with_pending_centres, Lay_StartRoundFrameTable (NULL,Txt_Institutions_with_pending_centres,
NULL,Hlp_SYSTEM_Pending,2); NULL,Hlp_SYSTEM_Hierarchy_pending,2);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\">" "<th class=\"LEFT_MIDDLE\">"
"%s" "%s"

6
swad_link.c
View File

@ -81,8 +81,7 @@ void Lnk_SeeLinks (void)
extern const char *Hlp_SYSTEM_Links; extern const char *Hlp_SYSTEM_Links;
extern const char *Txt_Links; extern const char *Txt_Links;
extern const char *Txt_No_links; extern const char *Txt_No_links;
extern const char *Txt_Create_another_link; extern const char *Txt_New_link;
extern const char *Txt_Create_link;
/***** Put contextual links *****/ /***** Put contextual links *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) // Only for system admins if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) // Only for system admins
@ -114,8 +113,7 @@ void Lnk_SeeLinks (void)
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
{ {
Act_FormStart (ActEdiLnk); Act_FormStart (ActEdiLnk);
Lay_PutConfirmButton (Gbl.Links.Num ? Txt_Create_another_link : Lay_PutConfirmButton (Txt_New_link);
Txt_Create_link);
Act_FormEnd (); Act_FormEnd ();
} }

6
swad_place.c
View File

@ -97,8 +97,7 @@ void Plc_SeePlaces (void)
extern const char *Txt_PLACES_ORDER[2]; extern const char *Txt_PLACES_ORDER[2];
extern const char *Txt_Other_places; extern const char *Txt_Other_places;
extern const char *Txt_Place_unspecified; extern const char *Txt_Place_unspecified;
extern const char *Txt_Create_another_place; extern const char *Txt_New_place;
extern const char *Txt_Create_place;
Plc_Order_t Order; Plc_Order_t Order;
unsigned NumPlc; unsigned NumPlc;
unsigned NumCtrsWithPlc = 0; unsigned NumCtrsWithPlc = 0;
@ -199,8 +198,7 @@ void Plc_SeePlaces (void)
if (ICanEdit) if (ICanEdit)
{ {
Act_FormStart (ActEdiPlc); Act_FormStart (ActEdiPlc);
Lay_PutConfirmButton (Gbl.Plcs.Num ? Txt_Create_another_place : Lay_PutConfirmButton (Txt_New_place);
Txt_Create_place);
Act_FormEnd (); Act_FormEnd ();
} }

86
swad_text.c
View File

@ -6092,27 +6092,6 @@ const char *Txt_Create_announcement =
"Criar an&uacute;ncio"; "Criar an&uacute;ncio";
#endif #endif
const char *Txt_Create_another_banner =
#if L==1
"Crear un altre banner";
#elif L==2
"Erstellen Sie ein anderes Werbebanner";
#elif L==3
"Create another banner";
#elif L==4
"Crear otro banner";
#elif L==5
"Cr&eacute;er un autre banni&eacute;re";
#elif L==6
"Crear otro banner"; // Okoteve traducción
#elif L==7
"Crea un altro banner";
#elif L==8
"Tworzenie inny banner";
#elif L==9
"Criar um outro banner";
#endif
const char *Txt_Create_another_centre = const char *Txt_Create_another_centre =
#if L==1 #if L==1
"Crear un altre centre"; "Crear un altre centre";
@ -6176,27 +6155,6 @@ const char *Txt_Create_another_degree =
"Criar uma outra titula&ccedil;&atilde;o"; "Criar uma outra titula&ccedil;&atilde;o";
#endif #endif
const char *Txt_Create_another_holiday =
#if L==1
"Crear una altra festivitat";
#elif L==2
"Erstellen Sie ein anderes Feiertag";
#elif L==3
"Create another holiday";
#elif L==4
"Crear otra festividad";
#elif L==5
"Cr&eacute;er un autre f&ecirc;te";
#elif L==6
"Crear otra festividad"; // Okoteve traducción
#elif L==7
"Crea una altra festivit&agrave;";
#elif L==8
"Tworzenie inny wakacje";
#elif L==9
"Criar uma outra f&eacute;ria";
#endif
const char *Txt_Create_another_institution = const char *Txt_Create_another_institution =
#if L==1 #if L==1
"Crear una altra instituci&oacute;"; "Crear una altra instituci&oacute;";
@ -6218,48 +6176,6 @@ const char *Txt_Create_another_institution =
"Criar uma outra institu&ccedil;&atilde;o"; "Criar uma outra institu&ccedil;&atilde;o";
#endif #endif
const char *Txt_Create_another_link =
#if L==1
"Crear un altre enlla&ccedil;";
#elif L==2
"Erstellen Sie einen anderen Link";
#elif L==3
"Create another link";
#elif L==4
"Crear otro enlace";
#elif L==5
"Cr&eacute;er un autre lien";
#elif L==6
"Crear otro enlace"; // Okoteve traducción
#elif L==7
"Crea un altro link";
#elif L==8
"Tworzenie inny link";
#elif L==9
"Criar um outro liga&ccedil;&atilde;o";
#endif
const char *Txt_Create_another_place =
#if L==1
"Crear un altre lloc";
#elif L==2
"Erstellen Sie einen anderen Standort";
#elif L==3
"Create another place";
#elif L==4
"Crear otro lugar";
#elif L==5
"Cr&eacute;er un autre emplacement";
#elif L==6
"Crear otro lugar"; // Okoteve traducción
#elif L==7
"Crea una altra localit&grave;";
#elif L==8
"Tworzenie innego miejsca";
#elif L==9
"Criar uma outra localiza&ccedil;&atilde;o";
#endif
const char *Txt_Create_assignment = const char *Txt_Create_assignment =
#if L==1 #if L==1
"Crear actividad"; // Necessita traduccio "Crear actividad"; // Necessita traduccio
@ -23972,7 +23888,7 @@ const char *Txt_New_announcement_OF_EXAM =
const char *Txt_New_banner = const char *Txt_New_banner =
#if L==1 #if L==1
"Nuevo banner"; // Necessita traduccio "Nou banner";
#elif L==2 #elif L==2
"Neue Werbebanner"; "Neue Werbebanner";
#elif L==3 #elif L==3