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

Version 17.11.4

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2017-09-30 19:28:51 +02:00
parent 0e8a50f938
commit 8aabf9bfaf
3 changed files with 71 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_changelog.h
View File

@ -252,13 +252,15 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 17.11.2 (2017-09-29)" #define Log_PLATFORM_VERSION "SWAD 17.11.4 (2017-09-30)"
#define CSS_FILE "swad17.0.css" #define CSS_FILE "swad17.0.css"
#define JS_FILE "swad16.206.3.js" #define JS_FILE "swad16.206.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 17.11.4: Sep 29, 2017 Changes in edition of a project. (231521 lines)
Version 17.11.3: Sep 29, 2017 Changes in layout of projects. (231517 lines)
Version 17.11.2: Sep 29, 2017 Changes in layout of projects. (231511 lines) Version 17.11.2: Sep 29, 2017 Changes in layout of projects. (231511 lines)
Version 17.11.1: Sep 29, 2017 Code refactoring in projects. (231510 lines) Version 17.11.1: Sep 29, 2017 Code refactoring in projects. (231510 lines)
Version 17.11: Sep 29, 2017 Select which projects to show: only my projects or all projects. (231531 lines) Version 17.11: Sep 29, 2017 Select which projects to show: only my projects or all projects. (231531 lines)

26
swad_project.c
View File

