From e269fbd9b951d3cb46431fe5fb623c026fff9618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 19 Nov 2019 21:59:30 +0100 Subject: [PATCH] Version19.73 --- css/{swad19.71.css => swad19.73.css} | 34 ++++---- icon/filext32x32/zip32x32 - copia.gif | Bin 1576 -> 0 bytes swad_centre.c | 2 +- swad_changelog.h | 5 +- swad_exam.c | 6 +- swad_file_browser.c | 121 +++++++++++++------------- swad_photo.c | 2 +- swad_statistic.c | 3 +- swad_text.c | 21 ----- 9 files changed, 88 insertions(+), 106 deletions(-) rename css/{swad19.71.css => swad19.73.css} (98%) delete mode 100644 icon/filext32x32/zip32x32 - copia.gif diff --git a/css/swad19.71.css b/css/swad19.73.css similarity index 98% rename from css/swad19.71.css rename to css/swad19.73.css index 5c81f959..1f97a925 100644 --- a/css/swad19.71.css +++ b/css/swad19.73.css @@ -1751,13 +1751,13 @@ a:hover /* Default ==> underlined */ { width:16px; height:16px; - margin-top:-2px; + /* margin-top:-2px; */ vertical-align:middle; } .CONTEXT_ICO_x16 { height:16px; - margin-top:-2px; + /* margin-top:-2px; */ vertical-align:middle; } @@ -2032,15 +2032,15 @@ a:hover img.CENTRE_PHOTO_SHOW } /******************************* User's photo ********************************/ -.PHOTO12x16 {width: 12px; height: 16px; border-radius:1px; vertical-align:middle; margin-top:-2px;} -.PHOTO15x20 {width: 15px; height: 20px; border-radius:2px; vertical-align:middle;} -.PHOTO15x20B {width: 15px; height: 20px; border-radius:2px; display:block; margin:0 auto;} -.PHOTO18x24 {width: 18px; height: 24px; border-radius:2px; vertical-align:middle;} -.PHOTO21x28 {width: 21px; height: 28px; border-radius:2px; vertical-align:middle;} -.PHOTO30x40 {width: 30px; height: 40px; border-radius:2px; vertical-align:middle;} -.PHOTO42x56 {width: 42px; height: 56px; border-radius:3px; vertical-align:middle;} -.PHOTO45x60 {width: 45px; height: 60px; border-radius:3px; vertical-align:middle;} -.PHOTO60x80 {width: 60px; height: 80px; border-radius:3px; vertical-align:middle;} +.PHOTO12x16 {width: 12px; height: 16px; border-radius:1px; vertical-align:middle; margin-top:-2px;} +.PHOTO15x20 {width: 15px; height: 20px; border-radius:2px; vertical-align:middle;} +.PHOTO15x20B {width: 15px; height: 20px; border-radius:2px; vertical-align:middle; display:block; margin:0 auto;} +.PHOTO18x24 {width: 18px; height: 24px; border-radius:2px; vertical-align:middle;} +.PHOTO21x28 {width: 21px; height: 28px; border-radius:2px; vertical-align:middle;} +.PHOTO30x40 {width: 30px; height: 40px; border-radius:2px; vertical-align:middle;} +.PHOTO42x56 {width: 42px; height: 56px; border-radius:3px; vertical-align:middle;} +.PHOTO45x60 {width: 45px; height: 60px; border-radius:3px; vertical-align:middle;} +.PHOTO60x80 {width: 60px; height: 80px; border-radius:3px; vertical-align:middle;} .PHOTO186x248 {width:186px; height:248px; border-radius:8px; vertical-align:middle;} .IMG_USR { @@ -2253,7 +2253,7 @@ a:hover img.CENTRE_PHOTO_SHOW white-space:nowrap; overflow:hidden; text-overflow:ellipsis; - } + } .FILENAME_TXT { color:#202020; @@ -2268,16 +2268,18 @@ a:hover img.CENTRE_PHOTO_SHOW box-sizing:border-box; width:100%; } -.LST {color:#202020; font-size:11pt; white-space:nowrap;} -.LST_HID {color:#A0A0A0; font-size:11pt; white-space:nowrap;} -.LST_REC {color:#008000; font-size:11pt; white-space:nowrap;} +.LST {color:#202020; font-size:11pt; white-space:nowrap;} +.LST_HID {color:#A0A0A0; font-size:11pt; white-space:nowrap;} +.LST_REC {color:#008000; font-size:11pt; white-space:nowrap;} .LST_REC_HID {color:#89BE87; font-size:11pt; white-space:nowrap;} -.LST_EDIT {width:250px; color:#202020; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;} +.LST_EDIT {width:250px; color:#202020; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;} .LST_EDIT_HID {width:250px; color:#A0A0A0; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;} .LST_EDIT_REC {width:250px; color:#008000; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;} .LST_EDIT_REC_HID {width:250px; color:#89BE87; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;} .LST_EDIT_ROWS {width:30px; color:#202020; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;} +.LICENSE {max-width:260px;} + /************** Paragraph (margin on top and bottom of a div) ****************/ .PAR { diff --git a/icon/filext32x32/zip32x32 - copia.gif b/icon/filext32x32/zip32x32 - copia.gif deleted file mode 100644 index 2e4e9842c1752ab309f16c8cffb659c1b79be823..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1576 zcmV+@2G{vVNk%w1VITk?0QUd@GFE(WJPSruc2Zh)R$+Z%YH}WWyDeFVJz2_gs!M&eQ+}*qbckYjk7#v+ZF+}ne2im%oP2$XD}%K^fxZi_{0_SL6{F)4 ztNj$U|0RdVHk#N!kl!ty<2#n*E~NN1pyM{7_dB`y4Z!~?!1*}G{6T=ML4mbcf~--4 zv{Qq)P>sA@hqYgbvtNw3S(3eGft_uIoPUIgc#4{3gQH`Ow_%dDV3W9PleBA;yK9)b zcaElekfwB$vT>HXc$vFJi^xoZ#YlzDNsh)wh|)}$+EkarU7g-bpYB_u%~Pk}Pp$7v zu;5yy=uolcU%mcnnaXFH(`cc_YpvCAq|JJx&vK#Caj4aEuiJgA+<3IuZ@TJcxBGLd z=yti{LdN}7!vA!@>3hxck^lgo9RP_x7^N-_tU3XkOc|F|4xUgKiC8j|YzLWYJ)Chp zqfi>KN*1_P0kcsSxLYN+QaG$=5~z0pq;e9xWgMwyFraxpw0keRbUKc7Wq^EprG7x9 zdSudm9mRYl!f#gp|NpRq3%!;qy`d(wj7QLp0@Q;X%7-MvpDf&tILfCn&apAos5a8L zF4nd+&4)(OjY!Y3M%KkI+r%{P!4CGy3iHPi{@Vrm&=cgwJLc9l@ZUWA<_Z4t1?u89 z^y)nO_&tS=mx+>^o|KQ1mYJKKo`jXAhn=*Vo}-STwVI=>kfO7Yqqv@^vYM*8qnVVZ zsHmi@w6dzIv9h$bwz#ypy}G-*hpNnksnL?N$e6p=g0JO>xbKy|?xeNIwYtEb$lQ#= zzK&klEwL!-uvIV%goHp*4EbB+}y#~=E2_l+TP;E;P1-l@z3l1&h`J(=J43_{o>Ne;^X7y z`2GL@00000A^8LW005Z)EC2ui03ZM$000R705b^`$S(>A4+s-_*s;UIuz?UGN{k{e zog6uFGLor7M~4m+NvMb%c}?QLac9s`yOJeFj2Sg#uwbzw$DMQe@{w~R2MacnndlMw zMKnrLqQ8)!z(Ge{zkcAfbYZhA;=WE;A8CCwsH>o_f&fiI(e!E5sk$KUQ3Mu!*^K>!uZneQOb{SAr`k&}>&_##`j4CUF*$5t&wq@4Z>l$Ju<8!t$#V_(1idwA3WnW$6OO&ST}em?2n zuip}(_q?gbMmpp~;7e?{a1zRbp={FNCJ^cdUna-!Fb5oH5QE?<9Cm2Rho+Ds%Ow*& z!Oc17WMf2ZvjpPFi!j2d2q`26D9jx4h-08csLZlRE$m@e3oM9?QsZ-4Xfwwa=|$Az zb++(<$CP>0@|}?rF7b^z%0QIJA)ta< z$f%@_x<@6?Krsd#;ozfBHU3v00Rmr;J^Y47+}Bxy1a7?7SllUKy~{H^iDhMP~46#K9Jx{JI*B0 z!w^pl;Xww*WI{|6?L<6~6#Dd#gcLn|agM9rm=R3^CODCf2K=a;$rSVa@WvZN)UXXc z_fTVn8Xlyfgf|zw"); + "name=\"PlcCod\" class=\"PLC_SEL\""); HTM_OPTION (HTM_Type_STRING,"0", Ctr_EditingCtr->PlcCod == 0,false, "%s",Txt_Another_place); diff --git a/swad_changelog.h b/swad_changelog.h index 0d16cbc2..728a65b5 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -488,13 +488,14 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.72.2 (2019-11-18)" -#define CSS_FILE "swad19.71.css" +#define Log_PLATFORM_VERSION "SWAD 19.73 (2019-11-18)" +#define CSS_FILE "swad19.73.css" #define JS_FILE "swad19.70.js" /* // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) // TODO: Impedir la creación y edición de proyectos si no son editables. + Version 19.73: Nov 18, 2019 Changes in file browser. (247005 lines) Version 19.72.2: Nov 18, 2019 Fixed bugs related to buttons. (247024 lines) Version 19.72.1: Nov 18, 2019 Fixed bugs related to buttons. (247023 lines) Version 19.72: Nov 17, 2019 Converted animated links to buttons. (247014 lines) diff --git a/swad_exam.c b/swad_exam.c index ac2a8a01..c91f5302 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -1211,7 +1211,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_SELECT_End (); HTM_SELECT_Begin (false, - "name=\"ExamMinute\">"); + "name=\"ExamMinute\""); for (Minute = 0; Minute <= 59; Minute++) @@ -1238,7 +1238,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, if (TypeViewExamAnnouncement == Exa_FORM_VIEW) { HTM_SELECT_Begin (false, - "name=\"DurationHour\">"); + "name=\"DurationHour\""); for (Hour = 0; Hour <= 8; Hour++) @@ -1248,7 +1248,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_SELECT_End (); HTM_SELECT_Begin (false, - "name=\"DurationMinute\">"); + "name=\"DurationMinute\""); for (Minute = 0; Minute <= 59; Minute++) diff --git a/swad_file_browser.c b/swad_file_browser.c index e14ad071..ee122d0d 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -1311,9 +1311,9 @@ static void Brw_PutIconFolderWithPlus (const char *FileBrowserId,const char *Row bool Open,bool Hidden); static void Brw_PutIconNewFileOrFolder (void); -static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size, - struct FileMetadata *FileMetadata); -static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *FileName); +static void Brw_PutIconFileWithLinkToViewMetadata (struct FileMetadata *FileMetadata); +static void Brw_PutIconFile (Brw_FileType_t FileType,const char *FileName, + const char *Class,bool Input); static void Brw_PutButtonToDownloadZIPOfAFolder (void); @@ -5593,7 +5593,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId, /***** Indentation depending on level, icon, and file/folder name *****/ /* Start column */ - HTM_TD_Begin ("class=\"NO_BR LT COLOR%u\" style=\"width:99%%;\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"NO_BR LM COLOR%u\" style=\"width:99%%;\"",Gbl.RowEvenOdd); HTM_TABLE_Begin (NULL); HTM_TR_Begin (NULL); @@ -5616,12 +5616,8 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId, /* Icon with folder */ Brw_PutIconFolder (Level,FileBrowserId,RowId,IconThisRow); else // File or link - { /* Icon with file type or link */ - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); - Brw_PutIconFileWithLinkToViewMetadata (16,&FileMetadata); - HTM_TD_End (); - } + Brw_PutIconFileWithLinkToViewMetadata (&FileMetadata); /* Check if is a new file or folder */ // If our last access was before the last modify ==> indicate the file is new by putting a blinking star @@ -5992,7 +5988,7 @@ static void Brw_PutIconFolder (unsigned Level, bool ICanCreate; /***** Start cell *****/ - HTM_TD_Begin ("class=\"LM\" style=\"width:%upx;\"",Level * 20); + HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); /***** Put icon to create a new file or folder *****/ if ((ICanCreate = Brw_CheckIfICanCreateIntoFolder (Level))) // I can create a new file or folder @@ -6131,11 +6127,10 @@ static void Brw_PutIconNewFileOrFolder (void) /*****************************************************************************/ // FileType can be Brw_IS_FILE or Brw_IS_LINK -static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size, - struct FileMetadata *FileMetadata) +static void Brw_PutIconFileWithLinkToViewMetadata (struct FileMetadata *FileMetadata) { - extern const char *Txt_View_data; - char *Class; + /***** Start cell *****/ + HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); /***** Begin form *****/ Frm_StartForm (Brw_ActReqDatFile[Gbl.FileBrowser.Type]); @@ -6144,25 +6139,23 @@ static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size, Brw_IS_UNKNOWN, // Not used FileMetadata->FilCod); - /***** Name and link of the file or folder *****/ - if (asprintf (&Class,"BT_LINK %s",Gbl.FileBrowser.TxtStyle) < 0) - Lay_NotEnoughMemoryExit (); - HTM_BUTTON_Begin (Txt_View_data,Class,NULL); - free (Class); - /***** Icon depending on the file extension *****/ - Brw_PutIconFile (Size,FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name); + Brw_PutIconFile (FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name, + "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16",true); - /***** End link and form *****/ - HTM_BUTTON_End (); + /***** End form *****/ Frm_EndForm (); + + /***** End cell *****/ + HTM_TD_End (); } /*****************************************************************************/ /***************************** Put icon of a file ****************************/ /*****************************************************************************/ -static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *FileName) +static void Brw_PutIconFile (Brw_FileType_t FileType,const char *FileName, + const char *Class,bool Input) { extern const unsigned Ext_NUM_FILE_EXT_ALLOWED; extern const char *Ext_FileExtensionsAllowed[]; @@ -6176,22 +6169,24 @@ static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *F /***** Icon depending on the file extension *****/ if (FileType == Brw_IS_LINK) - Ico_PutIcon ("link.svg",Txt_Link,(Size == 16) ? "CONTEXT_ICO_16x16" : - "ICO40x40"); + { + if (Input) + HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"link.svg",Txt_Link,Class); + else + Ico_PutIcon ("link.svg",Txt_Link,Class); + } else // FileType == Brw_IS_FILE { - if (asprintf (&URL,"%s%ux%u", - CfG_URL_ICON_FILEXT_PUBLIC, - Size,Size) < 0) + if (asprintf (&URL,"%s32x32", + CfG_URL_ICON_FILEXT_PUBLIC) < 0) Lay_NotEnoughMemoryExit (); for (DocType = 0, NotFound = true; DocType < Ext_NUM_FILE_EXT_ALLOWED && NotFound; DocType++) if (Str_FileIs (FileName,Ext_FileExtensionsAllowed[DocType])) { - if (asprintf (&Icon,"%s%ux%u.gif", - Ext_FileExtensionsAllowed[DocType], - Size,Size) < 0) + if (asprintf (&Icon,"%s32x32.gif", + Ext_FileExtensionsAllowed[DocType]) < 0) Lay_NotEnoughMemoryExit (); if (asprintf (&Title,Txt_X_file, Ext_FileExtensionsAllowed[DocType]) < 0) @@ -6200,15 +6195,17 @@ static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *F } if (NotFound) { - if (asprintf (&Icon,"xxx%ux%u.gif",Size,Size) < 0) + if (asprintf (&Icon,"xxx32x32.gif") < 0) Lay_NotEnoughMemoryExit (); if (asprintf (&Title,"%s","") < 0) Lay_NotEnoughMemoryExit (); } - HTM_IMG (URL,Icon,Title, - "class=\"CONTEXT_OPT ICO_HIGHLIGHT %s\"", - (Size == 16) ? "CONTEXT_ICO_16x16" : - "ICO40x40"); + + if (Input) + HTM_INPUT_IMAGE (URL,Icon,Title,Class); + else + HTM_IMG (URL,Icon,Title, + "class=\"%s\"",Class); free (Title); free (Icon); free (URL); @@ -6307,21 +6304,20 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic) Gbl.FileBrowser.TxtStyle); HTM_NBSP (); - HTM_DIV_Begin ("class=\"FILENAME\""); Frm_StartForm (Brw_ActDowFile[Gbl.FileBrowser.Type]); Brw_PutImplicitParamsFileBrowser (); /* Link to the form and to the file */ - if (asprintf (&Class,"BT_LINK %s",Gbl.FileBrowser.TxtStyle) < 0) + if (asprintf (&Class,"BT_LINK FILENAME %s",Gbl.FileBrowser.TxtStyle) < 0) Lay_NotEnoughMemoryExit (); HTM_BUTTON_Begin ((Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS || Gbl.FileBrowser.Type == Brw_SHOW_MRK_GRP) ? Txt_Check_marks_in_the_file : Txt_Download, Class,NULL); - free (Class); HTM_Txt (FileNameToShow); HTM_BUTTON_End (); + free (Class); Frm_EndForm (); /* Put icon to make public/private file */ @@ -6329,7 +6325,6 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic) Ico_PutIconOff ("unlock.svg", Txt_Public_open_educational_resource_OER_for_everyone); - HTM_DIV_End (); HTM_TD_End (); } } @@ -9511,11 +9506,11 @@ void Brw_ShowFileMetadata (void) /***** Filename *****/ HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtF ("%s:",Txt_Filename); HTM_TD_End (); - HTM_TD_Begin ("class=\"DAT LM\""); + HTM_TD_Begin ("class=\"DAT LB\""); Brw_WriteSmallLinkToDownloadFile (URL,&FileMetadata,FileNameToShow); HTM_TD_End (); @@ -9524,11 +9519,11 @@ void Brw_ShowFileMetadata (void) /***** Publisher's data *****/ HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtF ("%s:",Txt_Uploaded_by); HTM_TD_End (); - HTM_TD_Begin ("class=\"DAT LM\""); + HTM_TD_Begin ("class=\"DAT LB\""); if (FileHasPublisher) { /* Show photo */ @@ -9538,6 +9533,7 @@ void Brw_ShowFileMetadata (void) "PHOTO15x20",Pho_ZOOM,false); /* Write name */ + HTM_NBSP (); HTM_Txt (PublisherUsrDat.FullName); } else @@ -9555,11 +9551,11 @@ void Brw_ShowFileMetadata (void) Fil_WriteFileSizeFull ((double) FileMetadata.Size,FileSizeStr); HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtF ("%s:",Txt_File_size); HTM_TD_End (); - HTM_TD_Begin ("class=\"DAT LM\""); + HTM_TD_Begin ("class=\"DAT LB\""); HTM_Txt (FileSizeStr); HTM_TD_End (); @@ -9568,11 +9564,11 @@ void Brw_ShowFileMetadata (void) /***** Write the date *****/ HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtF ("%s:",Txt_Date_of_creation); HTM_TD_End (); - HTM_TD_Begin ("id=\"filedate\" class=\"DAT LM\""); + HTM_TD_Begin ("id=\"filedate\" class=\"DAT LB\""); Dat_WriteLocalDateHMSFromUTC ("filedate",FileMetadata.Time, Gbl.Prefs.DateFormat,Dat_SEPARATOR_COMMA, true,true,true,0x7); @@ -9583,14 +9579,14 @@ void Brw_ShowFileMetadata (void) /***** Private or public? *****/ HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"RM\""); + HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"PublicFile\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtF ("%s:",Txt_Availability); HTM_LABEL_End (); HTM_TD_End (); - HTM_TD_Begin ("class=\"DAT LM\""); + HTM_TD_Begin ("class=\"DAT LB\""); if (ICanChangePublic) // I can change file to public { HTM_SELECT_Begin (false, @@ -9624,7 +9620,7 @@ void Brw_ShowFileMetadata (void) if (ICanEdit) // I can edit file properties { HTM_SELECT_Begin (false, - "id=\"License\" name=\"License\">"); + "id=\"License\" name=\"License\" class=\"LICENSE\""); for (License = 0; License < Brw_NUM_LICENSES; License++) @@ -9647,11 +9643,11 @@ void Brw_ShowFileMetadata (void) { HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtF ("%s:",Txt_My_views); HTM_TD_End (); - HTM_TD_Begin ("class=\"DAT LM\""); + HTM_TD_Begin ("class=\"DAT LB\""); HTM_Unsigned (FileMetadata.NumMyViews); HTM_TD_End (); @@ -9661,11 +9657,11 @@ void Brw_ShowFileMetadata (void) /***** Write number of identificated views *****/ HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtF ("%s:",Txt_Identified_views); HTM_TD_End (); - HTM_TD_Begin ("class=\"DAT LM\""); + HTM_TD_Begin ("class=\"DAT LB\""); HTM_TxtF ("%u ",FileMetadata.NumViewsFromLoggedUsrs); HTM_TxtF ("(%u %s)", FileMetadata.NumLoggedUsrs, @@ -9678,11 +9674,11 @@ void Brw_ShowFileMetadata (void) /***** Write number of public views *****/ HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtF ("%s:",Txt_Public_views); HTM_TD_End (); - HTM_TD_Begin ("class=\"DAT LM\""); + HTM_TD_Begin ("class=\"DAT LB\""); HTM_Unsigned (FileMetadata.NumPublicViews); HTM_TD_End (); @@ -10029,7 +10025,8 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL, /* Link begin */ HTM_BUTTON_Begin (Txt_Check_marks_in_the_file,"BT_LINK FILENAME_TXT",NULL); - Brw_PutIconFile (32,FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name); + Brw_PutIconFile (FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name, + "ICO40x40",false); /* Name of the file of marks, link end and form end */ HTM_TxtF (" %s ",FileNameToShow); @@ -10045,7 +10042,8 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL, /* Put anchor and filename */ HTM_A_Begin ("href=\"%s\" class=\"FILENAME_TXT\" title=\"%s\" target=\"_blank\"", URL,Title); - Brw_PutIconFile (32,FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name); + Brw_PutIconFile (FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name, + "ICO40x40",false); HTM_TxtF (" %s ",FileNameToShow); Ico_PutIcon ("download.svg",Title,"ICO40x40"); HTM_A_End (); @@ -12091,7 +12089,8 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) Ico_PutIcon ("folder-yellow.png",Txt_Folder,"CONTEXT_ICO_16x16"); else /* Icon with file type or link */ - Brw_PutIconFile (16,FileMetadata.FilFolLnk.Type,FileMetadata.FilFolLnk.Name); + Brw_PutIconFile (FileMetadata.FilFolLnk.Type,FileMetadata.FilFolLnk.Name, + "CONTEXT_ICO_16x16",false); HTM_TxtF (" %s",FileNameToShow); HTM_BUTTON_End (); diff --git a/swad_photo.c b/swad_photo.c index 288b7c02..b26bc11c 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -1191,7 +1191,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL, else Frm_StartForm (ActSeeOthPubPrf); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - HTM_BUTTON_Begin (NULL,"BT_LINK",NULL); + HTM_BUTTON_Begin (NULL,"BT_LINK CM",NULL); } /***** Hidden div to pass user's name to Javascript *****/ diff --git a/swad_statistic.c b/swad_statistic.c index 749e7770..c0921a60 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -455,7 +455,8 @@ void Sta_AskShowCrsHits (void) HTM_TxtF ("(%s: ",Txt_results_per_page); HTM_SELECT_Begin (false, "id=\"RowsPage\" name=\"RowsPage\"%s", - Gbl.Stat.ClicksGroupedBy == Sta_CLICKS_CRS_DETAILED_LIST ? "" : " disabled=\"disabled\""); + Gbl.Stat.ClicksGroupedBy == Sta_CLICKS_CRS_DETAILED_LIST ? "" : + " disabled=\"disabled\""); for (i = 0; i < NUM_OPTIONS_ROWS_PER_PAGE; i++) diff --git a/swad_text.c b/swad_text.c index e2133ba8..7a4ec634 100644 --- a/swad_text.c +++ b/swad_text.c @@ -52569,27 +52569,6 @@ const char *Txt_View_attendance = "Ver presença"; #endif -const char *Txt_View_data = -#if L==1 // ca - "Veure dades"; -#elif L==2 // de - "Siehe Daten"; -#elif L==3 // en - "View data"; -#elif L==4 // es - "Ver datos"; -#elif L==5 // fr - "Voir les données"; -#elif L==6 // gn - "Ver datos"; // Okoteve traducción -#elif L==7 // it - "Visualizza i dati"; -#elif L==8 // pl - "Zobacz dane"; -#elif L==9 // pt - "Ver os dados"; -#endif - const char *Txt_View_email_addresses = #if L==1 // ca "Veure adreces de correu";