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.11

This commit is contained in:
Antonio Cañas Vargas 2018-10-09 13:41:55 +02:00
parent 340a5796e1
commit 63e3674aca
9 changed files with 35 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swad_action.c
View File

@ -3069,7 +3069,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActReqUseGbl */{ 761, 0,TabAna,ActReqUseGbl ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sta_ReqShowFigures ,"pie64x64.gif" },
/* ActSeePhoDeg */{ 447, 1,TabAna,ActSeePhoDeg ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pho_ShowPhotoDegree ,"classphoto64x64.gif" },
/* ActReqStaCrs */{ 767, 2,TabAna,ActReqStaCrs ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ind_ReqIndicatorsCourses ,"tablestats64x64.gif" },
/* ActReqAccGbl */{ 591, 3,TabAna,ActReqAccGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Sta_SetIniEndDates ,Sta_AskShowGblHits ,"stats64x64.gif" },
/* ActReqAccGbl */{ 591, 3,TabAna,ActReqAccGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Sta_SetIniEndDates ,Sta_AskShowGblHits ,"stats64x64.gif" },
/* ActReqMyUsgRep */{1586, 4,TabAna,ActReqMyUsgRep ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rep_ReqMyUsageReport ,"report64x64.png" },
/* ActMFUAct */{ 993, 5,TabAna,ActMFUAct ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,MFU_ShowMyMFUActions ,"star64x64.gif" },
@ -3092,7 +3092,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActSeeMyTT */{ 408, 3,TabPrf,ActSeeMyTT ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TT_ShowClassTimeTable ,"clock64x64.gif" },
/* ActSeeMyAgd */{1602, 4,TabPrf,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Agd_ShowMyAgenda ,"calendar64x64.png" },
/* ActFrmMyAcc */{ 36, 5,TabPrf,ActFrmMyAcc ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Acc_ShowFormMyAccount ,"arroba64x64.gif" },
/* ActReqEdiRecSha */{ 285, 6,TabPrf,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndOtherData,"card64x64.gif" },
/* ActReqEdiRecSha */{ 285, 6,TabPrf,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndMore ,"card64x64.gif" },
/* ActEdiPrf */{ 673, 7,TabPrf,ActEdiPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pre_EditPrefs ,"heart64x64.gif" },
// Actions not in menu:
@ -3149,7 +3149,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActChgPriPho */{ 774,-1,TabUnk,ActEdiPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pho_ChangePhotoVisibility ,NULL},
/* ActChgPriPrf */{1404,-1,TabUnk,ActEdiPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prf_ChangeProfileVisibility ,NULL},
/* ActReqEdiMyIns */{1165,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndOtherData,NULL},
/* ActReqEdiMyIns */{1165,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndMore,NULL},
/* ActChgCtyMyIns */{1166,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ChgCountryOfMyInstitution ,NULL},
/* ActChgMyIns */{1167,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_UpdateMyInstitution ,NULL},
/* ActChgMyCtr */{1168,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_UpdateMyCentre ,NULL},
@ -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 ,Rec_ShowMySharedRecordAndOtherData,NULL},
/* ActReqEdiMyNet */{1172,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndMore,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.10 (2018-10-09)"
#define Log_PLATFORM_VERSION "SWAD 18.2.11 (2018-10-09)"
#define CSS_FILE "swad18.2.2.css"
#define JS_FILE "swad17.17.1.js"
/*
Version 18.2.11: Oct 09, 2018 Button to my courses is moved to left top corner of search box. (234850 lines)
Version 18.2.10: Oct 09, 2018 Button to search courses is moved to left top corner of my courses. (234888 lines)
Version 18.2.9: Oct 09, 2018 Changes in layout of user's record card. (234891 lines)
Version 18.2.8: Oct 09, 2018 Changes in edition of user's photo. (234889 lines)

6
swad_course.c
View File

@ -2917,17 +2917,17 @@ static void Sch_PutLinkToSearchCoursesParams (void) // TODO: Move to search modu
}
/*****************************************************************************/
/****************** Put a link (form) to select my courses *******************/
/****************** Put an icon (form) to select my courses ******************/
/*****************************************************************************/
void Crs_PutFormToSelectMyCourses (void)
void Crs_PutIconToSelectMyCourses (void)
{
extern const char *Txt_My_courses;
/***** Put form to search / select courses *****/
Lay_PutContextualLink (ActMyCrs,NULL,NULL,
"hierarchy64x64.gif",
Txt_My_courses,Txt_My_courses,
Txt_My_courses,NULL,
NULL);
}

2
swad_course.h
View File

@ -129,7 +129,7 @@ void Crs_RenameCourseFullInConfig (void);
void Crs_ChangeCrsStatus (void);
void Crs_ContEditAfterChgCrs (void);
void Crs_PutFormToSelectMyCourses (void);
void Crs_PutIconToSelectMyCourses (void);
void Crs_PutParamCrsCod (long CrsCod);
void Crs_ReqSelectOneOfMyCourses (void);

2
swad_network.c
View File

@ -379,7 +379,7 @@ void Net_UpdateMyWebsAndSocialNets (void)
Net_GetMyWebsAndSocialNetsFromForm ();
/***** Show form again *****/
Rec_ShowMySharedRecordAndOtherData ();
Rec_ShowMySharedRecordAndMore ();
}
/*****************************************************************************/

