Version 14.106.1

This commit is contained in:
Antonio Cañas Vargas 2015-04-02 14:22:21 +02:00
parent 522e5ff23f
commit a70d759729
36 changed files with 102 additions and 83 deletions

View File

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

View File

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

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Pwd_PutLinkToChangeUsrPassword (&Gbl.Usrs.Me.UsrDat);
if (Acc_CheckIfICanEliminateAccount (true)) // ItsMe = true
Acc_PutLinkToRemoveMyAccount ();

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
/***** Put link (form) to create a new announcement *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
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,"</div>");
}
/***** List announcements *****/
Ann_ListAnnouncements ();
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActFrmNewAsg);
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();

View File

@ -116,8 +116,8 @@ void Att_SeeAttEvents (void)
Grp_GetParamWhichGrps ();
Pag_GetParamPagNum (Pag_ATT_EVENTS);
/***** Put other options *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
/***** Show contextual menu *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* 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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActPrnLstAttStd);
if (ShowDetails)
Par_PutHiddenParamChar ("ShowDetails",'Y');

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
/***** Link to edit banners *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActEdiBan);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);

View File

@ -125,7 +125,7 @@ void Cal_DrawCalendar (void)
if (!PrintView)
{
/* Link to print view */
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutLinkToPrintView1 (ActPrnCal);
Lay_PutLinkToPrintView2 ();
fprintf (Gbl.F.Out,"</div>");

View File

@ -266,7 +266,7 @@ static void Ctr_Configuration (bool PrintView)
and to upload photo and logo *****/
if (!PrintView)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to show degrees */
Act_FormStart (ActSeeDeg);
@ -288,7 +288,6 @@ static void Ctr_Configuration (bool PrintView)
fprintf (Gbl.F.Out,"</div>");
}
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);

View File

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

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to show institutions */
Act_FormStart (ActSeeIns);

View File

@ -183,7 +183,7 @@ static void Crs_Configuration (bool PrintView)
}
/***** Links to print view and request enrollment *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* 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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Crs_PutLinkToSearchCourses ();
fprintf (Gbl.F.Out,"</div>");

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to show courses */
Act_FormStart (ActSeeCrs);

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActEdiDpt);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);

View File

@ -288,8 +288,9 @@ void Enr_ReqAcceptRegisterInCrs (void)
Gbl.CurrentCrs.Crs.FullName);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/***** Send button to accept register in the current course *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
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,"</div>");
/***** 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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Put link to go to admin one user */
Enr_PutLinkToAdminOneUsr ();
@ -2185,13 +2187,11 @@ void Enr_ShowEnrollmentRequests (void)
"</table>");
/* Send button */
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Update,Txt_Update);
fprintf (Gbl.F.Out,"</div>");
/* Form end */
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
/***** 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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
if (Pwd_CheckIfICanChangeOtherUsrPassword (Gbl.Usrs.Other.UsrDat.UsrCod))
{
ID_PutLinkToChangeUsrIDs (&Gbl.Usrs.Other.UsrDat); // Put link (form) to change user's IDs

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
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);

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (Action);
if (Gbl.FileBrowser.FullTree)
Par_PutHiddenParamChar ("FullTree",'Y');

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActEdiHld);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (Inf_ActionsEditInfo[InfoType]);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to show centres */
Act_FormStart (ActSeeCtr);

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (Action);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActEdiLnk);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActEdiMai);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);

View File

@ -217,7 +217,7 @@ void Msg_ListEMails (void)
Lay_EndRoundFrameTable10 ();
/***** Icon to open the client e-mail program *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">"
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">"
"<a href=\"mailto:%s?subject=%s&cc=%s&bcc=%s\" title=\"%s\" class=\"%s\">",
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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Msg_PutLinkToViewBannedUsers ();
fprintf (Gbl.F.Out,"</div>");
}
@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart ((TypeOfMessages == Msg_MESSAGES_RECEIVED) ? ActReqDelAllRcvMsg : ActReqDelAllSntMsg);
Msg_PutHiddenParamsMsgsFilters ();

View File

@ -320,7 +320,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
if (ICanEditNotices)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActWriNot);
Act_LinkFormSubmit (Txt_New_notice,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("new",Txt_New_notice,Txt_New_notice);

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Ntf_PutLinkToChangePrefs (); // Put form to change notification preferences
if (NumNotifications)
Ntf_PutLinkToMarkAllNotifAsSeen (); // Put form to change notification preferences

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/***** Start form *****/
Act_FormStart (ActCalPhoDeg);

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActEdiPlc);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActEdiPlg);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);

