Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.86.7

This commit is contained in:
Antonio Cañas Vargas 2016-12-05 01:54:03 +01:00
parent 7daeabb79e
commit 4e3a234a32
13 changed files with 39 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/swad16.86.5.css
View File

@ -1995,16 +1995,14 @@ a:hover img.CENTRE_PHOTO_SHOW
.PREF_OFF .PREF_OFF
{ {
box-sizing:border-box; box-sizing:border-box;
height:44px; padding:6px;
padding:0 10px;
text-align:center; text-align:center;
vertical-align:middle; vertical-align:middle;
} }
.PREF_ON .PREF_ON
{ {
box-sizing:border-box; box-sizing:border-box;
height:44px; padding:6px;
padding:0 10px;
text-align:center; text-align:center;
vertical-align:middle; vertical-align:middle;
border:solid 1px; border:solid 1px;

BIN
icon/lock-off64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 860 B

BIN
icon/lock-on64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 828 B

BIN
icon/lockunlock64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 829 B

BIN
icon/unlock-off64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 934 B

BIN
icon/unlock-on64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 915 B

BIN
icon/unlock64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 603 B

43
swad_agenda.c
View File

@ -74,7 +74,7 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType);
static void Agd_PutIconToCreateNewEvent (void); static void Agd_PutIconToCreateNewEvent (void);
static void Agd_PutButtonToCreateNewEvent (void); static void Agd_PutButtonToCreateNewEvent (void);
static void Agd_PutParamsToCreateNewEvent (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_GetParamWhichEvents (void);
static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod); static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod);
static void Agd_WriteEventAuthor (struct AgendaEvent *AgdEvent); 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 /***** Put form to choice whether to show
all events or only public events *****/ all events or only public events *****/
Act_FormStart (ActSeeMyAgd); Act_FormStart (ActSeeMyAgd);
Agd_ShowSelectorWhichEvents (); Agd_ShowFormToSelWhichEvents (ActSeeMyAgd);
Act_FormEnd (); Act_FormEnd ();
break; 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]; extern const char *Txt_Show_WHICH_events[2];
Agd_WhichEvents_t WhichEvents; Agd_WhichEvents_t WhichEvents;
fprintf (Gbl.F.Out,"<div style=\"margin:12px 0;\">" fprintf (Gbl.F.Out,"<div style=\"display:table-cell; padding:0 20px;\">");
"<ul class=\"LIST_CENTER\">");
for (WhichEvents = Agd_ALL_EVENTS; for (WhichEvents = Agd_ALL_EVENTS;
WhichEvents <= Agd_ONLY_PUBLIC_EVENTS; WhichEvents <= Agd_ONLY_PUBLIC_EVENTS;
WhichEvents++) WhichEvents++)
{ {
fprintf (Gbl.F.Out,"<li class=\"DAT LEFT_MIDDLE\"" fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"display:table-cell;\">",
" style=\"display:inline;\">" WhichEvents == Gbl.Agenda.WhichEvents ? "PREF_ON" :
"<input type=\"radio\" name=\"WhichEvents\" value=\"%u\"", "PREF_OFF");
(unsigned) WhichEvents); Act_FormStart (Action);
if (WhichEvents == Gbl.Agenda.WhichEvents) Par_PutHiddenParamUnsigned ("WhichEvents",(unsigned) WhichEvents);
fprintf (Gbl.F.Out," checked=\"checked\""); fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s\""
fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />" " alt=\"%s\" title=\"%s\" class=\"ICO25x25\""
" %s" " style=\"margin:0 auto;\" />",
"</li>", Gbl.Prefs.IconsURL,
Gbl.Form.Id,Txt_Show_WHICH_events[WhichEvents]); 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,"</div>");
} }
fprintf (Gbl.F.Out,"</ul>" fprintf (Gbl.F.Out,"</div>");
"</div>");
} }
/*****************************************************************************/ /*****************************************************************************/
@ -597,12 +600,12 @@ static void Agd_PutFormsToRemEditOneEvent (struct AgendaEvent *AgdEvent)
{ {
if (AgdEvent->Public) if (AgdEvent->Public)
Lay_PutContextualLink (ActPrvEvtMyAgd,Agd_PutParams, 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, Txt_Event_visible_to_the_users_of_your_courses_click_to_make_it_private,NULL,
NULL); NULL);
else else
Lay_PutContextualLink (ActPubEvtMyAgd,Agd_PutParams, 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, Txt_Event_private_click_to_make_it_visible_to_the_users_of_your_courses,NULL,
NULL); NULL);
} }

3
swad_changelog.h
View File

