diff --git a/css/swad_desktop.css b/css/swad_desktop.css index 9e72356b7..0379f0cf8 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -315,6 +315,13 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} .ICON48x48 {width:48px; height:48px; vertical-align:middle;} .ICON64x64 {width:64px; height:64px; vertical-align:middle;} +/****** Contextual links with small icons and text to go to some action ******/ +.CONTEXT_MENU + { + text-align:center; + margin-bottom:10px; + } + /********************************* Frame 10 **********************************/ .FRAME10 { diff --git a/css/swad_mobile.css b/css/swad_mobile.css index 277e7956c..d14fcd409 100644 --- a/css/swad_mobile.css +++ b/css/swad_mobile.css @@ -279,6 +279,13 @@ p {margin:0;} .ICON48x48 {width:48px; height:48px; vertical-align:middle;} .ICON64x64 {width:64px; height:64px; vertical-align:middle;} +/****** Contextual links with small icons and text to go to some action ******/ +.CONTEXT_MENU + { + text-align:center; + margin-bottom:10px; + } + /********************************* Frame 10 **********************************/ .FRAME10 { diff --git a/swad_account.c b/swad_account.c index ed30871e0..f2e9fad4b 100644 --- a/swad_account.c +++ b/swad_account.c @@ -115,7 +115,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith char NewNicknameWithArroba[Nck_MAX_BYTES_NICKNAME_WITH_ARROBA+1]; /***** Link to log in *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActFrmLogIn); Act_LinkFormSubmit (Txt_Log_in,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("login",Txt_Log_in,Txt_Log_in); @@ -208,7 +208,7 @@ void Acc_ShowFormChangeMyAccount (void) Lay_ShowAlert (Lay_WARNING,Txt_Please_fill_in_your_ID); /***** Put links to change my password and to remove my account*****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Pwd_PutLinkToChangeUsrPassword (&Gbl.Usrs.Me.UsrDat); if (Acc_CheckIfICanEliminateAccount (true)) // ItsMe = true Acc_PutLinkToRemoveMyAccount (); diff --git a/swad_announcement.c b/swad_announcement.c index 791d368ed..bef4eb606 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -74,21 +74,20 @@ void Ann_ShowAllAnnouncements (void) extern const char *The_ClassFormulB[The_NUM_THEMES]; extern const char *Txt_New_announcement; - fprintf (Gbl.F.Out,"
"); - /***** Put link (form) to create a new announcement *****/ if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM) { + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActWriAnn); Act_LinkFormSubmit (Txt_New_announcement,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("new",Txt_New_announcement,Txt_New_announcement); Act_FormEnd (); + fprintf (Gbl.F.Out,"
"); } /***** List announcements *****/ Ann_ListAnnouncements (); - fprintf (Gbl.F.Out,"
"); } /*****************************************************************************/ diff --git a/swad_assignment.c b/swad_assignment.c index 7f1d03721..33bfbcf31 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -475,7 +475,7 @@ static void Asg_PutFormToCreateNewAsg (void) extern const char *Txt_New_assignment; /***** Put form to create a new assignment *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActFrmNewAsg); Asg_PutHiddenParamAsgOrderType (); Grp_PutParamWhichGrps (); diff --git a/swad_attendance.c b/swad_attendance.c index dd86d290a..8e392067a 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -116,8 +116,8 @@ void Att_SeeAttEvents (void) Grp_GetParamWhichGrps (); Pag_GetParamPagNum (Pag_ATT_EVENTS); - /***** Put other options *****/ - fprintf (Gbl.F.Out,"
"); + /***** Show contextual menu *****/ + fprintf (Gbl.F.Out,"
"); /* Put link (form) to create a bew attendance event */ switch (Gbl.Usrs.Me.LoggedRole) @@ -2916,7 +2916,7 @@ static void Att_PutFormToPrintListStds (bool ShowDetails,char *StrAttCodsSelecte extern const char *Txt_Print; /***** Link to print view *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActPrnLstAttStd); if (ShowDetails) Par_PutHiddenParamChar ("ShowDetails",'Y'); diff --git a/swad_banner.c b/swad_banner.c index 6ba357102..5bf515f12 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -127,7 +127,8 @@ static void Ban_PutFormToEditBanners (void) extern const char *The_ClassFormulB[The_NUM_THEMES]; extern const char *Txt_Edit; - fprintf (Gbl.F.Out,"
"); + /***** Link to edit banners *****/ + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActEdiBan); Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit); diff --git a/swad_calendar.c b/swad_calendar.c index 6c8c8aa61..b04c75ddb 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -125,7 +125,7 @@ void Cal_DrawCalendar (void) if (!PrintView) { /* Link to print view */ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Lay_PutLinkToPrintView1 (ActPrnCal); Lay_PutLinkToPrintView2 (); fprintf (Gbl.F.Out,"
"); diff --git a/swad_centre.c b/swad_centre.c index ee38c26f9..3084855c6 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -266,7 +266,7 @@ static void Ctr_Configuration (bool PrintView) and to upload photo and logo *****/ if (!PrintView) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /* Link to show degrees */ Act_FormStart (ActSeeDeg); @@ -288,7 +288,6 @@ static void Ctr_Configuration (bool PrintView) fprintf (Gbl.F.Out,"
"); } - /***** Start frame *****/ Lay_StartRoundFrameTable10 (NULL,2,NULL); diff --git a/swad_changelog.h b/swad_changelog.h index 8f1b98324..a983d4cc9 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.106 (2015/04/02)" +#define Log_PLATFORM_VERSION "SWAD 14.106.1 (2015/04/02)" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 /* + Version 14.106.1: Apr 02, 2015 Changes in layout of icon with links. (183925 lines) Version 14.106: Apr 02, 2015 Lot of changes in layout of icon with links. (183909 lines) Version 14.105.3: Apr 01, 2015 Changes in layout of course configuration and exam announcements. (183912 lines) Version 14.105.2: Mar 30, 2015 Some messages translated. (183941 lines) diff --git a/swad_country.c b/swad_country.c index 4e1988072..550e84f75 100644 --- a/swad_country.c +++ b/swad_country.c @@ -233,7 +233,7 @@ static void Cty_Configuration (bool PrintView) if (Gbl.CurrentCty.Cty.CtyCod > 0) { /***** Links to show institutions and to print view *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /* Link to show institutions */ Act_FormStart (ActSeeIns); diff --git a/swad_course.c b/swad_course.c index 4896f276f..2200df1e7 100644 --- a/swad_course.c +++ b/swad_course.c @@ -183,7 +183,7 @@ static void Crs_Configuration (bool PrintView) } /***** Links to print view and request enrollment *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /* Link to print view */ Lay_PutLinkToPrintView1 (ActPrnCrsInf); @@ -2976,7 +2976,7 @@ void Crs_ReqSelectOneOfMyCourses (void) extern const char *Txt_If_you_can_not_find_your_institution_your_centre_your_degree_or_your_courses_you_can_create_them; /***** Search / select more courses *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Crs_PutLinkToSearchCourses (); fprintf (Gbl.F.Out,"
"); diff --git a/swad_degree.c b/swad_degree.c index 8af15f49b..1549d9a95 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -304,7 +304,7 @@ static void Deg_Configuration (bool PrintView) /***** Links to show courses, to print view and to upload logo *****/ if (!PrintView) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /* Link to show courses */ Act_FormStart (ActSeeCrs); diff --git a/swad_department.c b/swad_department.c index 8a3aefcb9..55f8e6a88 100644 --- a/swad_department.c +++ b/swad_department.c @@ -214,7 +214,7 @@ static void Dpt_PutFormToEditDpts (void) extern const char *The_ClassFormulB[The_NUM_THEMES]; extern const char *Txt_Edit; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActEdiDpt); Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit); diff --git a/swad_enrollment.c b/swad_enrollment.c index 8d5a3b422..59cf8d3a6 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -288,8 +288,9 @@ void Enr_ReqAcceptRegisterInCrs (void) Gbl.CurrentCrs.Crs.FullName); Lay_ShowAlert (Lay_INFO,Gbl.Message); + fprintf (Gbl.F.Out,"
"); + /***** Send button to accept register in the current course *****/ - fprintf (Gbl.F.Out,"
"); Act_FormStart (ActAccEnrCrs); Act_LinkFormSubmit (Txt_Confirm_my_enrollment,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("ok_green",Txt_Confirm_my_enrollment,Txt_Confirm_my_enrollment); @@ -300,6 +301,7 @@ void Enr_ReqAcceptRegisterInCrs (void) Act_LinkFormSubmit (Txt_Remove_me_from_this_course,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("delon",Txt_Remove_me_from_this_course,Txt_Remove_me_from_this_course); Act_FormEnd (); + fprintf (Gbl.F.Out,"
"); /***** Mark possible notification as seen *****/ @@ -517,7 +519,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void) bool ExternalUsrsServiceAvailable = (Cfg_EXTERNAL_LOGIN_CLIENT_COMMAND[0] != '\0'); /***** Put contextual links *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /* Put link to go to admin one user */ Enr_PutLinkToAdminOneUsr (); @@ -2185,13 +2187,11 @@ void Enr_ShowEnrollmentRequests (void) ""); /* Send button */ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutCalculateIcon (Txt_Update,Txt_Update); - fprintf (Gbl.F.Out,"
"); - - /* Form end */ Act_FormEnd (); + fprintf (Gbl.F.Out,"
"); /***** Build query *****/ switch (Gbl.Scope.Current) @@ -2671,7 +2671,7 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (void) if (Gbl.CurrentCrs.Crs.CrsCod > 0 || Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); if (Gbl.CurrentCrs.Crs.CrsCod > 0) /* Put link to go to admin several users */ @@ -2852,7 +2852,7 @@ static void Enr_AskIfRegRemUsr (struct ListUsrCods *ListUsrCods) static void Enr_ShowFormToEditOtherUsr (void) { /***** Buttons for edition *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); if (Pwd_CheckIfICanChangeOtherUsrPassword (Gbl.Usrs.Other.UsrDat.UsrCod)) { ID_PutLinkToChangeUsrIDs (&Gbl.Usrs.Other.UsrDat); // Put link (form) to change user's IDs diff --git a/swad_exam.c b/swad_exam.c index 7a5c1f114..b7590a889 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -443,7 +443,7 @@ static void Exa_ListExamAnnouncements (Exa_tTypeViewExamAnnouncement_t TypeViewE { case Rol_ROLE_TEACHER: case Rol_ROLE_SYS_ADM: - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActEdiExaAnn); Act_LinkFormSubmit (Txt_New_announcement_OF_EXAM,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("new",Txt_New_announcement_OF_EXAM,Txt_New_announcement_OF_EXAM); diff --git a/swad_file_browser.c b/swad_file_browser.c index 01bc20a5b..41c769452 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -4273,7 +4273,7 @@ static void Brw_PutFormToShowOrAdmin (Brw_ShowOrAdmin_t ShowOrAdmin, extern const char *Txt_View; extern const char *Txt_Edit; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (Action); if (Gbl.FileBrowser.FullTree) Par_PutHiddenParamChar ("FullTree",'Y'); diff --git a/swad_holiday.c b/swad_holiday.c index d12da2af0..64c4cbfe6 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -198,7 +198,7 @@ static void Hld_PutFormToEditHlds (void) extern const char *The_ClassFormulB[The_NUM_THEMES]; extern const char *Txt_Edit; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActEdiHld); Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit); diff --git a/swad_info.c b/swad_info.c index 9ee6569dd..d6d36f3e1 100644 --- a/swad_info.c +++ b/swad_info.c @@ -412,7 +412,7 @@ static void Inf_PutFormToEditInfo (Inf_InfoType_t InfoType) extern const char *The_ClassFormulB[The_NUM_THEMES]; extern const char *Txt_Edit; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (Inf_ActionsEditInfo[InfoType]); Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit); diff --git a/swad_institution.c b/swad_institution.c index d4823f83d..4451020bd 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -245,7 +245,7 @@ static void Ins_Configuration (bool PrintView) /***** Links to show centres, to print view and to upload logo *****/ if (!PrintView) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /* Link to show centres */ Act_FormStart (ActSeeCtr); diff --git a/swad_layout.c b/swad_layout.c index 2f63a6b43..30a81eff4 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -941,7 +941,7 @@ void Lay_PutFormToView (Act_Action_t Action) extern const char *The_ClassFormulB[The_NUM_THEMES]; extern const char *Txt_View; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (Action); Act_LinkFormSubmit (Txt_View,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("visible_on",Txt_View,Txt_View); @@ -958,7 +958,7 @@ void Lay_PutFormToEdit (Act_Action_t Action) extern const char *The_ClassFormulB[The_NUM_THEMES]; extern const char *Txt_Edit; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (Action); Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit); diff --git a/swad_link.c b/swad_link.c index 11a79a187..65f632c70 100644 --- a/swad_link.c +++ b/swad_link.c @@ -121,7 +121,7 @@ static void Lnk_PutFormToEditLinks (void) extern const char *The_ClassFormulB[The_NUM_THEMES]; extern const char *Txt_Edit; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActEdiLnk); Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit); diff --git a/swad_mail.c b/swad_mail.c index 2543a1197..b9ae6df4a 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -177,7 +177,7 @@ static void Mai_PutFormToEditMailDomains (void) extern const char *The_ClassFormulB[The_NUM_THEMES]; extern const char *Txt_Edit; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActEdiMai); Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit); diff --git a/swad_message.c b/swad_message.c index 6642a5973..5eb57487f 100644 --- a/swad_message.c +++ b/swad_message.c @@ -217,7 +217,7 @@ void Msg_ListEMails (void) Lay_EndRoundFrameTable10 (); /***** Icon to open the client e-mail program *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "", Gbl.Usrs.Me.UsrDat.Email, Gbl.CurrentCrs.Crs.FullName,Gbl.Usrs.Me.UsrDat.Email,StrAddresses, @@ -1498,7 +1498,7 @@ void Msg_ShowRecMsgs (void) /***** Link to view banned users *****/ if (Msg_GetNumUsrsBannedByMe ()) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Msg_PutLinkToViewBannedUsers (); fprintf (Gbl.F.Out,"
"); } @@ -2155,7 +2155,7 @@ void Msg_ShowFormDelSentOrRecMsgs (Msg_TypeOfMessages_t TypeOfMessages,unsigned char StrFilterContent[256+Msg_MAX_LENGTH_FILTER_CONTENT+1]; /***** Put link to request deletion of all sent or received messages *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart ((TypeOfMessages == Msg_MESSAGES_RECEIVED) ? ActReqDelAllRcvMsg : ActReqDelAllSntMsg); Msg_PutHiddenParamsMsgsFilters (); diff --git a/swad_notice.c b/swad_notice.c index f17b9e14d..58fe03c31 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -320,7 +320,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing) if (ICanEditNotices) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActWriNot); Act_LinkFormSubmit (Txt_New_notice,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("new",Txt_New_notice,Txt_New_notice); diff --git a/swad_notification.c b/swad_notification.c index aec9573b8..7847f42cf 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -295,7 +295,7 @@ void Ntf_ShowMyNotifications (void) NumNotifications = DB_QuerySELECT (Query,&mysql_res,"can not get your notifications"); /***** Buttons to change preferences and to mark all notifications as seen *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Ntf_PutLinkToChangePrefs (); // Put form to change notification preferences if (NumNotifications) Ntf_PutLinkToMarkAllNotifAsSeen (); // Put form to change notification preferences diff --git a/swad_photo.c b/swad_photo.c index 2d3d80697..53d6acd86 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -236,7 +236,7 @@ void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *Pho if (PhotoExists) // User has photo { /***** Forms to remove photo and make it public *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Pho_PutLinkToRemoveUsrPhoto (UsrDat); if (ItsMe) Pri_PutLinkToChangeMyPrivacy (); // Put link (form) to change my privacy @@ -1671,7 +1671,7 @@ static Pho_HowOrderDegrees_t Pho_GetHowOrderDegreesFromForm (void) static void Pho_PutLinkToPrintViewOfDegreeStats (void) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Lay_PutLinkToPrintView1 (ActPrnPhoDeg); Pho_PutHiddenParamTypeOfAvg (); Pho_PutHiddenParamPhotoSize (); @@ -1708,7 +1708,7 @@ static void Pho_PutLinkToCalculateDegreeStats (void) Deg_GetDataOfDegreeByCod (&Deg); /***** Start div *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Start form *****/ Act_FormStart (ActCalPhoDeg); diff --git a/swad_place.c b/swad_place.c index d69aae30a..84b615cbd 100644 --- a/swad_place.c +++ b/swad_place.c @@ -203,7 +203,7 @@ static void Plc_PutFormToEditPlcs (void) extern const char *The_ClassFormulB[The_NUM_THEMES]; extern const char *Txt_Edit; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActEdiPlc); Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit); diff --git a/swad_plugin.c b/swad_plugin.c index 5bb69bc79..0168633d0 100644 --- a/swad_plugin.c +++ b/swad_plugin.c @@ -153,7 +153,7 @@ static void Plg_PutFormToEditPlugins (void) extern const char *The_ClassFormulB[The_NUM_THEMES]; extern const char *Txt_Edit; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActEdiPlg); Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit); diff --git a/swad_record.c b/swad_record.c index 9277a465c..fb5992b10 100644 --- a/swad_record.c +++ b/swad_record.c @@ -911,7 +911,7 @@ void Rec_ListRecordsInvs (void) if (Gbl.CurrentAct == ActSeeRecSevInv) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /* Link to print view */ Act_FormStart (ActPrnRecSevInv); @@ -990,7 +990,7 @@ static void Rec_ShowRecordOneStdCrs (void) /***** Asign users listing type depending on current action *****/ Gbl.Usrs.Listing.RecsUsrs = Rec_RECORD_USERS_STUDENTS; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Link to edit record fields *****/ if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_TEACHER) @@ -1061,7 +1061,7 @@ void Rec_ListRecordsStdsCrs (void) if (Gbl.CurrentAct == ActSeeRecSevStd) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /* Link to edit record fields */ if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_TEACHER) @@ -1153,18 +1153,20 @@ static void Rec_ShowRecordOneTchCrs (void) /***** Asign users listing type depending on current action *****/ Gbl.Usrs.Listing.RecsUsrs = Rec_RECORD_USERS_TEACHERS; - fprintf (Gbl.F.Out,"
"); + /***** Show contextual menu *****/ + fprintf (Gbl.F.Out,"
"); - /***** Show office hours? *****/ + /* Show office hours? */ Rec_WriteFormShowOfficeHours (true,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); - /***** Link to print view *****/ + /* Link to print view */ Act_FormStart (ActPrnRecSevTch); Usr_PutHiddenParUsrCodAll (ActPrnRecSevTch,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); Par_PutHiddenParamChar ("ParamOfficeHours",'Y'); Par_PutHiddenParamChar ("ShowOfficeHours",'Y'); Rec_ShowLinkToPrintPreviewOfRecords (); Act_FormEnd (); + fprintf (Gbl.F.Out,"
"); fprintf (Gbl.F.Out,"
"); + /***** Show contextual menu *****/ + fprintf (Gbl.F.Out,"
"); /* Show office hours? */ Rec_WriteFormShowOfficeHours (ShowOfficeHours,Gbl.Usrs.Select.All); @@ -1237,6 +1240,7 @@ void Rec_ListRecordsTchsCrs (void) 'N'); Rec_ShowLinkToPrintPreviewOfRecords (); Act_FormEnd (); + fprintf (Gbl.F.Out,"
"); } @@ -1296,15 +1300,16 @@ void Rec_ListRecordsTchsCrs (void) void Rec_ShowLinkToPrintPreviewOfRecords (void) { extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *Txt_Print; extern const char *Txt_record_cards_per_page; unsigned i; Act_LinkFormSubmit (Txt_Print,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("print",Txt_Print,Txt_Print); - fprintf (Gbl.F.Out," (" + fprintf (Gbl.F.Out,"(" "" " %s)", - The_ClassFormulB[Gbl.Prefs.Theme],Txt_record_cards_per_page); + The_ClassFormul[Gbl.Prefs.Theme],Txt_record_cards_per_page); } /*****************************************************************************/ @@ -1348,14 +1353,16 @@ static void Rec_WriteFormShowOfficeHours (bool ShowOfficeHours,const char *ListU Par_PutHiddenParamChar ("ParamOfficeHours",'Y'); /***** End form *****/ - fprintf (Gbl.F.Out,"" + "" "\"%s\"" - " %s", + " %s" + "
", Gbl.FormId, Gbl.Prefs.IconsURL, Txt_Show_office_hours, @@ -1864,7 +1871,7 @@ void Rec_ShowFormMyCommRecord (void) Lay_ShowAlert (Lay_WARNING,Txt_Please_fill_in_your_record_card_including_your_name); /***** Buttons for edition *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Rec_PutLinkToChangeMyInsCtrDpt (); // Put link (form) to change my institution, centre, department... Rec_PutLinkToChangeMySocialNetworks (); // Put link (form) to change my social networks Pho_PutLinkToChangeUsrPhoto (&Gbl.Usrs.Me.UsrDat); // Put link (form) to change my photo diff --git a/swad_search.c b/swad_search.c index 33f012585..246af371e 100644 --- a/swad_search.c +++ b/swad_search.c @@ -90,7 +90,7 @@ void Sch_ReqSysSearch (void) /***** Select one of my courses *****/ if (Gbl.Usrs.Me.Logged) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Crs_PutFormToSelectMyCourses (); fprintf (Gbl.F.Out,"
"); } @@ -109,7 +109,7 @@ void Sch_ReqCtySearch (void) /***** Select one of my courses *****/ if (Gbl.Usrs.Me.Logged) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Crs_PutFormToSelectMyCourses (); fprintf (Gbl.F.Out,"
"); } @@ -128,7 +128,7 @@ void Sch_ReqInsSearch (void) /***** Select one of my courses *****/ if (Gbl.Usrs.Me.Logged) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Crs_PutFormToSelectMyCourses (); fprintf (Gbl.F.Out,"
"); } @@ -147,7 +147,7 @@ void Sch_ReqCtrSearch (void) /***** Select one of my courses *****/ if (Gbl.Usrs.Me.Logged) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Crs_PutFormToSelectMyCourses (); fprintf (Gbl.F.Out,"
"); } @@ -166,7 +166,7 @@ void Sch_ReqDegSearch (void) /***** Select one of my courses *****/ if (Gbl.Usrs.Me.Logged) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Crs_PutFormToSelectMyCourses (); fprintf (Gbl.F.Out,"
"); } @@ -185,7 +185,7 @@ void Sch_ReqCrsSearch (void) /***** Select one of my courses *****/ if (Gbl.Usrs.Me.Logged) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Crs_PutFormToSelectMyCourses (); fprintf (Gbl.F.Out,"
"); } diff --git a/swad_survey.c b/swad_survey.c index d6ad46693..af70ce667 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -697,7 +697,7 @@ static void Svy_PutFormToCreateNewSvy (void) extern const char *The_ClassFormulB[The_NUM_THEMES]; extern const char *Txt_New_survey; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActFrmNewSvy); Svy_PutHiddenParamSvyOrderType (); Grp_PutParamWhichGrps (); diff --git a/swad_test.c b/swad_test.c index 121fbbb74..383d17f63 100644 --- a/swad_test.c +++ b/swad_test.c @@ -256,7 +256,7 @@ void Tst_ShowFormAskTst (void) Gbl.Usrs.Me.LoggedRole == Rol_ROLE_TEACHER || Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Tst_PutFormToSeeResultsOfUsersTests (); Tst_PutFormToEdit (); Tst_PutFormToConfigure (); diff --git a/swad_timetable.c b/swad_timetable.c index 8ad0febd9..2b3054c09 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -249,7 +249,7 @@ void TT_ShowClassTimeTable (void) /***** Put buttons *****/ if (PutEditButton || PutEditOfficeHours || !PrintView) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); if (PutEditButton) { @@ -322,7 +322,7 @@ void TT_EditCrsTimeTable (void) extern const char *Txt_Show_timetable; /***** Link (form) to see my timetable *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActSeeCrsTimTbl); Act_LinkFormSubmit (Txt_Show_timetable,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("clock",Txt_Show_timetable,Txt_Show_timetable); @@ -354,7 +354,7 @@ void TT_ShowMyTutTimeTable (void) extern const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES]; /***** Link (form) to see my timetable *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActSeeMyTimTbl); Act_LinkFormSubmit (Txt_Show_timetable,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("clock",Txt_Show_timetable,Txt_Show_timetable); diff --git a/swad_user.c b/swad_user.c index abc29c0d2..75a447e56 100644 --- a/swad_user.c +++ b/swad_user.c @@ -1345,7 +1345,7 @@ void Usr_WriteFormLogin (void) extern const char *Txt_I_forgot_my_password; /***** Links to other actions *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /* Link to create a new account */ Act_FormStart (ActFrmUsrAcc); @@ -2459,7 +2459,7 @@ void Usr_ShowFormsLogoutAndRole (void) extern const char *Txt_Role; /***** Link to log out *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActLogOut); Act_LinkFormSubmit (Txt_Log_out,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("logout",Txt_Log_out,Txt_Log_out); @@ -6337,27 +6337,25 @@ void Usr_SeeGuests (void) /***** Get list of selected users *****/ Usr_GetListSelectedUsrs (); + fprintf (Gbl.F.Out,"
"); switch (Gbl.Usrs.Me.ListType) { case Usr_CLASS_PHOTO: /***** Link to print view *****/ - fprintf (Gbl.F.Out,"
"); Lay_PutLinkToPrintView1 (ActPrnInvPho); Lay_PutLinkToPrintView2 (); - fprintf (Gbl.F.Out,"
"); break; case Usr_LIST: /****** Link to show all the data ******/ - fprintf (Gbl.F.Out,"
"); Act_FormStart (ActLstInvAll); Usr_PutParamListWithPhotos (); Usr_PutExtraParamsUsrList (ActLstInvAll); Act_LinkFormSubmit (Txt_Show_all_data,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutSendIcon ("table",Txt_Show_all_data,Txt_Show_all_data); Act_FormEnd (); - fprintf (Gbl.F.Out,"
"); break; } + fprintf (Gbl.F.Out,"
"); /***** Draw a class photo with students of the course *****/ fprintf (Gbl.F.Out,"
"); @@ -6424,7 +6422,7 @@ void Usr_SeeStudents (void) (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_TEACHER || // My role in current course is teacher... Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)) // ...or superuser { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Link to list official students *****/ Usr_PutLinkToListOfficialStudents (); @@ -6490,7 +6488,7 @@ void Usr_SeeStudents (void) { case Usr_CLASS_PHOTO: /***** Link to print view *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Lay_PutLinkToPrintView1 (ActPrnStdPho); Grp_PutParamsCodGrps (); Lay_PutLinkToPrintView2 (); @@ -6500,7 +6498,7 @@ void Usr_SeeStudents (void) if (Gbl.Usrs.Me.LoggedRole >= Rol_ROLE_TEACHER) { /****** Link to show all the data ******/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActLstStdAll); Grp_PutParamsCodGrps (); Usr_PutParamListWithPhotos (); @@ -6634,7 +6632,7 @@ void Usr_SeeTeachers (void) switch (Gbl.Usrs.Me.ListType) { case Usr_CLASS_PHOTO: - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Lay_PutLinkToPrintView1 (ActPrnTchPho); Sco_PutParamScope (Gbl.Scope.Current); Lay_PutLinkToPrintView2 (); @@ -6644,7 +6642,7 @@ void Usr_SeeTeachers (void) if (Gbl.Usrs.Me.LoggedRole >= Rol_ROLE_TEACHER) { /****** Link to show all the data ******/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActLstTchAll); Sco_PutParamScope (Gbl.Scope.Current); Usr_PutParamListWithPhotos (); diff --git a/swad_zip.c b/swad_zip.c index d61e18d4f..f547b6e86 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -114,7 +114,7 @@ void ZIP_PutButtonToCreateZIPAsgWrk (void) extern const char *The_ClassFormulB[The_NUM_THEMES]; extern const char *Txt_Create_ZIP_file; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActAdmAsgWrkCrs); Usr_PutHiddenParUsrCodAll (ActAdmAsgWrkCrs,Gbl.Usrs.Select.All); if (Gbl.FileBrowser.FullTree)