diff --git a/icon/exam64x64.png b/icon/exam64x64.png new file mode 100644 index 000000000..2027ad451 Binary files /dev/null and b/icon/exam64x64.png differ diff --git a/icon/iconset/awesome/action64x64/announcement64x64.png b/icon/iconset/awesome/action64x64/announcement64x64.png new file mode 100644 index 000000000..07cb1a623 Binary files /dev/null and b/icon/iconset/awesome/action64x64/announcement64x64.png differ diff --git a/icon/iconset/awesome/action64x64/notice64x64.png b/icon/iconset/awesome/action64x64/notice64x64.png new file mode 100644 index 000000000..d35c879ec Binary files /dev/null and b/icon/iconset/awesome/action64x64/notice64x64.png differ diff --git a/icon/iconset/awesome/action64x64/rollcall64x64.png b/icon/iconset/awesome/action64x64/rollcall64x64.png new file mode 100644 index 000000000..ec0e54f76 Binary files /dev/null and b/icon/iconset/awesome/action64x64/rollcall64x64.png differ diff --git a/icon/iconset/nuvola/action64x64/announcement64x64.png b/icon/iconset/nuvola/action64x64/announcement64x64.png new file mode 100644 index 000000000..bb369a0c2 Binary files /dev/null and b/icon/iconset/nuvola/action64x64/announcement64x64.png differ diff --git a/icon/iconset/nuvola/action64x64/notice64x64.png b/icon/iconset/nuvola/action64x64/notice64x64.png new file mode 100644 index 000000000..4437580bc Binary files /dev/null and b/icon/iconset/nuvola/action64x64/notice64x64.png differ diff --git a/icon/iconset/nuvola/action64x64/rollcall64x64.png b/icon/iconset/nuvola/action64x64/rollcall64x64.png new file mode 100644 index 000000000..ff3894ecc Binary files /dev/null and b/icon/iconset/nuvola/action64x64/rollcall64x64.png differ diff --git a/icon/notice64x64.png b/icon/notice64x64.png new file mode 100644 index 000000000..d35c879ec Binary files /dev/null and b/icon/notice64x64.png differ diff --git a/icon/rollcall64x64.png b/icon/rollcall64x64.png new file mode 100644 index 000000000..ec0e54f76 Binary files /dev/null and b/icon/rollcall64x64.png differ diff --git a/swad_action.c b/swad_action.c index 0cf306a9d..528fc066e 100644 --- a/swad_action.c +++ b/swad_action.c @@ -2295,7 +2295,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActLstStd */{ 678, 1,TabUsr,ActLstStd ,0x1F8,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Usr_SeeStudents ,"usrs64x64.gif" }, /* ActLstTch */{ 679, 2,TabUsr,ActLstTch ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Usr_SeeTeachers ,"tch64x64.gif" }, /* ActLstOth */{1186, 3,TabUsr,ActLstOth ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Usr_ListDataAdms ,"adm64x64.gif" }, - /* ActSeeAtt */{ 861, 4,TabUsr,ActSeeAtt ,0x118,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Att_SeeAttEvents ,"rollcall64x64.gif" }, + /* ActSeeAtt */{ 861, 4,TabUsr,ActSeeAtt ,0x118,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Att_SeeAttEvents ,"rollcall64x64.png" }, /* ActReqSignUp */{1054, 5,TabUsr,ActReqSignUp ,0x000,0x006,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReqSignUpInCrs ,"enrollmentrequest64x64.gif"}, /* ActSeeSignUpReq */{1057, 6,TabUsr,ActSeeSignUpReq ,0x1F0,0x1F0,0x1F0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ShowEnrollmentRequests ,"enrollmentrequest64x64.gif"}, /* ActLstCon */{ 995, 7,TabUsr,ActLstCon ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Con_ShowConnectedUsrs ,"userplugged64x64.gif" }, @@ -2677,8 +2677,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabMsg ****************************************************************** // Actions in menu: /* ActSeeNtf */{ 990, 0,TabMsg,ActSeeNtf ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ntf_ShowMyNotifications ,"bell64x64.gif" }, - /* ActSeeAnn */{1235, 1,TabMsg,ActSeeAnn ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ann_ShowAllAnnouncements ,"note64x64.gif" }, - /* ActSeeAllNot */{ 762, 2,TabMsg,ActSeeAllNot ,0x1FF,0x1FF,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Not_ListFullNotices ,"note64x64.gif" }, + /* ActSeeAnn */{1235, 1,TabMsg,ActSeeAnn ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ann_ShowAllAnnouncements ,"announcement64x64.png"}, + /* ActSeeAllNot */{ 762, 2,TabMsg,ActSeeAllNot ,0x1FF,0x1FF,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Not_ListFullNotices ,"notice64x64.png" }, /* ActReqMsgUsr */{ 26, 3,TabMsg,ActReqMsgUsr ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Msg_FormMsgUsrs ,"editnewmsg64x64.gif" }, /* ActSeeRcvMsg */{ 3, 4,TabMsg,ActSeeRcvMsg ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Msg_ShowRecMsgs ,"recmsg64x64.gif" }, /* ActSeeSntMsg */{ 70, 5,TabMsg,ActSeeSntMsg ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Msg_ShowSntMsgs ,"sntmsg64x64.gif" }, diff --git a/swad_changelog.h b/swad_changelog.h index 1f5b0f85d..522c87411 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -168,17 +168,35 @@ // TODO: Change forms to change my webs / social networks to one unique form with a "Save changes" button +// TODO: Change "Results tests" to "View exams" ? +// TODO: Change "See exam" to "View exam" ? +// TODO: Change "Test result" to "Exam" ? + /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.65.3 (2016-11-20)" +#define Log_PLATFORM_VERSION "SWAD 16.66 (2016-11-21)" #define CSS_FILE "swad16.60.1.css" #define JS_FILE "swad16.46.1.js" // 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 16.66: Nov 21, 2016 Change icons for attendance. + Change icons for announcements. + Change icons for notices. + Change icon for exam. (207394 lines) +Copy icon/rollcall64x64.png to public icons directory +Copy icon/iconset/awesome/action64x64/rollcall64x64.png to public icons directory +Copy icon/iconset/nuvola/action64x64/rollcall64x64.png to public icons directory +Copy icon/iconset/awesome/action64x64/announcement64x64.png to public icons directory +Copy icon/iconset/nuvola/action64x64/announcement64x64.png to public icons directory +Copy icon/notice64x64.png to public icons directory +Copy icon/iconset/awesome/action64x64/notice64x64.png to public icons directory +Copy icon/iconset/nuvola/action64x64/notice64x64.png to public icons directory +Copy icon/exam64x64.png to public icons directory + Version 16.65.3: Nov 20, 2016 Contextual help on duplicated users. (207378 lines) Version 16.65.2: Nov 20, 2016 Changed order of links in other users. (207371 lines) Version 16.65.1: Nov 20, 2016 Changes in help of administrators and guests. (207370 lines) diff --git a/swad_notification.c b/swad_notification.c index 218831e67..45a129fdb 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -243,7 +243,7 @@ static const char *Ntf_Icons[Ntf_NUM_NOTIFY_EVENTS] = "forum64x64.gif", // Ntf_EVENT_FORUM_REPLY /* Messages tab */ - "note64x64.gif", // Ntf_EVENT_NOTICE + "notice64x64.png", // Ntf_EVENT_NOTICE "msg64x64.gif", // Ntf_EVENT_MESSAGE /* Statistics tab */ diff --git a/swad_record.c b/swad_record.c index 25283a3cb..01d8ac230 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2369,12 +2369,12 @@ static void Rec_PutIconsCommands (void) /***** Button to view user's test exams *****/ if (ItsMe) Lay_PutContextualLink (ActSeeMyTstExa,NULL, - "file64x64.gif", + "exam64x64.png", Txt_View_exams,NULL, NULL); else Lay_PutContextualLink (ActSeeUsrTstExa,Rec_PutParamsStudent, - "file64x64.gif", + "exam64x64.png", Txt_View_exams,NULL, NULL); @@ -2386,13 +2386,13 @@ static void Rec_PutIconsCommands (void) if (IAmLoggedAsStudent) // As student, I can see my attendance Lay_PutContextualLink (ActSeeLstMyAtt,NULL, - "rollcall64x64.gif", + "rollcall64x64.png", Txt_View_attendance,NULL, NULL); else // IAmLoggedAsTeacher || IAmLoggedAsSysAdm // As teacher, I can see attendance of the student Lay_PutContextualLink (ActSeeLstStdAtt,Rec_PutParamsStudent, - "rollcall64x64.gif", + "rollcall64x64.png", Txt_View_attendance,NULL, NULL); } diff --git a/swad_social.c b/swad_social.c index f3e96aa87..c2b2e938d 100644 --- a/swad_social.c +++ b/swad_social.c @@ -1588,7 +1588,7 @@ static void Soc_PutFormGoToAction (const struct SocialNote *SocNot) "forum64x64.gif", // Soc_NOTE_FORUM_POST /* Messages tab */ - "note64x64.gif", // Soc_NOTE_NOTICE + "notice64x64.png", // Soc_NOTE_NOTICE /* Statistics tab */ diff --git a/swad_test.c b/swad_test.c index 29eef6f96..c71562498 100644 --- a/swad_test.c +++ b/swad_test.c @@ -370,7 +370,7 @@ static void Tst_PutFormToSeeResultsOfUsersTests (Act_Action_t Action) extern const char *Txt_Results_tests; fprintf (Gbl.F.Out,"
"); - Lay_PutContextualLink (Action,NULL,"file64x64.gif", + Lay_PutContextualLink (Action,NULL,"exam64x64.png", Txt_Results_tests,Txt_Results_tests, NULL); fprintf (Gbl.F.Out,"
"); @@ -7296,7 +7296,7 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat) Act_FormStart (Gbl.Action.Act == ActSeeMyTstExa ? ActSeeOneTstExaMe : ActSeeOneTstExaOth); Tst_PutParamTstCod (TstCod); - fprintf (Gbl.F.Out,"", Gbl.Prefs.IconsURL,