From 4a2a1c31a07c367a0766532853a066f76799edd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 27 Nov 2015 13:45:39 +0100 Subject: [PATCH] Version 15.47.1 --- css/{swad_desktop.css => swad.css} | 0 css/swad_mobile.css | 1146 ---------------------------- swad_changelog.h | 4 +- swad_config.h | 36 +- swad_copy.sh | 5 +- swad_layout.c | 16 +- swad_menu.c | 8 +- swad_menu.h | 4 +- swad_tab.c | 2 +- swad_tab.h | 2 +- 10 files changed, 33 insertions(+), 1190 deletions(-) rename css/{swad_desktop.css => swad.css} (100%) delete mode 100644 css/swad_mobile.css diff --git a/css/swad_desktop.css b/css/swad.css similarity index 100% rename from css/swad_desktop.css rename to css/swad.css diff --git a/css/swad_mobile.css b/css/swad_mobile.css deleted file mode 100644 index ec028b4d0..000000000 --- a/css/swad_mobile.css +++ /dev/null @@ -1,1146 +0,0 @@ -/* swad_mobile.css:style-sheet for mobile layout of SWAD */ - -/* - SWAD (Shared Workspace At a Distance), - is a web platform developed at the University of Granada (Spain), - and used to support university teaching. - - This file is part of SWAD core. - Copyright (C) 1999-2015 Antonio Caņas Vargas - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General 3 License as - published by the Free Software Foundation,either version 3 of the - License,or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not,see . -*/ - -A:link {text-decoration:none;} -A:visited {text-decoration:none;} -A:active {text-decoration:none;} -A:hover {text-decoration:underline;} -body - { - margin:0; - background-color:white; - font-family:"Helvetica Neue",Helvetica,Arial,sans-serif; - font-size:1.25em; - } -input {font-size:20pt; vertical-align:middle;} -select {font-size:20pt;} -textarea {font-size:20pt;} -table - { - border-width:0; - border-style:none; - border-spacing:0; - } -table th - { - padding:0; - color:#4D88A1; - font-size:18pt; - font-weight:bold; - } -table td - { - padding:0; - } -img {border-width:0; border-style:none;} -form {margin:0; display:inline;} - -/****************** Layout (the whole page with a background) ****************/ -#whole_page_white - { - display:table; - width:100%; - background-image:linear-gradient(black 0,black 60px,white 60px,#cfcfce 60px,white 94px,white 100%); - background-repeat:no-repeat; - } -#whole_page_grey - { - display:table; - width:100%; - background-image:linear-gradient(#383838 0,#404040 40px,#404040 170px,white 170px,white 100%); - background-repeat:no-repeat; - } -#whole_page_blue - { - display:table; - width:100%; - background-image:linear-gradient(#5fa5df 0,#4f90c8 40px,#4f90c8 170px,white 170px,white 100%); - background-repeat:no-repeat; - } -#whole_page_yellow - { - display:table; - width:100%; - background-image:linear-gradient(#201420 0,#201420 170px,white 170px,white 100%); - background-repeat:no-repeat; - } - -/************************* Layout (first heading row) ************************/ -#head_row_1_white - { - display:table; - width:100%; - height:60px; - background-color:black; - } -#head_row_1_grey - { - display:table; - width:100%; - height:60px; - background-image:linear-gradient(#383838 0,#383838 40px,#404040 100%); - background-repeat:no-repeat; - } -#head_row_1_blue - { - display:table; - width:100%; - height:60px; - background-image:linear-gradient(#5fa5df 0,#4f90c8 40px,#4f90c8 100%); - background-repeat:no-repeat; - } -#head_row_1_yellow - { - display:table; - width:100%; - height:60px; - background-color:#201420; - } - -#head_row_1_logo - { - display:table-cell; - text-align:center; - vertical-align:middle; - } -#head_row_1_usr_lang - { - display:table-cell; - text-align:right; - vertical-align:middle; - } -#head_row_1_session - { - display:table-cell; - width:220px; - text-align:center; - vertical-align:middle; - } -.WHITE_HEAD {color:#E0E0E0; font-size:20pt; white-space:nowrap;} -.GREY_HEAD {color:#E0E0E0; font-size:20pt; white-space:nowrap;} -.BLUE_HEAD {color:white; font-size:20pt; white-space:nowrap;} -.YELLOW_HEAD {color:#B3B0B3; font-size:20pt; white-space:nowrap;} - -/************************ Layout (second heading row) ************************/ -#head_row_2 - { - display:table; - width:100%; - height:40px; - text-align:center; - vertical-align:middle; - } -.TOP_LOGO /* Institution / Centre / Degree logo in top title */ - { - margin-right:10px; - text-align:left; - vertical-align:top !important; - } - -/**************** Layout (third heading row with breadcrumb) *****************/ -#head_row_3 - { - display:table; - // width:100%; - height:72px; - } -#breadcrumb_container - { - display:table-cell; - min-width:500px; - height:72px; - margin:0; - padding:0 25px; - border-radius:8px 8px 0 0; - box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2); - vertical-align:middle; - overflow:hidden; - } -.WHITE_TAB_ON - { - color:#4D88A1; - font-size:25pt; - font-weight:bold; - white-space:nowrap; - } -.GREY_TAB_ON - { - color:#606060; - font-size:25pt; - font-weight:bold; - white-space:nowrap; - } -.BLUE_TAB_ON - { - color:#4D88A1; - font-size:25pt; - font-weight:bold; - white-space:nowrap; - } -.YELLOW_TAB_ON - { - color:#BD4815; - font-size:25pt; - font-weight:bold; - white-space:nowrap; - } - -/*********************** Layout (fourth row, main zone) **********************/ -#main_zone - { - display:table; - width:100%; - } -#main_zone_central - { - display:table-cell; - text-align:center; - vertical-align:top; - } -#main_zone_central_container - { - min-width:925px; - min-height:925px; - width:100%; - margin:-8px 0 0 0; - padding:10px 0; - border-radius:8px; - box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2); - text-align:center; - vertical-align:top; - overflow:hidden; - position:relative; - display:inline-block; - } -#main_zone_central_content - { - display:table; - width:100%; - } -#main_zone_canvas /* Where content for each action is written */ - { - display:table-cell; - text-align:left; - vertical-align:top; - padding:0 12px 12px 12px; - } - -/********************************* Menu fonts ********************************/ -.WHITE_MENU_OFF {color:#707070; font-size:25pt; line-height:110%;} -.GREY_MENU_OFF {color:#707070; font-size:25pt; line-height:110%;} -.BLUE_MENU_OFF {color:#4D88A1; font-size:25pt; line-height:110%;} -.YELLOW_MENU_OFF {color:#FF4301; font-size:25pt; line-height:110%;} - -.WHITE_MENU_ON {color:#4D88A1; font-size:25pt; font-weight:bold; line-height:110%;} -.GREY_MENU_ON {color:#606060; font-size:25pt; font-weight:bold; line-height:110%;} -.BLUE_MENU_ON {color:#4D88A1; font-size:25pt; font-weight:bold; line-height:110%;} -.YELLOW_MENU_ON {color:#FF4301; font-size:25pt; font-weight:bold; line-height:110%;} - -/************************* Users connected globally **************************/ -.CONNECTED - { - margin:0; - border-style:solid; - border-width:1px; - border-color:#398000; - padding:5px; - border-radius:4px; - font-size:12pt; - color:#398000; - overflow:hidden; - } - -/*********************************** Month ***********************************/ -.MONTH_CONTAINER - { - width:138px; - margin:0; - padding:5px; - border-style:solid; - border-width:1px; - border-color:#8CBCCE; - border-radius:4px; - text-align:center; - overflow:hidden; - } -.MONTH_TABLE_DAYS - { - width:138px; - margin-top:2px; - padding-top:2px; - border-style:solid; - border-width:1px 0 0 0; - border-color:#DDECF1; - } -.MONTH - { - color:#4D88A1; - font-size:10pt; - white-space:nowrap; - } -.DAY_WRK_HEAD - { - color:#4D88A1; - font-size:10pt; - text-align:center; - } -.DAY_NO_WRK_HEAD - { - color:#FF0000; - font-size:10pt; - text-align:center; - } -.DAY_WRK - { - color:#202020; - font-size:10pt; - text-align:center; - } -.DAY_NO_WORK - { - color:#C04080; - font-size:10pt; - text-align:center; - } -.DAY_HLD - { - color:#FF0000; - font-size:10pt; - text-align:center; - } -.DAY_WRK_LIGHT - { - color:#E0E0E0; - font-size:10pt; - text-align:center; - } -.DAY_NO_WORK_LIGHT - { - color:#FFE0FF; - font-size:10pt; - text-align:center; - } -.DAY_HLD_LIGHT - { - color:#FFE0E0; - font-size:10pt; - text-align:center; - } -.DAY - { - border:solid 1px; - border-color:white; - text-align:center; - } -.TODAY - { - border:solid 1px; - border-color:#50B800; - text-align:center; - } -.DAY_EVENT - { - border:solid 1px; - border-color:white; - background-color:#FFF080; - text-align:center; - } -.TODAY_EVENT - { - border:solid 1px; - border-color:#50B800; - background-color:#FFF080; - text-align:center; - } - -/********************************* Buttons ***********************************/ -.BT_CREATE - { - background-color:#5BC33B; - border:1px solid #518741; - } -.BT_CONFIRM - { - background-color:#55ACEE; - border:1px solid #3B88C3; - } -.BT_REMOVE - { - background-color:#EF5555; - border:1px solid #C33B3B; - } -.BT_SUBMIT - { - color:white; - font-size:20px; - font-weight:bold; - line-height:normal; - margin:8px auto; - padding:10px 20px; - border-radius:4px; - box-shadow:0 1px 0 rgba(255,255,255,0.15) inset; - } -.BT_SUBMIT_INLINE - { - min-width:180px; - color:white; - font-size:15px; - font-weight:bold; - line-height:normal; - margin:0 5px; - padding:5px 10px; - border-radius:4px; - box-shadow:0 1px 0 rgba(255,255,255,0.15) inset; - } -.BT_SUBMIT:hover - { - background-image:linear-gradient(rgba(0,0,0,0),rgba(0,0,0,0.2)); - } -.BT_SUBMIT_INLINE:hover - { - background-image:linear-gradient(rgba(0,0,0,0),rgba(0,0,0,0.2)); - } - -/********************************** Notice ***********************************/ -.NOTICE_CONTAINER_ACTIVE - { - margin:10px auto; - padding:10px; - background-image:linear-gradient(rgba(238,216,108,0.8) 0%,rgba(248,237,149,0.8) 15%,rgba(250,240,152,0.8) 100%); - box-shadow:0 8px 10px -5px rgba(125,113,0,0.8); - text-align:left; - overflow:hidden; - } -.NOTICE_CONTAINER_OBSOLETE - { - margin:10px auto; - padding:10px; - background-image:linear-gradient(rgba(238,216,108,0.4) 0%,rgba(248,237,149,0.4) 15%,rgba(250,240,152,0.4) 100%); - box-shadow:0 8px 10px -5px rgba(125,113,0,0.4); - text-align:left; - overflow:hidden; - } -.NOTICE_DATE_ACTIVE - { - float:right; - font-size:12pt; - color:#404040; - text-align:right; - overflow:hidden; - display:inline-block; - } -.NOTICE_DATE_OBSOLETE - { - float:right; - font-size:12pt; - color:#808080; - text-align:right; - overflow:hidden; - display:inline-block; - } -.NOTICE_SUBJECT_ACTIVE - { - margin:12px auto; - font-size:15pt; - font-weight:bold; - color:#404040; - text-align:center; - overflow:hidden; - } -.NOTICE_SUBJECT_OBSOLETE - { - margin:12px auto; - font-size:15pt; - font-weight:bold; - color:#808080; - text-align:center; - overflow:hidden; - } -.NOTICE_TEXT_ACTIVE - { - padding:10px 20px; - clear:both; - font-size:12pt; - color:#204080; - overflow:hidden; - } -.NOTICE_TEXT_OBSOLETE - { - padding:10px 20px; - clear:both; - font-size:12pt; - color:#4070A0; - overflow:hidden; - } -.NOTICE_AUTHOR_ACTIVE - { - color:#404040; - font-size:12pt; - text-align:right; - overflow:hidden; - } -.NOTICE_AUTHOR_OBSOLETE - { - color:#808080; - font-size:12pt; - text-align:right; - overflow:hidden; - } - -/**************************** Institutional links ****************************/ -#institutional_links - { - width:138px; - margin:0; - border-style:solid; - border-width:1px; - border-color:#4D88A1; - padding:5px; - border-radius:4px; - font-size:11pt; - color:#4D88A1; - overflow:hidden; - } -.INS_LNK - { - padding:1px; - font-size:11pt; - color:#4D88A1; - } - -/********************************** Alerts ***********************************/ -.ALERT - { - margin:8px auto 0 auto; - background-color:#FFF9E0; - background-repeat:no-repeat; - background-position:12px 12px; - padding:12px 12px 12px 45px; - border-radius:8px; - box-shadow:1px 1px 3px #CCC7B4; - font-size:20pt; - color:#632921; - text-align:justify; - overflow:hidden; - display:inline-block; - } - -/*********************************** Icons ***********************************/ -.ICON16x16 {width:20px; height:20px; vertical-align:middle;} -.ICON16x12B {width:20px; height:15px; vertical-align:middle; display:block;} -.ICON16x16B {width:20px; height:20px; vertical-align:middle; display:block;} -.ICON20x20 {width:25px; height:25px; vertical-align:middle;} -.ICON32x32 {width:40px; height:40px; vertical-align:middle;} -.ICON32x32B {width:40px; height:40px; vertical-align:middle; display:block;} -.ICON48x48 {width:60px; height:60px; vertical-align:middle;} -.ICON64x64 {width:80px; height:80px; vertical-align:middle;} -.ICON128x128 {width:160px; height:160px; vertical-align:middle;} -.BANNER {width:150px; height:50px;} -.BANNER_SMALL {width:75px; height:25px;} - -/****** Contextual links with small icons and text to go to some action ******/ -.CONTEXT_MENU - { - margin:6px 0 8px 0; - text-align:center; - } -.CONTEXT_OPT - { - display:inline; - margin-left:6px; - margin-right:6px; - } - -/********************************* Frame 10 **********************************/ -.FRAME10 - { - margin:5px 0; - padding:12px; - background-color:white; - border-radius:8px; - box-shadow:1px 1px 2px #CCC; - text-align:center; - overflow:hidden; - display:inline-block; - } -.FRAME10_SHADOW - { - margin:5px 0 18px 0; - padding:12px; - background-color:rgba(255,255,255,0.95); - border-width:1px; - border-style:solid; - border-color:#C0C0C0; - border-radius:8px; - box-shadow:2px 5px 15px #888; - text-align:center; - overflow:hidden; - display:inline-block; - } -.TABLE10 - { - width:100%; - } -.TIT_TBL_10 - { - margin:12px; - color:#808080; - font-size:25pt; - font-weight:bold; - } -.CELLS_PAD_1 th {padding:1px;} -.CELLS_PAD_1 td {padding:1px;} -.CELLS_PAD_2 th {padding:2px;} -.CELLS_PAD_2 td {padding:2px;} -.CELLS_PAD_4 th {padding:5px;} -.CELLS_PAD_4 td {padding:5px;} -.CELLS_PAD_8 th {padding:10px;} -.CELLS_PAD_8 td {padding:10px;} - -/*********************************** Title ***********************************/ -.TIT { - margin:20px auto 0 auto; - font-size:20pt; - font-weight:bold; - color:#94745C; - text-align:center; - } - -/********** Title of country,institution,centre,degree,course ************/ -.TITLE_LOCATION - { - font-size:25pt; - font-weight:bold; - color:#808080; - text-align:center; - } - -/******************************* Map of country ******************************/ -.COUNTRY_MAP_TITLE - { - width:40px; height:40px; - margin-right:10px; - vertical-align:top; - } -.COUNTRY_MAP_TINY - { - width:20px; height:20px; - vertical-align:middle; - } -.COUNTRY_MAP_SMALL - { - width:64px; height:64px; - vertical-align:middle; - } -.COUNTRY_MAP_SHOW - { - width:320px; height:320px; - margin:10px; - } -.COUNTRY_MAP_PRINT - { - width:625px; height:625px; - margin:12px; - } - -/****************************** Photo of centre ******************************/ -.CENTRE_PHOTO_SHOW - { - width:480px; height:320px; - padding:6px; margin:10px; - border:solid 1px #EEE; - } -a:hover img.CENTRE_PHOTO_SHOW - { - border:solid 1px #CCC; - box-shadow:1px 1px 6px #999; - } -.CENTRE_PHOTO_PRINT - { - width:720px; height:480px; - padding:10px; margin:12px; - border:solid 1px #EEE; - box-shadow:1px 1px 6px #999; - } - -/**************** Attribution (author and license) of images *****************/ -.ATTRIBUTION - { - color:#A0A0A0; - font-size:8pt; - max-width:500px; - text-align:center; - } - -/******************************* User's photo ********************************/ -.PHOTO12x16 {width: 15px; height: 24px; vertical-align:middle; border-radius:2px;} -.PHOTO12x16B {width: 15px; height: 24px; vertical-align:middle; border-radius:2px; display:block; margin:0 auto;} -.PHOTO15x20 {width: 18px; height: 25px; vertical-align:middle; border-radius:2px;} -.PHOTO18x24 {width: 21px; height: 28px; vertical-align:middle; border-radius:2px;} -.PHOTO24x32 {width: 30px; height: 40px; vertical-align:middle; border-radius:2px;} -.PHOTO36x48 {width: 45px; height: 60px; vertical-align:middle; border-radius:4px;} -.PHOTO75x100 {width: 93px; height:124px; vertical-align:middle; border-radius:4px;} -.PHOTO150x200 {width:186px; height:248px; vertical-align:middle; border-radius:8px;} -.IMG_USR - { - width:186px; - height:248px; - border-radius:4px; - } -.ZOOM - { - position:absolute; - z-index:1000; - left:-203px; - top:-375px; - padding:6px; - background-color:rgba(255,255,255,0.8); - border-width:1px; - border-style:solid; - border-color:#C0C0C0; - border-radius:8px; - box-shadow:2px 5px 15px #888; - } -.ZOOM_TXT - { - color:#202020; - font-size:12pt; - } - -.NO_BR {white-space:nowrap;} - -.BG_MSG_BLUE - { - background-image:linear-gradient(#eaf3f6 0,#eaf3f6 80%,white 100%); - background-repeat:no-repeat; - } -.BG_MSG_GREEN - { - background-image:linear-gradient(#f5ffd7 0,#f5ffd7 80%,white 100%); - background-repeat:no-repeat; - } - -.WHITE_DEGREE {color:#707070; font-size:18pt; font-weight:bold; white-space:nowrap;} -.GREY_DEGREE {color:#FFB42E; font-size:18pt; font-weight:bold; white-space:nowrap;} -.BLUE_DEGREE {color:#FFE880; font-size:18pt; font-weight:bold; white-space:nowrap;} -.YELLOW_DEGREE {color:#FFC040; font-size:18pt; font-weight:bold; white-space:nowrap;} - -.WHITE_COURSE {color:#4D88A1; font-size:18pt; white-space:nowrap;} -.GREY_COURSE {font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif; color:#F7F6F5; font-size:18pt; white-space:nowrap;} -.BLUE_COURSE {font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif; color:white; font-size:18pt; white-space:nowrap;} -.YELLOW_COURSE {font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif; color:white; font-size:18pt; white-space:nowrap;} - -.WHITE_USR {color:#E0E0E0; font-size:20pt; font-weight:bold; white-space:nowrap;} -.GREY_USR {color:#E0E0E0; font-size:20pt; font-weight:bold; white-space:nowrap;} -.BLUE_USR {color:white; font-size:20pt; font-weight:bold; white-space:nowrap;} -.YELLOW_USR {color:#B3B0B3; font-size:20pt; font-weight:bold; white-space:nowrap;} - -.WHITE_CONNECTED {color:#398000; font-size:12pt;} -.GREY_CONNECTED {color:#398000; font-size:12pt;} -.BLUE_CONNECTED {color:#398000; font-size:12pt;} -.YELLOW_CONNECTED {color:#398000; font-size:12pt;} - -.WHITE_TITLE {color:#505050; font-size:20pt;} -.GREY_TITLE {color:#505050; font-size:20pt;} -.BLUE_TITLE {color:#4D88A1; font-size:20pt;} -.YELLOW_TITLE {color:#FF4301; font-size:20pt;} - -/**************************** Icon highlighting ******************************/ -.ICON_HIDDEN - { - opacity:0.2; - } -.ICON_HIGHLIGHT - { - opacity:0.67; - } -.ICON_HIGHLIGHT:hover - { - opacity:1; - } - -/********************************* Form fonts ********************************/ -.WHITE_FORM {color:#4D88A1; font-size:20pt;} -.GREY_FORM {color:#4D88A1; font-size:20pt;} -.BLUE_FORM {color:#4D88A1; font-size:20pt;} -.YELLOW_FORM {color:#FF4301; font-size:20pt;} - -.WHITE_FORM_NOWRAP {color:#4D88A1; font-size:20pt; white-space:nowrap;} -.GREY_FORM_NOWRAP {color:#4D88A1; font-size:20pt; white-space:nowrap;} -.BLUE_FORM_NOWRAP {color:#4D88A1; font-size:20pt; white-space:nowrap;} -.YELLOW_FORM_NOWRAP {color:#FF4301; font-size:20pt; white-space:nowrap;} - -.WHITE_FORM_BOLD {color:#4D88A1; font-size:20pt; font-weight:bold;} -.GREY_FORM_BOLD {color:#4D88A1; font-size:20pt; font-weight:bold;} -.BLUE_FORM_BOLD {color:#4D88A1; font-size:20pt; font-weight:bold;} -.YELLOW_FORM_BOLD {color:#FF4301; font-size:20pt; 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;} -.CENTER_TOP {text-align:center; vertical-align:top;} -.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;} - -/***************** Colors used in headers,backgrounds,etc. *****************/ -.COLOR0 {background-color:#F4F2EA;} -.COLOR1 {background-color:#FBFAF7;} -.LIGHT_GREEN {background-color:#C0FF40;} -.LIGHT_BLUE {background-color:#DDECF1;} -.VERY_LIGHT_BLUE {background-color:#EAF3F6;} - -.TAB_ON_WHITE {background-color:#F7F6F5;} -.TAB_ON_GREY {background-color:#F7F6F5;} -.TAB_ON_BLUE {background-color:#E8F3F6;} -.TAB_ON_YELLOW {background-color:#FFF2BD;} - -.TAB_OFF_WHITE {background-color:#D4D4D4;} -.TAB_OFF_GREY {background-color:#D4D4D4;} -.TAB_OFF_BLUE {background-color:#CAE1E8;} -.TAB_OFF_YELLOW {background-color:#FADE94;} - -/********************************* Course info *******************************/ -#crs_info - { - margin:0; - padding:0 12px; - color:inherit; - } -#crs_info table - { - border: 1px solid grey; - } -#crs_info th - { - border:1px solid grey; - background-color:#F0F0F0; - padding:6px; - } -#crs_info td - { - border:1px solid grey; - padding:6px; - } - -/************************ Help for the text editor ***************************/ -.HELP_EDIT - { - margin:12px; - text-align:center; - color:#808080; - font-size:12pt; - } - -/*********************************** Lists ***********************************/ -.LIST_LEFT - { - list-style-type:none; - padding:0; - margin:0; - text-align:left; - vertical-align:middle; - } -.LIST_CENTER - { - list-style-type:none; - padding:0; - margin:0; - text-align:center; - vertical-align:middle; - } - -/*****************************************************************************/ - -.FILENAME {color:#404040; font-size:22pt; font-weight:bold;} - -.BROWSER_TITLE {color:#94745C; font-size:20pt; font-weight:bold;} -.BROWSER_TITLE_LIGHT {color:#D5C6BB; font-size:20pt; font-weight:bold;} -.BROWSER_SUBTITLE {color:#94745C; font-size:18pt;} - -.T1 {color:#404040; font-size:20pt;} -.T2 {color:#404040; font-size:18pt;} -.T3 {color:#404040; font-size:15pt;} - -.LST {color:#404040; font-size:15pt; white-space:nowrap;} -.LST_HID {color:#A0A0A0; font-size:15pt; white-space:nowrap;} -.LST_REC {color:#008000; font-size:15pt; white-space:nowrap;} -.LST_REC_HID {color:#89BE87; font-size:15pt; white-space:nowrap;} -.LST_EDIT {color:#404040; font-weight:bold; font-size:11pt; height:20px; padding-top:0; padding-bottom:0; margin-top:-1px; margin-bottom:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;} -.LST_EDIT_HID {color:#A0A0A0; font-weight:bold; font-size:11pt; height:20px; padding-top:0; padding-bottom:0; margin-top:-1px; margin-bottom:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;} -.LST_EDIT_REC {color:#008000; font-weight:bold; font-size:11pt; height:20px; padding-top:0; padding-bottom:0; margin-top:-1px; margin-bottom:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;} -.LST_EDIT_REC_HID {color:#89BE87; font-weight:bold; font-size:11pt; height:20px; padding-top:0; padding-bottom:0; margin-top:-1px; margin-bottom:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;} - -.USR_ID {color:#404040; font-size:20pt; font-weight:bold;} - -.DAT {color:#707070; font-size:20pt;} -.DAT_GREEN {color:#008000; font-size:20pt;} -.DAT_LIGHT {color:#A0A0A0; font-size:20pt;} -.DAT_NOBR {color:#707070; font-size:20pt; white-space:nowrap;} -.DAT_N {color:#404040; font-size:20pt;} -.DAT_NOBR_N {color:#404040; font-size:20pt; white-space:nowrap;} - -/*********************** Line in top part of a table row *********************/ -.LINE_TOP - { - color:#404040; - font-size:20pt; - border-style:solid none none none; - border-width:1px; - } - -.DAT_SMALL {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:18pt;} -.DAT_SMALL_LIGHT {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#A0A0A0; font-size:18pt;} -.DAT_SMALL_NOBR {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:18pt; white-space:nowrap;} -.DAT_SMALL_N {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#404040; font-size:18pt;} -.DAT_SMALL_NOBR_N {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#404040; font-size:18pt; white-space:nowrap;} - -.DAT_SMALL_GREY {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:18pt;} -.DAT_SMALL_RED {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#FF0000; font-size:18pt;} -.DAT_SMALL_GREEN {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#008000; font-size:18pt;} -.DAT_SMALL_BLUE {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#0080FF; font-size:18pt;} -.DAT_SMALL_YELLOW {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#C0C000; font-size:18pt;} - -.HEAD_REC {font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif; color:#808080; font-size:20pt;} -.HEAD_REC_SMALL {font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif; color:#808080; font-size:15pt;} -.REC_NAME {color:#808080; font-size:25pt; font-weight:bold;} -.REC_NICK {color:#808080; font-size:20pt; font-weight:bold;} -.DAT_REC {color:#404040; font-size:18pt; line-height:110%;} -.DAT_REC_SMALL {color:#808080; font-size:18pt; line-height:110%;} -.DAT_REC_SMALL_BOLD {color:#202020; font-size:18pt; line-height:110%;} -.MSJ_AVISO {color:#632921; font-size:15pt;} -.TIT_TBL {color:#4D88A1; font-size:18pt; font-weight:bold;} -.TIT_CLASSPHOTO {font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif; color:#606060; font-size:13pt;} -.CLASSPHOTO {color:#606060; font-size:13pt; line-height:110%; white-space:nowrap;} - -.GRP_TITLE {color:#4D88A1; font-size:20pt; font-weight:bold;} - -.ASG_TITLE {color:#4D88A1; font-size:20pt; font-weight:bold;} -.ASG_TITLE_LIGHT {color:#AFC4CC; font-size:20pt; font-weight:bold;} -.ASG_GRP {color:#4D88A1; font-size:15pt;} -.ASG_GRP_LIGHT {color:#AFC4CC; font-size:15pt;} -.DATE_GREEN {color:#008000; font-size:18pt;} -.DATE_GREEN_LIGHT {color:#89BE87; font-size:18pt;} -.DATE_RED {color:#FF0000; font-size:18pt;} -.DATE_RED_LIGHT {color:#F98A8A; font-size:18pt;} - -.ASG_LST_DATE_GREEN {color:#008000; font-size:15pt; white-space:nowrap;} -.ASG_LST_DATE_RED {color:#FF0000; font-size:15pt; white-space:nowrap;} - -.STATUS_GREEN {color:#008000; font-size:18pt;} -.STATUS_GREEN_LIGHT {color:#89BE87; font-size:18pt;} -.STATUS_RED {color:#FF0000; font-size:18pt;} -.STATUS_RED_LIGHT {color:#F98A8A; font-size:18pt;} - -/********************************** Tests ************************************/ -.ANS {color:#404040; font-size:20pt; font-weight:bold;} -.ANS_OK {color:#008000; font-size:20pt; font-weight:bold;} -.ANS_BAD {color:#FF0000; font-size:20pt; font-weight:bold;} -.TEST {color:#404040; font-size:18pt;} -.TEST_EXA {color:#404040; font-size:18pt;} -.TEST_EXA_LIGHT {color:#A0A0A0; font-size:18pt;} -.TEST_EDI {color:#404040; font-size:18pt;} -.TEST_EDI_LIGHT {color:#A0A0A0; font-size:18pt;} - -.HOR {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#345C6C; font-size:15pt; line-height:110%; letter-spacing:0;} -.FREE0 {background-color:#F4F2EA; border:solid 1px; border-color:#F4F2EA #E0D9C2 #EEEADC #F4F2EA;} -.FREE1 {background-color:#F4F2EA; border:solid 1px; border-color:#F4F2EA #E0D9C2 #E0D9C2 #F4F2EA;} -.FREE2 {background-color:#FBFAF7; border:solid 1px; border-color:#FBFAF7 #E0D9C2 #F5F2E9 #FBFAF7;} -.FREE3 {background-color:#FBFAF7; border:solid 1px; border-color:#FBFAF7 #E0D9C2 #E0D9C2 #FBFAF7;} -.THEO {background-color:#C0DAE4; border:solid 2px; border-color:#C9E3ED #B5CFD9 #B5CFD9 #C9E3ED;} -.PRAC {background-color:#DBE5E9; border:solid 2px; border-color:#E4EEF2 #D0DADE #D0DADE #E4EEF2;} -.TUTO {background-color:#D6E9C3; border:solid 2px; border-color:#DFEEE0 #CAE3B1 #CAE3B1 #DFEEE0;} - -.CUR_TIME {color:#BAD2DA; font-size:15pt; font-weight:bold;} - -.PREF_OFF {height:40px; text-align:center; vertical-align:middle;} -.PREF_ON {height:40px; text-align:center; vertical-align:middle; border:solid 1px; border-color:#C0DAE4; background-color:#DDECF1;} - -.LOG {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#606060; font-size:11pt;} -.LOG_R {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#FF0000; font-size:11pt;} - -.MSG_TXT {font-family:"Courier New","DejaVu LGC Sans Mono","Bitstream Vera Sans Mono",monospace; color:#404040; font-size:12pt;} - -.MSG_TIT {color:#4D88A1; font-size:12pt;} -.MSG_TIT_NEW {color:#4D88A1; font-size:12pt; font-weight:bold;} -.MSG_TIT_REM {color:#AFC4CC; font-size:12pt;} -.MSG_TIT_BG - { - background-image:linear-gradient(#eaf3f6 0,#eaf3f6 80%,white 100%); - background-repeat:no-repeat; - background-repeat:repeat-x; - color:#4D88A1; - font-size:12pt; - } -.MSG_TIT_BG_NEW - { - background-image:linear-gradient(#f5ffd7 0,#f5ffd7 80%,white 100%); - background-repeat:no-repeat; - color:#4D88A1; - font-size:12pt; - font-weight:bold; - } -.MSG_TIT_BG_REM - { - background-image:linear-gradient(#f3fcff 0,#f3fcff 80%,white 100%); - background-repeat:no-repeat; - color:#AFC4CC; - font-size:12pt; - } -.MSG_AUT {color:#4D88A1; font-size:11pt;} -.MSG_AUT_LIGHT {color:#AFC4CC; font-size:11pt;} -.MSG_AUT_NEW {color:#4D88A1; font-size:11pt; font-weight:bold;} -.MSG_AUT_BG - { - background-image:linear-gradient(#eaf3f6 0,#eaf3f6 80%,white 100%); - background-repeat:no-repeat; - color:#4D88A1; - font-size:11pt; - } -.MSG_AUT_BG_NEW - { - background-image:linear-gradient(#f5ffd7 0,#f5ffd7 80%,white 100%); - background-repeat:no-repeat; - color:#4D88A1; - font-size:11pt; - font-weight:bold; - } -.MSG_AUT_BG_REM - { - background-image:linear-gradient(#f3fcff 0,#f3fcff 80%,white 100%); - background-repeat:no-repeat; - color:#AFC4CC; - font-size:11pt; - } -.MSG_DATE {color:#4D88A1; font-size:11pt;} -.MSG_DATE_NEW {color:#4D88A1; font-size:11pt; font-weight:bold;} -.BT {width:20px; text-align:center; vertical-align:top;} -.BT0 {width:20px; text-align:center; vertical-align:top; background-color:#F4F2EA;} -.BT1 {width:20px; text-align:center; vertical-align:top; background-color:#FBFAF7;} -.BM {width:20px; text-align:center; vertical-align:middle;} -.BM_SEL {width:20px; text-align:center; vertical-align:middle; background-color:#C0FF40;} -.BM0 {width:20px; text-align:center; vertical-align:middle; background-color:#F4F2EA;} -.BM1 {width:20px; text-align:center; vertical-align:middle; background-color:#FBFAF7;} - -/***************************** Calls for exams *******************************/ -.CONV_TIT - { - font-family:Garamond,"DejaVu LGC Serif","Bitstream Vera Serif",serif; - color:#404040; - font-weight:bold; - font-size:18pt; - } -.CONV_TIT_IMPR - { - font-family:Garamond,"DejaVu LGC Serif","Bitstream Vera Serif",serif; - color:#202020; - font-weight:bold; - font-size:18pt; - } -.CONV_NEG - { - font-family:Garamond,"DejaVu LGC Serif","Bitstream Vera Serif",serif; - color:#404040; - font-weight:bold; - font-size:13pt; - white-space:nowrap; - } -.CONV_NEG_IMPR - { - font-family:Garamond,"DejaVu LGC Serif","Bitstream Vera Serif",serif; - color:#202020; - font-weight:bold; - font-size:13pt; - white-space:nowrap; - } -.CONV - { - font-family:Garamond,"DejaVu LGC Serif","Bitstream Vera Serif",serif; - color:#404040; - font-size:9pt; - } -.CONV_IMPR - { - font-family:Garamond,"DejaVu LGC Serif","Bitstream Vera Serif",serif; - color:#202020; - font-size:9pt; - } - -/***************************** Public user's profile *************************/ -.FOLLOW - { - color:#C0C0C0; - font-size:35pt; - font-weight:bold; - } -.FOLLOW_B - { - color:#000000; - font-size:35pt; - font-weight:bold; - } -.PRF_ICON_CONTAINER - { - width:25px; - } -.PRF_ICON - { - margin:auto; - display:block; - width:20px; - height:20px; - opacity:0.33; - } -.PRF_FIG - { - text-align:left; - vertical-align:middle; - } - -.CON {color:#B8D070; font-size:11pt; line-height:110%; white-space:nowrap;} -.CON_CRS {color:#398000; font-size:11pt; line-height:110%; white-space:nowrap;} - -/*************************** Indicators about courses ************************/ -.INDICATORS td,.INDICATORS th - { - border:1px solid silver; - border-collapse:collapse; - padding:1px; - } -.INDICATORS th - { - color:#4D88A1; - font-size:12pt; - font-weight:bold; - } - -/********************* Used to align buttons in account forms ****************/ -.FORM_ACCOUNT - { - display:inline-block; - min-width:312px; - } diff --git a/swad_changelog.h b/swad_changelog.h index 59b14328d..e86573133 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -115,11 +115,13 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.47 (2015/11/27)" +#define Log_PLATFORM_VERSION "SWAD 15.47.1 (2015/11/27)" // 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 15.47.1: Nov 27, 2015 swad_desktop.css is renamed to swad.css. + swad_mobile.css is removed. (186343 lines) Version 15.47: Nov 27, 2015 Mobile layout is removed (only 1.45% of users used it and now it is replaced by responsive design). (187426 lines) 3 changes necessary in database: ALTER TABLE IP_prefs DROP COLUMN Layout; diff --git a/swad_config.h b/swad_config.h index 833e86613..a74df27eb 100644 --- a/swad_config.h +++ b/swad_config.h @@ -59,12 +59,9 @@ #define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc. #define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data -#define Cfg_PLATFORM_LOGO_DESKTOP_FILE "openswad240x40.png" // Logo displayed in the top of the page -#define Cfg_PLATFORM_LOGO_DESKTOP_WIDTH 240 -#define Cfg_PLATFORM_LOGO_DESKTOP_HEIGHT 40 -#define Cfg_PLATFORM_LOGO_MOBILE_FILE "openswad330x60.png" // Logo displayed in the top of the page -#define Cfg_PLATFORM_LOGO_MOBILE_WIDTH 330 -#define Cfg_PLATFORM_LOGO_MOBILE_HEIGHT 60 +#define Cfg_PLATFORM_LOGO_FILE "openswad240x40.png" // Logo displayed in the top of the page +#define Cfg_PLATFORM_LOGO_WIDTH 240 +#define Cfg_PLATFORM_LOGO_HEIGHT 40 #define Cfg_PLATFORM_RESPONSIBLE_NAME "Antonio Cañas Vargas" // Main responsible for the platform #define Cfg_PLATFORM_RESPONSIBLE_E_MAIL "webmaster@openswad.org" // Main responsible for the platform @@ -112,12 +109,9 @@ #define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc. #define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data -#define Cfg_PLATFORM_LOGO_DESKTOP_FILE "openswad240x40.png" // Logo displayed in the top of the page -#define Cfg_PLATFORM_LOGO_DESKTOP_WIDTH 240 -#define Cfg_PLATFORM_LOGO_DESKTOP_HEIGHT 40 -#define Cfg_PLATFORM_LOGO_MOBILE_FILE "openswad330x60.png" // Logo displayed in the top of the page -#define Cfg_PLATFORM_LOGO_MOBILE_WIDTH 330 -#define Cfg_PLATFORM_LOGO_MOBILE_HEIGHT 60 +#define Cfg_PLATFORM_LOGO_FILE "openswad240x40.png" // Logo displayed in the top of the page +#define Cfg_PLATFORM_LOGO_WIDTH 240 +#define Cfg_PLATFORM_LOGO_HEIGHT 40 #define Cfg_PLATFORM_RESPONSIBLE_NAME "Antonio Caņas Vargas" // Main responsible for the platform #define Cfg_PLATFORM_RESPONSIBLE_E_MAIL "webmaster@openswad.org" // Main responsible for the platform @@ -182,12 +176,9 @@ #define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc. #define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data -#define Cfg_PLATFORM_LOGO_DESKTOP_FILE "swad160x40.png" // Logo displayed in the top of the page -#define Cfg_PLATFORM_LOGO_DESKTOP_WIDTH 160 -#define Cfg_PLATFORM_LOGO_DESKTOP_HEIGHT 40 -#define Cfg_PLATFORM_LOGO_MOBILE_FILE "swad210x60.png" // Logo displayed in the top of the page -#define Cfg_PLATFORM_LOGO_MOBILE_WIDTH 210 -#define Cfg_PLATFORM_LOGO_MOBILE_HEIGHT 60 +#define Cfg_PLATFORM_LOGO_FILE "swad160x40.png" // Logo displayed in the top of the page +#define Cfg_PLATFORM_LOGO_WIDTH 160 +#define Cfg_PLATFORM_LOGO_HEIGHT 40 #define Cfg_PLATFORM_RESPONSIBLE_NAME "CEVUG" // Main responsible for the platform #define Cfg_PLATFORM_RESPONSIBLE_E_MAIL "sctecnico@ugr.es" // Main responsible for the platform @@ -242,12 +233,9 @@ #define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc. #define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data -#define Cfg_PLATFORM_LOGO_DESKTOP_FILE "swad160x40.png" // Logo displayed in the top of the page -#define Cfg_PLATFORM_LOGO_DESKTOP_WIDTH 160 -#define Cfg_PLATFORM_LOGO_DESKTOP_HEIGHT 40 -#define Cfg_PLATFORM_LOGO_MOBILE_FILE "swad210x60.png" // Logo displayed in the top of the page -#define Cfg_PLATFORM_LOGO_MOBILE_WIDTH 210 -#define Cfg_PLATFORM_LOGO_MOBILE_HEIGHT 60 +#define Cfg_PLATFORM_LOGO_FILE "swad160x40.png" // Logo displayed in the top of the page +#define Cfg_PLATFORM_LOGO_WIDTH 160 +#define Cfg_PLATFORM_LOGO_HEIGHT 40 #define Cfg_PLATFORM_RESPONSIBLE_NAME "Carmen Varela Báez" // Main responsible for the platform #define Cfg_PLATFORM_RESPONSIBLE_E_MAIL "cevuna@rec.una.py" // Main responsible for the platform diff --git a/swad_copy.sh b/swad_copy.sh index 64418342b..e9a7a2c81 100755 --- a/swad_copy.sh +++ b/swad_copy.sh @@ -19,9 +19,8 @@ cp -af $CGI/swad_pt $CGI/swad_pt.old cp -f $CORE/swad_ca $CORE/swad_de $CORE/swad_en $CORE/swad_es $CORE/swad_fr $CORE/swad_gn $CORE/swad_it $CORE/swad_pl $CORE/swad_pt $CGI cp -f $CORE/js/swad.js $PUBLIC_HTML -cp -f $CORE/css/swad_desktop.css $CORE/css/swad_mobile.css $PUBLIC_HTML +cp -f $CORE/css/swad.css $PUBLIC_HTML chown -R $APACHE_USER:$APACHE_GROUP $CGI chown $APACHE_USER:$APACHE_GROUP $PUBLIC_HTML/swad.js -chown $APACHE_USER:$APACHE_GROUP $PUBLIC_HTML/swad_desktop.css -chown $APACHE_USER:$APACHE_GROUP $PUBLIC_HTML/swad_mobile.css +chown $APACHE_USER:$APACHE_GROUP $PUBLIC_HTML/swad.css diff --git a/swad_layout.c b/swad_layout.c index 569438d81..a785b24e7 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -188,7 +188,7 @@ void Lay_WriteStartOfPage (void) Gbl.Prefs.IconsURL); /* Style sheet for SWAD */ - fprintf (Gbl.F.Out,"\n", + fprintf (Gbl.F.Out,"\n", Cfg_HTTPS_URL_SWAD_PUBLIC); /* Style sheet for Dropzone.js (http://www.dropzonejs.com/) */ @@ -300,7 +300,7 @@ void Lay_WriteStartOfPage (void) { /* Vertical menu (left) */ fprintf (Gbl.F.Out,"
"); - Mnu_WriteVerticalMenuThisTabDesktop (); + Mnu_WriteVerticalMenuThisTab (); fprintf (Gbl.F.Out,"
"); } @@ -309,7 +309,7 @@ void Lay_WriteStartOfPage (void) if (Gbl.Prefs.Menu == Mnu_MENU_HORIZONTAL) /* Horizontal menu */ - Mnu_WriteHorizontalMenuThisTabDesktop (); + Mnu_WriteHorizontalMenuThisTab (); /* Write warning when degree type does not allow direct login */ Usr_WarningWhenDegreeTypeDoesntAllowDirectLogin (); @@ -680,12 +680,12 @@ static void Lay_WritePageTopHeading (void) " style=\"width:%upx; height:%upx;\" />" "" "", - Cfg_PLATFORM_LOGO_DESKTOP_WIDTH, + Cfg_PLATFORM_LOGO_WIDTH, Cfg_HTTPS_URL_SWAD_CGI, - Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_DESKTOP_FILE, + Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_FILE, Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME, - Cfg_PLATFORM_LOGO_DESKTOP_WIDTH, - Cfg_PLATFORM_LOGO_DESKTOP_HEIGHT); + Cfg_PLATFORM_LOGO_WIDTH, + Cfg_PLATFORM_LOGO_HEIGHT); /* 1st. row, 1st. column: search */ fprintf (Gbl.F.Out,"
"); @@ -749,7 +749,7 @@ static void Lay_WritePageTopHeading (void) /***** 3rd. row (tabs) *****/ fprintf (Gbl.F.Out,"
"); - Tab_DrawTabsDeskTop (); + Tab_DrawTabs (); fprintf (Gbl.F.Out,"
"); } diff --git a/swad_menu.c b/swad_menu.c index 3329a90bc..ff40e7df1 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -67,10 +67,10 @@ const char *Mnu_MenuIcons[Mnu_NUM_MENUS] = }; /*****************************************************************************/ -/************* Write the menu of current tab (desktop layout) ****************/ +/******************* Write vertical menu of current tab **********************/ /*****************************************************************************/ -void Mnu_WriteVerticalMenuThisTabDesktop (void) +void Mnu_WriteVerticalMenuThisTab (void) { extern const char *The_ClassMenuOn[The_NUM_THEMES]; extern const char *The_ClassMenuOff[The_NUM_THEMES]; @@ -163,10 +163,10 @@ void Mnu_WriteVerticalMenuThisTabDesktop (void) } /*****************************************************************************/ -/********** Write horizontal menu of current tab (desktop layout) ************/ +/******************* Write horizontal menu of current tab ********************/ /*****************************************************************************/ -void Mnu_WriteHorizontalMenuThisTabDesktop (void) +void Mnu_WriteHorizontalMenuThisTab (void) { extern const char *The_ClassMenuOn[The_NUM_THEMES]; extern const char *The_ClassMenuOff[The_NUM_THEMES]; diff --git a/swad_menu.h b/swad_menu.h index 8a8d4f52a..33f42514e 100644 --- a/swad_menu.h +++ b/swad_menu.h @@ -49,8 +49,8 @@ typedef enum /***************************** Public prototypes *****************************/ /*****************************************************************************/ -void Mnu_WriteVerticalMenuThisTabDesktop (void); -void Mnu_WriteHorizontalMenuThisTabDesktop (void); +void Mnu_WriteVerticalMenuThisTab (void); +void Mnu_WriteHorizontalMenuThisTab (void); void Mnu_PutIconsToSelectMenu (void); void Mnu_ChangeMenu (void); diff --git a/swad_tab.c b/swad_tab.c index 12d4cf823..fdb632b56 100644 --- a/swad_tab.c +++ b/swad_tab.c @@ -78,7 +78,7 @@ static void Tab_WriteBreadcrumbAction (void); /**************** Draw tabs with the current tab highlighted *****************/ /*****************************************************************************/ -void Tab_DrawTabsDeskTop (void) +void Tab_DrawTabs (void) { extern const char *The_ClassTabOn[The_NUM_THEMES]; extern const char *The_ClassTabOff[The_NUM_THEMES]; diff --git a/swad_tab.h b/swad_tab.h index f4fd0bcd0..de0b71506 100644 --- a/swad_tab.h +++ b/swad_tab.h @@ -41,7 +41,7 @@ /***************************** Public prototypes *****************************/ /*****************************************************************************/ -void Tab_DrawTabsDeskTop (void); +void Tab_DrawTabs (void); void Tab_DrawBreadcrumb (void); void Tab_SetCurrentTab (void);