Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 18.2.3

This commit is contained in:
Antonio Cañas Vargas 2018-10-08 18:41:56 +02:00
parent f035e55bd6
commit 1a0e5f6014
7 changed files with 56 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/swad18.2.2.css
View File

@ -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;

2
swad_action.c
View File

@ -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},

3
swad_changelog.h
View File

@ -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)

46
swad_network.c
View File

@ -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,"<tr>"
"<td class=\"LEFT_MIDDLE\">"
"<td class=\"REC_C1_BOT LEFT_MIDDLE\">"
"<label for=\"URL%u\" class=\"%s\">"
"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
@ -340,20 +331,20 @@ void Net_ShowFormMyWebsAndSocialNets (void)
"%s:"
"</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\" style=\"width:%upx;\">",
"<td class=\"REC_C2_BOT LEFT_MIDDLE\">",
(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,"<input type=\"url\" id=\"URL%u\" name=\"URL\""
" maxlength=\"%u\" value=\"%s\" style=\"width:%upx;\""
" maxlength=\"%u\" value=\"%s\""
" class=\"REC_C2_BOT_INPUT\""
" onchange=\"document.getElementById('%s').submit();\" />",
(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,"</td>"
@ -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 ();
}
/*****************************************************************************/

1
swad_network.h
View File

@ -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);

51
swad_record.c
View File

@ -1072,7 +1072,7 @@ static void Rec_ListRecordsGsts (Rec_SharedRecordViewType_t TypeOfView)
Ale_ShowPendingAlert ();
/* Shared record */
fprintf (Gbl.F.Out,"<div class=\"REC_SHA\">");
fprintf (Gbl.F.Out,"<div class=\"REC_LEFT\">");
Rec_ShowSharedUsrRecord (TypeOfView,&UsrDat,RecordSectionId);
fprintf (Gbl.F.Out,"</div>");
@ -1141,7 +1141,7 @@ static void Rec_ShowRecordOneStdCrs (void)
fprintf (Gbl.F.Out,"<div class=\"REC_USR\">");
/***** Shared record *****/
fprintf (Gbl.F.Out,"<div class=\"REC_SHA\">");
fprintf (Gbl.F.Out,"<div class=\"REC_LEFT\">");
Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,&Gbl.Usrs.Other.UsrDat,NULL);
fprintf (Gbl.F.Out,"</div>");
@ -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,"<div class=\"REC_CRS\">");
fprintf (Gbl.F.Out,"<div class=\"REC_RIGHT\">");
Rec_ShowCrsRecord (Rec_CRS_LIST_ONE_RECORD,&Gbl.Usrs.Other.UsrDat,NULL);
fprintf (Gbl.F.Out,"</div>");
}
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,"<div class=\"REC_CRS\">");
fprintf (Gbl.F.Out,"<div class=\"REC_RIGHT\">");
Rec_ShowCrsRecord (Rec_CRS_MY_RECORD_AS_STUDENT_FORM,&Gbl.Usrs.Other.UsrDat,NULL);
fprintf (Gbl.F.Out,"</div>");
}
@ -1268,7 +1268,7 @@ static void Rec_ListRecordsStds (Rec_SharedRecordViewType_t ShaTypeOfView,
Ale_ShowPendingAlert ();
/* Shared record */
fprintf (Gbl.F.Out,"<div class=\"REC_SHA\">");
fprintf (Gbl.F.Out,"<div class=\"REC_LEFT\">");
Rec_ShowSharedUsrRecord (ShaTypeOfView,&UsrDat,RecordSectionId);
fprintf (Gbl.F.Out,"</div>");
@ -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,"<div class=\"REC_CRS\">");
fprintf (Gbl.F.Out,"<div class=\"REC_RIGHT\">");
Rec_ShowCrsRecord (CrsTypeOfView,&UsrDat,RecordSectionId);
fprintf (Gbl.F.Out,"</div>");
}
@ -1361,14 +1361,14 @@ static void Rec_ShowRecordOneTchCrs (void)
fprintf (Gbl.F.Out,"<div class=\"REC_USR\">");
/***** Shared record *****/
fprintf (Gbl.F.Out,"<div class=\"REC_SHA\">");
fprintf (Gbl.F.Out,"<div class=\"REC_LEFT\">");
Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,&Gbl.Usrs.Other.UsrDat,NULL);
fprintf (Gbl.F.Out,"</div>");
/***** Office hours *****/
if (ShowOfficeHours)
{
fprintf (Gbl.F.Out,"<div class=\"REC_TT\">");
fprintf (Gbl.F.Out,"<div class=\"REC_RIGHT\">");
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,"<div class=\"REC_SHA\">");
fprintf (Gbl.F.Out,"<div class=\"REC_LEFT\">");
Rec_ShowSharedUsrRecord (TypeOfView,&UsrDat,RecordSectionId);
fprintf (Gbl.F.Out,"</div>");
/* Office hours */
if (ShowOfficeHours)
{
fprintf (Gbl.F.Out,"<div class=\"REC_TT\">");
fprintf (Gbl.F.Out,"<div class=\"REC_RIGHT\">");
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,"</div>");
@ -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,"<div class=\"REC_USR\">");
/***** My institution, centre and department *****/
/***** My shared record *****/
fprintf (Gbl.F.Out,"<div class=\"REC_LEFT\">");
Rec_ShowFormMySharedRecord ();
fprintf (Gbl.F.Out,"</div>");
/***** Right part *****/
/* Start container for right part */
fprintf (Gbl.F.Out,"<div class=\"REC_RIGHT\">");
/* My institution, centre and department */
Rec_ShowFormMyInsCtrDpt ();
/* My webs / social networks */
Net_ShowFormMyWebsAndSocialNets ();
/* End container for right part */
fprintf (Gbl.F.Out,"</div>");
/***** End container for this user *****/
fprintf (Gbl.F.Out,"</div>");
/***** Data protection clause *****/
Rec_WriteLinkToDataProtectionClause ();
}

21
swad_text.c
View File

@ -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
"&Eacute;diter mes webs / r&eacute;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";