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 18.54

This commit is contained in:
Antonio Cañas Vargas 2019-02-21 21:12:04 +01:00
parent f53f29fac9
commit d0d7ac6209
6 changed files with 40 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
css/swad18.52.4.css → css/swad18.54.css
View File

@ -1603,15 +1603,15 @@ a:hover /* Default ==> underlined */
}
/*********************************** Icons ***********************************/
.ICOx16 {height:16px; vertical-align:middle;}
.ICO16x16 {width:16px; height:16px; vertical-align:middle;}
.ICO20x20 {width:20px; height:20px; vertical-align:middle;}
.ICO25x25 {width:25px; height:25px; vertical-align:middle;}
.ICOx25 {height:25px; vertical-align:middle; margin:0 auto;}
.ICO40x40 {width:40px; height:40px; vertical-align:middle;}
.ICO64x64 {width:64px; height:64px; vertical-align:middle;}
.ICO160x160 {width:160px; height:160px; vertical-align:middle;}
.BANNER {width:150px; height:50px;}
.ICOx16 { height:16px; vertical-align:middle;}
.ICO16x16 {width:16px; height:16px; vertical-align:middle;}
.ICO20x20 {width:20px; height:20px; vertical-align:middle;}
.ICOx20 { height:20px; vertical-align:middle; margin:0 auto;}
.ICO25x25 {width:25px; height:25px; vertical-align:middle;}
.ICO40x40 {width:40px; height:40px; vertical-align:middle;}
.ICO64x64 {width:64px; height:64px; vertical-align:middle;}
.ICO160x160 {width:160px; height:160px; vertical-align:middle;}
.BANNER {width:150px; height:50px;}
.BANNER_SMALL {width:75px; height:25px;}
/****** Contextual links with small icons and text to go to some action ******/

12
swad_agenda.c
View File