@ -1103,15 +1103,20 @@ static void Prj_ShowOneProjectWriteUsrs (long PrjCod,Prj_ProjectView_t ProjectVi
if (ProjectView == Prj_EDIT_ONE_PROJECT) if (ProjectView == Prj_EDIT_ONE_PROJECT)
{ {
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"3\" class=\"LEFT_MIDDLE\">"); "<td class=\"CENTER_TOP\" style=\"width:30px;\">");
Gbl.Prjs.PrjCodToEdit = PrjCod; // Used to pass project code as a parameter Gbl.Prjs.PrjCodToEdit = PrjCod; // Used to pass project code as a parameter
sprintf (Gbl.Title,Txt_Add_USER,Txt_PROJECT_ROLES_SINGUL_abc[RoleInProject]); sprintf (Gbl.Title,Txt_Add_USER,Txt_PROJECT_ROLES_SINGUL_abc[RoleInProject]);
Lay_PutContextualLink (ActionReqAddUsr[RoleInProject],NULL,Prj_PutParams, Lay_PutContextualLink (ActionReqAddUsr[RoleInProject],NULL,Prj_PutParams,
"plus64x64.png", "plus64x64.png",
Gbl.Title,Gbl.Title, Gbl.Title,NULL,
NULL); NULL);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "<td style=\"width:30px;\">" // Column for photo
"</td>");
if (RoleInProject == Prj_ROLE_STD)
fprintf (Gbl.F.Out,"<td></td>"); // Column for user's IDs
fprintf (Gbl.F.Out,"<td></td>" // Column for name
"</tr>");
} }
/***** End table *****/ /***** End table *****/
@ -2152,7 +2157,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_New_project; extern const char *Txt_New_project;
extern const char *Txt_Edit_project; extern const char *Txt_Edit_project;
extern const char *Txt_Project_data; extern const char *Txt_Data;
extern const char *Txt_Title; extern const char *Txt_Title;
extern const char *Txt_Department; extern const char *Txt_Department;
extern const char *Txt_Description; extern const char *Txt_Description;
@ -2164,7 +2169,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
extern const char *Txt_Yes; extern const char *Txt_Yes;
extern const char *Txt_Create_project; extern const char *Txt_Create_project;
extern const char *Txt_Save; extern const char *Txt_Save;
extern const char *Txt_Project_members; extern const char *Txt_Members;
Prj_RoleInProject_t RoleInProject; Prj_RoleInProject_t RoleInProject;
/***** Start box and form *****/ /***** Start box and form *****/
@ -2177,7 +2182,10 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
} }
else else
{ {
Box_StartBox (NULL,Txt_Edit_project,NULL, Box_StartBox (NULL,
Prj->Title[0] ? Prj->Title :
Txt_Edit_project,
NULL,
Hlp_ASSESSMENT_Projects_edit_project,Box_NOT_CLOSABLE); Hlp_ASSESSMENT_Projects_edit_project,Box_NOT_CLOSABLE);
Act_FormStart (ActChgPrj); Act_FormStart (ActChgPrj);
Gbl.Prjs.PrjCodToEdit = Prj->PrjCod; Gbl.Prjs.PrjCodToEdit = Prj->PrjCod;
@ -2187,7 +2195,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
/***** 1. Project members *****/ /***** 1. Project members *****/
if (!ItsANewProject) // Existing project if (!ItsANewProject) // Existing project
{ {
Box_StartBoxTable (NULL,Txt_Project_members,NULL, Box_StartBoxTable (NULL,Txt_Members,NULL,
NULL,Box_NOT_CLOSABLE,2); NULL,Box_NOT_CLOSABLE,2);
for (RoleInProject = Prj_ROLE_STD; for (RoleInProject = Prj_ROLE_STD;
RoleInProject <= Prj_ROLE_EVA; RoleInProject <= Prj_ROLE_EVA;
@ -2198,7 +2206,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
/***** 2. Project data *****/ /***** 2. Project data *****/
/* Start box and table */ /* Start box and table */
Box_StartBoxTable (NULL,Txt_Project_data,NULL, Box_StartBoxTable (NULL,Txt_Data,NULL,
NULL,Box_NOT_CLOSABLE,2); NULL,Box_NOT_CLOSABLE,2);
/* Project title */ /* Project title */
@ -2227,7 +2235,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
The_ClassForm[Gbl.Prefs.Theme],Txt_Department); The_ClassForm[Gbl.Prefs.Theme],Txt_Department);
Dpt_WriteSelectorDepartment (Gbl.CurrentIns.Ins.InsCod, Dpt_WriteSelectorDepartment (Gbl.CurrentIns.Ins.InsCod,
Prj->DptCod, // Selected department Prj->DptCod, // Selected department
false); // Don't submit on change false); // Don't submit on change
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");

102
swad_text.c
View File

@ -7618,6 +7618,27 @@ const char *Txt_Current_password =
"Senha atual"; "Senha atual";
#endif #endif
const char *Txt_Data = // Project data
#if L==1
"Dades";
#elif L==2
"Daten";
#elif L==3
"Data";
#elif L==4
"Datos";
#elif L==5
"Donn&eacute;es";
#elif L==6
"Datos"; // Okoteve traducción
#elif L==7
"Dati";
#elif L==8
"Dane";
#elif L==9
"Dados";
#endif
const char *Txt_DATA_PROTECTION_CLAUSE = const char *Txt_DATA_PROTECTION_CLAUSE =
#if L==1 #if L==1
"Pol&iacute;tica de protecci&oacute;n de datos"; // Necessita traduccio "Pol&iacute;tica de protecci&oacute;n de datos"; // Necessita traduccio
@ -18525,6 +18546,27 @@ const char *Txt_maximum =
"m&aacute;ximo"; "m&aacute;ximo";
#endif #endif
const char *Txt_Members = // Project members
#if L==1
"Membres";
#elif L==2
"Mitarbeiter";
#elif L==3
"Members";
#elif L==4
"Miembros";
#elif L==5
"Membres";
#elif L==6
"Miembros"; // Okoteve traducción
#elif L==7
"Membri";
#elif L==8
"Cz&lstrok;onkowie";
#elif L==9
"Membros";
#endif
const char *Txt_Menu = const char *Txt_Menu =
#if L==1 #if L==1
"Men&uacute;"; "Men&uacute;";
@ -30720,27 +30762,6 @@ const char *Txt_Private_available_to_certain_users_identified =
"Privado, dispon&iacute;vel para alguns usu&aacute;rios identificados"; "Privado, dispon&iacute;vel para alguns usu&aacute;rios identificados";
#endif #endif
const char *Txt_Project_data =
#if L==1
"Dades del projecte";
#elif L==2
"Projektdaten";
#elif L==3
"Project data";
#elif L==4
"Datos del proyecto";
#elif L==5
"Donn&eacute;es du projet";
#elif L==6
"Datos del proyecto"; // Okoteve traducción
#elif L==7
"Dati del progetto";
#elif L==8
"Dane projektu";
#elif L==9
"Dados do projeto";
#endif
const char *Txt_Project_X_is_now_hidden = // Warning: it is very important to include %s in the following sentences const char *Txt_Project_X_is_now_hidden = // Warning: it is very important to include %s in the following sentences
#if L==1 #if L==1
"El projecte <strong>%s</strong> ara est&agrave; ocult."; "El projecte <strong>%s</strong> ara est&agrave; ocult.";
@ -30783,27 +30804,6 @@ const char *Txt_Project_X_is_now_visible = // Warning: it is very important to i
"O projeto <strong>%s</strong> &eacute; agora vis&iacute;vel."; "O projeto <strong>%s</strong> &eacute; agora vis&iacute;vel.";
#endif #endif
const char *Txt_Project_members =
#if L==1
"Membres del projecte";
#elif L==2
"Projektmitarbeiter";
#elif L==3
"Project members";
#elif L==4
"Miembros del proyecto";
#elif L==5
"Membres du projet";
#elif L==6
"Miembros del proyecto"; // Okoteve traducción
#elif L==7
"Membri del progetto";
#elif L==8
"Cz&lstrok;onkowie projektu";
#elif L==9
"Membros do projeto";
#endif
const char *Txt_PROJECT_ORDER[Prj_NUM_ORDERS] = const char *Txt_PROJECT_ORDER[Prj_NUM_ORDERS] =
{ {
// Prj_ORDER_START_TIME // Prj_ORDER_START_TIME
@ -30850,23 +30850,23 @@ const char *Txt_PROJECT_ORDER[Prj_NUM_ORDERS] =
, ,
// Prj_ORDER_TITLE // Prj_ORDER_TITLE
#if L==1 #if L==1
"Projecte" "T&iacute;tol"
#elif L==2 #elif L==2
"Projekt" "Titel"
#elif L==3 #elif L==3
"Project" "Title"
#elif L==4 #elif L==4
"Proyecto" "T&iacute;tulo"
#elif L==5 #elif L==5
"Projet" "Titre"
#elif L==6 #elif L==6
"Proyecto" // Okoteve traducción "Moak&atilde;ha"
#elif L==7 #elif L==7
"Progetto" "Titolo"
#elif L==8 #elif L==8
"Projekt" "Tytu&lstrok;"
#elif L==9 #elif L==9
"Projeto" "T&iacute;tulo"
#endif #endif
, ,
// Prj_ORDER_DEPARTMENT // Prj_ORDER_DEPARTMENT