diff --git a/swad_changelog.h b/swad_changelog.h index 73153253f..98ced3f0c 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -254,13 +254,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 17.25 (2017-10-10)" +#define Log_PLATFORM_VERSION "SWAD 17.25.1 (2017-10-10)" #define CSS_FILE "swad17.25.css" #define JS_FILE "swad17.17.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 17.25.1: Oct 10, 2017 Fixed problem in layout of projects. (234357 lines) Version 17.25: Oct 10, 2017 New column with the number of the project in listing of projects. (234336 lines) Version 17.24.2: Oct 10, 2017 Code refactoring in projects filter. (234209 lines) Version 17.24.1: Oct 10, 2017 Changes in pagination of projects. (234228 lines) diff --git a/swad_project.c b/swad_project.c index 6591b1fce..1d9ff3fcb 100644 --- a/swad_project.c +++ b/swad_project.c @@ -1133,14 +1133,14 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, break; case Prj_FILE_BROWSER_PROJECT: fprintf (Gbl.F.Out,"" - "", + "", UniqueId); Prj_PutIconToToggleProject (UniqueId,"more64x64.png",Txt_See_more); fprintf (Gbl.F.Out,"" ""); fprintf (Gbl.F.Out,"" - "", + "", UniqueId); Prj_PutIconToToggleProject (UniqueId,"less64x64.png",Txt_See_less); fprintf (Gbl.F.Out,"" @@ -1161,7 +1161,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, break; case Prj_FILE_BROWSER_PROJECT: fprintf (Gbl.F.Out,"" - "" - "" - ""); + /* Column for label */ switch (ProjectView) { case Prj_LIST_PROJECTS: fprintf (Gbl.F.Out,"" "%s:" - "" - "", + "", Gbl.RowEvenOdd, Prj->Hidden == Prj_HIDDEN ? "ASG_LABEL_LIGHT" : "ASG_LABEL", NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : - Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject], + Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); + break; + case Prj_FILE_BROWSER_PROJECT: + fprintf (Gbl.F.Out,"" + "%s:" + "", + Prj->Hidden == Prj_HIDDEN ? "ASG_LABEL_LIGHT" : + "ASG_LABEL", + NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : + Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); + break; + case Prj_PRINT_ONE_PROJECT: + fprintf (Gbl.F.Out,"" + "%s:" + "", + Prj->Hidden == Prj_HIDDEN ? "ASG_LABEL_LIGHT" : + "ASG_LABEL", + NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : + Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); + break; + case Prj_EDIT_ONE_PROJECT: + fprintf (Gbl.F.Out,"%s:", + Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); + break; + } + + /* Start column with list of users */ + switch (ProjectView) + { + case Prj_LIST_PROJECTS: + fprintf (Gbl.F.Out,"", Gbl.RowEvenOdd, Prj->Hidden == Prj_HIDDEN ? "DAT_LIGHT" : "DAT"); break; case Prj_FILE_BROWSER_PROJECT: case Prj_PRINT_ONE_PROJECT: - fprintf (Gbl.F.Out,"" - "%s:" - "" - "", - Prj->Hidden == Prj_HIDDEN ? "ASG_LABEL_LIGHT" : - "ASG_LABEL", - NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : - Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject], + fprintf (Gbl.F.Out,"", Prj->Hidden == Prj_HIDDEN ? "DAT_LIGHT" : "DAT"); break; case Prj_EDIT_ONE_PROJECT: - fprintf (Gbl.F.Out,"%s:" - "", - Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); + fprintf (Gbl.F.Out,""); break; }