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

Version 15.224.1

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-06-12 20:50:06 +02:00
parent 7abd6efbd5
commit 726f522669
2 changed files with 7 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -130,13 +130,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.224 (2016-06-12)"
#define Log_PLATFORM_VERSION "SWAD 15.224.1 (2016-06-12)"
#define CSS_FILE "swad15.218.css"
#define JS_FILE "swad15.216.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 15.224.1: Jun 12, 2016 Change in layout of file browsers. (202266 lines)
Version 15.224: Jun 12, 2016 Now a user can unfollow users followed by him/her whose profile is not visible.
Code refactoring in list of follweing/followers. (202304 lines)
Version 15.223.3: Jun 12, 2016 Fixed layout of list of forums. (202282 lines)

49
swad_file_browser.c
View File

@ -294,37 +294,6 @@ const char *Brw_RootFolderInternalNames[Brw_NUM_TYPES_FILE_BROWSER] =
Brw_INTERNAL_NAME_ROOT_FOLDER_TEACHERS, // Brw_ADMI_TEACH_GRP
};
// Number of columns of a file browser
static const unsigned Brw_NumColumnsInExpTree[Brw_NUM_TYPES_FILE_BROWSER] =
{
4, // Brw_UNKNOWN
4, // Brw_SHOW_DOCUM_CRS
4, // Brw_SHOW_MARKS_CRS
7, // Brw_ADMI_DOCUM_CRS
7, // Brw_ADMI_SHARE_CRS
7, // Brw_ADMI_SHARE_GRP
7, // Brw_ADMI_WORKS_USR
7, // Brw_ADMI_WORKS_CRS
9, // Brw_ADMI_MARKS_CRS
7, // Brw_ADMI_BRIEF_USR
4, // Brw_SHOW_DOCUM_GRP
7, // Brw_ADMI_DOCUM_GRP
4, // Brw_SHOW_MARKS_GRP
9, // Brw_ADMI_MARKS_GRP
7, // Brw_ADMI_ASSIG_USR
7, // Brw_ADMI_ASSIG_CRS
4, // Brw_SHOW_DOCUM_DEG
7, // Brw_ADMI_DOCUM_DEG
4, // Brw_SHOW_DOCUM_CTR
7, // Brw_ADMI_DOCUM_CTR
4, // Brw_SHOW_DOCUM_INS
7, // Brw_ADMI_DOCUM_INS
7, // Brw_ADMI_SHARE_DEG
7, // Brw_ADMI_SHARE_CTR
7, // Brw_ADMI_SHARE_INS
7, // Brw_ADMI_TEACH_CRS
7, // Brw_ADMI_TEACH_GRP
};
static const bool Brw_FileBrowserIsEditable[Brw_NUM_TYPES_FILE_BROWSER] =
{
false, // Brw_UNKNOWN
@ -3669,13 +3638,7 @@ static void Brw_ShowFileBrowser (void)
FunctionToDrawContextualIcons);
/***** Title *****/
fprintf (Gbl.F.Out,"<table class=\"BROWSER_TABLE\">"
"<tr>"
"<td class=\"CENTER_MIDDLE\" colspan=\"%u\">",
Brw_NumColumnsInExpTree[Gbl.FileBrowser.Type]);
Brw_WriteSubtitleOfFileBrowser ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** Show and store number of documents found *****/
if (Brw_FileBrowserIsEditable[Gbl.FileBrowser.Type])
@ -3685,12 +3648,13 @@ static void Brw_ShowFileBrowser (void)
}
/***** List recursively the directory *****/
fprintf (Gbl.F.Out,"<table class=\"BROWSER_TABLE\">");
Brw_SetFullPathInTree (Brw_RootFolderInternalNames[Gbl.FileBrowser.Type],".");
if (Brw_WriteRowFileBrowser (0,Brw_IS_FOLDER,Brw_EXPAND_TREE_NOTHING,Brw_RootFolderInternalNames[Gbl.FileBrowser.Type],"."))
Brw_ListDir (1,Gbl.FileBrowser.Priv.PathRootFolder,Brw_RootFolderInternalNames[Gbl.FileBrowser.Type]);
/***** End of table *****/
fprintf (Gbl.F.Out,"</table>");
/***** End of frame *****/
Lay_EndRoundFrame ();
fprintf (Gbl.F.Out,"</section>");
}
@ -4020,10 +3984,8 @@ static void Brw_ShowSizeOfFileTree (void)
extern const char *Txt_files;
extern const char *Txt_of_PART_OF_A_TOTAL;
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"%u\" class=\"DAT CENTER_MIDDLE\">"
fprintf (Gbl.F.Out,"<div class=\"DAT CENTER_MIDDLE\">"
"%u %s; %lu %s; %lu %s; ",
Brw_NumColumnsInExpTree[Gbl.FileBrowser.Type],
Gbl.FileBrowser.Size.NumLevls,
Gbl.FileBrowser.Size.NumLevls == 1 ? Txt_level :
Txt_levels ,
@ -4042,8 +4004,7 @@ static void Brw_ShowSizeOfFileTree (void)
Str_WriteSizeInBytesBrief ((double) Gbl.FileBrowser.Size.MaxQuota);
fprintf (Gbl.F.Out,")");
}
fprintf (Gbl.F.Out,"</td>"
"</tr>");
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/