View File

@ -911,7 +911,7 @@ void Rec_ListRecordsInvs (void)
if (Gbl.CurrentAct == ActSeeRecSevInv)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* 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,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/***** 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,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* 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,"<div style=\"text-align:center;\">");
/***** Show contextual menu *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/***** 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,"</div>");
fprintf (Gbl.F.Out,"<div style=\"text-align:center;"
@ -1223,7 +1225,8 @@ void Rec_ListRecordsTchsCrs (void)
if (Gbl.CurrentAct == ActSeeRecSevTch)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/***** Show contextual menu *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* 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,"</div>");
}
@ -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,"<span class=\"%s\"> (</span>"
fprintf (Gbl.F.Out,"<span class=\"%s\">(</span>"
"<select name=\"RecsPerPag\">",
The_ClassFormulB[Gbl.Prefs.Theme]);
The_ClassFormul[Gbl.Prefs.Theme]);
for (i = 1;
i <= 10;
@ -1317,7 +1322,7 @@ void Rec_ShowLinkToPrintPreviewOfRecords (void)
}
fprintf (Gbl.F.Out,"</select>"
"<span class=\"%s\"> %s)</span>",
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,"<input type=\"checkbox\" name=\"ShowOfficeHours\" value=\"Y\"");
fprintf (Gbl.F.Out,"<div style=\"margin:0 5px; display:inline;\">"
"<input type=\"checkbox\" name=\"ShowOfficeHours\" value=\"Y\"");
if (ShowOfficeHours)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," style=\"vertical-align:middle; margin-left:10px;\""
fprintf (Gbl.F.Out," style=\"vertical-align:middle;\""
" onclick=\"javascript:document.getElementById('%s').submit();\" />"
"<img src=\"%s/clock16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />"
"<span class=\"%s\">&nbsp;%s</span>",
"<span class=\"%s\">&nbsp;%s</span>"
"</div>",
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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
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

View File

@ -90,7 +90,7 @@ void Sch_ReqSysSearch (void)
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
@ -109,7 +109,7 @@ void Sch_ReqCtySearch (void)
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
@ -128,7 +128,7 @@ void Sch_ReqInsSearch (void)
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
@ -147,7 +147,7 @@ void Sch_ReqCtrSearch (void)
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
@ -166,7 +166,7 @@ void Sch_ReqDegSearch (void)
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
@ -185,7 +185,7 @@ void Sch_ReqCrsSearch (void)
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActFrmNewSvy);
Svy_PutHiddenParamSvyOrderType ();
Grp_PutParamWhichGrps ();

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Tst_PutFormToSeeResultsOfUsersTests ();
Tst_PutFormToEdit ();
Tst_PutFormToConfigure ();

View File

@ -249,7 +249,7 @@ void TT_ShowClassTimeTable (void)
/***** Put buttons *****/
if (PutEditButton || PutEditOfficeHours || !PrintView)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActSeeMyTimTbl);
Act_LinkFormSubmit (Txt_Show_timetable,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("clock",Txt_Show_timetable,Txt_Show_timetable);

View File

@ -1345,7 +1345,7 @@ void Usr_WriteFormLogin (void)
extern const char *Txt_I_forgot_my_password;
/***** Links to other actions *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* 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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
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,"<div class=\"CONTEXT_MENU\">");
switch (Gbl.Usrs.Me.ListType)
{
case Usr_CLASS_PHOTO:
/***** Link to print view *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Lay_PutLinkToPrintView1 (ActPrnInvPho);
Lay_PutLinkToPrintView2 ();
fprintf (Gbl.F.Out,"</div>");
break;
case Usr_LIST:
/****** Link to show all the data ******/
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
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,"</div>");
break;
}
fprintf (Gbl.F.Out,"</div>");
/***** Draw a class photo with students of the course *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/***** 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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActLstTchAll);
Sco_PutParamScope (Gbl.Scope.Current);
Usr_PutParamListWithPhotos ();

View File

@ -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,"<div style=\"text-align:center; margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActAdmAsgWrkCrs);
Usr_PutHiddenParUsrCodAll (ActAdmAsgWrkCrs,Gbl.Usrs.Select.All);
if (Gbl.FileBrowser.FullTree)