diff --git a/css/swad18.2.2.css b/css/swad18.2.2.css index ce65cd20f..0f8b91217 100644 --- a/css/swad18.2.2.css +++ b/css/swad18.2.2.css @@ -2107,7 +2107,7 @@ a:hover img.CENTRE_PHOTO_SHOW text-align:center; vertical-align:top; } -.REC_SHA, .REC_CRS, .REC_TT +.REC_LEFT, .REC_RIGHT { display:inline-block; margin:0 6px; diff --git a/swad_action.c b/swad_action.c index af646cd7a..69049325b 100644 --- a/swad_action.c +++ b/swad_action.c @@ -3157,7 +3157,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgMyOff */{1170,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_UpdateMyOffice ,NULL}, /* ActChgMyOffPho */{1171,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_UpdateMyOfficePhone ,NULL}, - /* ActReqEdiMyNet */{1172,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Net_ShowFormMyWebsAndSocialNets,NULL}, + /* ActReqEdiMyNet */{1172,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndMyInsCtrDpt,NULL}, /* ActChgMyNet */{1173,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Net_UpdateMyWebsAndSocialNets ,NULL}, /* ActChgThe */{ 841,-1,TabUnk,ActEdiPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,The_ChangeTheme ,Pre_EditPrefs ,NULL}, diff --git a/swad_changelog.h b/swad_changelog.h index bc06d31c1..8e4ccf1f1 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -355,10 +355,11 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.2.2 (2018-10-08)" +#define Log_PLATFORM_VERSION "SWAD 18.2.3 (2018-10-08)" #define CSS_FILE "swad18.2.2.css" #define JS_FILE "swad17.17.1.js" /* + Version 18.2.3: Oct 08, 2018 Changes in edition of webs/social networks. (234952 lines) Version 18.2.2: Oct 08, 2018 Changes in edition of user's institution, centre, department... (234968 lines) Version 18.2.1: Oct 08, 2018 Changes in edition of user's institution, centre, department... (234989 lines) Version 18.2: Oct 08, 2018 Changes in layout of record card. (234980 lines) diff --git a/swad_network.c b/swad_network.c index 5398d8d20..e659d3f68 100644 --- a/swad_network.c +++ b/swad_network.c @@ -184,6 +184,8 @@ const char *Net_WebsAndSocialNetworksTitle[Net_NUM_WEBS_AND_SOCIAL_NETWORKS] = "YouTube", // Net_YOUTUBE }; +#define Net_MY_WEBS_ID "my_webs_section" + /*****************************************************************************/ /***************************** Private prototypes ****************************/ /*****************************************************************************/ @@ -267,27 +269,10 @@ static void Net_ShowAWebOrSocialNet (const char *URL, Title,Title); } -/*****************************************************************************/ -/*********** Put a link to the action to edit my social networks *************/ -/*****************************************************************************/ - -void Net_PutLinkToChangeMySocialNetworks (void) - { - extern const char *Txt_Edit_my_webs_networks; - - /***** Link to edit my social networks *****/ - Lay_PutContextualLink (ActReqEdiMyNet,NULL,NULL, - "earth64x64.gif", - Txt_Edit_my_webs_networks,NULL, - NULL); - } - /*****************************************************************************/ /********************* Show form to edit my social networks ******************/ /*****************************************************************************/ -#define Net_COL2_WIDTH 300 - void Net_ShowFormMyWebsAndSocialNets (void) { extern const char *Hlp_PROFILE_Webs; @@ -298,9 +283,15 @@ void Net_ShowFormMyWebsAndSocialNets (void) MYSQL_ROW row; Net_WebsAndSocialNetworks_t NumURL; char URL[Cns_MAX_BYTES_WWW + 1]; + char StrRecordWidth[10 + 1]; + + /***** Start section *****/ + Lay_StartSection (Net_MY_WEBS_ID); /***** Start box and table *****/ - Box_StartBoxTable (NULL,Txt_Webs_social_networks,Net_PutIconsWebsSocialNetworks, + sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH); + Box_StartBoxTable (StrRecordWidth, + Txt_Webs_social_networks,Net_PutIconsWebsSocialNetworks, Hlp_PROFILE_Webs,Box_NOT_CLOSABLE,2); for (NumURL = (Net_WebsAndSocialNetworks_t) 0; @@ -331,7 +322,7 @@ void Net_ShowFormMyWebsAndSocialNets (void) /***** Row for this web / social network *****/ fprintf (Gbl.F.Out,"" - "" + "" "