Version 16.61.2

This commit is contained in:
Antonio Cañas Vargas 2016-11-14 17:39:39 +01:00
parent ea7499aab3
commit 74d8855639
2 changed files with 32 additions and 16 deletions

View File

@ -157,13 +157,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.61.1 (2016-11-14)"
#define Log_PLATFORM_VERSION "SWAD 16.61.2 (2016-11-14)"
#define CSS_FILE "swad16.60.1.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.61.2: Nov 14, 2016 Code refactoring in file browser. (207166 lines)
Version 16.61.1: Nov 14, 2016 Code refactoring in hierarchy. (207150 lines)
Version 16.61: Nov 14, 2016 New module swad_hierarchy. (207159 lines)
Version 16.60.1: Nov 14, 2016 Changes in layout of file browser. (207096 lines)

View File

@ -5313,28 +5313,43 @@ static void Brw_PutIconsRemoveCopyPaste (unsigned Level,
const char *PathInTree,const char *FileName,const char *FileNameToShow)
{
/***** Icon to remove folder, file or link *****/
if (Gbl.FileBrowser.FileType == Brw_IS_FOLDER)
/* Icon to remove a folder */
Brw_PutIconRemoveDir (PathInTree,FileName,FileNameToShow);
else // File or link
/* Icon to remove a file or link */
Brw_PutIconRemoveFile (PathInTree,FileName,FileNameToShow);
switch (Gbl.FileBrowser.FileType)
{
case Brw_IS_FILE:
case Brw_IS_LINK:
/* Icon to remove a file or link */
Brw_PutIconRemoveFile (PathInTree,FileName,FileNameToShow);
break;
case Brw_IS_FOLDER:
/* Icon to remove a folder */
Brw_PutIconRemoveDir (PathInTree,FileName,FileNameToShow);
break;
default:
break;
}
/***** Icon to copy *****/
Brw_PutIconCopy (PathInTree,FileName,FileNameToShow);
/***** Icon to paste *****/
if (Gbl.FileBrowser.FileType == Brw_IS_FOLDER)
switch (Gbl.FileBrowser.FileType)
{
if (Brw_CheckIfCanPasteIn (Level))
/* Icon to paste active */
Brw_PutIconPasteOn (PathInTree,FileName,FileNameToShow);
else
/* Icon to paste inactive */
Brw_PutIconPasteOff ();
case Brw_IS_FILE:
case Brw_IS_LINK:
/* File or link. Can't paste in a file or link */
fprintf (Gbl.F.Out,"<td class=\"BM%u\"></td>",Gbl.RowEvenOdd);
break;
case Brw_IS_FOLDER:
if (Brw_CheckIfCanPasteIn (Level))
/* Icon to paste active */
Brw_PutIconPasteOn (PathInTree,FileName,FileNameToShow);
else
/* Icon to paste inactive */
Brw_PutIconPasteOff ();
break;
default:
break;
}
else // File or link. Can't paste in a file or link.
fprintf (Gbl.F.Out,"<td class=\"BM%u\"></td>",Gbl.RowEvenOdd);
}
/*****************************************************************************/