From d7a0efea17563cb729d91314dfa5e9c948e2388e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 18 Nov 2019 15:48:46 +0100 Subject: [PATCH] Version19.71 --- css/{swad19.70.css => swad19.71.css} | 43 +++++++++------------------- swad_MFU.c | 6 ++-- swad_centre.c | 4 +-- swad_changelog.h | 5 ++-- swad_course.c | 4 +-- swad_degree.c | 4 +-- swad_institution.c | 4 +-- swad_link.c | 6 ++-- swad_mail.c | 4 +-- swad_match.c | 7 ++--- swad_menu.c | 4 +-- swad_tab.c | 11 +++---- 12 files changed, 43 insertions(+), 59 deletions(-) rename css/{swad19.70.css => swad19.71.css} (99%) diff --git a/css/swad19.70.css b/css/swad19.71.css similarity index 99% rename from css/swad19.70.css rename to css/swad19.71.css index 7a2ae147..d37a46be 100644 --- a/css/swad19.70.css +++ b/css/swad19.71.css @@ -89,7 +89,7 @@ a:link, a:visited, a:active a:hover /* Default ==> underlined */ { text-decoration:underline; - } + } .TAB_OFF a, .TAB_ON a, .MENU_LIST_ITEM a, .CONTEXT_OPT a /* Tabs and menus are the exceptions */ { text-decoration:none; @@ -935,23 +935,14 @@ a:hover /* Default ==> underlined */ } #main_horizontal .MENU_OPT_OFF { - opacity:0.7; + opacity:0.67; } #main_horizontal .MENU_OPT_OFF:hover, #main_horizontal .MENU_OPT_ON { opacity:1; transform:scale(1.286,1.286); } -/* -#main_horizontal .MENU_ICO - { - box-sizing:border-box; - padding:28px 0 0 0; - background-size:28px 28px; - background-repeat:no-repeat; - background-position:center top; - } -*/ + #main_horizontal .MENU_ICO { box-sizing:border-box; @@ -1004,23 +995,13 @@ a:hover /* Default ==> underlined */ } #main_vertical .MENU_OPT_OFF { - opacity:0.7; + opacity:0.67; } #main_vertical .MENU_OPT_OFF:hover, #main_vertical .MENU_OPT_ON { opacity:1; transform:scale(1.286,1.286); } - /* - #main_vertical .MENU_ICO - { - box-sizing:border-box; - padding:28px 0 0 0; - background-size:28px 28px; - background-repeat:no-repeat; - background-position:center top; - } - */ #main_vertical .MENU_ICO { box-sizing:border-box; @@ -1071,7 +1052,7 @@ a:hover /* Default ==> underlined */ } #main_vertical .MENU_OPT_OFF { - opacity:0.7; + opacity:0.67; } #main_vertical .MENU_OPT_OFF:hover, #main_vertical .MENU_OPT_ON { @@ -1520,12 +1501,10 @@ a:hover /* Default ==> underlined */ border:none; padding:0; font:inherit; - text-align:left; } .BT_LINK:hover { - text-decoration: underline; - cursor: pointer; + cursor:pointer; } /********************************** Notice ***********************************/ @@ -2141,12 +2120,13 @@ a:hover img.CENTRE_PHOTO_SHOW /*********************** Icon and checkbox highlighting **********************/ .ICO_HIDDEN { - opacity:0.3; + opacity:0.33; } .ICO_HIGHLIGHT, .CHECKBOX_UNCHECKED { - opacity:0.7; + opacity:0.67; } + .ICO_HIGHLIGHT:hover, .CHECKBOX_UNCHECKED:hover, .CHECKBOX_CHECKED { opacity:1; @@ -2154,7 +2134,7 @@ a:hover img.CENTRE_PHOTO_SHOW .HLP_HIGHLIGHT { - opacity:0.3; + opacity:0.33; } .HLP_HIGHLIGHT:hover { @@ -2489,6 +2469,9 @@ a:hover img.CENTRE_PHOTO_SHOW margin:0 auto; } +/************************** Left column menu *********************************/ +.LINK_TITLE, .MFU_TITLE {color:#4D88A1;} + /*****************************************************************************/ .MSJ_AVISO {color:#632921; font-size:12pt;} .TIT_TBL {color:#4D88A1; font-size:12pt; font-weight:bold;} diff --git a/swad_MFU.c b/swad_MFU.c index 466e7e42..6434fbc5 100644 --- a/swad_MFU.c +++ b/swad_MFU.c @@ -279,9 +279,9 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions) /***** Start div and link *****/ HTM_DIV_Begin ("id=\"MFU_actions\""); Frm_StartForm (ActMFUAct); - Frm_LinkFormSubmit (Txt_My_frequent_actions,NULL,NULL); - HTM_TxtF (" %s",Txt_Frequent_ACTIONS); - Frm_LinkFormEnd (); + HTM_BUTTON_Begin (Txt_My_frequent_actions,"BT_LINK MFU_TITLE",NULL); + HTM_TxtF ("%s",Txt_Frequent_ACTIONS); + HTM_BUTTON_End (); Frm_EndForm (); /***** Write list of frequently used actions *****/ diff --git a/swad_centre.c b/swad_centre.c index a565ec74..ce249fc2 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -886,12 +886,12 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr) if (Ctr->Status & Ctr_STATUS_BIT_PENDING) { TxtClassNormal = "DAT_LIGHT"; - TxtClassStrong = "BT_LINK DAT_LIGHT"; + TxtClassStrong = "BT_LINK LT DAT_LIGHT"; } else { TxtClassNormal = "DAT"; - TxtClassStrong = "BT_LINK DAT_N"; + TxtClassStrong = "BT_LINK LT DAT_N"; } BgColor = (Ctr->CtrCod == Gbl.Hierarchy.Ctr.CtrCod) ? "LIGHT_BLUE" : Gbl.ColorRows[Gbl.RowEvenOdd]; diff --git a/swad_changelog.h b/swad_changelog.h index 88002352..a507ec56 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.70.7 (2019-11-17)" -#define CSS_FILE "swad19.70.css" +#define Log_PLATFORM_VERSION "SWAD 19.71 (2019-11-17)" +#define CSS_FILE "swad19.71.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.71: Nov 17, 2019 Converting links to buttons. (247076 lines) Version 19.70.7: Nov 17, 2019 Converting links to buttons. (247095 lines) Version 19.70.6: Nov 17, 2019 Converting links to buttons. (247093 lines) Version 19.70.5: Nov 17, 2019 Converting links to buttons. (247064 lines) diff --git a/swad_course.c b/swad_course.c index 65f37492..41aaac78 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1222,12 +1222,12 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year) if (Crs->Status & Crs_STATUS_BIT_PENDING) { TxtClassNormal = "DAT_LIGHT"; - TxtClassStrong = "BT_LINK DAT_LIGHT"; + TxtClassStrong = "BT_LINK LT DAT_LIGHT"; } else { TxtClassNormal = "DAT"; - TxtClassStrong = "BT_LINK DAT_N"; + TxtClassStrong = "BT_LINK LT DAT_N"; } /* Check if this course is one of my courses */ diff --git a/swad_degree.c b/swad_degree.c index 367f5865..55011e29 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -1207,12 +1207,12 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg) if (Deg->Status & Deg_STATUS_BIT_PENDING) { TxtClassNormal = "DAT_LIGHT"; - TxtClassStrong = "BT_LINK DAT_LIGHT"; + TxtClassStrong = "BT_LINK LT DAT_LIGHT"; } else { TxtClassNormal = "DAT"; - TxtClassStrong = "BT_LINK DAT_N"; + TxtClassStrong = "BT_LINK LT DAT_N"; } BgColor = (Deg->DegCod == Gbl.Hierarchy.Deg.DegCod) ? "LIGHT_BLUE" : Gbl.ColorRows[Gbl.RowEvenOdd]; diff --git a/swad_institution.c b/swad_institution.c index c4c9fbe9..160f1966 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -766,12 +766,12 @@ static void Ins_ListOneInstitutionForSeeing (struct Instit *Ins,unsigned NumIns) if (Ins->Status & Ins_STATUS_BIT_PENDING) { TxtClassNormal = "DAT_LIGHT"; - TxtClassStrong = "BT_LINK DAT_LIGHT"; + TxtClassStrong = "BT_LINK LT DAT_LIGHT"; } else { TxtClassNormal = "DAT"; - TxtClassStrong = "BT_LINK DAT_N"; + TxtClassStrong = "BT_LINK LT DAT_N"; } BgColor = (Ins->InsCod == Gbl.Hierarchy.Ins.InsCod) ? "LIGHT_BLUE" : Gbl.ColorRows[Gbl.RowEvenOdd]; diff --git a/swad_link.c b/swad_link.c index c8489806..942b7bc0 100644 --- a/swad_link.c +++ b/swad_link.c @@ -165,9 +165,9 @@ void Lnk_WriteMenuWithInstitutionalLinks (void) HTM_DIV_Begin ("id=\"institutional_links\""); Frm_StartForm (ActSeeLnk); - Frm_LinkFormSubmit (Txt_Links,NULL,NULL); - HTM_TxtF (" %s",Txt_Links); - Frm_LinkFormEnd (); + HTM_BUTTON_Begin (Txt_Links,"BT_LINK LINK_TITLE",NULL); + HTM_TxtF ("%s",Txt_Links); + HTM_BUTTON_End (); Frm_EndForm (); Lnk_WriteListOfLinks (); diff --git a/swad_mail.c b/swad_mail.c index 0e2c3910..62763bc2 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -137,13 +137,13 @@ void Mai_SeeMailDomains (void) Frm_StartForm (ActSeeMai); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); - Frm_LinkFormSubmit (Txt_EMAIL_DOMAIN_HELP_ORDER[Order],"TIT_TBL",NULL); + HTM_BUTTON_Begin (Txt_EMAIL_DOMAIN_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL); if (Order == Gbl.Mails.SelectedOrder) HTM_U_Begin (); HTM_Txt (Txt_EMAIL_DOMAIN_ORDER[Order]); if (Order == Gbl.Mails.SelectedOrder) HTM_U_End (); - Frm_LinkFormEnd (); + HTM_BUTTON_End (); Frm_EndForm (); HTM_TH_End (); diff --git a/swad_match.c b/swad_match.c index 2491ac03..cac9c565 100644 --- a/swad_match.c +++ b/swad_match.c @@ -1218,10 +1218,9 @@ static void Mch_PutFormNewMatch (struct Game *Game) /***** End table *****/ HTM_TABLE_End (); - /***** Put icon with link *****/ - Frm_LinkFormSubmit (Txt_Play,NULL,NULL); - Ico_PutIcon ("play.svg",Txt_Play,"CONTEXT_OPT ICO_HIGHLIGHT ICO64x64"); - Frm_LinkFormEnd (); + /***** Put icon to submit the form *****/ + HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"play.svg", + Txt_Play,"CONTEXT_OPT ICO_HIGHLIGHT ICO64x64"); /***** End box *****/ Box_BoxEnd (); diff --git a/swad_menu.c b/swad_menu.c index 90f62598..eb60bf5f 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -366,7 +366,7 @@ void Mnu_WriteMenuThisTab (void) /***** Begin form and link *****/ Frm_StartForm (NumAct); - Frm_LinkFormSubmit (Title,The_ClassTxtMenu[Gbl.Prefs.Theme],NULL); + HTM_BUTTON_Begin (Title,"BT_LINK",NULL); /***** Icon and text *****/ HTM_DIV_Begin ("class=\"MENU_ICO\" style=\"background-image:url('%s/%s');\"", @@ -378,7 +378,7 @@ void Mnu_WriteMenuThisTab (void) HTM_DIV_End (); /***** End link and form *****/ - Frm_LinkFormEnd (); + HTM_BUTTON_End (); Frm_EndForm (); /***** End container used to highlight this option *****/ diff --git a/swad_tab.c b/swad_tab.c index 265921a2..510eb9c1 100644 --- a/swad_tab.c +++ b/swad_tab.c @@ -129,13 +129,14 @@ void Tab_DrawTabs (void) if (NumTab == Gbl.Action.Tab) HTM_DIV_Begin (NULL); // This div must be present even in current tab in order to render properly the tab else - HTM_DIV_Begin ("class=\"class=\"ICO_HIGHLIGHT\""); + HTM_DIV_Begin ("class=\"ICO_HIGHLIGHT\""); Frm_StartForm (ActMnu); Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) NumTab); - Frm_LinkFormSubmit (Txt_TABS_TXT[NumTab], - NumTab == Gbl.Action.Tab ? The_ClassTxtTabOn[Gbl.Prefs.Theme] : - The_ClassTxtTabOff[Gbl.Prefs.Theme],NULL); + HTM_BUTTON_Begin (Txt_TABS_TXT[NumTab], + NumTab == Gbl.Action.Tab ? "BT_LINK" : + "BT_LINK", + NULL); HTM_IMG (Gbl.Prefs.URLIconSet,Tab_GetIcon (NumTab),Txt_TABS_TXT[NumTab], "class=\"TAB_ICO\""); HTM_DIV_Begin ("class=\"TAB_TXT %s\"", @@ -143,7 +144,7 @@ void Tab_DrawTabs (void) The_ClassTxtTabOff[Gbl.Prefs.Theme]); HTM_Txt (Txt_TABS_TXT[NumTab]); HTM_DIV_End (); - Frm_LinkFormEnd (); + HTM_BUTTON_End (); Frm_EndForm (); HTM_DIV_End ();