From cd58031c02dee74a12556c5095fa957b7e2e2d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 20 Feb 2019 17:18:13 +0100 Subject: [PATCH] Version 18.52 --- css/{swad18.41.1.css => swad18.52.css} | 294 +++++++++++++++---------- icon/sign-in-alt-green.svg | 2 +- icon/sign-in-alt-white.svg | 1 + icon/sign-out-alt-red.svg | 2 +- icon/sign-out-alt-white.svg | 1 + icon/theme/blue/sitemap.svg | 2 +- icon/theme/pink/bell.svg | 1 + icon/theme/pink/sitemap.svg | 1 + icon/theme/pink/theme_32x20.gif | Bin 0 -> 120 bytes icon/theme/purple/bell.svg | 1 + icon/theme/purple/sitemap.svg | 1 + icon/theme/purple/theme_32x20.gif | Bin 0 -> 120 bytes icon/theme/yellow/sitemap.svg | 2 +- icon/theme/yellow/theme_32x20.gif | Bin 134 -> 120 bytes swad_changelog.h | 62 +++++- swad_layout.c | 4 + swad_menu.c | 10 +- swad_tab.c | 2 + swad_theme.c | 163 ++++++++------ swad_theme.h | 12 +- swad_user.c | 4 +- 21 files changed, 363 insertions(+), 202 deletions(-) rename css/{swad18.41.1.css => swad18.52.css} (89%) create mode 100644 icon/sign-in-alt-white.svg create mode 100644 icon/sign-out-alt-white.svg create mode 100644 icon/theme/pink/bell.svg create mode 100644 icon/theme/pink/sitemap.svg create mode 100644 icon/theme/pink/theme_32x20.gif create mode 100644 icon/theme/purple/bell.svg create mode 100644 icon/theme/purple/sitemap.svg create mode 100644 icon/theme/purple/theme_32x20.gif diff --git a/css/swad18.41.1.css b/css/swad18.52.css similarity index 89% rename from css/swad18.41.1.css rename to css/swad18.52.css index 130a61b46..3beebd5db 100644 --- a/css/swad18.41.1.css +++ b/css/swad18.52.css @@ -123,19 +123,37 @@ a:hover /* Default ==> underlined */ } .HEAD_ROW_1_GREY { - background-image:-webkit-linear-gradient(#383838 0,#383838 26px,#404040 100%); /* Safari */ - background-image:linear-gradient(#383838 0,#383838 26px,#404040 100%); + background-image:-webkit-linear-gradient(#383838 0,#404040 100%); /* Safari */ + background-image:linear-gradient(#383838 0,#404040 100%); + background-repeat:no-repeat; + } +.HEAD_ROW_1_PURPLE + { + background-image:-webkit-linear-gradient(#812b5a 0,#874c80 100%); /* Safari */ + background-image:linear-gradient(#812b5a, #874c80 100%); background-repeat:no-repeat; } .HEAD_ROW_1_BLUE { - background-image:-webkit-linear-gradient(#5fa5df 0,#4f90c8 26px,#4f90c8 100%); /* Safari */ - background-image:linear-gradient(#5fa5df 0,#4f90c8 26px,#4f90c8 100%); - background-repeat:no-repeat; + background-color:#3781c1; } .HEAD_ROW_1_YELLOW { - background-color:#201420; + background-image:-webkit-linear-gradient(#292229 0,#302830 100%); /* Safari */ + background-image:linear-gradient(#292229 0,#302830 100%); + background-repeat:no-repeat; + } +.HEAD_ROW_1_PINK + { + background-image:-webkit-linear-gradient(#bf667f 0,#c86b85 100%); /* Safari */ + background-image:linear-gradient(#bf667f 0,#c86b85 100%); + background-repeat:no-repeat; + } +.HEAD_ROW_1_PINK + { + background-image:-webkit-linear-gradient(#8e5e8f 0,#ab5c84 100%); /* Safari */ + background-image:linear-gradient(#8e5e8f 0,#ab5c84 100%); + background-repeat:no-repeat; } #head_row_1_left @@ -157,7 +175,7 @@ a:hover /* Default ==> underlined */ #head_row_1_tagline { display:none; - } + } } @media only screen and (min-width: 1024px) { /* For tablets and desktop */ @@ -182,10 +200,12 @@ a:hover /* Default ==> underlined */ vertical-align:middle; } } -.WHITE_TAGLINE {color:#B0B0B0;} -.GREY_TAGLINE {color:#E0E0E0;} -.BLUE_TAGLINE {color:#BAD2DA;} -.YELLOW_TAGLINE {color:#B3B0B3;} +.TAGLINE_WHITE {color:#b0b0b0;} +.TAGLINE_GREY {color:#e0e0e0;} +.TAGLINE_PURPLE {color:#e0e0e0;} +.TAGLINE_BLUE {color:#bad2da;} +.TAGLINE_YELLOW {color:#b3b0b3;} +.TAGLINE_PINK {color:#e8e8e8;} #head_row_1_search { @@ -197,7 +217,7 @@ a:hover /* Default ==> underlined */ #head_search_text { display:none; - } + } } @media only screen and (max-width: 480px) @@ -230,10 +250,12 @@ a:hover /* Default ==> underlined */ text-overflow:ellipsis; } } -.WHITE_USR {color:#E0E0E0; font-size:15pt; font-weight:bold; white-space:nowrap;} -.GREY_USR {color:#E0E0E0; font-size:15pt; font-weight:bold; white-space:nowrap;} -.BLUE_USR {color:white; font-size:15pt; font-weight:bold; white-space:nowrap;} -.YELLOW_USR {color:#B3B0B3; font-size:15pt; font-weight:bold; white-space:nowrap;} +.USR_WHITE {color:#b0b0b0; font-size:15pt; font-weight:bold; white-space:nowrap;} +.USR_GREY {color:#e0e0e0; font-size:15pt; font-weight:bold; white-space:nowrap;} +.USR_PURPLE {color:#e0e0e0; font-size:15pt; font-weight:bold; white-space:nowrap;} +.USR_BLUE {color:white; font-size:15pt; font-weight:bold; white-space:nowrap;} +.USR_YELLOW {color:#b3b0b3; font-size:15pt; font-weight:bold; white-space:nowrap;} +.USR_PINK {color:white; font-size:15pt; font-weight:bold; white-space:nowrap;} #head_row_1_right { @@ -264,13 +286,27 @@ a:hover /* Default ==> underlined */ { background-color:#404040; } +.HEAD_ROW_2_PURPLE + { + background-image:-webkit-linear-gradient(#874c80 0,#a070a1 100%); /* Safari */ + background-image:linear-gradient(#874c80 0,#a070a1 100%); + background-repeat:no-repeat; + } .HEAD_ROW_2_BLUE { - background-color:#4f90c8; + background-image:-webkit-linear-gradient(#3781c1 0,#4f90c8 100%); /* Safari */ + background-image:linear-gradient(#3781c1 0,#4f90c8 100%); + background-repeat:no-repeat; } .HEAD_ROW_2_YELLOW { - background-color:#201420; + background-color:#302830; + } +.HEAD_ROW_2_PINK + { + background-image:-webkit-linear-gradient(#ab5c84 0,#c86b85 100%); /* Safari */ + background-image:linear-gradient(#ab5c84 0,#c86b85 100%); + background-repeat:no-repeat; } /******************************* Current time ********************************/ @@ -416,13 +452,15 @@ a:hover /* Default ==> underlined */ } } -.BC_SEMIOFF {opacity:0.67;} -.BC_OFF {opacity:0.33;} +.BC_SEMIOFF {opacity:0.7;} +.BC_OFF {opacity:0.3;} .BC_WHITE {color:#707070;} -.BC_GREY {color:#FFB42E;} -.BC_BLUE {color:#FFE880;} -.BC_YELLOW {color:#FFC040;} +.BC_GREY {color:#ffb42e;} +.BC_PURPLE {color:#ffc040;} +.BC_BLUE {color:#ffc040;} +.BC_YELLOW {color:#ffb42e;} +.BC_PINK {color:#ffc040;} .BC_ICON { @@ -483,10 +521,12 @@ a:hover /* Default ==> underlined */ vertical-align:middle; } } -.WHITE_COURSE {color:#4D88A1;} -.GREY_COURSE {color:#F7F6F5;} -.BLUE_COURSE {color:white;} -.YELLOW_COURSE {color:white;} +.MAIN_TITLE_WHITE {color:#4d88a1;} +.MAIN_TITLE_GREY {color:#f7f6f5;} +.MAIN_TITLE_PURPLE {color:white;} +.MAIN_TITLE_BLUE {color:white;} +.MAIN_TITLE_YELLOW {color:white;} +.MAIN_TITLE_PINK {color:white;} #my_courses { width:130px; @@ -508,19 +548,21 @@ a:hover /* Default ==> underlined */ #msg { display:none; - } + } } @media only screen and (min-width: 1024px) and (max-width: 1280px) { /* For tablets */ #notif_all { display:none; - } + } } -.WHITE_NOTIF {color:#707070; font-size:12pt; white-space:nowrap;} -.GREY_NOTIF {color:#E0E0E0; font-size:12pt; white-space:nowrap;} -.BLUE_NOTIF {color:white; font-size:12pt; white-space:nowrap;} -.YELLOW_NOTIF {color:#B3B0B3; font-size:12pt; white-space:nowrap;} +.NOTIF_WHITE {color:#707070; font-size:12pt; white-space:nowrap;} +.NOTIF_GREY {color:#e0e0e0; font-size:12pt; white-space:nowrap;} +.NOTIF_PURPLE {color:#e0e0e0; font-size:12pt; white-space:nowrap;} +.NOTIF_BLUE {color:white; font-size:12pt; white-space:nowrap;} +.NOTIF_YELLOW {color:#b3b0b3; font-size:12pt; white-space:nowrap;} +.NOTIF_PINK {color:white; font-size:12pt; white-space:nowrap;} /******************* Layout (third heading row with tabs) ********************/ .HEAD_ROW_3_WHITE @@ -532,6 +574,11 @@ a:hover /* Default ==> underlined */ background-image:-webkit-linear-gradient(#404040 0,#404040 54px,white 54px,white 100%); /* Safari */ background-image:linear-gradient(#404040 0,#404040 54px,white 54px,white 100%); } +.HEAD_ROW_3_PURPLE + { + background-image:-webkit-linear-gradient(#a070a1 0,#a070a1 54px,white 54px,white 100%); /* Safari */ + background-image:linear-gradient(#a070a1 0,#a070a1 54px,white 54px,white 100%); + } .HEAD_ROW_3_BLUE { background-image:-webkit-linear-gradient(#4f90c8 0,#4f90c8 54px,white 54px,white 100%); /* Safari */ @@ -539,8 +586,13 @@ a:hover /* Default ==> underlined */ } .HEAD_ROW_3_YELLOW { - background-image:-webkit-linear-gradient(#201420 0,#201420 54px,white 54px,white 100%); /* Safari */ - background-image:linear-gradient(#201420 0,#201420 54px,white 54px,white 100%); + background-image:-webkit-linear-gradient(#302830 0,#302830 54px,white 54px,white 100%); /* Safari */ + background-image:linear-gradient(#302830 0,#302830 54px,white 54px,white 100%); + } +.HEAD_ROW_3_PINK + { + background-image:-webkit-linear-gradient(#c86b85 0,#c86b85 54px,white 54px,white 100%); /* Safari */ + background-image:linear-gradient(#c86b85 0,#c86b85 54px,white 54px,white 100%); } @media only screen and (max-width: 480px) { /* For mobile-phones */ @@ -690,39 +742,36 @@ a:hover /* Default ==> underlined */ } } -.TAB_ON_WHITE {background-color:rgba(247, 246, 245, 0.99);} -.TAB_ON_GREY {background-color:rgba(247, 246, 245, 0.99);} -.TAB_ON_BLUE {background-color:rgba(232, 243, 246, 0.99);} -.TAB_ON_YELLOW {background-color:rgba(255, 242, 189, 0.99);} +.TAB_ON_WHITE {background-color:#f7f6f5;} +.TAB_ON_GREY {background-color:#f7f6f5;} +.TAB_ON_PURPLE {background-color:#fdf3f3;} +.TAB_ON_BLUE {background-color:#e8f3f6;} +.TAB_ON_YELLOW {background-color:#faf0da;} +.TAB_ON_PINK {background-color:#f5ede6;} -.TAB_OFF_WHITE {background-color:#D4D4D4;} -.TAB_OFF_GREY {background-color:#AEA79F;} -.TAB_OFF_BLUE {background-color:#CAE1E8;} -.TAB_OFF_YELLOW {background-color:#FADE94;} +.TAB_OFF_WHITE {background-color:#d4d4d4;} +.TAB_OFF_GREY {background-color:#aea79f;} +.TAB_OFF_PURPLE {background-color:#f2dada;} +.TAB_OFF_BLUE {background-color:#cae1e8;} +.TAB_OFF_YELLOW {background-color:#f4dfb2;} +.TAB_OFF_PINK {background-color:#f3dcca;} -.WHITE_TAB_OFF {color:#707070;} -.GREY_TAB_OFF {color:#505050;} -.BLUE_TAB_OFF {color:#365E6E;} -.YELLOW_TAB_OFF {color:#4A2E19;} +.TAB_OFF_TXT_WHITE {color:#707070;} +.TAB_OFF_TXT_GREY {color:#505050;} +.TAB_OFF_TXT_PURPLE {color:#505050;} +.TAB_OFF_TXT_BLUE {color:#365e6e;} +.TAB_OFF_TXT_YELLOW {color:#4a2e19;} +.TAB_OFF_TXT_PINK {color:#505050;} -.WHITE_TAB_ON {color:#4D88A1;} -.GREY_TAB_ON {color:#606060;} -.BLUE_TAB_ON {color:#4D88A1;} -.YELLOW_TAB_ON {color:#BD4815;} +.TAB_ON_TXT_WHITE {color:#4d88A1;} +.TAB_ON_TXT_GREY {color:#606060;} +.TAB_ON_TXT_PURPLE {color:#573c4d;} +.TAB_ON_TXT_BLUE {color:#4d88A1;} +.TAB_ON_TXT_YELLOW {color:#7c4d2a;} +.TAB_ON_TXT_PINK {color:#63474e;} -/* .TAB_ICO { - width:32px; - height:32px; - vertical-align:middle; - margin-top:2px; - padding:2px 0; - } -*/ -.TAB_ICO - { - /* width:32px; */ height:32px; vertical-align:middle; margin-top:2px; @@ -868,7 +917,7 @@ a:hover /* Default ==> underlined */ } #main_horizontal .MENU_OPT_OFF { - opacity:0.6; + opacity:0.7; } #main_horizontal .MENU_OPT_OFF:hover, #main_horizontal .MENU_OPT_ON { @@ -937,7 +986,7 @@ a:hover /* Default ==> underlined */ } #main_vertical .MENU_OPT_OFF { - opacity:0.6; + opacity:0.7; } #main_vertical .MENU_OPT_OFF:hover, #main_vertical .MENU_OPT_ON { @@ -1004,7 +1053,7 @@ a:hover /* Default ==> underlined */ } #main_vertical .MENU_OPT_OFF { - opacity:0.6; + opacity:0.7; } #main_vertical .MENU_OPT_OFF:hover, #main_vertical .MENU_OPT_ON { @@ -1071,26 +1120,27 @@ a:hover /* Default ==> underlined */ } } -.WHITE_MENU_OFF {color:#4D88A1;} -.GREY_MENU_OFF {color:#707070;} -.BLUE_MENU_OFF {color:#4D88A1;} -.YELLOW_MENU_OFF {color:#BD4815;} - -.WHITE_MENU_ON {color:#4D88A1;} -.GREY_MENU_ON {color:#606060;} -.BLUE_MENU_ON {color:#4D88A1;} -.YELLOW_MENU_ON {color:#BD4815;} +.MENU_TXT_WHITE {color:#4D88a1;} +.MENU_TXT_GREY {color:#606060;} +.MENU_TXT_PURPLE {color:#573c4d;} +.MENU_TXT_BLUE {color:#4D88a1;} +.MENU_TXT_YELLOW {color:#7c4d2a;} +.MENU_TXT_PINK {color:#63474e;} /****************** Title of current action in main block ********************/ -.WHITE_TITLE_ACTION {color:#606060; font-size:20pt;} -.GREY_TITLE_ACTION {color:#606060; font-size:20pt;} -.BLUE_TITLE_ACTION {color:#4D88A1; font-size:20pt;} -.YELLOW_TITLE_ACTION {color:#BD4815; font-size:20pt;} +.TITLE_ACTION_WHITE {color:#606060; font-size:20pt;} +.TITLE_ACTION_GREY {color:#606060; font-size:20pt;} +.TITLE_ACTION_PURPLE {color:#573c4d; font-size:20pt;} +.TITLE_ACTION_BLUE {color:#4D88A1; font-size:20pt;} +.TITLE_ACTION_YELLOW {color:#7c4d2a; font-size:20pt;} +.TITLE_ACTION_PINK {color:#63474e; font-size:20pt;} -.WHITE_SUBTITLE_ACTION {color:#606060; font-size:12pt;} -.GREY_SUBTITLE_ACTION {color:#606060; font-size:12pt;} -.BLUE_SUBTITLE_ACTION {color:#4D88A1; font-size:12pt;} -.YELLOW_SUBTITLE_ACTION {color:#BD4815; font-size:12pt;} +.SUBTITLE_ACTION_WHITE {color:#606060; font-size:12pt;} +.SUBTITLE_ACTION_GREY {color:#606060; font-size:12pt;} +.SUBTITLE_ACTION_PURPLE {color:#573c4d; font-size:12pt;} +.SUBTITLE_ACTION_BLUE {color:#4D88A1; font-size:12pt;} +.SUBTITLE_ACTION_YELLOW {color:#7c4d2a; font-size:12pt;} +.SUBTITLE_ACTION_PINK {color:#63474e; font-size:12pt;} /***************************** Users connected *******************************/ .CONNECTED @@ -1524,8 +1574,8 @@ a:hover /* Default ==> underlined */ box-sizing:border-box; margin:8px auto; padding:12px; - /* background-color:#FFF9EA; */ - background-color:#FFF3D4; + /* background-color:#fff3d4; */ + background-color:#fff8e5; border-radius:2px; box-shadow: 0 2px 2px 0 rgba(124,121,109,0.14), 0 2px 1px -2px rgba(124,121,109,0.2), 0 1px 5px 0 rgba(124,121,109,0.12); } @@ -1943,10 +1993,12 @@ a:hover img.CENTRE_PHOTO_SHOW .USR_LIST_NUM_N {color:#404040; font-size:15pt; font-weight:bold;} /*****************************************************************************/ -.WHITE_TITLE {color:#505050; font-size:18pt;} -.GREY_TITLE {color:#505050; font-size:18pt;} -.BLUE_TITLE {color:#4D88A1; font-size:18pt;} -.YELLOW_TITLE {color:#BD4815; font-size:18pt;} +.TITLE_WHITE {color:#505050; font-size:18pt;} +.TITLE_GREY {color:#505050; font-size:18pt;} +.TITLE_PURPLE {color:#573c4d; font-size:18pt;} +.TITLE_BLUE {color:#4D88A1; font-size:18pt;} +.TITLE_YELLOW {color:#7c4d2a; font-size:18pt;} +.TITLE_PINK {color:#63474e; font-size:18pt;} /*********************** Icon and checkbox highlighting **********************/ .ICO_HIDDEN @@ -1972,42 +2024,50 @@ a:hover img.CENTRE_PHOTO_SHOW } /********************************* Form fonts ********************************/ -.WHITE_FORM {color:#4D88A1; font-size:13pt;} -.GREY_FORM {color:#4D88A1; font-size:13pt;} -.BLUE_FORM {color:#4D88A1; font-size:13pt;} -.YELLOW_FORM {color:#7C4D2A; font-size:13pt;} +.FORM_WHITE {color:#4D88A1; font-size:13pt;} +.FORM_GREY {color:#4D88A1; font-size:13pt;} +.FORM_PURPLE {color:#4D88A1; font-size:13pt;} +.FORM_BLUE {color:#4D88A1; font-size:13pt;} +.FORM_YELLOW {color:#7C4D2A; font-size:13pt;} +.FORM_PINK {color:#4D88A1; font-size:13pt;} -.WHITE_FORM_DARK {color:#365E6E; font-size:13pt;} -.GREY_FORM_DARK {color:#365E6E; font-size:13pt;} -.BLUE_FORM_DARK {color:#365E6E; font-size:13pt;} -.YELLOW_FORM_DARK {color:#4A2E19; font-size:13pt;} +.FORM_DARK_WHITE {color:#365E6E; font-size:13pt;} +.FORM_DARK_GREY {color:#365E6E; font-size:13pt;} +.FORM_DARK_PURPLE {color:#365E6E; font-size:13pt;} +.FORM_DARK_BLUE {color:#365E6E; font-size:13pt;} +.FORM_DARK_YELLOW {color:#4A2E19; font-size:13pt;} +.FORM_DARK_PINK {color:#365E6E; font-size:13pt;} -.WHITE_FORM_NOWRAP {color:#4D88A1; font-size:13pt; white-space:nowrap;} -.GREY_FORM_NOWRAP {color:#4D88A1; font-size:13pt; white-space:nowrap;} -.BLUE_FORM_NOWRAP {color:#4D88A1; font-size:13pt; white-space:nowrap;} -.YELLOW_FORM_NOWRAP {color:#7C4D2A; font-size:13pt; white-space:nowrap;} +.FORM_NOWRAP_WHITE {color:#4D88A1; font-size:13pt; white-space:nowrap;} +.FORM_NOWRAP_GREY {color:#4D88A1; font-size:13pt; white-space:nowrap;} +.FORM_NOWRAP_PURPLE {color:#4D88A1; font-size:13pt; white-space:nowrap;} +.FORM_NOWRAP_BLUE {color:#4D88A1; font-size:13pt; white-space:nowrap;} +.FORM_NOWRAP_YELLOW {color:#7C4D2A; font-size:13pt; white-space:nowrap;} +.FORM_NOWRAP_PINK {color:#4D88A1; font-size:13pt; white-space:nowrap;} -.WHITE_FORM_BOLD {color:#4D88A1; font-size:13pt; font-weight:bold;} -.GREY_FORM_BOLD {color:#4D88A1; font-size:13pt; font-weight:bold;} -.BLUE_FORM_BOLD {color:#4D88A1; font-size:13pt; font-weight:bold;} -.YELLOW_FORM_BOLD {color:#7C4D2A; font-size:13pt; font-weight:bold;} +.FORM_BOLD_WHITE {color:#4D88a1; font-size:13pt; font-weight:bold;} +.FORM_BOLD_GREY {color:#4D88a1; font-size:13pt; font-weight:bold;} +.FORM_BOLD_PURPLE {color:#573c4d; font-size:13pt; font-weight:bold;} +.FORM_BOLD_BLUE {color:#4D88a1; font-size:13pt; font-weight:bold;} +.FORM_BOLD_YELLOW {color:#7c4d2a; font-size:13pt; font-weight:bold;} +.FORM_BOLD_PINK {color:#63474e; font-size:13pt; font-weight:bold;} /****************************** Placing of objects ***************************/ .LEFT_TOP {text-align:left; vertical-align:top;} -.LEFT_MIDDLE {text-align:left; vertical-align:middle;} -.LEFT_BOTTOM {text-align:left; vertical-align:bottom;} +.LEFT_MIDDLE {text-align:left; vertical-align:middle;} +.LEFT_BOTTOM {text-align:left; vertical-align:bottom;} .CENTER_TOP {text-align:center; vertical-align:top;} -.CENTER_MIDDLE {text-align:center; vertical-align:middle;} -.CENTER_BOTTOM {text-align:center; vertical-align:bottom;} +.CENTER_MIDDLE {text-align:center; vertical-align:middle;} +.CENTER_BOTTOM {text-align:center; vertical-align:bottom;} .RIGHT_TOP {text-align:right; vertical-align:top;} -.RIGHT_MIDDLE {text-align:right; vertical-align:middle;} -.RIGHT_BOTTOM {text-align:right; vertical-align:bottom;} +.RIGHT_MIDDLE {text-align:right; vertical-align:middle;} +.RIGHT_BOTTOM {text-align:right; vertical-align:bottom;} /***************** Colors used in headers,backgrounds,etc. *****************/ -.COLOR0 {background-color:#F4F2EA;} -.COLOR1 {background-color:#FBFAF7;} +.COLOR0 {background-color:#F4F2EA;} +.COLOR1 {background-color:#FBFAF7;} .LIGHT_GREEN {background-color:#C0FF40;} -.LIGHT_BLUE {background-color:#DDECF1;} +.LIGHT_BLUE {background-color:#DDECF1;} .VERY_LIGHT_BLUE {background-color:#EAF3F6;} /********************************* Course info *******************************/ @@ -2121,7 +2181,7 @@ a:hover img.CENTRE_PHOTO_SHOW border-width:1px; } -.DAT_SMALL {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#606060; font-size:12pt;} +.DAT_SMALL {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#606060; font-size:12pt;} .DAT_SMALL_LIGHT {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#A0A0A0; font-size:12pt;} .DAT_SMALL_NOBR {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#606060; font-size:12pt; white-space:nowrap;} .DAT_SMALL_N {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:black; font-size:12pt;} @@ -2129,9 +2189,11 @@ a:hover img.CENTRE_PHOTO_SHOW .DAT_SMALL_GREY {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:12pt;} .DAT_SMALL_RED {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:red; font-size:12pt;} +.DAT_SMALL_PURPLE {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:12pt;} .DAT_SMALL_GREEN {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#008000; font-size:12pt;} .DAT_SMALL_BLUE {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#0080FF; font-size:12pt;} .DAT_SMALL_YELLOW {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#C0C000; font-size:12pt;} +.DAT_SMALL_PINK {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:12pt;} /******************************** User's IDs *********************************/ .USR_ID {font-size:18pt; font-weight:bold;} @@ -2614,7 +2676,7 @@ a:hover img.CENTRE_PHOTO_SHOW box-sizing:border-box; width:100%; padding:25px 25px 125px 25px; - opacity:0.33; + opacity:0.3; } /****************************** Image uploading ******************************/ @@ -3210,7 +3272,7 @@ a.PAG:hover, .PAG_CUR background-size:16px 16px; background-repeat:no-repeat; background-position:left center; - opacity:0.67; + opacity:0.7; } #following_side diff --git a/icon/sign-in-alt-green.svg b/icon/sign-in-alt-green.svg index 372073959..f881948e4 100644 --- a/icon/sign-in-alt-green.svg +++ b/icon/sign-in-alt-green.svg @@ -1 +1 @@ - + diff --git a/icon/sign-in-alt-white.svg b/icon/sign-in-alt-white.svg new file mode 100644 index 000000000..a66fed3d9 --- /dev/null +++ b/icon/sign-in-alt-white.svg @@ -0,0 +1 @@ + diff --git a/icon/sign-out-alt-red.svg b/icon/sign-out-alt-red.svg index 3fb99cc5b..384880a9f 100644 --- a/icon/sign-out-alt-red.svg +++ b/icon/sign-out-alt-red.svg @@ -1 +1 @@ - + diff --git a/icon/sign-out-alt-white.svg b/icon/sign-out-alt-white.svg new file mode 100644 index 000000000..6ffd6a88e --- /dev/null +++ b/icon/sign-out-alt-white.svg @@ -0,0 +1 @@ + diff --git a/icon/theme/blue/sitemap.svg b/icon/theme/blue/sitemap.svg index e027b420f..3a2c9493c 100644 --- a/icon/theme/blue/sitemap.svg +++ b/icon/theme/blue/sitemap.svg @@ -1 +1 @@ - + diff --git a/icon/theme/pink/bell.svg b/icon/theme/pink/bell.svg new file mode 100644 index 000000000..7b0caf0fd --- /dev/null +++ b/icon/theme/pink/bell.svg @@ -0,0 +1 @@ + diff --git a/icon/theme/pink/sitemap.svg b/icon/theme/pink/sitemap.svg new file mode 100644 index 000000000..3a2c9493c --- /dev/null +++ b/icon/theme/pink/sitemap.svg @@ -0,0 +1 @@ + diff --git a/icon/theme/pink/theme_32x20.gif b/icon/theme/pink/theme_32x20.gif new file mode 100644 index 0000000000000000000000000000000000000000..5efea118cfbc9e4c0cb1e5c1906ad2a0ca397da3 GIT binary patch literal 120 zcmZ?wbhEHbRA3NcSjfx(1ShgvzrK4`5|7 zH8gC#w}<(5>!NSG*E@=y&fIp;>u6Cb*SFs1zxKWR*Z-Qa-AeJJhJjN1si*5-K8aj( XM)PatUa#z1Z{Juab{y|wVz34PnMySd literal 0 HcmV?d00001 diff --git a/icon/theme/purple/bell.svg b/icon/theme/purple/bell.svg new file mode 100644 index 000000000..7b0caf0fd --- /dev/null +++ b/icon/theme/purple/bell.svg @@ -0,0 +1 @@ + diff --git a/icon/theme/purple/sitemap.svg b/icon/theme/purple/sitemap.svg new file mode 100644 index 000000000..3a2c9493c --- /dev/null +++ b/icon/theme/purple/sitemap.svg @@ -0,0 +1 @@ + diff --git a/icon/theme/purple/theme_32x20.gif b/icon/theme/purple/theme_32x20.gif new file mode 100644 index 0000000000000000000000000000000000000000..1c3c2b6faeb4b81ffe7b6f2d2c9091582b1baa5d GIT binary patch literal 120 zcmZ?wbhEHbRA3NcSjfx(1Pcll{{8&9$RR=TCkrDN12cmTNE9T`z~ninf9324{EO$D zYiQVfZx8eB)u5Z21f9-qsum3e;yOrWc4Fje2Q%~2wd=k0n XjON$Oy^R=V#9$2opjb5_ literal 0 HcmV?d00001 diff --git a/icon/theme/yellow/sitemap.svg b/icon/theme/yellow/sitemap.svg index 3a2c9493c..3422d25cf 100644 --- a/icon/theme/yellow/sitemap.svg +++ b/icon/theme/yellow/sitemap.svg @@ -1 +1 @@ - + diff --git a/icon/theme/yellow/theme_32x20.gif b/icon/theme/yellow/theme_32x20.gif index b78859510882cc159be0b01b3a492b8c5abb40a1..b5be044511dd4207983c4a1f84a3a085f59569de 100644 GIT binary patch literal 120 zcmZ?wbhEHbRA3NcSjfx(1O^%gzdqb5a!648$->CRz|5cn5(UXKFnP}DUpe~$|Kd64 z8X7j=+rxajbm5Z;XKp*_b+jmz>s#;hU;Ezu>wnGIZl(B9!$7J1)YJ7ZpF}P? Xqxm&+uUGc1w{NTyJC1iTF<1it9Mm(} literal 134 zcmZ?wbhEHbRA3NcIK;#N1O^%g|AFAsUJwZbia%KxxfqxjbU-RVY8jZlHFn+k$9uwa z_1>Vy1H1nxaAYKARxREzS7*k$T$w!)x#_PKysvrxfBpP|6Wl`mcFIMT0Y?4jo*QVf aX05uQUAF3ORPnv{xiyV5&iAn}SOWmLDm|e9 diff --git a/swad_changelog.h b/swad_changelog.h index 86a8d1b65..8046dcb6d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -340,6 +340,42 @@ Hola Antonio, he ampliado el evento y nos deja comentar. El problema es que el p Buenos días Profesor Cañas, sé que no es nada fácil, pero pudiera hacer más versátil las hojas de calificaciones que en pocos pasos se pudiera configurar para dar promedios, parciales y definitivas. Perdone la solicitud. Soy usuario agradecido de OpenSwad. */ +/* TODO: Mensaje del profesor Joaquín Manuel Durán Álvarez + * Estimado Antonio: +Como todos los años te voy a preguntar si vais a implementar una opción, en donde yo pueda bloquear a un alumno sin necesidad de borrarlo de la asignatura. Si lo borro, pierdo todos sus datos sobre trabajos entregados y las notas que le haya puesto. Y algunas veces cuando la gente aprueba, prefiero bloquearlo pero que siga dado de alta para consultar cosas. +O incluso para gente que pierde el derecho de examen por curso y puede recuperarlo. Son múltiples situaciones distintas en las que vendría muy bien esa opción. +Gracias por todo. Seguimos en contacto +--- +Respuesta: +Hola, Joaquín, ¿qué tal? + +He estado discutiendo tu mensaje un buen rato con Javier Fernández @jfernand y más o menos entendemos que podrían ser interesantes distintos tipos de roles, cada uno con diferentes permisos: + +- estudiante bloqueado + Sería parecido a un usuario que visita otra asignatura, en el sentido de que no podría ver nada que no sea público, ni podría editar nada, pero aparecería como estudiante bloqueado en la lista de estudiantes de la asignatura. + +- estudiante antiguo / estudiante invitado + Podría acceder a (leer) los materiales de la asignatura, pero no recibiría notificaciones ni podría editar. Aparecería en las listas como estudiante invitado. + +En cualquier caso el estudiante siempre podría borrarse de la asignatura, como ya ocurre con cualquiera de los roles existentes. + +Anoto tu comentario y mi respuesta en la lista de mejoras por estudiar e implementar, aunque ahora mismo no puedo ponerla como la primera de la lista por haber otras con mayor prioridad y por la dificultad que supone crear un nuevo rol. Hace un tiempo creé el nuevo rol de profesor no editor y llevó meses dejarlo más o menos fino, ya que, aunque está bastante sistematizado, en la práctica supone cambiar miles de líneas de código por todo el programa (que ya va por las 240 000 líneas) donde se hacen comprobaciones sobre lo que puede hacer o no cada rol. + +Hablando con @jfernand se nos ocurre que para el primer caso (estudiante bloqueado) sólo hay dos opciones ahora: +- Borrarlo de la asignatura (es lo que hace Javier) por ejemplo si desaparece de las actas. En este caso te sugiero que antes de borrarlo hagas dos copias de seguridad: + 1. En Archivos > Trabajos, crea un zip de todo y guárdalo en tu ordenador. + 2. En Usuarios > Estudiantes > Ver como lista > Botón superior izquierdo "Mostrar todos los datos en una tabla" > Guardar esa tabla como página web o (copiarla en una hoja de cálculo) en tu ordenador. +- Dejarlo tal cual, como si fuera un alumno más + +Para el segundo caso (estudiantes antiguos o invitados) tienes dos opciones: +- Crear una asignatura cada año y dejar más o menos congeladas las asignaturas de años anteriores. Tiene la desventaja de tener que subir todo el material cada año. +- Crear grupos dentro de la asignatura con los estudiantes de cada curso. Seguirían recibiendo notificaciones de los cambios en la asignatura. + +He guardado tu correo y esta respuesta en mi lista de "TO DO" (por hacer). +Saludos, +Antonio + */ + // TODO: Eliminar todas las preguntas de test de un golpe // TODO: URGENTE: Cuando se cree un descriptor nuevo TIENE QUE ESTAR INHABILITADO porque si no los alumnos pueden ver el examen (Miguel Damas) @@ -395,10 +431,32 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.51 (2019-02-19)" -#define CSS_FILE "swad18.41.1.css" +#define Log_PLATFORM_VERSION "SWAD 18.52 (2019-02-20)" +#define CSS_FILE "swad18.52.css" #define JS_FILE "swad18.51.js" /* + Version 18.52: Feb 20, 2019 Two new color themes: purple and pink. (237424 lines) + Copy the following icons to icon public directory: +sudo mkdir /var/www/html/swad/icon/theme/purple +sudo mkdir /var/www/html/swad/icon/theme/pink + +sudo cp icon/theme/purple/sitemap.svg /var/www/html/swad/icon/theme/purple +sudo cp icon/theme/blue/sitemap.svg /var/www/html/swad/icon/theme/blue +sudo cp icon/theme/yellow/sitemap.svg /var/www/html/swad/icon/theme/yellow +sudo cp icon/theme/pink/sitemap.svg /var/www/html/swad/icon/theme/pink + +sudo cp icon/theme/purple/bell.svg /var/www/html/swad/icon/theme/purple +sudo cp icon/theme/pink/bell.svg /var/www/html/swad/icon/theme/pink + +sudo cp icon/theme/purple/theme_32x20.gif /var/www/html/swad/icon/theme/purple +sudo cp icon/theme/yellow/theme_32x20.gif /var/www/html/swad/icon/theme/yellow +sudo cp icon/theme/pink/theme_32x20.gif /var/www/html/swad/icon/theme/pink + +sudo cp icon/sign-out-alt-red.svg /var/www/html/swad/icon/ +sudo cp icon/sign-out-alt-white.svg /var/www/html/swad/icon/ +sudo cp icon/sign-in-alt-green.svg /var/www/html/swad/icon/ +sudo cp icon/sign-in-alt-white.svg /var/www/html/swad/icon/ + Version 18.51: Feb 19, 2019 The number of publications by default in the timeline becomes 50 (before it was 20). Changes in javascript related to timeline. (237281 lines) Version 18.50.4: Feb 18, 2019 Fixed bug in actions. (237276 lines) diff --git a/swad_layout.c b/swad_layout.c index 7f1f6a5be..681dfa5ae 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -829,15 +829,19 @@ static void Lay_WritePageTopHeading (void) { "HEAD_ROW_1_WHITE", // The_THEME_WHITE "HEAD_ROW_1_GREY", // The_THEME_GREY + "HEAD_ROW_1_PURPLE", // The_THEME_PURPLE "HEAD_ROW_1_BLUE", // The_THEME_BLUE "HEAD_ROW_1_YELLOW", // The_THEME_YELLOW + "HEAD_ROW_1_PINK", // The_THEME_PINK }; const char *ClassHeadRow2[The_NUM_THEMES] = { "HEAD_ROW_2_WHITE", // The_THEME_WHITE "HEAD_ROW_2_GREY", // The_THEME_GREY + "HEAD_ROW_2_PURPLE", // The_THEME_PURPLE "HEAD_ROW_2_BLUE", // The_THEME_BLUE "HEAD_ROW_2_YELLOW", // The_THEME_YELLOW + "HEAD_ROW_2_PINK", // The_THEME_PINK }; /***** Start header *****/ diff --git a/swad_menu.c b/swad_menu.c index 2c1ffb118..e301fa659 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -330,8 +330,7 @@ Act_Action_t Mnu_GetFirstActionAvailableInCurrentTab (void) void Mnu_WriteMenuThisTab (void) { - extern const char *The_ClassTxtMenuOn[The_NUM_THEMES]; - extern const char *The_ClassTxtMenuOff[The_NUM_THEMES]; + extern const char *The_ClassTxtMenu[The_NUM_THEMES]; extern const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB]; unsigned NumOptInMenu; Act_Action_t NumAct; @@ -366,9 +365,7 @@ void Mnu_WriteMenuThisTab (void) /***** Start form and link *****/ Frm_StartForm (NumAct); - Frm_LinkFormSubmit (Title, - IsTheSelectedAction ? The_ClassTxtMenuOn[Gbl.Prefs.Theme] : - The_ClassTxtMenuOff[Gbl.Prefs.Theme],NULL); + Frm_LinkFormSubmit (Title,The_ClassTxtMenu[Gbl.Prefs.Theme],NULL); /***** Icon *****/ fprintf (Gbl.F.Out,"
" "%s" "
", - IsTheSelectedAction ? The_ClassTxtMenuOn[Gbl.Prefs.Theme] : - The_ClassTxtMenuOff[Gbl.Prefs.Theme], + The_ClassTxtMenu[Gbl.Prefs.Theme], Txt_MENU_TITLE[Gbl.Action.Tab][NumOptInMenu]); /***** End link and form *****/ diff --git a/swad_tab.c b/swad_tab.c index a0890202b..4b1280e05 100644 --- a/swad_tab.c +++ b/swad_tab.c @@ -91,8 +91,10 @@ void Tab_DrawTabs (void) { "HEAD_ROW_3_WHITE", // The_THEME_WHITE "HEAD_ROW_3_GREY", // The_THEME_GREY + "HEAD_ROW_3_PURPLE", // The_THEME_PURPLE "HEAD_ROW_3_BLUE", // The_THEME_BLUE "HEAD_ROW_3_YELLOW", // The_THEME_YELLOW + "HEAD_ROW_3_PINK", // The_THEME_PINK }; /***** Start tabs container *****/ diff --git a/swad_theme.c b/swad_theme.c index 08c13c9c3..df193f69b 100644 --- a/swad_theme.c +++ b/swad_theme.c @@ -54,159 +54,189 @@ const char *The_ThemeId[The_NUM_THEMES] = { "white", "grey", + "purple", "blue", "yellow", + "pink", }; const char *The_ThemeNames[The_NUM_THEMES] = { "White", "Grey", + "Purple", "Blue", "Yellow", + "Pink", }; const char *The_TabOnBgColors[The_NUM_THEMES] = { "TAB_ON_WHITE", "TAB_ON_GREY", + "TAB_ON_PURPLE", "TAB_ON_BLUE", "TAB_ON_YELLOW", + "TAB_ON_PINK", }; const char *The_TabOffBgColors[The_NUM_THEMES] = { "TAB_OFF_WHITE", "TAB_OFF_GREY", + "TAB_OFF_PURPLE", "TAB_OFF_BLUE", "TAB_OFF_YELLOW", + "TAB_OFF_PINK", }; const char *The_ClassTagline[The_NUM_THEMES] = { - "WHITE_TAGLINE", - "GREY_TAGLINE", - "BLUE_TAGLINE", - "YELLOW_TAGLINE", + "TAGLINE_WHITE", + "TAGLINE_GREY", + "TAGLINE_PURPLE", + "TAGLINE_BLUE", + "TAGLINE_YELLOW", + "TAGLINE_PINK", }; const char *The_ClassNotif[The_NUM_THEMES] = { - "WHITE_NOTIF", - "GREY_NOTIF", - "BLUE_NOTIF", - "YELLOW_NOTIF", + "NOTIF_WHITE", + "NOTIF_GREY", + "NOTIF_PURPLE", + "NOTIF_BLUE", + "NOTIF_YELLOW", + "NOTIF_PINK", }; const char *The_ClassUsr[The_NUM_THEMES] = { - "WHITE_USR", - "GREY_USR", - "BLUE_USR", - "YELLOW_USR", + "USR_WHITE", + "USR_GREY", + "USR_PURPLE", + "USR_BLUE", + "USR_YELLOW", + "USR_PINK", }; const char *The_ClassBreadcrumb[The_NUM_THEMES] = { "BC_WHITE", "BC_GREY", + "BC_PURPLE", "BC_BLUE", "BC_YELLOW", + "BC_PINK", }; const char *The_ClassCourse[The_NUM_THEMES] = { - "WHITE_COURSE", - "GREY_COURSE", - "BLUE_COURSE", - "YELLOW_COURSE", + "MAIN_TITLE_WHITE", + "MAIN_TITLE_GREY", + "MAIN_TITLE_PURPLE", + "MAIN_TITLE_BLUE", + "MAIN_TITLE_YELLOW", + "MAIN_TITLE_PINK", }; -const char *The_ClassTxtMenuOff[The_NUM_THEMES] = +const char *The_ClassTxtMenu[The_NUM_THEMES] = { - "WHITE_MENU_OFF", - "GREY_MENU_OFF", - "BLUE_MENU_OFF", - "YELLOW_MENU_OFF", - }; - -const char *The_ClassTxtMenuOn[The_NUM_THEMES] = - { - "WHITE_MENU_ON", - "GREY_MENU_ON", - "BLUE_MENU_ON", - "YELLOW_MENU_ON", + "MENU_TXT_WHITE", + "MENU_TXT_GREY", + "MENU_TXT_PURPLE", + "MENU_TXT_BLUE", + "MENU_TXT_YELLOW", + "MENU_TXT_PINK", }; const char *The_ClassTxtTabOff[The_NUM_THEMES] = { - "WHITE_TAB_OFF", - "GREY_TAB_OFF", - "BLUE_TAB_OFF", - "YELLOW_TAB_OFF", + "TAB_OFF_TXT_WHITE", + "TAB_OFF_TXT_GREY", + "TAB_OFF_TXT_PURPLE", + "TAB_OFF_TXT_BLUE", + "TAB_OFF_TXT_YELLOW", + "TAB_OFF_TXT_PINK", }; const char *The_ClassTxtTabOn[The_NUM_THEMES] = { - "WHITE_TAB_ON", - "GREY_TAB_ON", - "BLUE_TAB_ON", - "YELLOW_TAB_ON", + "TAB_ON_TXT_WHITE", + "TAB_ON_TXT_GREY", + "TAB_ON_TXT_PURPLE", + "TAB_ON_TXT_BLUE", + "TAB_ON_TXT_YELLOW", + "TAB_ON_TXT_PINK", }; const char *The_ClassTitleAction[The_NUM_THEMES] = { - "WHITE_TITLE_ACTION", - "GREY_TITLE_ACTION", - "BLUE_TITLE_ACTION", - "YELLOW_TITLE_ACTION", + "TITLE_ACTION_WHITE", + "TITLE_ACTION_GREY", + "TITLE_ACTION_PURPLE", + "TITLE_ACTION_BLUE", + "TITLE_ACTION_YELLOW", + "TITLE_ACTION_PINK", }; const char *The_ClassSubtitleAction[The_NUM_THEMES] = { - "WHITE_SUBTITLE_ACTION", - "GREY_SUBTITLE_ACTION", - "BLUE_SUBTITLE_ACTION", - "YELLOW_SUBTITLE_ACTION", + "SUBTITLE_ACTION_WHITE", + "SUBTITLE_ACTION_GREY", + "SUBTITLE_ACTION_PURPLE", + "SUBTITLE_ACTION_BLUE", + "SUBTITLE_ACTION_YELLOW", + "SUBTITLE_ACTION_PINK", }; const char *The_ClassTitle[The_NUM_THEMES] = { - "WHITE_TITLE", - "GREY_TITLE", - "BLUE_TITLE", - "YELLOW_TITLE", + "TITLE_WHITE", + "TITLE_GREY", + "TITLE_PURPLE", + "TITLE_BLUE", + "TITLE_YELLOW", + "TITLE_PINK", }; const char *The_ClassForm[The_NUM_THEMES] = { - "WHITE_FORM", - "GREY_FORM", - "BLUE_FORM", - "YELLOW_FORM", + "FORM_WHITE", + "FORM_GREY", + "FORM_PURPLE", + "FORM_BLUE", + "FORM_YELLOW", + "FORM_PINK", }; const char *The_ClassFormDark[The_NUM_THEMES] = { - "WHITE_FORM_DARK", - "GREY_FORM_DARK", - "BLUE_FORM_DARK", - "YELLOW_FORM_DARK", + "FORM_DARK_WHITE", + "FORM_DARK_GREY", + "FORM_DARK_PURPLE", + "FORM_DARK_BLUE", + "FORM_DARK_YELLOW", + "FORM_DARK_PINK", }; const char *The_ClassFormNoWrap[The_NUM_THEMES] = { - "WHITE_FORM_NOWRAP", - "GREY_FORM_NOWRAP", - "BLUE_FORM_NOWRAP", - "YELLOW_FORM_NOWRAP", + "FORM_NOWRAP_WHITE", + "FORM_NOWRAP_GREY", + "FORM_NOWRAP_PURPLE", + "FORM_NOWRAP_BLUE", + "FORM_NOWRAP_YELLOW", + "FORM_NOWRAP_PINK", }; const char *The_ClassFormBold[The_NUM_THEMES] = { - "WHITE_FORM_BOLD", - "GREY_FORM_BOLD", - "BLUE_FORM_BOLD", - "YELLOW_FORM_BOLD", + "FORM_BOLD_WHITE", + "FORM_BOLD_GREY", + "FORM_BOLD_PURPLE", + "FORM_BOLD_BLUE", + "FORM_BOLD_YELLOW", + "FORM_BOLD_PINK", }; /*****************************************************************************/ @@ -286,7 +316,8 @@ void The_ChangeTheme (void) DB_QueryUPDATE ("can not update your preference about theme", "UPDATE usr_data SET Theme='%s'" " WHERE UsrCod=%ld", - The_ThemeId[Gbl.Prefs.Theme],Gbl.Usrs.Me.UsrDat.UsrCod); + The_ThemeId[Gbl.Prefs.Theme], + Gbl.Usrs.Me.UsrDat.UsrCod); /***** Set preferences from current IP *****/ Pre_SetPrefsFromIP (); diff --git a/swad_theme.h b/swad_theme.h index 59e20cef1..7b377940e 100644 --- a/swad_theme.h +++ b/swad_theme.h @@ -31,7 +31,7 @@ /***************************** Public constants ******************************/ /*****************************************************************************/ -#define The_NUM_THEMES 4 +#define The_NUM_THEMES 6 /*****************************************************************************/ /******************************* Public types ********************************/ @@ -41,11 +41,13 @@ typedef enum { The_THEME_WHITE = 0, The_THEME_GREY = 1, - The_THEME_BLUE = 2, - The_THEME_YELLOW = 3, - The_THEME_UNKNOWN = 4, + The_THEME_PURPLE = 2, + The_THEME_BLUE = 3, + The_THEME_YELLOW = 4, + The_THEME_PINK = 5, + The_THEME_UNKNOWN = 6, } The_Theme_t; -#define The_THEME_DEFAULT The_THEME_WHITE +#define The_THEME_DEFAULT The_THEME_GREY /*****************************************************************************/ /***************************** Public prototypes *****************************/ diff --git a/swad_user.c b/swad_user.c index 177e4f34b..05b26d875 100644 --- a/swad_user.c +++ b/swad_user.c @@ -2640,7 +2640,7 @@ void Usr_PutFormLogIn (void) /***** Link to log in form *****/ Frm_StartForm (ActFrmLogIn); - Ico_PutIconLink ("sign-in-alt-green.svg",Txt_Log_in); + Ico_PutIconLink ("sign-in-alt-white.svg",Txt_Log_in); Frm_EndForm (); } @@ -2699,7 +2699,7 @@ void Usr_PutFormLogOut (void) /***** Link to log out form *****/ Frm_StartForm (ActLogOut); - Ico_PutIconLink ("sign-out-alt-red.svg",Txt_Log_out); + Ico_PutIconLink ("sign-out-alt-white.svg",Txt_Log_out); Frm_EndForm (); }