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

Version 16.79.1

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-11-30 22:09:18 +01:00
parent 488d3b18a0
commit 00330efedf
3 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -183,13 +183,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.79 (2016-11-30)"
#define Log_PLATFORM_VERSION "SWAD 16.79.1 (2016-11-30)"
#define CSS_FILE "swad16.69.css"
#define JS_FILE "swad16.46.1.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.79.1: Nov 30, 2016 Changed location to event in agenda. (? lines)
Version 16.79: Nov 30, 2016 In locations, split Title into Event (What?) and Location (Where?). (209534 lines)
4 changes necessary in database:
ALTER TABLE locations ADD COLUMN Location VARCHAR(255) NOT NULL AFTER Title;

24
swad_location.c
View File

@ -103,7 +103,7 @@ void Loc_SeeLocations (void)
static void Loc_ShowAllLocations (void)
{
extern const char *Hlp_PROFILE_Location;
extern const char *Txt_Locations;
extern const char *Txt_Agenda;
extern const char *Txt_ASG_ATT_OR_SVY_HELP_ORDER[2];
extern const char *Txt_ASG_ATT_OR_SVY_ORDER[2];
extern const char *Txt_Location;
@ -127,7 +127,7 @@ static void Loc_ShowAllLocations (void)
Pag_WriteLinksToPagesCentered (Pag_ASSIGNMENTS,0,&Pagination);
/***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_Locations,
Lay_StartRoundFrame ("100%",Txt_Agenda,
Loc_PutIconsListLocations,Hlp_PROFILE_Location);
if (Gbl.Usrs.Me.Locs.Num)
@ -222,12 +222,12 @@ static void Loc_PutIconsListLocations (void)
static void Loc_PutIconToCreateNewLoc (void)
{
extern const char *Txt_New_location;
extern const char *Txt_New_event;
/***** Put form to create a new location *****/
Lay_PutContextualLink (ActFrmNewLoc,Loc_PutParamsToCreateNewLoc,
"plus64x64.png",
Txt_New_location,NULL,
Txt_New_event,NULL,
NULL);
}
@ -237,11 +237,11 @@ static void Loc_PutIconToCreateNewLoc (void)
static void Loc_PutButtonToCreateNewLoc (void)
{
extern const char *Txt_New_location;
extern const char *Txt_New_event;
Act_FormStart (ActFrmNewLoc);
Loc_PutParamsToCreateNewLoc ();
Lay_PutConfirmButton (Txt_New_location);
Lay_PutConfirmButton (Txt_New_event);
Act_FormEnd ();
}
@ -865,12 +865,12 @@ void Loc_RequestCreatOrEditLoc (void)
extern const char *Hlp_PROFILE_Location_new_location;
extern const char *Hlp_PROFILE_Location_edit_location;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_New_location;
extern const char *Txt_New_event;
extern const char *Txt_Edit_location;
extern const char *Txt_Location;
extern const char *Txt_Event;
extern const char *Txt_Description;
extern const char *Txt_Create_location;
extern const char *Txt_Create_event;
extern const char *Txt_Save;
struct Location Loc;
bool ItsANewLocation;
@ -919,11 +919,11 @@ void Loc_RequestCreatOrEditLoc (void)
/***** Table start *****/
Lay_StartRoundFrameTable (NULL,
ItsANewLocation ? Txt_New_location :
Txt_Edit_location,
ItsANewLocation ? Txt_New_event :
Txt_Edit_location,
NULL,
ItsANewLocation ? Hlp_PROFILE_Location_new_location :
Hlp_PROFILE_Location_edit_location,
Hlp_PROFILE_Location_edit_location,
2);
/***** Location *****/
@ -976,7 +976,7 @@ void Loc_RequestCreatOrEditLoc (void)
/***** New location *****/
if (ItsANewLocation)
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_location);
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_event);
else
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd ();

33
swad_text.c
View File

@ -2090,6 +2090,27 @@ const char *Txt_Admin_several_teachers =
"Gerenciar vários professores";
#endif
const char *Txt_Agenda =
#if L==1
"Agenda";
#elif L==2
"Organizer";
#elif L==3
"Agenda";
#elif L==4
"Agenda";
#elif L==5
"Agenda";
#elif L==6
"Aporyrã";
#elif L==7
"Agenda";
#elif L==8
"Pamiętnik";
#elif L==9
"Agenda";
#endif
const char *Txt_all =
#if L==1
"tot";
@ -6316,7 +6337,7 @@ const char *Txt_Create_link =
#elif L==9
"Criar ligação";
#endif
/*
const char *Txt_Create_location =
#if L==1
"Crear ubicació";
@ -6337,7 +6358,7 @@ const char *Txt_Create_location =
#elif L==9
"Criar localização";
#endif
*/
const char *Txt_Create_notice =
#if L==1
"Crear avís";
@ -19526,7 +19547,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
#elif L==5
"Agenda"
#elif L==6
"Agenda" // Okoteve traducción
"Aporyrã"
#elif L==7
"Agenda"
#elif L==8
@ -21420,7 +21441,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
#elif L==5
"Agenda"
#elif L==6
"Agenda" // Okoteve traducción
"Aporyrã"
#elif L==7
"Agenda"
#elif L==8
@ -23776,7 +23797,7 @@ const char *Txt_New_link =
#elif L==9
"Nova ligação";
#endif
/*
const char *Txt_New_location =
#if L==1
"Nova ubicació";
@ -23797,7 +23818,7 @@ const char *Txt_New_location =
#elif L==9
"Nova localização";
#endif
*/
const char *Txt_New_message =
#if L==1
"Nou missatge";