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 21.76.5: Dec 29, 2021 Working on design of dark theme.

This commit is contained in:
acanas 2021-12-29 15:09:17 +01:00
parent 0a94332663
commit 31aa54ea1b
4 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
css/swad21.76.4.css → css/swad21.76.5.css
View File

@ -1176,39 +1176,39 @@ a:hover /* Default ==> underlined */
.MENU_TXT_DARK {color:#d0d0d0;}
/***************************** Users connected *******************************/
.CONNECTED
.CON
{
box-sizing:border-box;
margin:0 auto;
border-style:solid;
border-width:1px;
border-color:#80C040;
border-color:#80c040;
margin:6px 0;
padding:5px;
border-radius:2px;
font-size:12pt;
color:#398000;
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
}
.CONNECTED_LIST
.CON_WHITE {color:#398000;}
.CON_GREY {color:#398000;}
.CON_PURPLE {color:#398000;}
.CON_BLUE {color:#398000;}
.CON_YELLOW {color:#398000;}
.CON_PINK {color:#398000;}
.CON_DARK {color:#80c040;}
.CON_LIST
{
box-sizing:border-box;
width:100%;
margin-top:2px;
padding-top:2px;
padding:6px 0 0 0;
border-style:solid;
border-width:1px 0 0 0;
border-color:#BFDF9F;
border-color:rgba(128,192,64,0.2);
white-space:nowrap;
overflow:hidden;
}
.CONNECTED_TXT
{
color:#398000;
font-size:12pt;
}
.CON_USR_NARROW_TIT
{
max-width:136px;
@ -1220,8 +1220,8 @@ a:hover /* Default ==> underlined */
}
/* Connected to the current course? */
.CON_NO_CRS {color:#B8D070; font-size:11pt; line-height:110%; white-space:nowrap;}
.CON_CRS {color:#398000; font-size:11pt; line-height:110%; white-space:nowrap;}
.CON_CRS {font-size:10pt; line-height:110%; white-space:nowrap;}
.CON_NO_CRS {font-size:10pt; line-height:110%; white-space:nowrap; opacity:0.5;}
/* 1st. column */
.CON_PHOTO
@ -2731,7 +2731,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
.INS_LNK_BLUE, .MFU_BLUE {color:#4d88a1;}
.INS_LNK_YELLOW, .MFU_YELLOW {color:#4d88a1;}
.INS_LNK_PINK, .MFU_PINK {color:#4d88a1;}
.INS_LNK_DARK, .MFU_DARK {color:#a6c4d0;}
.INS_LNK_DARK, .MFU_DARK {color:#8cbcce;}
/*****************************************************************************/
.MSJ_AVISO {color:#632921; font-size:12pt;}

5
swad_changelog.h
View File

@ -602,10 +602,11 @@ TODO: FIX BUG, URGENT! En las fechas como par
TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo.
*/
#define Log_PLATFORM_VERSION "SWAD 21.76.4 (2021-12-28)"
#define CSS_FILE "swad21.76.4.css"
#define Log_PLATFORM_VERSION "SWAD 21.76.5 (2021-12-29)"
#define CSS_FILE "swad21.76.5.css"
#define JS_FILE "swad21.67.4.js"
/*
Version 21.76.5: Dec 29, 2021 Working on design of dark theme. (322313 lines)
Version 21.76.4: Dec 28, 2021 Working on design of dark theme. (322306 lines)
Version 21.76.3: Dec 28, 2021 Working on design of dark theme. (322293 lines)
Version 21.76.2: Dec 27, 2021 Working on design of dark theme. (322282 lines)

67
swad_connected.c
View File

@ -60,6 +60,7 @@ extern struct Globals Gbl;
/*****************************************************************************/
static void Con_PutIconToUpdateConnected (__attribute__((unused)) void *Args);
static void Con_PutParamScope (__attribute__((unused)) void *Args);
static void Con_ShowGlobalConnectedUsrsRole (Rol_Role_t Role,unsigned UsrsTotal);
@ -135,17 +136,15 @@ static void Con_PutIconToUpdateConnected (__attribute__((unused)) void *Args)
{
extern const char *Txt_Update;
/***** Begin form *****/
Frm_BeginForm (ActLstCon);
Lay_PutContextualLinkOnlyIcon (ActLstCon,NULL,
Con_PutParamScope,NULL,
"recycle.svg",Ico_BLACK,
Txt_Update);
}
static void Con_PutParamScope (__attribute__((unused)) void *Args)
{
Sco_PutParamScope ("ScopeCon",Gbl.Scope.Current);
/* Button */
HTM_BUTTON_Animated_Begin (Txt_Update,"BT_LINK",NULL);
Ico_PutCalculateIcon (Txt_Update);
HTM_BUTTON_End ();
/***** End form *****/
Frm_EndForm ();
}
/*****************************************************************************/
@ -154,6 +153,7 @@ static void Con_PutIconToUpdateConnected (__attribute__((unused)) void *Args)
void Con_ShowGlobalConnectedUsrs (void)
{
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Connected_users;
extern const char *Txt_session;
extern const char *Txt_sessions;
@ -173,14 +173,15 @@ void Con_ShowGlobalConnectedUsrs (void)
}
/***** Container start *****/
HTM_DIV_Begin ("class=\"CONNECTED\"");
HTM_DIV_Begin ("class=\"CON CON_%s\"",
The_Colors[Gbl.Prefs.Theme]);
/***** Number of sessions *****/
/* Link to view more details about connected users */
Frm_BeginFormUnique (ActLstCon); // Must be unique because
// the list of connected users
// is dynamically updated via AJAX
HTM_BUTTON_OnSubmit_Begin (Txt_Connected_users,"BT_LINK CONNECTED_TXT",NULL);
HTM_BUTTON_OnSubmit_Begin (Txt_Connected_users,"BT_LINK",NULL);
/* Write total number of sessions */
HTM_TxtF ("%u %s",Gbl.Session.NumSessions,
@ -192,7 +193,7 @@ void Con_ShowGlobalConnectedUsrs (void)
if (NumUsrsTotal)
{
HTM_DIV_Begin ("class=\"CONNECTED_LIST\"");
HTM_DIV_Begin ("class=\"CON_LIST\"");
/***** Write total number of users *****/
HTM_TxtF ("%u %s:",NumUsrsTotal,
@ -271,15 +272,17 @@ static void Con_ComputeConnectedUsrsWithARoleBelongingToCurrentCrs (Rol_Role_t R
static void Con_ShowConnectedUsrsBelongingToLocation (void)
{
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_from;
struct ConnectedUsrs Usrs;
/***** Begin container *****/
HTM_DIV_Begin ("class=\"CONNECTED\"");
HTM_DIV_Begin ("class=\"CON CON_%s\"",
The_Colors[Gbl.Prefs.Theme]);
/***** Number of connected users who belong to scope *****/
Con_GetNumConnectedWithARoleBelongingToCurrentScope (Rol_UNK,&Usrs);
HTM_DIV_Begin ("class=\"CONNECTED_TXT\"");
HTM_DIV_Begin (NULL);
/* Write number of connected users */
HTM_TxtF ("%u %s ",Usrs.NumUsrs,Txt_from);
@ -292,7 +295,7 @@ static void Con_ShowConnectedUsrsBelongingToLocation (void)
HTM_DIV_End ();
/***** Number of teachers and students *****/
HTM_TABLE_Begin ("CONNECTED_LIST");
HTM_TABLE_Begin ("CON_LIST");
Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnMainZone (Rol_TCH);
Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnMainZone (Rol_NET);
Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnMainZone (Rol_STD);
@ -313,6 +316,7 @@ static void Con_ShowConnectedUsrsBelongingToLocation (void)
void Con_ShowConnectedUsrsBelongingToCurrentCrs (void)
{
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Connected_users;
extern const char *Txt_from;
char CourseName[Cns_HIERARCHY_MAX_BYTES_SHRT_NAME + 1];
@ -323,14 +327,15 @@ void Con_ShowConnectedUsrsBelongingToCurrentCrs (void)
return;
/***** Begin container *****/
HTM_DIV_Begin ("class=\"CONNECTED\"");
HTM_DIV_Begin ("class=\"CON CON_%s\"",
The_Colors[Gbl.Prefs.Theme]);
/***** Number of connected users who belong to course *****/
/* Link to view more details about connected users */
Frm_BeginFormUnique (ActLstCon); // Must be unique because
// the list of connected users
// is dynamically updated via AJAX
HTM_BUTTON_OnSubmit_Begin (Txt_Connected_users,"BT_LINK CONNECTED_TXT",NULL);
HTM_BUTTON_OnSubmit_Begin (Txt_Connected_users,"BT_LINK",NULL);
Str_Copy (CourseName,Gbl.Hierarchy.Crs.ShrtName,sizeof (CourseName) - 1);
Con_GetNumConnectedWithARoleBelongingToCurrentScope (Rol_UNK,&Usrs);
HTM_TxtF ("%u %s %s",Usrs.NumUsrs,Txt_from,CourseName);
@ -338,7 +343,7 @@ void Con_ShowConnectedUsrsBelongingToCurrentCrs (void)
Frm_EndForm ();
/***** Number of teachers and students *****/
HTM_TABLE_Begin ("CONNECTED_LIST");
HTM_TABLE_Begin ("CON_LIST");
Gbl.Usrs.Connected.NumUsr = 0;
Gbl.Usrs.Connected.NumUsrs = 0;
Gbl.Usrs.Connected.NumUsrsToList = 0;
@ -367,9 +372,10 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnMainZone (
{
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"3\" class=\"CT\"");
HTM_TxtF ("%u %s",Usrs.NumUsrs,
Usrs.NumUsrs == 1 ? Txt_ROLES_SINGUL_abc[Role][Usrs.Sex] :
Txt_ROLES_PLURAL_abc[Role][Usrs.Sex]);
HTM_TxtF ("%u %s",
Usrs.NumUsrs,
Usrs.NumUsrs == 1 ? Txt_ROLES_SINGUL_abc[Role][Usrs.Sex] :
Txt_ROLES_PLURAL_abc[Role][Usrs.Sex]);
HTM_TD_End ();
HTM_TR_End ();
@ -672,8 +678,7 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
Role == Rol_TCH)); // ...or teacher
/***** Get connected users who belong to current location from database *****/
NumUsrs = Con_DB_GetConnectedFromCurrentLocation (&mysql_res,Role);
if (NumUsrs)
if ((NumUsrs = Con_DB_GetConnectedFromCurrentLocation (&mysql_res,Role)))
{
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
@ -721,14 +726,12 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
Usr_PutParamUsrCodEncrypted (UsrDat.EnUsrCod);
}
HTM_DIV_Begin ("class=\"CON_NAME_WIDE\""); // Limited width
if (PutLinkToRecord)
HTM_BUTTON_OnSubmit_Begin (UsrDat.FullName,
"BT_LINK",NULL);
Usr_WriteFirstNameBRSurnames (&UsrDat);
if (PutLinkToRecord)
HTM_BUTTON_End ();
HTM_DIV_End ();
if (PutLinkToRecord)
HTM_BUTTON_OnSubmit_Begin (UsrDat.FullName,
"BT_LINK LT",NULL);
Usr_WriteFirstNameBRSurnames (&UsrDat);
if (PutLinkToRecord)
HTM_BUTTON_End ();
if (PutLinkToRecord)
Frm_EndForm ();

4
swad_follow.c
View File

@ -184,6 +184,7 @@ void Fol_SuggestUsrsToFollowMainZone (void)
void Fol_SuggestUsrsToFollowMainZoneOnRightColumn (void)
{
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Who_to_follow;
extern const char *Txt_No_user_to_whom_you_can_follow_Try_again_later;
MYSQL_RES *mysql_res;
@ -198,7 +199,8 @@ void Fol_SuggestUsrsToFollowMainZoneOnRightColumn (void)
&mysql_res)))
{
/***** Begin container *****/
HTM_DIV_Begin ("class=\"CONNECTED CONNECTED_TXT\"");
HTM_DIV_Begin ("class=\"CON CON_%s\"",
The_Colors[Gbl.Prefs.Theme]);
/***** Title with link to suggest more users to follow *****/
Frm_BeginForm (ActSeeSocPrf);