From 4e3a234a3208d336eb9fc469dd029f3c78e47ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 5 Dec 2016 01:54:03 +0100 Subject: [PATCH] Version 16.86.7 --- css/swad16.86.5.css | 6 ++---- icon/lock-off64x64.png | Bin 0 -> 860 bytes icon/lock-on64x64.png | Bin 0 -> 828 bytes icon/lockunlock64x64.png | Bin 0 -> 829 bytes icon/unlock-off64x64.png | Bin 0 -> 934 bytes icon/unlock-on64x64.png | Bin 0 -> 915 bytes icon/unlock64x64.png | Bin 0 -> 603 bytes swad_agenda.c | 43 +++++++++++++++++++++------------------ swad_changelog.h | 3 ++- swad_file_browser.c | 2 +- swad_group.c | 43 ++++++++------------------------------- swad_group.h | 1 - swad_message.c | 6 +++--- 13 files changed, 39 insertions(+), 65 deletions(-) create mode 100644 icon/lock-off64x64.png create mode 100644 icon/lock-on64x64.png create mode 100644 icon/lockunlock64x64.png create mode 100644 icon/unlock-off64x64.png create mode 100644 icon/unlock-on64x64.png create mode 100644 icon/unlock64x64.png diff --git a/css/swad16.86.5.css b/css/swad16.86.5.css index 9b6895f3a..b516eb269 100644 --- a/css/swad16.86.5.css +++ b/css/swad16.86.5.css @@ -1995,16 +1995,14 @@ a:hover img.CENTRE_PHOTO_SHOW .PREF_OFF { box-sizing:border-box; - height:44px; - padding:0 10px; + padding:6px; text-align:center; vertical-align:middle; } .PREF_ON { box-sizing:border-box; - height:44px; - padding:0 10px; + padding:6px; text-align:center; vertical-align:middle; border:solid 1px; diff --git a/icon/lock-off64x64.png b/icon/lock-off64x64.png new file mode 100644 index 0000000000000000000000000000000000000000..8e22095f859d079c8849f4c7542d23b95ac97d86 GIT binary patch literal 860 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 literal 0 HcmV?d00001 diff --git a/swad_agenda.c b/swad_agenda.c index 1ecd6e548..460841ac2 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -74,7 +74,7 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType); static void Agd_PutIconToCreateNewEvent (void); static void Agd_PutButtonToCreateNewEvent (void); static void Agd_PutParamsToCreateNewEvent (void); -static void Agd_ShowSelectorWhichEvents (void); +static void Agd_ShowFormToSelWhichEvents (Act_Action_t Action); static void Agd_GetParamWhichEvents (void); static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod); static void Agd_WriteEventAuthor (struct AgendaEvent *AgdEvent); @@ -211,7 +211,7 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType) /***** Put form to choice whether to show all events or only public events *****/ Act_FormStart (ActSeeMyAgd); - Agd_ShowSelectorWhichEvents (); + Agd_ShowFormToSelWhichEvents (ActSeeMyAgd); Act_FormEnd (); break; } @@ -325,33 +325,36 @@ static void Agd_PutParamsToCreateNewEvent (void) } /*****************************************************************************/ -/** Show selector to choice whether to show all events or only public events */ +/*** Show form to choice whether to show all events or only public events ****/ /*****************************************************************************/ -static void Agd_ShowSelectorWhichEvents (void) +static void Agd_ShowFormToSelWhichEvents (Act_Action_t Action) { extern const char *Txt_Show_WHICH_events[2]; Agd_WhichEvents_t WhichEvents; - fprintf (Gbl.F.Out,"
" - "
    "); + fprintf (Gbl.F.Out,"
    "); for (WhichEvents = Agd_ALL_EVENTS; WhichEvents <= Agd_ONLY_PUBLIC_EVENTS; WhichEvents++) { - fprintf (Gbl.F.Out,"
  • " - "" - " %s" - "
    • ", - Gbl.Form.Id,Txt_Show_WHICH_events[WhichEvents]); + fprintf (Gbl.F.Out,"
    ", + WhichEvents == Gbl.Agenda.WhichEvents ? "PREF_ON" : + "PREF_OFF"); + Act_FormStart (Action); + Par_PutHiddenParamUnsigned ("WhichEvents",(unsigned) WhichEvents); + fprintf (Gbl.F.Out,"", + Gbl.Prefs.IconsURL, + WhichEvents == Agd_ONLY_PUBLIC_EVENTS ? "unlock64x64.png" : + "lockunlock64x64.png", + Txt_Show_WHICH_events[WhichEvents], + Txt_Show_WHICH_events[WhichEvents]); + Act_FormEnd (); + fprintf (Gbl.F.Out,"
    "); } - fprintf (Gbl.F.Out,"
" - "
"); + fprintf (Gbl.F.Out,""); } /*****************************************************************************/ @@ -597,12 +600,12 @@ static void Agd_PutFormsToRemEditOneEvent (struct AgendaEvent *AgdEvent) { if (AgdEvent->Public) Lay_PutContextualLink (ActPrvEvtMyAgd,Agd_PutParams, - "open_on16x16.gif", + "unlock-on64x64.png", Txt_Event_visible_to_the_users_of_your_courses_click_to_make_it_private,NULL, NULL); else Lay_PutContextualLink (ActPubEvtMyAgd,Agd_PutParams, - "closed_on16x16.gif", + "lock-on64x64.png", Txt_Event_private_click_to_make_it_visible_to_the_users_of_your_courses,NULL, NULL); } diff --git a/swad_changelog.h b/swad_changelog.h index 0098fb536..84553e02d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -183,13 +183,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.86.6 (2016-12-04)" +#define Log_PLATFORM_VERSION "SWAD 16.86.7 (2016-12-05)" #define CSS_FILE "swad16.86.5.css" #define JS_FILE "swad16.84.2.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.86.7: Dec 05, 2016 Changes in icons for open/closed and public/private. (209852 lines) Version 16.86.6: Dec 04, 2016 Removed contextual icons to change which groups to show. (209876 lines) Version 16.86.5: Dec 04, 2016 Changes in layout of forms to change which groups to show / first day of week. (209913 lines) Version 16.86.4: Dec 04, 2016 Contextual icons to change which groups to show. (209864 lines) diff --git a/swad_file_browser.c b/swad_file_browser.c index 858370559..2ceb82cc9 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -6049,7 +6049,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic, /* Put icon to make public/private file */ if (IsPublic) - fprintf (Gbl.F.Out," \"%s\"", Gbl.Prefs.IconsURL, diff --git a/swad_group.c b/swad_group.c index d1b179505..38b533525 100644 --- a/swad_group.c +++ b/swad_group.c @@ -1334,12 +1334,12 @@ static void Grp_ListGroupsForEdition (void) Grp->Open ? Txt_Group_X_open_click_to_close_it : Txt_Group_X_closed_click_to_open_it, Grp->GrpName); - fprintf (Gbl.F.Out,"", Gbl.Prefs.IconsURL, - Grp->Open ? "open" : - "closed", + Grp->Open ? "unlock" : + "lock", Gbl.Title, Gbl.Title); Act_FormEnd (); @@ -2000,13 +2000,13 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight) if (Highlight) fprintf (Gbl.F.Out," LIGHT_BLUE"); fprintf (Gbl.F.Out,"\" style=\"width:15px;\">" - "\"%s\"" "", Gbl.Prefs.IconsURL, - Grp->Open ? "open" : - "closed", + Grp->Open ? "unlock" : + "lock", Gbl.Title,Gbl.Title); /***** Group name *****/ @@ -2195,7 +2195,7 @@ static void Grp_PutFormToCreateGroup (void) Lay_PutIconRemovalNotAllowed (); fprintf (Gbl.F.Out,"" "" - "\"%s\"" "" @@ -4201,36 +4201,9 @@ void Grp_PutParamWhichGrpsAllGrps (void) } /*****************************************************************************/ -/********** Show selector to choice whether to show only my groups ***********/ -/********** or all groups in timetable ***********/ +/***** Show form to choice whether to show only my groups or all groups ******/ /*****************************************************************************/ -void Grp_ShowSelectorWhichGrps (void) - { - extern const char *Txt_Show_WHICH_groups[2]; - Grp_WhichGroups_t WhichGrps; - - fprintf (Gbl.F.Out,"
" - "
    "); - for (WhichGrps = Grp_ONLY_MY_GROUPS; - WhichGrps <= Grp_ALL_GROUPS; - WhichGrps++) - { - fprintf (Gbl.F.Out,"
  • " - "" - " %s" - "
    • ", - Gbl.Form.Id,Txt_Show_WHICH_groups[WhichGrps]); - } - fprintf (Gbl.F.Out,"
" - "
"); - } - void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ()) { extern const char *Txt_Show_WHICH_groups[2]; diff --git a/swad_group.h b/swad_group.h index a355a218a..0a81e70f5 100644 --- a/swad_group.h +++ b/swad_group.h @@ -182,7 +182,6 @@ void Grp_PutParamAllGroups (void); void Grp_PutParamWhichGrps (void); void Grp_PutParamWhichGrpsOnlyMyGrps (void); void Grp_PutParamWhichGrpsAllGrps (void); -void Grp_ShowSelectorWhichGrps (void); void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ()); void Grp_GetParamWhichGrps (void); diff --git a/swad_message.c b/swad_message.c index da63dc2b1..e7153fd07 100644 --- a/swad_message.c +++ b/swad_message.c @@ -3589,7 +3589,7 @@ static void Msg_PutFormToBanSender (struct UsrData *UsrDat) Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Msg_PutHiddenParamsMsgsFilters (); - fprintf (Gbl.F.Out,"", Gbl.Prefs.IconsURL, @@ -3611,7 +3611,7 @@ static void Msg_PutFormToUnbanSender (struct UsrData *UsrDat) Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Msg_PutHiddenParamsMsgsFilters (); fprintf (Gbl.F.Out," " - "", Gbl.Prefs.IconsURL, @@ -3790,7 +3790,7 @@ void Msg_ListBannedUsrs (void) Act_FormStart (ActUnbUsrLst); Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod); fprintf (Gbl.F.Out,"", Gbl.Prefs.IconsURL,