10
swad_photo.c
View File

@ -269,7 +269,7 @@ void Pho_ReqMyPhoto (void)
Pho_ReqPhoto (&Gbl.Usrs.Me.UsrDat);
/***** Show my record and other data *****/
Rec_ShowMySharedRecordAndOtherData ();
Rec_ShowMySharedRecordAndMore ();
}
/*****************************************************************************/
@ -387,7 +387,7 @@ void Pho_RecMyPhotoDetFaces (void)
Pho_ReqPhoto (&Gbl.Usrs.Me.UsrDat); // Request my photograph again
/***** Show my record and other data *****/
Rec_ShowMySharedRecordAndOtherData ();
Rec_ShowMySharedRecordAndMore ();
}
/*****************************************************************************/
@ -444,7 +444,7 @@ void Pho_ReqRemoveMyPhoto (void)
Ale_ShowAlert (Ale_INFO,Txt_The_photo_no_longer_exists);
/***** Show my record and other data *****/
Rec_ShowMySharedRecordAndOtherData ();
Rec_ShowMySharedRecordAndMore ();
}
/*****************************************************************************/
@ -466,7 +466,7 @@ void Pho_RemoveMyPhoto2 (void)
Ale_ShowPendingAlert ();
/***** Show my record and other data *****/
Rec_ShowMySharedRecordAndOtherData ();
Rec_ShowMySharedRecordAndMore ();
}
/*****************************************************************************/
@ -837,7 +837,7 @@ void Pho_UpdateMyPhoto2 (void)
Pho_UpdatePhoto2 ();
/***** Show my record and other data *****/
Rec_ShowMySharedRecordAndOtherData ();
Rec_ShowMySharedRecordAndMore ();
}
/*****************************************************************************/

16
swad_record.c
View File

@ -2152,7 +2152,7 @@ void Rec_ShowMySharedRecordUpd (void)
Ale_ShowAlert (Ale_SUCCESS,Txt_Your_personal_data_have_been_updated);
/***** Show my record and other data *****/
Rec_ShowMySharedRecordAndOtherData ();
Rec_ShowMySharedRecordAndMore ();
}
/*****************************************************************************/
@ -3938,7 +3938,7 @@ static void Rec_GetUsrCommentsFromForm (struct UsrData *UsrDat)
/**** Show my shared record and a form to edit my institution, centre... *****/
/*****************************************************************************/
void Rec_ShowMySharedRecordAndOtherData (void)
void Rec_ShowMySharedRecordAndMore (void)
{
/***** Start container for this user *****/
fprintf (Gbl.F.Out,"<div class=\"REC_USR\">");
@ -4260,7 +4260,7 @@ void Rec_ChgCountryOfMyInstitution (void)
Enr_UpdateInstitutionCentreDepartment ();
/***** Show form again *****/
Rec_ShowMySharedRecordAndOtherData ();
Rec_ShowMySharedRecordAndMore ();
}
/*****************************************************************************/
@ -4298,7 +4298,7 @@ void Rec_UpdateMyInstitution (void)
Enr_UpdateInstitutionCentreDepartment ();
/***** Show form again *****/
Rec_ShowMySharedRecordAndOtherData ();
Rec_ShowMySharedRecordAndMore ();
}
/*****************************************************************************/
@ -4331,7 +4331,7 @@ void Rec_UpdateMyCentre (void)
Enr_UpdateInstitutionCentreDepartment ();
/***** Show form again *****/
Rec_ShowMySharedRecordAndOtherData ();
Rec_ShowMySharedRecordAndMore ();
}
/*****************************************************************************/
@ -4362,7 +4362,7 @@ void Rec_UpdateMyDepartment (void)
Enr_UpdateInstitutionCentreDepartment ();
/***** Show form again *****/
Rec_ShowMySharedRecordAndOtherData ();
Rec_ShowMySharedRecordAndMore ();
}
/*****************************************************************************/
@ -4383,7 +4383,7 @@ void Rec_UpdateMyOffice (void)
DB_QueryUPDATE (Query,"can not update office");
/***** Show form again *****/
Rec_ShowMySharedRecordAndOtherData ();
Rec_ShowMySharedRecordAndMore ();
}
/*****************************************************************************/
@ -4404,5 +4404,5 @@ void Rec_UpdateMyOfficePhone (void)
DB_QueryUPDATE (Query,"can not update office phone");
/***** Show form again *****/
Rec_ShowMySharedRecordAndOtherData ();
Rec_ShowMySharedRecordAndMore ();
}

