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.16.3

This commit is contained in:
Antonio Cañas Vargas 2017-10-03 14:05:45 +02:00
parent f2f5ed1e06
commit 77441d56f0
2 changed files with 61 additions and 4 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 *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 17.16.2 (2017-10-03)"
#define Log_PLATFORM_VERSION "SWAD 17.16.3 (2017-10-03)"
#define CSS_FILE "swad17.0.css"
#define JS_FILE "swad17.15.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.16.3: Oct 03, 2017 Changing expansion of file subtrees. Not finished. (232113 lines)
Version 17.16.2: Oct 03, 2017 Fixed bug in pagination of projects. (232061 lines)
Version 17.16.1: Oct 03, 2017 Changing expansion of file subtrees. Not finished.
Fixed bug in notifications about new private files. (232060 lines)

62
swad_file_browser.c
View File

@ -5302,7 +5302,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,
/***** Start this row *****/
fprintf (Gbl.F.Out,"<tr");
if (TreeContracted) // This row is inside a contracted subtree
fprintf (Gbl.F.Out," style=\"display:none;\"");
fprintf (Gbl.F.Out," class=\"NOT_SHOWN\"");
fprintf (Gbl.F.Out,">");
/****** If current action allows file administration... ******/
@ -5673,6 +5673,60 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_IconTree_t
"<table>"
"<tr>");
Brw_IndentDependingOnLevel (Level);
/***** New icon to expand/contract *****/
if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
{
fprintf (Gbl.F.Out,"<td class=\"BM%u\" style=\"background-color:palegreen;\">",Gbl.RowEvenOdd);
switch (IconThisRow)
{
case Brw_ICON_TREE_NOTHING:
fprintf (Gbl.F.Out,"<img src=\"%s/tr16x16.gif\""
" alt=\"\" title=\"\""
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL);
break;
case Brw_ICON_TREE_EXPAND:
/***** Form to expand folder *****/
sprintf (FileBrowserId,"file_browser_%u",Gbl.FileBrowser.Id);
Act_FormStartAnchor (Brw_ActExpandFolder[Gbl.FileBrowser.Type],FileBrowserId);
Brw_PutParamsFileBrowser (Brw_ActExpandFolder[Gbl.FileBrowser.Type],
PathInTree,FileName,
Brw_IS_FOLDER,-1L);
sprintf (Gbl.Title,"%s %s",Txt_Expand,FileNameToShow);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/expand64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title);
Act_FormEnd ();
Lay_EndSection ();
break;
case Brw_ICON_TREE_CONTRACT:
/***** Form to contract folder *****/
sprintf (FileBrowserId,"file_browser_%u",Gbl.FileBrowser.Id);
Act_FormStartAnchor (Brw_ActContractFolder[Gbl.FileBrowser.Type],FileBrowserId);
Brw_PutParamsFileBrowser (Brw_ActContractFolder[Gbl.FileBrowser.Type],
PathInTree,FileName,
Brw_IS_FOLDER,-1L);
sprintf (Gbl.Title,"%s %s",Txt_Contract,FileNameToShow);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/contract64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title);
Act_FormEnd ();
Lay_EndSection ();
break;
}
fprintf (Gbl.F.Out,"</td>");
}
/***** Old icon to expand/contract *****/
fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd);
switch (IconThisRow)
@ -5719,6 +5773,8 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_IconTree_t
break;
}
fprintf (Gbl.F.Out,"</td>");
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>"
@ -5843,7 +5899,7 @@ static void Brw_PutIconFolder (unsigned Level,Brw_IconTree_t IconSubtree,
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
(IconSubtree == Brw_ICON_TREE_EXPAND) ? "closed" :
"open",
"open",
Gbl.Title,
Gbl.Title);
Act_FormEnd ();
@ -5854,7 +5910,7 @@ static void Brw_PutIconFolder (unsigned Level,Brw_IconTree_t IconSubtree,
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
(IconSubtree == Brw_ICON_TREE_EXPAND) ? "closed" :
"open",
"open",
Txt_Folder,
Txt_Folder);