Version 15.64.1

This commit is contained in:
Antonio Cañas Vargas 2015-12-12 23:47:53 +01:00
parent 40114fd0e1
commit 90ac1f8e78
3 changed files with 44 additions and 68 deletions

View File

@ -1517,13 +1517,13 @@ a:hover img.CENTRE_PHOTO_SHOW
.DAT_GREEN {color:#008000; font-size:13pt;} .DAT_GREEN {color:#008000; font-size:13pt;}
.DAT_LIGHT {color:#A0A0A0; font-size:13pt;} .DAT_LIGHT {color:#A0A0A0; font-size:13pt;}
.DAT_NOBR {color:#707070; font-size:13pt; white-space:nowrap;} .DAT_NOBR {color:#707070; font-size:13pt; white-space:nowrap;}
.DAT_N {color:#404040; font-size:13pt;} .DAT_N {color:black; font-size:13pt;}
.DAT_NOBR_N {color:#404040; font-size:13pt; white-space:nowrap;} .DAT_NOBR_N {color:black; font-size:13pt; white-space:nowrap;}
/*********************** Line in top part of a table row *********************/ /*********************** Line in top part of a table row *********************/
.DAT_N_LINE_TOP .DAT_N_LINE_TOP
{ {
color:#404040; color:black;
font-size:13pt; font-size:13pt;
border-style:solid none none none; border-style:solid none none none;
border-width:1px; border-width:1px;
@ -1532,8 +1532,8 @@ a:hover img.CENTRE_PHOTO_SHOW
.DAT_SMALL {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:12pt;} .DAT_SMALL {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:12pt;}
.DAT_SMALL_LIGHT {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#A0A0A0; font-size:12pt;} .DAT_SMALL_LIGHT {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#A0A0A0; font-size:12pt;}
.DAT_SMALL_NOBR {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:12pt; white-space:nowrap;} .DAT_SMALL_NOBR {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:12pt; white-space:nowrap;}
.DAT_SMALL_N {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#404040; font-size:12pt;} .DAT_SMALL_N {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:black; font-size:12pt;}
.DAT_SMALL_NOBR_N {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#404040; font-size:12pt; white-space:nowrap;} .DAT_SMALL_NOBR_N {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:black; font-size:12pt; white-space:nowrap;}
.DAT_SMALL_GREY {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:12pt;} .DAT_SMALL_GREY {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:12pt;}
.DAT_SMALL_RED {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:red; font-size:12pt;} .DAT_SMALL_RED {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:red; font-size:12pt;}
@ -1767,7 +1767,7 @@ a:hover img.CENTRE_PHOTO_SHOW
text-align:left; text-align:left;
vertical-align:top; vertical-align:top;
} }
.PRF_FIG_LIST .PRF_FIG_UL
{ {
display:inline-block; display:inline-block;
list-style-type:none; list-style-type:none;
@ -1776,14 +1776,13 @@ a:hover img.CENTRE_PHOTO_SHOW
text-align:left; text-align:left;
vertical-align:middle; vertical-align:middle;
} }
.PRF_ICON .PRF_FIG_LI
{ {
box-sizing:border-box; padding:0 0 0 24px;
margin-right:4px; background-size:20px 20px;
width:20px; background-repeat:no-repeat;
height:20px; background-position:center middle;
vertical-align:middle; opacity:0.67;
opacity:0.33;
} }
#num_following #num_following
@ -1813,7 +1812,7 @@ a:hover img.CENTRE_PHOTO_SHOW
color:#404040; color:#404040;
font-size:30pt; font-size:30pt;
font-weight:bold; font-weight:bold;
opacity:0.5; opacity:0.67;
} }
.FOLLOW_NUM_B .FOLLOW_NUM_B
{ {

View File

@ -117,12 +117,13 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.64 (2015/12/12)" #define Log_PLATFORM_VERSION "SWAD 15.64.1 (2015/12/12)"
#define CSS_FILE "swad15.64.css" #define CSS_FILE "swad15.64.1.css"
// 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 15.64.1: Dec 12, 2015 Changes in layout of user's public profile. (186980 lines)
Version 15.64: Dec 12, 2015 Changes in layout of user's public profile. Version 15.64: Dec 12, 2015 Changes in layout of user's public profile.
Changes in some small icons. (187004 lines) Changes in some small icons. (187004 lines)
Version 15.63: Dec 12, 2015 New layout for user's public profile. Version 15.63: Dec 12, 2015 New layout for user's public profile.

View File

@ -310,23 +310,20 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Start left list *****/ /***** Start left list *****/
fprintf (Gbl.F.Out,"<div id=\"prf_fig_left_container\">" fprintf (Gbl.F.Out,"<div id=\"prf_fig_left_container\">"
"<ul class=\"PRF_FIG_LIST DAT\">"); "<ul class=\"PRF_FIG_UL DAT_NOBR_N\">");
/***** Number of courses in which the user is teacher *****/ /***** Number of courses in which the user is teacher *****/
NumCrssUsrIsTeacher = Usr_GetNumCrssOfUsrWithARole (UsrDat->UsrCod,Rol_TEACHER); NumCrssUsrIsTeacher = Usr_GetNumCrssOfUsrWithARole (UsrDat->UsrCod,Rol_TEACHER);
fprintf (Gbl.F.Out,"<li>" fprintf (Gbl.F.Out,"<li title=\"%s\" class=\"PRF_FIG_LI\""
"<img src=\"%s/tch64x64.gif\"" " style=\"background-image:url('%s/tch64x64.gif');\" />"
" alt=\"%s\" title=\"%s\""
" class=\"PRF_ICON\" />"
"%u&nbsp;%s&nbsp;", "%u&nbsp;%s&nbsp;",
Txt_ROLES_SINGUL_Abc[Rol_TEACHER][UsrDat->Sex],
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
Txt_ROLES_SINGUL_Abc[Rol_TEACHER][UsrDat->Sex],
Txt_ROLES_SINGUL_Abc[Rol_TEACHER][UsrDat->Sex],
NumCrssUsrIsTeacher, NumCrssUsrIsTeacher,
(NumCrssUsrIsTeacher == 1) ? Txt_course : (NumCrssUsrIsTeacher == 1) ? Txt_course :
Txt_courses); Txt_courses);
if (NumCrssUsrIsTeacher) if (NumCrssUsrIsTeacher)
fprintf (Gbl.F.Out,"(%u&nbsp;%s&nbsp;+&nbsp;%u&nbsp;%s)", fprintf (Gbl.F.Out,"(%u&nbsp;%s/%u&nbsp;%s)",
Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_TEACHER,Rol_TEACHER), Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_TEACHER,Rol_TEACHER),
Txt_teachers_ABBREVIATION, Txt_teachers_ABBREVIATION,
Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_TEACHER,Rol_STUDENT), Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_TEACHER,Rol_STUDENT),
@ -335,19 +332,16 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Number of courses in which the user is student *****/ /***** Number of courses in which the user is student *****/
NumCrssUsrIsStudent = Usr_GetNumCrssOfUsrWithARole (UsrDat->UsrCod,Rol_STUDENT); NumCrssUsrIsStudent = Usr_GetNumCrssOfUsrWithARole (UsrDat->UsrCod,Rol_STUDENT);
fprintf (Gbl.F.Out,"<li>" fprintf (Gbl.F.Out,"<li title=\"%s\" class=\"PRF_FIG_LI\""
"<img src=\"%s/std64x64.gif\"" " style=\"background-image:url('%s/std64x64.gif');\" />"
" alt=\"%s\" title=\"%s\""
" class=\"PRF_ICON\" />"
"%u&nbsp;%s&nbsp;", "%u&nbsp;%s&nbsp;",
Txt_ROLES_SINGUL_Abc[Rol_STUDENT][UsrDat->Sex],
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
Txt_ROLES_SINGUL_Abc[Rol_STUDENT][UsrDat->Sex],
Txt_ROLES_SINGUL_Abc[Rol_STUDENT][UsrDat->Sex],
NumCrssUsrIsStudent, NumCrssUsrIsStudent,
(NumCrssUsrIsStudent == 1) ? Txt_course : (NumCrssUsrIsStudent == 1) ? Txt_course :
Txt_courses); Txt_courses);
if (NumCrssUsrIsStudent) if (NumCrssUsrIsStudent)
fprintf (Gbl.F.Out,"(%u&nbsp;%s&nbsp;+&nbsp;%u&nbsp;%s)", fprintf (Gbl.F.Out,"(%u&nbsp;%s/%u&nbsp;%s)",
Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_STUDENT,Rol_TEACHER), Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_STUDENT,Rol_TEACHER),
Txt_teachers_ABBREVIATION, Txt_teachers_ABBREVIATION,
Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_STUDENT,Rol_STUDENT), Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_STUDENT,Rol_STUDENT),
@ -359,15 +353,12 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
NumPublicFiles = Brw_GetNumPublicFilesUsr (UsrDat->UsrCod); NumPublicFiles = Brw_GetNumPublicFilesUsr (UsrDat->UsrCod);
else else
NumPublicFiles = 0; NumPublicFiles = 0;
fprintf (Gbl.F.Out,"<li>" fprintf (Gbl.F.Out,"<li title=\"%s\" class=\"PRF_FIG_LI\""
"<img src=\"%s/file64x64.gif\"" " style=\"background-image:url('%s/file64x64.gif');\" />"
" alt=\"%s\" title=\"%s\""
" class=\"PRF_ICON\" />"
"%u&nbsp;%s&nbsp;(%u&nbsp;%s)" "%u&nbsp;%s&nbsp;(%u&nbsp;%s)"
"</li>", "</li>",
Txt_Files,
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
Txt_Files,
Txt_Files,
NumFiles, NumFiles,
(NumFiles == 1) ? Txt_file : (NumFiles == 1) ? Txt_file :
Txt_files, Txt_files,
@ -377,13 +368,10 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
Prf_GetUsrFigures (UsrDat->UsrCod,&UsrFigures); Prf_GetUsrFigures (UsrDat->UsrCod,&UsrFigures);
/* First click time */ /* First click time */
fprintf (Gbl.F.Out,"<li>" fprintf (Gbl.F.Out,"<li title=\"%s\" class=\"PRF_FIG_LI\""
"<img src=\"%s/clock64x64.gif\"" " style=\"background-image:url('%s/clock64x64.gif');\" />",
" alt=\"%s\" title=\"%s\""
" class=\"PRF_ICON\" />",
Gbl.Prefs.IconsURL,
Txt_From_TIME, Txt_From_TIME,
Txt_From_TIME); Gbl.Prefs.IconsURL);
if (UsrFigures.FirstClickTimeUTC) if (UsrFigures.FirstClickTimeUTC)
{ {
fprintf (Gbl.F.Out,"<span id=\"first_click_date\"></span>"); fprintf (Gbl.F.Out,"<span id=\"first_click_date\"></span>");
@ -414,19 +402,16 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Start left list *****/ /***** Start left list *****/
fprintf (Gbl.F.Out,"<div id=\"prf_fig_right_container\">" fprintf (Gbl.F.Out,"<div id=\"prf_fig_right_container\">"
"<ul class=\"PRF_FIG_LIST DAT\">"); "<ul class=\"PRF_FIG_UL DAT_NOBR_N\">");
UsrIsBannedFromRanking = Usr_CheckIfUsrBanned (UsrDat->UsrCod); UsrIsBannedFromRanking = Usr_CheckIfUsrBanned (UsrDat->UsrCod);
if (!UsrIsBannedFromRanking) if (!UsrIsBannedFromRanking)
{ {
/* Number of clicks */ /* Number of clicks */
fprintf (Gbl.F.Out,"<li>" fprintf (Gbl.F.Out,"<li title=\"%s\" class=\"PRF_FIG_LI\""
"<img src=\"%s/click64x64.gif\"" " style=\"background-image:url('%s/click64x64.gif');\" />",
" alt=\"%s\" title=\"%s\""
" class=\"PRF_ICON\" />",
Gbl.Prefs.IconsURL,
Txt_Clicks, Txt_Clicks,
Txt_Clicks); Gbl.Prefs.IconsURL);
if (UsrFigures.NumClicks >= 0) if (UsrFigures.NumClicks >= 0)
{ {
@ -457,13 +442,10 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
fprintf (Gbl.F.Out,"</li>"); fprintf (Gbl.F.Out,"</li>");
/***** Number of file views *****/ /***** Number of file views *****/
fprintf (Gbl.F.Out,"<li>" fprintf (Gbl.F.Out,"<li title=\"%s\" class=\"PRF_FIG_LI\""
"<img src=\"%s/download64x64.gif\"" " style=\"background-image:url('%s/download64x64.gif');\" />",
" alt=\"%s\" title=\"%s\""
" class=\"PRF_ICON\" />",
Gbl.Prefs.IconsURL,
Txt_Downloads, Txt_Downloads,
Txt_Downloads); Gbl.Prefs.IconsURL);
if (UsrFigures.NumFileViews >= 0) if (UsrFigures.NumFileViews >= 0)
{ {
fprintf (Gbl.F.Out,"%ld&nbsp;%s&nbsp;", fprintf (Gbl.F.Out,"%ld&nbsp;%s&nbsp;",
@ -492,13 +474,10 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
fprintf (Gbl.F.Out,"</li>"); fprintf (Gbl.F.Out,"</li>");
/***** Number of posts in forums *****/ /***** Number of posts in forums *****/
fprintf (Gbl.F.Out,"<li>" fprintf (Gbl.F.Out,"<li title=\"%s\" class=\"PRF_FIG_LI\""
"<img src=\"%s/forum64x64.gif\"" " style=\"background-image:url('%s/forum64x64.gif');\" />",
" alt=\"%s\" title=\"%s\""
" class=\"PRF_ICON\" />",
Gbl.Prefs.IconsURL,
Txt_Forums, Txt_Forums,
Txt_Forums); Gbl.Prefs.IconsURL);
if (UsrFigures.NumForPst >= 0) if (UsrFigures.NumForPst >= 0)
{ {
fprintf (Gbl.F.Out,"%ld&nbsp;%s&nbsp;", fprintf (Gbl.F.Out,"%ld&nbsp;%s&nbsp;",
@ -527,13 +506,10 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
fprintf (Gbl.F.Out,"</li>"); fprintf (Gbl.F.Out,"</li>");
/***** Number of messages sent *****/ /***** Number of messages sent *****/
fprintf (Gbl.F.Out,"<li>" fprintf (Gbl.F.Out,"<li title=\"%s\" class=\"PRF_FIG_LI\""
"<img src=\"%s/msg64x64.gif\"" " style=\"background-image:url('%s/msg64x64.gif');\" />",
" alt=\"%s\" title=\"%s\""
" class=\"PRF_ICON\" />",
Gbl.Prefs.IconsURL,
Txt_Messages, Txt_Messages,
Txt_Messages); Gbl.Prefs.IconsURL);
if (UsrFigures.NumMsgSnt >= 0) if (UsrFigures.NumMsgSnt >= 0)
{ {
fprintf (Gbl.F.Out,"%ld&nbsp;%s&nbsp;", fprintf (Gbl.F.Out,"%ld&nbsp;%s&nbsp;",