Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 17.25.1

This commit is contained in:
Antonio Cañas Vargas 2017-10-10 19:17:21 +02:00
parent f26a8a2af6
commit 797d8a3be2
2 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -254,13 +254,14 @@
/****************************** Public constants *****************************/ /****************************** 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 CSS_FILE "swad17.25.css"
#define JS_FILE "swad17.17.1.js" #define JS_FILE "swad17.17.1.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.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.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.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) Version 17.24.1: Oct 10, 2017 Changes in pagination of projects. (234228 lines)

59
swad_project.c
View File

@ -1133,14 +1133,14 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj,
break; break;
case Prj_FILE_BROWSER_PROJECT: case Prj_FILE_BROWSER_PROJECT:
fprintf (Gbl.F.Out,"<tr id=\"prj_exp_%u\">" fprintf (Gbl.F.Out,"<tr id=\"prj_exp_%u\">"
"<td colspan=\"4\" class=\"CENTER_MIDDLE\">", "<td colspan=\"5\" class=\"CENTER_MIDDLE\">",
UniqueId); UniqueId);
Prj_PutIconToToggleProject (UniqueId,"more64x64.png",Txt_See_more); Prj_PutIconToToggleProject (UniqueId,"more64x64.png",Txt_See_more);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
fprintf (Gbl.F.Out,"<tr id=\"prj_con_%u\" style=\"display:none;\">" fprintf (Gbl.F.Out,"<tr id=\"prj_con_%u\" style=\"display:none;\">"
"<td colspan=\"4\" class=\"CENTER_MIDDLE\">", "<td colspan=\"5\" class=\"CENTER_MIDDLE\">",
UniqueId); UniqueId);
Prj_PutIconToToggleProject (UniqueId,"less64x64.png",Txt_See_less); Prj_PutIconToToggleProject (UniqueId,"less64x64.png",Txt_See_less);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
@ -1161,7 +1161,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj,
break; break;
case Prj_FILE_BROWSER_PROJECT: case Prj_FILE_BROWSER_PROJECT:
fprintf (Gbl.F.Out,"<tr id=\"prj_pro_%u\" style=\"display:none;\">" fprintf (Gbl.F.Out,"<tr id=\"prj_pro_%u\" style=\"display:none;\">"
"<td colspan=\"2\" class=\"RIGHT_TOP", "<td colspan=\"3\" class=\"RIGHT_TOP",
UniqueId); UniqueId);
break; break;
default: default:
@ -1424,7 +1424,7 @@ static void Prj_ShowOneProjectTxtField (struct Project *Prj,
break; break;
case Prj_FILE_BROWSER_PROJECT: case Prj_FILE_BROWSER_PROJECT:
fprintf (Gbl.F.Out,"<tr id=\"%s%u\" style=\"display:none;\">" fprintf (Gbl.F.Out,"<tr id=\"%s%u\" style=\"display:none;\">"
"<td colspan=\"2\" class=\"RIGHT_TOP", "<td colspan=\"3\" class=\"RIGHT_TOP",
id,UniqueId); id,UniqueId);
break; break;
case Prj_PRINT_ONE_PROJECT: case Prj_PRINT_ONE_PROJECT:
@ -1493,7 +1493,7 @@ static void Prj_ShowOneProjectURL (const struct Project *Prj,
break; break;
case Prj_FILE_BROWSER_PROJECT: case Prj_FILE_BROWSER_PROJECT:
fprintf (Gbl.F.Out,"<tr id=\"%s%u\" style=\"display:none;\">" fprintf (Gbl.F.Out,"<tr id=\"%s%u\" style=\"display:none;\">"
"<td colspan=\"2\" class=\"RIGHT_TOP", "<td colspan=\"3\" class=\"RIGHT_TOP",
id,UniqueId); id,UniqueId);
break; break;
case Prj_PRINT_ONE_PROJECT: case Prj_PRINT_ONE_PROJECT:
@ -1598,39 +1598,60 @@ static void Prj_ShowOneProjectMembersWithARole (const struct Project *Prj,
/***** Start row with label and listing of users *****/ /***** Start row with label and listing of users *****/
fprintf (Gbl.F.Out,"<tr>"); fprintf (Gbl.F.Out,"<tr>");
/* Column for label */
switch (ProjectView) switch (ProjectView)
{ {
case Prj_LIST_PROJECTS: case Prj_LIST_PROJECTS:
fprintf (Gbl.F.Out,"<td colspan=\"4\" class=\"RIGHT_TOP COLOR%u %s\">" fprintf (Gbl.F.Out,"<td colspan=\"4\" class=\"RIGHT_TOP COLOR%u %s\">"
"%s:" "%s:"
"</td>" "</td>",
"<td colspan=\"2\" class=\"LEFT_TOP COLOR%u %s\">",
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
Prj->Hidden == Prj_HIDDEN ? "ASG_LABEL_LIGHT" : Prj->Hidden == Prj_HIDDEN ? "ASG_LABEL_LIGHT" :
"ASG_LABEL", "ASG_LABEL",
NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : 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,"<td colspan=\"3\" class=\"RIGHT_TOP %s\">"
"%s:"
"</td>",
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,"<td colspan=\"2\" class=\"RIGHT_TOP %s\">"
"%s:"
"</td>",
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,"<td class=\"RIGHT_TOP ASG_LABEL\">%s:</td>",
Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]);
break;
}
/* Start column with list of users */
switch (ProjectView)
{
case Prj_LIST_PROJECTS:
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"LEFT_TOP COLOR%u %s\">",
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
Prj->Hidden == Prj_HIDDEN ? "DAT_LIGHT" : Prj->Hidden == Prj_HIDDEN ? "DAT_LIGHT" :
"DAT"); "DAT");
break; break;
case Prj_FILE_BROWSER_PROJECT: case Prj_FILE_BROWSER_PROJECT:
case Prj_PRINT_ONE_PROJECT: case Prj_PRINT_ONE_PROJECT:
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"RIGHT_TOP %s\">" fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"LEFT_TOP %s\">",
"%s:"
"</td>"
"<td colspan=\"2\" class=\"LEFT_TOP %s\">",
Prj->Hidden == Prj_HIDDEN ? "ASG_LABEL_LIGHT" :
"ASG_LABEL",
NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] :
Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject],
Prj->Hidden == Prj_HIDDEN ? "DAT_LIGHT" : Prj->Hidden == Prj_HIDDEN ? "DAT_LIGHT" :
"DAT"); "DAT");
break; break;
case Prj_EDIT_ONE_PROJECT: case Prj_EDIT_ONE_PROJECT:
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP ASG_LABEL\">%s:</td>" fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"LEFT_TOP DAT\">");
"<td colspan=\"2\" class=\"LEFT_TOP DAT\">",
Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]);
break; break;
} }