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 16.68.3

This commit is contained in:
Antonio Cañas Vargas 2016-11-22 12:58:43 +01:00
parent cbcdc472be
commit 43a0c1267a
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -172,13 +172,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.68.2 (2016-11-22)"
#define Log_PLATFORM_VERSION "SWAD 16.68.3 (2016-11-22)"
#define CSS_FILE "swad16.68.css"
#define JS_FILE "swad16.46.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 16.68.3: Nov 22, 2016 Change in layout of contextual links in file browsers. (207436 lines)
Version 16.68.2: Nov 22, 2016 Code refactoring related to file browser and contextual checkbox. (207438 lines)
Version 16.68.1: Nov 22, 2016 Code refactoring related to notifications and contextual checkbox. (207438 lines)
Version 16.68: Nov 22, 2016 Change in text related to notifications.

27
swad_file_browser.c
View File

@ -1469,7 +1469,7 @@ static void Brw_StoreSizeOfFileTreeInDB (void);
static void Brw_PutParamsContextualLink (void);
static void Brw_WriteFormFullTree (void);
static void Brw_PutCheckboxFullTree (void);
static void Brw_PutParamsFullTree (void);
static bool Brw_GetFullTreeFromForm (void);
static void Brw_GetAndUpdateDateLastAccFileBrowser (void);
@ -1582,7 +1582,7 @@ static bool Brw_CheckIfICanModifySharedFileOrFolder (void);
static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row);
static void Brw_PutFormToAskRemOldFiles (void);
static void Brw_PutLinkToAskRemOldFiles (void);
static void Brw_RemoveOldFilesInBrowser (unsigned Months,struct Brw_NumObjects *Removed);
static void Brw_ScanDirRemovingOldFiles (unsigned Level,const char *Path,
const char *PathInTree,
@ -3741,13 +3741,17 @@ static void Brw_WriteTopBeforeShowingFileBrowser (void)
Brw_UpdateLastAccess ();
/***** Write contextual links *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Put checkbox to show the full tree */
Brw_PutCheckboxFullTree ();
/* Put link to remove old files */
if (Gbl.FileBrowser.Type == Brw_ADMI_BRIEF_USR &&
Gbl.Action.Act != ActReqRemOldBrf)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Brw_PutFormToAskRemOldFiles ();
fprintf (Gbl.F.Out,"</div>");
}
Brw_PutLinkToAskRemOldFiles ();
fprintf (Gbl.F.Out,"</div>");
/***** Initialize hidden levels *****/
switch (Gbl.FileBrowser.Type)
@ -3772,9 +3776,6 @@ static void Brw_WriteTopBeforeShowingFileBrowser (void)
break;
}
/***** Write form to show the full tree *****/
Brw_WriteFormFullTree ();
/***** If browser is editable, get and write current clipboard *****/
if (Brw_FileBrowserIsEditable[Gbl.FileBrowser.Type])
if (Brw_GetMyClipboard ())
@ -4667,16 +4668,14 @@ static void Brw_PutParamsContextualLink (void)
/************** Write a form to select whether show full tree ****************/
/*****************************************************************************/
static void Brw_WriteFormFullTree (void)
static void Brw_PutCheckboxFullTree (void)
{
extern const char *Txt_Show_all_files;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualCheckbox (Brw_ActSeeAdm[Gbl.FileBrowser.Type],
Brw_PutParamsFullTree,
"FullTree",Gbl.FileBrowser.FullTree,
Txt_Show_all_files,Txt_Show_all_files);
fprintf (Gbl.F.Out,"</div>");
}
static void Brw_PutParamsFullTree (void)
@ -11811,7 +11810,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
/***************** Write a form (link) to remove old files *******************/
/*****************************************************************************/
static void Brw_PutFormToAskRemOldFiles (void)
static void Brw_PutLinkToAskRemOldFiles (void)
{
extern const char *Txt_Remove_old_files;