@ -183,13 +183,14 @@
/****************************** Public constants *****************************/ /****************************** 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 CSS_FILE "swad16.86.5.css"
#define JS_FILE "swad16.84.2.js" #define JS_FILE "swad16.84.2.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // 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.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.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) Version 16.86.4: Dec 04, 2016 Contextual icons to change which groups to show. (209864 lines)

2
swad_file_browser.c
View File

@ -6049,7 +6049,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic,
/* Put icon to make public/private file */ /* Put icon to make public/private file */
if (IsPublic) if (IsPublic)
fprintf (Gbl.F.Out,"&nbsp;<img src=\"%s/open_on16x16.gif\"" fprintf (Gbl.F.Out,"&nbsp;<img src=\"%s/unlock-on64x64.png\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />", " class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,

43
swad_group.c
View File

@ -1334,12 +1334,12 @@ static void Grp_ListGroupsForEdition (void)
Grp->Open ? Txt_Group_X_open_click_to_close_it : Grp->Open ? Txt_Group_X_open_click_to_close_it :
Txt_Group_X_closed_click_to_open_it, Txt_Group_X_closed_click_to_open_it,
Grp->GrpName); Grp->GrpName);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s_on16x16.gif\"" fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s-on64x64.png\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />", " class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
Grp->Open ? "open" : Grp->Open ? "unlock" :
"closed", "lock",
Gbl.Title, Gbl.Title,
Gbl.Title); Gbl.Title);
Act_FormEnd (); Act_FormEnd ();
@ -2000,13 +2000,13 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight)
if (Highlight) if (Highlight)
fprintf (Gbl.F.Out," LIGHT_BLUE"); fprintf (Gbl.F.Out," LIGHT_BLUE");
fprintf (Gbl.F.Out,"\" style=\"width:15px;\">" fprintf (Gbl.F.Out,"\" style=\"width:15px;\">"
"<img src=\"%s/%s_off16x16.gif\"" "<img src=\"%s/%s-off64x64.png\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />" " class=\"ICO20x20\" />"
"</td>", "</td>",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
Grp->Open ? "open" : Grp->Open ? "unlock" :
"closed", "lock",
Gbl.Title,Gbl.Title); Gbl.Title,Gbl.Title);
/***** Group name *****/ /***** Group name *****/
@ -2195,7 +2195,7 @@ static void Grp_PutFormToCreateGroup (void)
Lay_PutIconRemovalNotAllowed (); Lay_PutIconRemovalNotAllowed ();
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"<td class=\"BM\">" "<td class=\"BM\">"
"<img src=\"%s/closed_off16x16.gif\"" "<img src=\"%s/lock-off64x64.png\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />" " class=\"ICO20x20\" />"
"</td>" "</td>"
@ -4201,36 +4201,9 @@ void Grp_PutParamWhichGrpsAllGrps (void)
} }
/*****************************************************************************/ /*****************************************************************************/
/********** Show selector to choice whether to show only my groups ***********/ /***** Show form to choice whether to show only my groups or all groups ******/
/********** or all groups in timetable ***********/
/*****************************************************************************/ /*****************************************************************************/
void Grp_ShowSelectorWhichGrps (void)
{
extern const char *Txt_Show_WHICH_groups[2];
Grp_WhichGroups_t WhichGrps;
fprintf (Gbl.F.Out,"<div style=\"margin:12px 0;\">"
"<ul class=\"LIST_CENTER\">");
for (WhichGrps = Grp_ONLY_MY_GROUPS;
WhichGrps <= Grp_ALL_GROUPS;
WhichGrps++)
{
fprintf (Gbl.F.Out,"<li class=\"DAT LEFT_MIDDLE\""
" style=\"display:inline;\">"
"<input type=\"radio\" name=\"WhichGrps\" value=\"%u\"",
(unsigned) WhichGrps);
if (WhichGrps == Gbl.CurrentCrs.Grps.WhichGrps)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
" %s"
"</li>",
Gbl.Form.Id,Txt_Show_WHICH_groups[WhichGrps]);
}
fprintf (Gbl.F.Out,"</ul>"
"</div>");
}
void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ()) void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ())
{ {
extern const char *Txt_Show_WHICH_groups[2]; extern const char *Txt_Show_WHICH_groups[2];

1
swad_group.h
View File

@ -182,7 +182,6 @@ void Grp_PutParamAllGroups (void);
void Grp_PutParamWhichGrps (void); void Grp_PutParamWhichGrps (void);
void Grp_PutParamWhichGrpsOnlyMyGrps (void); void Grp_PutParamWhichGrpsOnlyMyGrps (void);
void Grp_PutParamWhichGrpsAllGrps (void); void Grp_PutParamWhichGrpsAllGrps (void);
void Grp_ShowSelectorWhichGrps (void);
void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ()); void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ());
void Grp_GetParamWhichGrps (void); void Grp_GetParamWhichGrps (void);

6
swad_message.c
View File

@ -3589,7 +3589,7 @@ static void Msg_PutFormToBanSender (struct UsrData *UsrDat)
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Msg_PutHiddenParamsMsgsFilters (); Msg_PutHiddenParamsMsgsFilters ();
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/open_on16x16.gif\"" fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/unlock-on64x64.png\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" style=\"margin-left:12px;\" />", " class=\"ICO20x20\" style=\"margin-left:12px;\" />",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
@ -3611,7 +3611,7 @@ static void Msg_PutFormToUnbanSender (struct UsrData *UsrDat)
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Msg_PutHiddenParamsMsgsFilters (); Msg_PutHiddenParamsMsgsFilters ();
fprintf (Gbl.F.Out,"<span class=\"MSG_AUT\">&nbsp;</span>" fprintf (Gbl.F.Out,"<span class=\"MSG_AUT\">&nbsp;</span>"
"<input type=\"image\" src=\"%s/closed_on16x16.gif\"" "<input type=\"image\" src=\"%s/lock-on64x64.png\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />", " class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
@ -3790,7 +3790,7 @@ void Msg_ListBannedUsrs (void)
Act_FormStart (ActUnbUsrLst); Act_FormStart (ActUnbUsrLst);
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
fprintf (Gbl.F.Out,"<input type=\"image\"" fprintf (Gbl.F.Out,"<input type=\"image\""
" src=\"%s/closed_on16x16.gif\"" " src=\"%s/lock-on64x64.png\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />", " class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,