diff --git a/css/swad15.74.3.css b/css/swad15.74.3.css index 613e3f7aa..eb9bab9ce 100644 --- a/css/swad15.74.3.css +++ b/css/swad15.74.3.css @@ -1154,8 +1154,9 @@ a:hover /* Default ==> underlined */ max-width:90%; margin:8px auto 0 auto; background-color:#FFF9E0; - background-repeat:no-repeat; background-position:12px 12px; + background-size:20px 20px; + background-repeat:no-repeat; padding:12px 12px 12px 45px; border-radius:4px; box-shadow:1px 1px 3px #CCC7B4; diff --git a/icon/cty64x64.gif b/icon/cty64x64.gif new file mode 100644 index 000000000..0ab855066 Binary files /dev/null and b/icon/cty64x64.gif differ diff --git a/icon/heart64x64.gif b/icon/heart64x64.gif new file mode 100644 index 000000000..67afa5fff Binary files /dev/null and b/icon/heart64x64.gif differ diff --git a/icon/iconset/awesome/action64x64/classphoto64x64.gif b/icon/iconset/awesome/action64x64/classphoto64x64.gif index 12f70dbe5..cc7eafaab 100644 Binary files a/icon/iconset/awesome/action64x64/classphoto64x64.gif and b/icon/iconset/awesome/action64x64/classphoto64x64.gif differ diff --git a/icon/list64x64.gif b/icon/list64x64.gif new file mode 100644 index 000000000..cc7eafaab Binary files /dev/null and b/icon/list64x64.gif differ diff --git a/icon/table64x64.gif b/icon/table64x64.gif new file mode 100644 index 000000000..9ad5a6bb2 Binary files /dev/null and b/icon/table64x64.gif differ diff --git a/swad_attendance.c b/swad_attendance.c index 254ed803d..985a9cc39 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -468,7 +468,7 @@ static void Att_PutFormToListMyAttendance (void) extern const char *Txt_Attendance_list; Lay_PutContextualLink (ActSeeLstMyAtt,NULL, - "list16x16.gif", + "list64x64.gif", Txt_Attendance_list,Txt_Attendance_list); } @@ -481,7 +481,7 @@ static void Att_PutFormToListStdsAttendance (void) extern const char *Txt_Attendance_list; Lay_PutContextualLink (ActReqLstStdAtt,Att_PutFormToListStdsParams, - "list16x16.gif", + "list64x64.gif", Txt_Attendance_list,Txt_Attendance_list); } diff --git a/swad_changelog.h b/swad_changelog.h index f5ddf7298..c3a1c9adc 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -102,26 +102,26 @@ // TODO: Show nicknames of users in lists? // TODO: Form to register and remove system admins // TODO: Fix this bug: when an admin clicks on "Use this email" in the email of another user the email was confirmed, the email becomes unconfirmed -// TODO: When error ("Ya existía un evento con el título") creating a new event, the data f the event is empty +// TODO: When error ("Ya existía un evento con el título") creating a new event, the data of the event is empty // TODO: When teacher clicks in attendance of a student (button in her/his record), // only (the groups he/she should have attend) union (the groups he/she really attended) // should be shown. -// TODO: By default, profile and photo should be visible by users who share course // TODO: When page is refreshed in course works, prevent users to be duplicated // TODO: Fix bug at the end of ranking (number too low) when a course is selected // TODO: Reply to all -// TODO: Reply icons should appear without text /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.74.5 (2015-12-26)" +#define Log_PLATFORM_VERSION "SWAD 15.74.7 (2015-12-26)" #define CSS_FILE "swad15.74.3.css" // 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 15.74.7: Dec 26, 2015 Changes in small icons. (187563 lines) + Version 15.74.6: Dec 26, 2015 Reply icon is shown without text. (187562 lines) Version 15.74.5: Dec 26, 2015 Text in link to remove messages is now shorter. Fixed bug in messages. (187563 lines) Version 15.74.4: Dec 26, 2015 Change in text when no course is selected. (187757 lines) diff --git a/swad_degree.c b/swad_degree.c index e7a543172..a9a002e60 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -1374,9 +1374,9 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg) Deg->NumCrss ? "ok_green" : "tr", Deg->NumCrss ? Txt_DEGREE_With_courses : - Txt_DEGREE_Without_courses, + Txt_DEGREE_Without_courses, Deg->NumCrss ? Txt_DEGREE_With_courses : - Txt_DEGREE_Without_courses); + Txt_DEGREE_Without_courses); /***** Number of degree in this list *****/ fprintf (Gbl.F.Out,"" diff --git a/swad_forum.c b/swad_forum.c index d94ecfab0..329b5aff0 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -1161,12 +1161,12 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst sprintf (Gbl.Title,Enabled ? Txt_Post_X_allowed_Click_to_ban_it : Txt_Post_X_banned_Click_to_unban_it, PstNum); - fprintf (Gbl.F.Out,"", Gbl.Prefs.IconsURL, - Enabled ? "visible" : - "hidden", + Enabled ? "eye" : + "eye-slash", Gbl.Title, Gbl.Title); Act_FormEnd (); @@ -1177,14 +1177,14 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst Txt_Post_X_banned, PstNum); fprintf (Gbl.F.Out,"" - "\"%s\"" "", Gbl.Title, Gbl.Prefs.IconsURL, - Enabled ? "visible" : - "hidden", + Enabled ? "eye" : + "eye-slash", Gbl.Title, Gbl.Title); } diff --git a/swad_layout.c b/swad_layout.c index 9c97a7a80..3a1f537bf 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1345,8 +1345,7 @@ void Lay_ShowAlert (Lay_AlertType_t MsgType,const char *Message) if (Message) fprintf (Gbl.F.Out,"
" "
" + " style=\"background-image:url('%s/%s16x16.gif');\">" "%s" "
" "
", diff --git a/swad_logo.c b/swad_logo.c index b9f58c9f1..6705b89b0 100644 --- a/swad_logo.c +++ b/swad_logo.c @@ -190,19 +190,19 @@ void Log_PutFormToChangeLogo (Sco_Scope_t Scope) Action = ActReqInsLog; Cod = Gbl.CurrentIns.Ins.InsCod; Folder = Cfg_FOLDER_INS; - Icon = "ins16x16.gif"; + Icon = "ins64x64.gif"; break; case Sco_SCOPE_CTR: Action = ActReqCtrLog; Cod = Gbl.CurrentCtr.Ctr.CtrCod; Folder = Cfg_FOLDER_CTR; - Icon = "ctr16x16.gif"; + Icon = "ctr64x64.gif"; break; case Sco_SCOPE_DEG: Action = ActReqDegLog; Cod = Gbl.CurrentDeg.Deg.DegCod; Folder = Cfg_FOLDER_DEG; - Icon = "deg16x16.gif"; + Icon = "deg64x64.gif"; break; default: return; // Nothing to do diff --git a/swad_message.c b/swad_message.c index 1b6f42aeb..a80135f57 100644 --- a/swad_message.c +++ b/swad_message.c @@ -3089,10 +3089,10 @@ static void Msg_WriteFormToReply (long MsgCod,long CrsCod,const char *Subject, (Replied ? Txt_Go_to_course_and_reply_again : Txt_Go_to_course_and_reply), The_ClassFormBold[Gbl.Prefs.Theme]); - Lay_PutIconWithText ("reply16x16.gif",Replied ? Txt_Reply_again : - Txt_Reply, - Replied ? Txt_Reply_again : - Txt_Reply); + Lay_PutIconWithText ("reply16x16.gif", + Replied ? Txt_Reply_again : + Txt_Reply, + NULL); fprintf (Gbl.F.Out,""); Act_FormEnd (); } diff --git a/swad_notification.c b/swad_notification.c index 6f0fc7aa0..d1a5aa0e1 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -187,33 +187,33 @@ static const char *Ntf_ParamEmailMeAboutNotifyEvents[Ntf_NUM_NOTIFY_EVENTS] = // Icons for notification events static const char *Ntf_Icons[Ntf_NUM_NOTIFY_EVENTS] = { - "faq", // Ntf_EVENT_UNKNOWN + "faq16x16.gif", // Ntf_EVENT_UNKNOWN /* Course tab */ - "folder", // Ntf_EVENT_DOCUMENT_FILE // TODO: Change icon to "file" - "folderusers", // Ntf_EVENT_SHARED_FILE // TODO: Change icon to "file" + "file64x64.gif", // Ntf_EVENT_DOCUMENT_FILE + "file64x64.gif", // Ntf_EVENT_SHARED_FILE /* Assessment tab */ - "desk", // Ntf_EVENT_ASSIGNMENT - "announce", // Ntf_EVENT_EXAM_ANNOUNCEMENT - "grades", // Ntf_EVENT_MARKS_FILE + "desk16x16.gif", // Ntf_EVENT_ASSIGNMENT + "announce16x16.gif", // Ntf_EVENT_EXAM_ANNOUNCEMENT + "grades16x16.gif", // Ntf_EVENT_MARKS_FILE /* Enrollment tab */ - "adduser", // Ntf_EVENT_ENROLLMENT_STUDENT - "adduser", // Ntf_EVENT_ENROLLMENT_TEACHER - "enrollmentrequest", // Ntf_EVENT_ENROLLMENT_REQUEST + "adduser16x16.gif", // Ntf_EVENT_ENROLLMENT_STUDENT + "adduser16x16.gif", // Ntf_EVENT_ENROLLMENT_TEACHER + "enrollmentrequest16x16.gif", // Ntf_EVENT_ENROLLMENT_REQUEST /* Messages tab */ - "note", // Ntf_EVENT_NOTICE - "forum", // Ntf_EVENT_FORUM_POST_COURSE - "forum", // Ntf_EVENT_FORUM_REPLY - "recmsg", // Ntf_EVENT_MESSAGE + "note16x16.gif", // Ntf_EVENT_NOTICE + "forum16x16.gif", // Ntf_EVENT_FORUM_POST_COURSE + "forum16x16.gif", // Ntf_EVENT_FORUM_REPLY + "msg64x64.gif", // Ntf_EVENT_MESSAGE /* Statistics tab */ - "survey", // Ntf_EVENT_SURVEY + "survey16x16.gif", // Ntf_EVENT_SURVEY /* Profile tab */ - "follow", // Ntf_EVENT_FOLLOWER + "follow64x64.gif", // Ntf_EVENT_FOLLOWER }; /*****************************************************************************/ @@ -302,7 +302,7 @@ void Ntf_ShowMyNotifications (void) /***** Buttons to change preferences and to mark all notifications as seen *****/ fprintf (Gbl.F.Out,"
"); // Put form to change notification preferences - Lay_PutContextualLink (ActEdiPrf,NULL,"heart16x16.gif", + Lay_PutContextualLink (ActEdiPrf,NULL,"heart64x64.gif", Txt_Change_preferences,Txt_Change_preferences); if (NumNotifications) // Put form to change notification preferences @@ -437,7 +437,7 @@ void Ntf_ShowMyNotifications (void) if (PutLink) { Ntf_StartFormGoToAction (NotifyEvent,Crs.CrsCod,Cod); - fprintf (Gbl.F.Out,"", Gbl.Prefs.IconsURL, @@ -447,7 +447,7 @@ void Ntf_ShowMyNotifications (void) Act_FormEnd (); } else - fprintf (Gbl.F.Out,"\"%s\"", Gbl.Prefs.IconsURL, diff --git a/swad_record.c b/swad_record.c index 501d9bd74..6d18bb022 100644 --- a/swad_record.c +++ b/swad_record.c @@ -1379,7 +1379,7 @@ static void Rec_WriteFormShowOfficeHours (bool ShowOfficeHours,const char *ListU fprintf (Gbl.F.Out," checked=\"checked\""); fprintf (Gbl.F.Out," class=\"LEFT_MIDDLE\"" " onclick=\"document.getElementById('%s').submit();\" />" - "\"%s\"" " %s" diff --git a/swad_statistic.c b/swad_statistic.c index b4b22ed75..9b07e28d2 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -4210,7 +4210,7 @@ static void Sta_GetAndShowNumCtysInSWAD (void) /***** Write number of countries *****/ fprintf (Gbl.F.Out,"" "" - "\"%s\"" " %s:" @@ -4335,7 +4335,7 @@ static void Sta_GetAndShowNumInssInSWAD (void) /***** Write number of institutions *****/ fprintf (Gbl.F.Out,"" "" - "\"%s\"" " %s:" @@ -4450,7 +4450,7 @@ static void Sta_GetAndShowNumCtrsInSWAD (void) /***** Write number of centres *****/ fprintf (Gbl.F.Out,"" "" - "\"%s\"" " %s:" @@ -4555,7 +4555,7 @@ static void Sta_GetAndShowNumDegsInSWAD (void) /***** Write number of degrees *****/ fprintf (Gbl.F.Out,"" "" - "\"%s\"" " %s:" @@ -4650,7 +4650,7 @@ static void Sta_GetAndShowNumCrssInSWAD (void) /***** Write number of courses *****/ fprintf (Gbl.F.Out,"" "" - "\"%s\"" " %s:" diff --git a/swad_test.c b/swad_test.c index 522539a63..ac642c017 100644 --- a/swad_test.c +++ b/swad_test.c @@ -1440,7 +1440,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,bool "\"%s\""); - Lay_PutContextualLink (ActSeeCrsTT,NULL,"clock16x16.gif", + Lay_PutContextualLink (ActSeeCrsTT,NULL,"clock64x64.gif", Txt_Show_timetable,Txt_Show_timetable); fprintf (Gbl.F.Out,"
"); @@ -363,7 +363,7 @@ void TT_ShowMyTutTimeTable (void) /***** Link (form) to see my timetable *****/ fprintf (Gbl.F.Out,"
"); - Lay_PutContextualLink (ActSeeMyTT,NULL,"clock16x16.gif", + Lay_PutContextualLink (ActSeeMyTT,NULL,"clock64x64.gif", Txt_Show_timetable,Txt_Show_timetable); fprintf (Gbl.F.Out,"
"); diff --git a/swad_user.c b/swad_user.c index e95991ceb..0567b2abd 100644 --- a/swad_user.c +++ b/swad_user.c @@ -78,8 +78,8 @@ const char *Usr_StringsUsrListTypeInDB[Usr_NUM_USR_LIST_TYPES] = }; const char *Usr_IconsClassPhotoOrList[Usr_NUM_USR_LIST_TYPES] = { - "classphoto", - "list" + "classphoto16x16.gif", + "list64x64.gif" }; #define Usr_NUM_MAIN_FIELDS_DATA_USR 9 @@ -4990,7 +4990,7 @@ static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,Usr_ShowUsrsTyp Usr_PutParamUsrListType (ListType); Usr_PutExtraParamsUsrList (NextAction); Act_LinkFormSubmit (Txt_USR_LIST_TYPES[ListType],The_ClassFormNoWrap[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"\"%s\"" " %s", @@ -6622,7 +6622,7 @@ void Usr_SeeGuests (void) case Usr_LIST: /****** Link to show all the data ******/ Lay_PutContextualLink (ActLstGstAll,Usr_PutLinkToShowGuestsAllDataParams, - "table16x16.gif", + "table64x64.gif", Txt_Show_all_data,Txt_Show_all_data); break; } @@ -6813,7 +6813,7 @@ void Usr_SeeStudents (void) /****** Link to show all the data ******/ fprintf (Gbl.F.Out,"
"); Lay_PutContextualLink (ActLstStdAll,Usr_PutLinkToShowStdsAllDataParams, - "table16x16.gif", + "table64x64.gif", Txt_Show_all_data,Txt_Show_all_data); fprintf (Gbl.F.Out,"
"); } @@ -6982,7 +6982,7 @@ void Usr_SeeTeachers (void) /****** Link to show all the data ******/ fprintf (Gbl.F.Out,"
"); Lay_PutContextualLink (ActLstTchAll,Usr_PutLinkToShowTchsAllDataParams, - "table16x16.gif", + "table64x64.gif", Txt_Show_all_data,Txt_Show_all_data); fprintf (Gbl.F.Out,"
"); } @@ -7070,7 +7070,7 @@ static void Usr_PutLinkToListOfficialStudents (void) Gbl.Imported.ExternalSesId[0] && Gbl.Imported.ExternalRole == Rol_TEACHER) // ...as a teacher /***** Link to list official students *****/ - Lay_PutContextualLink (ActGetExtLstStd,NULL,"list16x16.gif", + Lay_PutContextualLink (ActGetExtLstStd,NULL,"list64x64.gif", Txt_Official_students,Txt_Official_students); } diff --git a/swad_zip.c b/swad_zip.c index 343affada..bd5936f66 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -118,7 +118,7 @@ void ZIP_PutButtonToCreateZIPAsgWrk (void) fprintf (Gbl.F.Out,"
"); Lay_PutContextualLink (ActAdmAsgWrkCrs,ZIP_PutButtonToCreateZIPAsgWrkParams, - "download16x16.gif", + "download64x64.gif", Txt_Create_ZIP_file,Txt_Create_ZIP_file); fprintf (Gbl.F.Out,"
"); } @@ -331,7 +331,7 @@ void ZIP_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *Fil } Brw_ParamListFiles (Brw_IS_FOLDER,PathInTree,FileName); Act_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassForm[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"\"%s\"" "",