diff --git a/swad_changelog.h b/swad_changelog.h index eb65b2b6f..7afb0d5c5 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -252,13 +252,15 @@ /****************************** 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 JS_FILE "swad16.206.3.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 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.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) diff --git a/swad_project.c b/swad_project.c index 112b46ff2..0e8a65ee6 100644 --- a/swad_project.c +++ b/swad_project.c @@ -1103,15 +1103,20 @@ static void Prj_ShowOneProjectWriteUsrs (long PrjCod,Prj_ProjectView_t ProjectVi if (ProjectView == Prj_EDIT_ONE_PROJECT) { fprintf (Gbl.F.Out,"" - ""); + ""); Gbl.Prjs.PrjCodToEdit = PrjCod; // Used to pass project code as a parameter sprintf (Gbl.Title,Txt_Add_USER,Txt_PROJECT_ROLES_SINGUL_abc[RoleInProject]); Lay_PutContextualLink (ActionReqAddUsr[RoleInProject],NULL,Prj_PutParams, "plus64x64.png", - Gbl.Title,Gbl.Title, + Gbl.Title,NULL, NULL); fprintf (Gbl.F.Out,"" - ""); + "" // Column for photo + ""); + if (RoleInProject == Prj_ROLE_STD) + fprintf (Gbl.F.Out,""); // Column for user's IDs + fprintf (Gbl.F.Out,"" // Column for name + ""); } /***** 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 *Txt_New_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_Department; 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_Create_project; extern const char *Txt_Save; - extern const char *Txt_Project_members; + extern const char *Txt_Members; Prj_RoleInProject_t RoleInProject; /***** Start box and form *****/ @@ -2177,7 +2182,10 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) } 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); Act_FormStart (ActChgPrj); Gbl.Prjs.PrjCodToEdit = Prj->PrjCod; @@ -2187,7 +2195,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) /***** 1. Project members *****/ if (!ItsANewProject) // Existing project { - Box_StartBoxTable (NULL,Txt_Project_members,NULL, + Box_StartBoxTable (NULL,Txt_Members,NULL, NULL,Box_NOT_CLOSABLE,2); for (RoleInProject = Prj_ROLE_STD; RoleInProject <= Prj_ROLE_EVA; @@ -2198,7 +2206,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) /***** 2. Project data *****/ /* Start box and table */ - Box_StartBoxTable (NULL,Txt_Project_data,NULL, + Box_StartBoxTable (NULL,Txt_Data,NULL, NULL,Box_NOT_CLOSABLE,2); /* Project title */ @@ -2227,7 +2235,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) The_ClassForm[Gbl.Prefs.Theme],Txt_Department); Dpt_WriteSelectorDepartment (Gbl.CurrentIns.Ins.InsCod, Prj->DptCod, // Selected department - false); // Don't submit on change + false); // Don't submit on change fprintf (Gbl.F.Out,"" ""); diff --git a/swad_text.c b/swad_text.c index 44b811f8a..7e9f9724c 100644 --- a/swad_text.c +++ b/swad_text.c @@ -7618,6 +7618,27 @@ const char *Txt_Current_password = "Senha atual"; #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é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 = #if L==1 "Política de protección de datos"; // Necessita traduccio @@ -18525,6 +18546,27 @@ const char *Txt_maximum = "máximo"; #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łonkowie"; +#elif L==9 + "Membros"; +#endif + const char *Txt_Menu = #if L==1 "Menú"; @@ -30720,27 +30762,6 @@ const char *Txt_Private_available_to_certain_users_identified = "Privado, disponível para alguns usuários identificados"; #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é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 #if L==1 "El projecte %s ara està ocult."; @@ -30783,27 +30804,6 @@ const char *Txt_Project_X_is_now_visible = // Warning: it is very important to i "O projeto %s é agora visível."; #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łonkowie projektu"; -#elif L==9 - "Membros do projeto"; -#endif - const char *Txt_PROJECT_ORDER[Prj_NUM_ORDERS] = { // Prj_ORDER_START_TIME @@ -30850,23 +30850,23 @@ const char *Txt_PROJECT_ORDER[Prj_NUM_ORDERS] = , // Prj_ORDER_TITLE #if L==1 - "Projecte" + "Títol" #elif L==2 - "Projekt" + "Titel" #elif L==3 - "Project" + "Title" #elif L==4 - "Proyecto" + "Título" #elif L==5 - "Projet" + "Titre" #elif L==6 - "Proyecto" // Okoteve traducción + "Moakãha" #elif L==7 - "Progetto" + "Titolo" #elif L==8 - "Projekt" + "Tytuł" #elif L==9 - "Projeto" + "Título" #endif , // Prj_ORDER_DEPARTMENT