2
swad_record.h
View File

@ -172,7 +172,7 @@ void Rec_UpdateMyRecord (void);
Rol_Role_t Rec_GetRoleFromRecordForm (void);
void Rec_GetUsrNameFromRecordForm (struct UsrData *UsrDat);
void Rec_ShowMySharedRecordAndOtherData (void);
void Rec_ShowMySharedRecordAndMore (void);
void Rec_ChgCountryOfMyInstitution (void);
void Rec_UpdateMyInstitution (void);
void Rec_UpdateMyCentre (void);

63
swad_search.c
View File

@ -85,14 +85,6 @@ static void Sch_SaveLastSearchIntoSession (void);
void Sch_ReqSysSearch (void)
{
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
/***** Search courses, teachers, documents... *****/
Sch_GetParamWhatToSearch ();
Sch_PutFormToSearchWithWhatToSearchAndScope (ActSysSch,Sco_SCOPE_SYS);
@ -104,14 +96,6 @@ void Sch_ReqSysSearch (void)
void Sch_ReqCtySearch (void)
{
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
/***** Search courses, teachers, documents... *****/
Sch_GetParamWhatToSearch ();
Sch_PutFormToSearchWithWhatToSearchAndScope (ActCtySch,Sco_SCOPE_CTY);
@ -123,14 +107,6 @@ void Sch_ReqCtySearch (void)
void Sch_ReqInsSearch (void)
{
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
/***** Search courses, teachers, documents... *****/
Sch_GetParamWhatToSearch ();
Sch_PutFormToSearchWithWhatToSearchAndScope (ActInsSch,Sco_SCOPE_INS);
@ -142,14 +118,6 @@ void Sch_ReqInsSearch (void)
void Sch_ReqCtrSearch (void)
{
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
/***** Search courses, teachers, documents... *****/
Sch_GetParamWhatToSearch ();
Sch_PutFormToSearchWithWhatToSearchAndScope (ActCtrSch,Sco_SCOPE_CTR);
@ -161,14 +129,6 @@ void Sch_ReqCtrSearch (void)
void Sch_ReqDegSearch (void)
{
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
/***** Search courses, teachers, documents... *****/
Sch_GetParamWhatToSearch ();
Sch_PutFormToSearchWithWhatToSearchAndScope (ActDegSch,Sco_SCOPE_DEG);
@ -180,14 +140,6 @@ void Sch_ReqDegSearch (void)
void Sch_ReqCrsSearch (void)
{
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
/***** Search courses, teachers, documents... *****/
Sch_GetParamWhatToSearch ();
Sch_PutFormToSearchWithWhatToSearchAndScope (ActCrsSch,Sco_SCOPE_CRS);
@ -234,12 +186,14 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
};
Sch_WhatToSearch_t WhatToSearch;
/***** Start form *****/
/***** Start box *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
Act_FormStart (Action);
Box_StartBox (NULL,Txt_Search,NULL,
Box_StartBox (NULL,Txt_Search,Crs_PutIconToSelectMyCourses,
Hlp_Search,Box_NOT_CLOSABLE);
/***** Start form *****/
Act_FormStart (Action);
/***** Scope (whole platform, current country, current institution,
current centre, current degree or current course) *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">"
@ -283,11 +237,14 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
/***** Magnifying glass icon *****/
Sch_PutMagnifyingGlassButton ("search64x64.png");
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Search);
/***** Send button *****/
Btn_PutButton (Btn_CONFIRM_BUTTON,Txt_Search);
/***** End form *****/
Act_FormEnd ();
/***** End box *****/
Box_EndBox ();
fprintf (Gbl.F.Out,"</div>");
}