Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-12 11:44:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 21.83.6: Mar 15, 2022 Working on design of dark theme.

Browse Source
This commit is contained in:
acanas 2022-03-15 23:33:37 +01:00
parent 67aa38a867
commit 925c2f6a9b
2 changed files with 81 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
swad_browser.c
View File

@ -1250,8 +1250,8 @@ static void Brw_PutIconFolderWithPlus (const char *FileBrowserId,const char *Row
static void Brw_PutIconNewFileOrFolder (void); static void Brw_PutIconNewFileOrFolder (void);
static void Brw_PutIconFileWithLinkToViewMetadata (struct FileMetadata *FileMetadata); static void Brw_PutIconFileWithLinkToViewMetadata (struct FileMetadata *FileMetadata);
static void Brw_PutIconFile (Brw_FileType_t FileType,const char *FileName, static void Brw_PutIconFile (const char *FileName,
const char *Class,bool Input); const char *Class,bool PutLinkToViewMetadata);
static void Brw_PutButtonToDownloadZIPOfAFolder (void); static void Brw_PutButtonToDownloadZIPOfAFolder (void);
@ -5136,6 +5136,10 @@ static void Brw_PutIconNewFileOrFolder (void)
static void Brw_PutIconFileWithLinkToViewMetadata (struct FileMetadata *FileMetadata) static void Brw_PutIconFileWithLinkToViewMetadata (struct FileMetadata *FileMetadata)
{ {
extern const char *Ico_ClassColor[Ico_NUM_COLORS][The_NUM_THEMES];
extern const char *Txt_Link;
char *Class;
/***** Begin cell *****/ /***** Begin cell *****/
HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]);
@ -5147,8 +5151,18 @@ static void Brw_PutIconFileWithLinkToViewMetadata (struct FileMetadata *FileMeta
FileMetadata->FilCod); FileMetadata->FilCod);
/***** Icon depending on the file extension *****/ /***** Icon depending on the file extension *****/
Brw_PutIconFile (FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name, if (FileMetadata->FilFolLnk.Type == Brw_IS_FILE)
"CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO16x16",true); Brw_PutIconFile (FileMetadata->FilFolLnk.Name,
"CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO16x16",
true); // Put link to view metadata
else
{
if (asprintf (&Class,"CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO16x16 %s",
Ico_ClassColor[Ico_BLACK][Gbl.Prefs.Theme]) < 0)
Err_NotEnoughMemoryExit ();
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"link.svg",Txt_Link,Class);
free (Class);
}
/***** End form *****/ /***** End form *****/
Frm_EndForm (); Frm_EndForm ();
@ -5161,12 +5175,11 @@ static void Brw_PutIconFileWithLinkToViewMetadata (struct FileMetadata *FileMeta
/***************************** Put icon of a file ****************************/ /***************************** Put icon of a file ****************************/
/*****************************************************************************/ /*****************************************************************************/
static void Brw_PutIconFile (Brw_FileType_t FileType,const char *FileName, static void Brw_PutIconFile (const char *FileName,
const char *Class,bool Input) const char *Class,bool PutLinkToViewMetadata)
{ {
extern const unsigned Ext_NUM_FILE_EXT_ALLOWED; extern const unsigned Ext_NUM_FILE_EXT_ALLOWED;
extern const char *Ext_FileExtensionsAllowed[]; extern const char *Ext_FileExtensionsAllowed[];
extern const char *Txt_Link;
extern const char *Txt_X_file; extern const char *Txt_X_file;
char *URL; char *URL;
char *Icon; char *Icon;
@ -5174,49 +5187,38 @@ static void Brw_PutIconFile (Brw_FileType_t FileType,const char *FileName,
unsigned DocType; unsigned DocType;
bool NotFound; bool NotFound;
/***** Icon depending on the file extension *****/ if (asprintf (&URL,"%s32x32",
if (FileType == Brw_IS_LINK) CfG_URL_ICON_FILEXT_PUBLIC) < 0)
{ Err_NotEnoughMemoryExit ();
if (Input) for (DocType = 0, NotFound = true;
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"link.svg",Txt_Link,Class); DocType < Ext_NUM_FILE_EXT_ALLOWED && NotFound;
else DocType++)
Ico_PutIcon ("link.svg",Ico_BLACK,Txt_Link,Class); if (Str_FileIs (FileName,Ext_FileExtensionsAllowed[DocType]))
}
else // FileType == Brw_IS_FILE
{
if (asprintf (&URL,"%s32x32",
CfG_URL_ICON_FILEXT_PUBLIC) < 0)
Err_NotEnoughMemoryExit ();
for (DocType = 0, NotFound = true;
DocType < Ext_NUM_FILE_EXT_ALLOWED && NotFound;
DocType++)
if (Str_FileIs (FileName,Ext_FileExtensionsAllowed[DocType]))
{
if (asprintf (&Icon,"%s32x32.gif",
Ext_FileExtensionsAllowed[DocType]) < 0)
Err_NotEnoughMemoryExit ();
if (asprintf (&Title,Txt_X_file,
Ext_FileExtensionsAllowed[DocType]) < 0)
Err_NotEnoughMemoryExit ();
NotFound = false;
}
if (NotFound)
{ {
if (asprintf (&Icon,"xxx32x32.gif") < 0) if (asprintf (&Icon,"%s32x32.gif",
Ext_FileExtensionsAllowed[DocType]) < 0)
Err_NotEnoughMemoryExit (); Err_NotEnoughMemoryExit ();
if (asprintf (&Title,"%s","") < 0) if (asprintf (&Title,Txt_X_file,
Ext_FileExtensionsAllowed[DocType]) < 0)
Err_NotEnoughMemoryExit (); Err_NotEnoughMemoryExit ();
NotFound = false;
} }
if (NotFound)
if (Input) {
HTM_INPUT_IMAGE (URL,Icon,Title,Class); if (asprintf (&Icon,"xxx32x32.gif") < 0)
else Err_NotEnoughMemoryExit ();
HTM_IMG (URL,Icon,Title, if (asprintf (&Title,"%s","") < 0)
"class=\"%s\"",Class); Err_NotEnoughMemoryExit ();
free (Title);
free (Icon);
free (URL);
} }
if (PutLinkToViewMetadata)
HTM_INPUT_IMAGE (URL,Icon,Title,Class);
else
HTM_IMG (URL,Icon,Title,
"class=\"%s\"",Class);
free (Title);
free (Icon);
free (URL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -8516,6 +8518,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
{ {
extern const char *Txt_Check_marks_in_the_file; extern const char *Txt_Check_marks_in_the_file;
extern const char *Txt_Download; extern const char *Txt_Download;
extern const char *Txt_Link;
const char *Title; const char *Title;
/***** On the screen a link will be shown to download the file *****/ /***** On the screen a link will be shown to download the file *****/
@ -8537,8 +8540,12 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
HTM_BUTTON_OnSubmit_Begin (Txt_Check_marks_in_the_file, HTM_BUTTON_OnSubmit_Begin (Txt_Check_marks_in_the_file,
"BT_LINK",NULL); "BT_LINK",NULL);
Brw_PutIconFile (FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name, if (FileMetadata->FilFolLnk.Type == Brw_IS_FILE)
"ICO40x40",false); Brw_PutIconFile (FileMetadata->FilFolLnk.Name,
"ICO40x40",
false); // Don't put link to view metadata
else
Ico_PutIcon ("link.svg",Ico_BLACK,Txt_Link,"ICO40x40");
/* Name of the file of marks, link end and form end */ /* Name of the file of marks, link end and form end */
HTM_TxtF ("&nbsp;%s&nbsp;",FileNameToShow); HTM_TxtF ("&nbsp;%s&nbsp;",FileNameToShow);
@ -8557,8 +8564,12 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
/* Put anchor and filename */ /* Put anchor and filename */
HTM_A_Begin ("href=\"%s\" class=\"FILENAME_BIG\" title=\"%s\" target=\"_blank\"", HTM_A_Begin ("href=\"%s\" class=\"FILENAME_BIG\" title=\"%s\" target=\"_blank\"",
URL,Title); URL,Title);
Brw_PutIconFile (FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name, if (FileMetadata->FilFolLnk.Type == Brw_IS_FILE)
"ICO40x40",false); Brw_PutIconFile (FileMetadata->FilFolLnk.Name,
"ICO40x40",
false); // Don't put link to view metadata
else
Ico_PutIcon ("link.svg",Ico_BLACK,Txt_Link,"ICO40x40");
HTM_TxtF ("&nbsp;%s&nbsp;",FileNameToShow); HTM_TxtF ("&nbsp;%s&nbsp;",FileNameToShow);
Ico_PutIcon ("download.svg",Ico_BLACK,Title,"ICO40x40"); Ico_PutIcon ("download.svg",Ico_BLACK,Title,"ICO40x40");
HTM_A_End (); HTM_A_End ();
@ -9911,6 +9922,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
extern const char *Txt_Marks_area; extern const char *Txt_Marks_area;
extern const char *Txt_Temporary_private_storage_area; extern const char *Txt_Temporary_private_storage_area;
extern const char *Txt_Folder; extern const char *Txt_Folder;
extern const char *Txt_Link;
struct FileMetadata FileMetadata; struct FileMetadata FileMetadata;
long InsCod; long InsCod;
long CtrCod; long CtrCod;
@ -10137,14 +10149,24 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
/* File or folder icon */ /* File or folder icon */
HTM_BUTTON_OnSubmit_Begin (FileNameToShow,"BT_LINK",NULL); HTM_BUTTON_OnSubmit_Begin (FileNameToShow,"BT_LINK",NULL);
if (FileMetadata.FilFolLnk.Type == Brw_IS_FOLDER) switch (FileMetadata.FilFolLnk.Type)
/* Icon with folder */ {
Ico_PutIcon ("folder-yellow.png",Ico_UNCHANGED, case Brw_IS_FILE:
Txt_Folder,"CONTEXT_ICO16x16"); Brw_PutIconFile (FileMetadata.FilFolLnk.Name,
else "CONTEXT_ICO16x16",
/* Icon with file type or link */ false); // Don't put link to view metadata
Brw_PutIconFile (FileMetadata.FilFolLnk.Type,FileMetadata.FilFolLnk.Name, break;
"CONTEXT_ICO16x16",false); case Brw_IS_FOLDER:
Ico_PutIcon ("folder-yellow.png",Ico_UNCHANGED,
Txt_Folder,"CONTEXT_ICO16x16");
break;
case Brw_IS_LINK:
Ico_PutIcon ("link.svg",Ico_BLACK,
Txt_Link,"CONTEXT_ICO16x16");
break;
default:
break;
}
HTM_TxtF ("&nbsp;%s",FileNameToShow); HTM_TxtF ("&nbsp;%s",FileNameToShow);
HTM_BUTTON_End (); HTM_BUTTON_End ();

3
swad_changelog.h
View File

@ -606,10 +606,11 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate
TODO: Attach pdf files in multimedia. TODO: Attach pdf files in multimedia.
*/ */
#define Log_PLATFORM_VERSION "SWAD 21.83.5 (2022-03-15)" #define Log_PLATFORM_VERSION "SWAD 21.83.6 (2022-03-15)"
#define CSS_FILE "swad21.83.5.css" #define CSS_FILE "swad21.83.5.css"
#define JS_FILE "swad21.78.2.js" #define JS_FILE "swad21.78.2.js"
/* /*
Version 21.83.6: Mar 15, 2022 Working on design of dark theme. (323581 lines)
Version 21.83.5: Mar 15, 2022 Working on design of dark theme. (323559 lines) Version 21.83.5: Mar 15, 2022 Working on design of dark theme. (323559 lines)
Version 21.83.4: Mar 11, 2022 Code refactoring in timetable. (323543 lines) Version 21.83.4: Mar 11, 2022 Code refactoring in timetable. (323543 lines)
Version 21.83.3: Mar 10, 2022 Code refactoring in timetable. (323527 lines) Version 21.83.3: Mar 10, 2022 Code refactoring in timetable. (323527 lines)