@ -179,7 +179,7 @@ static void Agd_ShowFormToSelPast__FutureEvents (void)
{
extern const char *Txt_AGENDA_PAST___FUTURE_EVENTS[2];
Agd_Past__FutureEvents_t PstFut;
static const char *Image[2] =
static const char *Icon[2] =
{
"calendar-minus.svg", // Agd_PAST___EVENTS
"calendar-plus.svg", // Agd_FUTURE_EVENTS
@ -199,7 +199,7 @@ static void Agd_ShowFormToSelPast__FutureEvents (void)
Gbl.Agenda.HiddenVisiblEvents,
Gbl.Agenda.CurrentPage,
-1L);
Ico_PutPrefIconLink (Image[PstFut],
Ico_PutPrefIconLink (Icon[PstFut],
Txt_AGENDA_PAST___FUTURE_EVENTS[PstFut]);
Frm_EndForm ();
fprintf (Gbl.F.Out,"</div>");
@ -215,7 +215,7 @@ static void Agd_ShowFormToSelPrivatPublicEvents (void)
{
extern const char *Txt_AGENDA_PRIVAT_PUBLIC_EVENTS[2];
Agd_PrivatPublicEvents_t PrvPub;
static const char *Image[2] =
static const char *Icon[2] =
{
"lock.svg", // Agd_PRIVAT_EVENTS
"unlock.svg", // Agd_PUBLIC_EVENTS
@ -235,7 +235,7 @@ static void Agd_ShowFormToSelPrivatPublicEvents (void)
Gbl.Agenda.HiddenVisiblEvents,
Gbl.Agenda.CurrentPage,
-1L);
Ico_PutPrefIconLink (Image[PrvPub],
Ico_PutPrefIconLink (Icon[PrvPub],
Txt_AGENDA_PRIVAT_PUBLIC_EVENTS[PrvPub]);
Frm_EndForm ();
fprintf (Gbl.F.Out,"</div>");
@ -251,7 +251,7 @@ static void Agd_ShowFormToSelHiddenVisiblEvents (void)
{
extern const char *Txt_AGENDA_HIDDEN_VISIBL_EVENTS[2];
Agd_HiddenVisiblEvents_t HidVis;
static const char *Image[2] =
static const char *Icon[2] =
{
"eye-slash.svg", // Agd_HIDDEN_EVENTS
"eye.svg", // Agd_VISIBL_EVENTS
@ -271,7 +271,7 @@ static void Agd_ShowFormToSelHiddenVisiblEvents (void)
Gbl.Agenda.HiddenVisiblEvents ^ (1 << HidVis), // Toggle
Gbl.Agenda.CurrentPage,
-1L);
Ico_PutPrefIconLink (Image[HidVis],
Ico_PutPrefIconLink (Icon[HidVis],
Txt_AGENDA_HIDDEN_VISIBL_EVENTS[HidVis]);
Frm_EndForm ();
fprintf (Gbl.F.Out,"</div>");

5
swad_changelog.h
View File

@ -429,10 +429,11 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 18.53 (2019-02-21)"
#define CSS_FILE "swad18.52.4.css"
#define Log_PLATFORM_VERSION "SWAD 18.54 (2019-02-21)"
#define CSS_FILE "swad18.54.css"
#define JS_FILE "swad18.51.js"
/*
Version 18.54: Feb 21, 2019 Selection of users scope in timeline is made with icons. (? lines)
Version 18.53: Feb 21, 2019 Last selection of users scope in timeline is saved in database. (237538 lines)
1 change necessary in database:
ALTER TABLE usr_last ADD COLUMN TimelineUsrs TINYINT NOT NULL DEFAULT 0 AFTER LastAccNotif;

2
swad_icon.c
View File

@ -351,7 +351,7 @@ void Ico_PutPrefIconLink (const char *Icon,const char *Title)
{
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO_HIGHLIGHT ICOx25\" />",
" class=\"ICO_HIGHLIGHT ICOx20\" />",
Gbl.Prefs.URLIcons,Icon,
Title,Title);
}

8
swad_project.c
View File

@ -357,7 +357,7 @@ static void Prj_ShowFormToFilterByMy_All (void)
extern const char *Txt_PROJECT_MY_ALL_PROJECTS[Prj_NUM_WHOSE_PROJECTS];
struct Prj_Filter Filter;
Prj_WhoseProjects_t My_All;
static const char *WhoseProjectsImage[Prj_NUM_WHOSE_PROJECTS] =
static const char *WhoseProjectsIcon[Prj_NUM_WHOSE_PROJECTS] =
{
"mysitemap.png", // Prj_MY__PROJECTS
"sitemap.svg", // Prj_ALL_PROJECTS
@ -380,7 +380,7 @@ static void Prj_ShowFormToFilterByMy_All (void)
Gbl.Prjs.SelectedOrder,
Gbl.Prjs.CurrentPage,
-1L);
Ico_PutPrefIconLink (WhoseProjectsImage[My_All],
Ico_PutPrefIconLink (WhoseProjectsIcon[My_All],
Txt_PROJECT_MY_ALL_PROJECTS[My_All]);
Frm_EndForm ();
fprintf (Gbl.F.Out,"</div>");
@ -432,7 +432,7 @@ static void Prj_ShowFormToFilterByHidden (void)
extern const char *Txt_PROJECT_HIDDEN_VISIBL_PROJECTS[Prj_NUM_HIDDEN_VISIBL];
struct Prj_Filter Filter;
Prj_HiddenVisibl_t HidVis;
static const char *HiddenVisiblImage[Prj_NUM_HIDDEN_VISIBL] =
static const char *HiddenVisiblIcon[Prj_NUM_HIDDEN_VISIBL] =
{
"eye-slash.svg", // Prj_HIDDEN
"eye.svg", // Prj_VISIBL
@ -455,7 +455,7 @@ static void Prj_ShowFormToFilterByHidden (void)
Gbl.Prjs.SelectedOrder,
Gbl.Prjs.CurrentPage,
-1L);
Ico_PutPrefIconLink (HiddenVisiblImage[HidVis],
Ico_PutPrefIconLink (HiddenVisiblIcon[HidVis],
Txt_PROJECT_HIDDEN_VISIBL_PROJECTS[HidVis]);
Frm_EndForm ();
fprintf (Gbl.F.Out,"</div>");

40
swad_social.c
View File

@ -1060,41 +1060,35 @@ static void Soc_FormStart (Act_Action_t ActionGbl,Act_Action_t ActionUsr)
}
/*****************************************************************************/
/******** Put form to select users whom public activity is displayed *********/
/******** Show form to select users whom public activity is displayed ********/
/*****************************************************************************/
static void Soc_PutFormWhichUsrs (void)
{
extern const char *Txt_TIMELINE_WHICH_USERS[Soc_NUM_WHICH_USRS];
Soc_WhichUsrs_t WhichUsrs;
static const char *Icon[Soc_NUM_WHICH_USRS] =
{
NULL, // Soc_USRS_UNKNOWN
"user-check.svg", // Soc_USRS_FOLLOWED
"users.svg", // Soc_USRS_ALL
};
/***** Form to select which users I want to see in timeline:
- only the users I follow
- all users *****/
Frm_StartForm (ActSeeSocTmlGbl);
fprintf (Gbl.F.Out,"<div class=\"SEL_BELOW_TITLE\">"
"<ul>");
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
for (WhichUsrs = (Soc_WhichUsrs_t) 1;
WhichUsrs < Soc_NUM_WHICH_USRS;
WhichUsrs++)
{
fprintf (Gbl.F.Out,"<li>"
"<label>"
"<input type=\"radio\" name=\"WhichUsrs\""
" value=\"%u\"",
(unsigned) WhichUsrs);
if (WhichUsrs == Gbl.Social.WhichUsrs)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
"%s"
"</label>"
"</li>",
Gbl.Form.Id,Txt_TIMELINE_WHICH_USERS[WhichUsrs]);
fprintf (Gbl.F.Out,"<div class=\"%s\">",
WhichUsrs == Gbl.Social.WhichUsrs ? "PREF_ON" :
"PREF_OFF");
Frm_StartForm (ActSeeSocTmlGbl);
Par_PutHiddenParamUnsigned ("WhichUsrs",WhichUsrs);
Ico_PutPrefIconLink (Icon[WhichUsrs],Txt_TIMELINE_WHICH_USERS[WhichUsrs]);
Frm_EndForm ();
fprintf (Gbl.F.Out,"</div>");
}
fprintf (Gbl.F.Out,"</ul>"
"</div>");
Frm_EndForm ();
fprintf (Gbl.F.Out,"</div>");
/***** Show warning if I do not follow anyone *****/
if (Gbl.Social.WhichUsrs == Soc_USRS_FOLLOWED)