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

This commit is contained in:
Antonio Cañas Vargas 2016-11-14 19:01:11 +01:00
parent 3a48038d0f
commit 43e3fef3ca
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -157,13 +157,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.61.4 (2016-11-14)"
#define Log_PLATFORM_VERSION "SWAD 16.61.5 (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.5: Nov 14, 2016 New alert type: clipboard. (207161 lines)
Version 16.61.4: Nov 14, 2016 Copy source is displayed as an alert. (207158 lines)
Version 16.61.3: Nov 14, 2016 Copy in flie browsers is allowed from any folder. (207156 lines)
Version 16.61.2: Nov 14, 2016 Code refactoring in file browser. (207166 lines)

6
swad_file_browser.c
View File

@ -6802,17 +6802,17 @@ static void Brw_WriteCurrentClipboard (void)
Gbl.FileBrowser.Clipboard.FileType,
Gbl.FileBrowser.Clipboard.FileName,FileNameToShow);
sprintf (Gbl.Message,"%s: %s, %s <strong>%s</strong>",
sprintf (Gbl.Message,"%s: %s, %s <strong>%s</strong>.",
Txt_Copy_source,ClipboardZone,
TxtFileType[Gbl.FileBrowser.Clipboard.FileType],
FileNameToShow); // It's not the root folder
}
else
sprintf (Gbl.Message,"%s: %s, %s",
sprintf (Gbl.Message,"%s: %s, %s.",
Txt_Copy_source,ClipboardZone,
Txt_all_files); // It's the root folder
Lay_ShowAlert (Lay_INFO,Gbl.Message);
Lay_ShowAlert (Lay_CLIPBOARD,Gbl.Message);
}
/*****************************************************************************/

11
swad_layout.c
View File

@ -1425,10 +1425,11 @@ void Lay_ShowAlert (Lay_AlertType_t MsgType,const char *Message)
{
static const char *MsgIcons[Lay_NUM_ALERT_TYPES] =
{
"info",
"success",
"warning",
"error",
"info16x16.gif",
"success16x16.gif",
"warning16x16.gif",
"error16x16.gif",
"copy_on16x16.gif",
};
/****** If start of page is not written yet, do it now ******/
@ -1438,7 +1439,7 @@ void Lay_ShowAlert (Lay_AlertType_t MsgType,const char *Message)
if (Message)
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">"
"<div class=\"ALERT\""
" style=\"background-image:url('%s/%s16x16.gif');\">"
" style=\"background-image:url('%s/%s');\">"
"%s"
"</div>"
"</div>",

11
swad_layout.h
View File

@ -47,13 +47,14 @@
/********************************* Public types ******************************/
/*****************************************************************************/
#define Lay_NUM_ALERT_TYPES 4
#define Lay_NUM_ALERT_TYPES 5
typedef enum
{
Lay_INFO = 0,
Lay_SUCCESS = 1,
Lay_WARNING = 2,
Lay_ERROR = 3,
Lay_INFO = 0,
Lay_SUCCESS = 1,
Lay_WARNING = 2,
Lay_ERROR = 3,
Lay_CLIPBOARD = 4,
} Lay_AlertType_t;
typedef enum