From fadf0a41caaa3fb91d5e52d7f9a234af3a8dfb1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 23 Oct 2019 02:18:24 +0200 Subject: [PATCH] Version19.41.4 --- icon/1col.png | Bin 0 -> 1344 bytes icon/2col.png | Bin 0 -> 2383 bytes icon/3col.png | Bin 0 -> 3166 bytes icon/4col.png | Bin 0 -> 2663 bytes swad_changelog.h | 12 +++++++----- swad_match.c | 11 ++++++----- 6 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 icon/1col.png create mode 100644 icon/2col.png create mode 100644 icon/3col.png create mode 100644 icon/4col.png diff --git a/icon/1col.png b/icon/1col.png new file mode 100644 index 0000000000000000000000000000000000000000..449ac57760b131e1c128aaddf9bba64c8eb79aae GIT binary patch literal 1344 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 literal 0 HcmV?d00001 diff --git a/swad_changelog.h b/swad_changelog.h index 7e3d1a1c..a1a67a4b 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.41.3 (2019-10-23)" +#define Log_PLATFORM_VERSION "SWAD 19.41.4 (2019-10-23)" #define CSS_FILE "swad19.41.3.css" #define JS_FILE "swad19.39.js" /* @@ -495,6 +495,7 @@ ps2pdf source.ps destination.pdf // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) // TODO: Change icon to upload file in timeline to photo-video.svg + Version 19.41.4: Oct 23, 2019 Number of cols in match in range [1...4]. (245955 lines) Version 19.41.3: Oct 23, 2019 Changes in layout of matches. (245952 lines) Version 19.41.2: Oct 23, 2019 Display match answers in columns. (245951 lines) Version 19.41.1: Oct 22, 2019 Change number of columns from form. (245944 lines) @@ -506,10 +507,11 @@ INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1802','es','N','Camb ALTER TABLE mch_matches ADD COLUMN NumCols INT NOT NULL DEFAULT 1 AFTER Showing; Version 19.40.5: Oct 22, 2019 New icons to view match in several columns. (245882 lines) - Copy the following 3 icons to icon public directory: -sudo cp -a icon/bars.svg /var/www/html/swad/icon/ -sudo cp -a icon/grip-vertical.svg /var/www/html/swad/icon/ -sudo cp -a icon/th.svg /var/www/html/swad/icon/ + Copy the following 4 icons to icon public directory: +sudo cp -a icon/1col.png /var/www/html/swad/icon/ +sudo cp -a icon/2col.png /var/www/html/swad/icon/ +sudo cp -a icon/3col.png /var/www/html/swad/icon/ +sudo cp -a icon/4col.png /var/www/html/swad/icon/ Version 19.40.4: Oct 22, 2019 New icon to view results in matches. (245838 lines) Copy the following icon to icon public directory: diff --git a/swad_match.c b/swad_match.c index 596d1423..772108dd 100644 --- a/swad_match.c +++ b/swad_match.c @@ -77,7 +77,7 @@ const char *Mch_ShowingStringsDB[Mch_NUM_SHOWING] = "results", }; -#define Mch_MAX_COLS 3 +#define Mch_MAX_COLS 4 #define Mch_NUM_COLS_DEFAULT 1 /*****************************************************************************/ @@ -2355,10 +2355,11 @@ static void Mch_ShowFormColumns (struct Match *Match) unsigned NumCols; static const char *NumColsIcon[1 + Mch_MAX_COLS] = { - "", // Not used - "bars.svg", // 1 column - "grip-vertical.svg", // 2 columns - "th.svg", // 3 columns + "", // Not used + "1col.png", // 1 column + "2col.png", // 2 columns + "3col.png", // 3 columns + "4col.png", // 4 columns }; /***** Begin selector *****/