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,"
"
- ""
+ " "
""
" "
" "
- "",
+ " ",
(unsigned) NumURL,The_ClassForm[Gbl.Prefs.Theme],
Gbl.Prefs.IconsURL,Net_WebsAndSocialNetworksIcons[NumURL],
Net_WebsAndSocialNetworksTitle[NumURL],
Net_WebsAndSocialNetworksTitle[NumURL],
- Net_WebsAndSocialNetworksTitle[NumURL],
- Net_COL2_WIDTH);
- Act_FormStart (ActChgMyNet);
+ Net_WebsAndSocialNetworksTitle[NumURL]);
+ Act_FormStartAnchor (ActChgMyNet,Net_MY_WEBS_ID);
Par_PutHiddenParamUnsigned ("Web",(unsigned) NumURL);
fprintf (Gbl.F.Out," ",
(unsigned) NumURL,
- Cns_MAX_CHARS_WWW,URL,Net_COL2_WIDTH - 20,
+ Cns_MAX_CHARS_WWW,URL,
Gbl.Form.Id);
Act_FormEnd ();
fprintf (Gbl.F.Out," "
@@ -362,6 +353,9 @@ void Net_ShowFormMyWebsAndSocialNets (void)
/***** End table and box *****/
Box_EndBoxTable ();
+
+ /***** End section *****/
+ Lay_EndSection ();
}
/*****************************************************************************/
@@ -385,7 +379,7 @@ void Net_UpdateMyWebsAndSocialNets (void)
Net_GetMyWebsAndSocialNetsFromForm ();
/***** Show form again *****/
- Net_ShowFormMyWebsAndSocialNets ();
+ Rec_ShowMySharedRecordAndMyInsCtrDpt ();
}
/*****************************************************************************/
diff --git a/swad_network.h b/swad_network.h
index cca59b060..cfc2c49a1 100644
--- a/swad_network.h
+++ b/swad_network.h
@@ -41,7 +41,6 @@
void Net_ShowWebsAndSocialNets (const struct UsrData *UsrDat);
-void Net_PutLinkToChangeMySocialNetworks (void);
void Net_ShowFormMyWebsAndSocialNets (void);
void Net_UpdateMyWebsAndSocialNets (void);
void Net_ShowWebAndSocialNetworksStats (void);
diff --git a/swad_record.c b/swad_record.c
index 57285f2ac..913746b4f 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -1072,7 +1072,7 @@ static void Rec_ListRecordsGsts (Rec_SharedRecordViewType_t TypeOfView)
Ale_ShowPendingAlert ();
/* Shared record */
- fprintf (Gbl.F.Out,"");
+ fprintf (Gbl.F.Out,"
");
Rec_ShowSharedUsrRecord (TypeOfView,&UsrDat,RecordSectionId);
fprintf (Gbl.F.Out,"
");
@@ -1141,7 +1141,7 @@ static void Rec_ShowRecordOneStdCrs (void)
fprintf (Gbl.F.Out,"
");
/***** Shared record *****/
- fprintf (Gbl.F.Out,"
");
+ fprintf (Gbl.F.Out,"
");
Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,&Gbl.Usrs.Other.UsrDat,NULL);
fprintf (Gbl.F.Out,"
");
@@ -1152,14 +1152,14 @@ static void Rec_ShowRecordOneStdCrs (void)
Gbl.Usrs.Me.Role.Logged == Rol_TCH ||
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
{
- fprintf (Gbl.F.Out,"
");
+ fprintf (Gbl.F.Out,"
");
Rec_ShowCrsRecord (Rec_CRS_LIST_ONE_RECORD,&Gbl.Usrs.Other.UsrDat,NULL);
fprintf (Gbl.F.Out,"
");
}
else if (Gbl.Usrs.Me.Role.Logged == Rol_STD &&
Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod) // It's me
{
- fprintf (Gbl.F.Out,"
");
+ fprintf (Gbl.F.Out,"
");
Rec_ShowCrsRecord (Rec_CRS_MY_RECORD_AS_STUDENT_FORM,&Gbl.Usrs.Other.UsrDat,NULL);
fprintf (Gbl.F.Out,"
");
}
@@ -1268,7 +1268,7 @@ static void Rec_ListRecordsStds (Rec_SharedRecordViewType_t ShaTypeOfView,
Ale_ShowPendingAlert ();
/* Shared record */
- fprintf (Gbl.F.Out,"
");
+ fprintf (Gbl.F.Out,"
");
Rec_ShowSharedUsrRecord (ShaTypeOfView,&UsrDat,RecordSectionId);
fprintf (Gbl.F.Out,"
");
@@ -1280,7 +1280,7 @@ static void Rec_ListRecordsStds (Rec_SharedRecordViewType_t ShaTypeOfView,
(Gbl.Usrs.Me.Role.Logged == Rol_STD && // I am student in this course...
UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod)) // ...and it's me
{
- fprintf (Gbl.F.Out,"
");
+ fprintf (Gbl.F.Out,"
");
Rec_ShowCrsRecord (CrsTypeOfView,&UsrDat,RecordSectionId);
fprintf (Gbl.F.Out,"
");
}
@@ -1361,14 +1361,14 @@ static void Rec_ShowRecordOneTchCrs (void)
fprintf (Gbl.F.Out,"
");
/***** Shared record *****/
- fprintf (Gbl.F.Out,"
");
+ fprintf (Gbl.F.Out,"
");
Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,&Gbl.Usrs.Other.UsrDat,NULL);
fprintf (Gbl.F.Out,"
");
/***** Office hours *****/
if (ShowOfficeHours)
{
- fprintf (Gbl.F.Out,"
");
+ fprintf (Gbl.F.Out,"
");
Gbl.TimeTable.Type = TT_TUTORING_TIMETABLE;
Box_StartBox (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],NULL,
Hlp_USERS_Teachers_timetable,Box_NOT_CLOSABLE);
@@ -1485,14 +1485,14 @@ static void Rec_ListRecordsTchs (Rec_SharedRecordViewType_t TypeOfView)
Ale_ShowPendingAlert ();
/* Shared record */
- fprintf (Gbl.F.Out,"
");
+ fprintf (Gbl.F.Out,"
");
Rec_ShowSharedUsrRecord (TypeOfView,&UsrDat,RecordSectionId);
fprintf (Gbl.F.Out,"
");
/* Office hours */
if (ShowOfficeHours)
{
- fprintf (Gbl.F.Out,"
");
+ fprintf (Gbl.F.Out,"
");
Gbl.TimeTable.Type = TT_TUTORING_TIMETABLE;
Box_StartBox (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],NULL,
Hlp_USERS_Teachers_timetable,Box_NOT_CLOSABLE);
@@ -2696,15 +2696,10 @@ static void Rec_PutIconsCommands (void)
/***** Button to change user's photo *****/
Pho_PutLinkToChangeOtherUsrPhoto ();
- /* Buttons to change my institution, my social networks and my privacy */
+ /* Button to change my privacy */
if (ItsMe)
- {
- /* Button to change my social networks */
- Net_PutLinkToChangeMySocialNetworks ();
-
/* Button to change my privacy */
Pri_PutLinkToChangeMyPrivacy ();
- }
/***** End container *****/
fprintf (Gbl.F.Out,"
");
@@ -3951,12 +3946,30 @@ static void Rec_GetUsrCommentsFromForm (struct UsrData *UsrDat)
void Rec_ShowMySharedRecordAndMyInsCtrDpt (void)
{
- /***** My shared record *****/
- Rec_ShowFormMySharedRecord ();
+ /***** Start container for this user *****/
+ fprintf (Gbl.F.Out,"
");
- /***** My institution, centre and department *****/
+ /***** My shared record *****/
+ fprintf (Gbl.F.Out,"
");
+ Rec_ShowFormMySharedRecord ();
+ fprintf (Gbl.F.Out,"
");
+
+ /***** Right part *****/
+ /* Start container for right part */
+ fprintf (Gbl.F.Out,"
");
+
+ /* My institution, centre and department */
Rec_ShowFormMyInsCtrDpt ();
+ /* My webs / social networks */
+ Net_ShowFormMyWebsAndSocialNets ();
+
+ /* End container for right part */
+ fprintf (Gbl.F.Out,"
");
+
+ /***** End container for this user *****/
+ fprintf (Gbl.F.Out,"
");
+
/***** Data protection clause *****/
Rec_WriteLinkToDataProtectionClause ();
}
diff --git a/swad_text.c b/swad_text.c
index 9f7a55794..6e968ca48 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -10547,27 +10547,6 @@ const char *Txt_Edit_my_personal_data =
"Editar os meus dados pessoais";
#endif
-const char *Txt_Edit_my_webs_networks =
-#if L==1
- "Edita meves webs / xarxes";
-#elif L==2
- "Bearbeiten meiner Webs / Netzwerke";
-#elif L==3
- "Edit my webs / networks";
-#elif L==4
- "Editar mis webs / redes";
-#elif L==5
- "Éditer mes webs / réseaux";
-#elif L==6
- "Editar mis webs / redes"; // Okoteve traducción
-#elif L==7
- "Editare i miei webs / reti";
-#elif L==8
- "Edycja moje webs / sieci";
-#elif L==9
- "Editar as minhas webs / redes";
-#endif
-
const char *Txt_Edit_plain_text =
#if L==1
"Editar text sense format";