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 15.3

This commit is contained in:
Antonio Cañas Vargas 2015-09-28 18:28:29 +02:00
parent 9684da49ff
commit faf292dfd5
54 changed files with 1002 additions and 1025 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

704
css/swad_desktop.css
View File

File diff suppressed because it is too large Load Diff

616
css/swad_mobile.css
View File

File diff suppressed because it is too large Load Diff

BIN
icon/theme/yellow/theme_32x20.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 161 B

After

Width:  |  Height:  |  Size: 134 B

28
js/swad.js
View File

@ -219,8 +219,8 @@ function zoom(imagen,urlPhoto,shortName) {
yPos += tempEl.offsetTop; yPos += tempEl.offsetTop;
tempEl = tempEl.offsetParent; tempEl = tempEl.offsetParent;
} }
xPos -= (225+18); xPos -= (187+15);
yPos -= ((300+18)/2); yPos -= ((250+15)/2);
if (yPos < 0) if (yPos < 0)
yPos = 0; yPos = 0;
document.getElementById('zoomLyr').style.left = xPos + 'px'; document.getElementById('zoomLyr').style.left = xPos + 'px';
@ -231,8 +231,8 @@ function zoom(imagen,urlPhoto,shortName) {
// Exit from zooming a user's photograph // Exit from zooming a user's photograph
function noZoom(imagen) { function noZoom(imagen) {
var xPos = -(225+18); var xPos = -(187+15);
var yPos = -(300+18+132); var yPos = -(250+15+110);
document.getElementById('zoomTxt').innerHTML = ''; document.getElementById('zoomTxt').innerHTML = '';
document.getElementById('zoomImg').src='/icon/_.gif'; document.getElementById('zoomImg').src='/icon/_.gif';
document.getElementById('zoomLyr').style.left = xPos + 'px'; document.getElementById('zoomLyr').style.left = xPos + 'px';
@ -307,26 +307,6 @@ function setDateTo (elem,Day,Month,Year) {
document.getElementById('EndDay').options[Day].selected = true; document.getElementById('EndDay').options[Day].selected = true;
} }
// Adjust iFrame height to height of browser
function iFrameHeight () {
var h;
if (document.getElementById) {
if (self.innerHeight) // all except Explorer
h = self.innerHeight;
else if (document.documentElement && document.documentElement.clientHeight)
// Explorer 6 Strict Mode
h = document.documentElement.clientHeight;
else if (document.body) // other Explorers
h = document.body.clientHeight;
if (h == 0) h = 480;
else {
h = h - 210;
if (h < 200) h = 200;
}
document.getElementById('iframe_central').style.height = h;
}
}
// Change text of a test descriptor // Change text of a test descriptor
function changeTxtTag(NumTag){ function changeTxtTag(NumTag){
var Sel = document.getElementById('SelDesc'+NumTag); var Sel = document.getElementById('SelDesc'+NumTag);

4
swad_QR.c
View File

@ -41,7 +41,7 @@
/***************************** Internal constants ****************************/ /***************************** Internal constants ****************************/
/*****************************************************************************/ /*****************************************************************************/
#define QR_CODE_SIZE ((6+25+6)*9) #define QR_CODE_SIZE ((6+25+6)*8)
#define QR_DEFAULT_TYPE QR_ID #define QR_DEFAULT_TYPE QR_ID
/*****************************************************************************/ /*****************************************************************************/
@ -155,7 +155,7 @@ void QR_ExamAnnnouncement (void)
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">"
"<img src=\"https://chart.googleapis.com/chart?cht=qr&amp;chs=%ux%u&amp;chl=%s/?crs=%ld%%26act=%ld\"" "<img src=\"https://chart.googleapis.com/chart?cht=qr&amp;chs=%ux%u&amp;chl=%s/?crs=%ld%%26act=%ld\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" style=\"width:300px; height:300px;\" />" " style=\"width:250px; height:250px;\" />"
"</div>", "</div>",
300,300, 300,300,
Cfg_HTTPS_URL_SWAD_CGI,Gbl.CurrentCrs.Crs.CrsCod,Act_Actions[ActSeeExaAnn].ActCod, Cfg_HTTPS_URL_SWAD_CGI,Gbl.CurrentCrs.Crs.CrsCod,Act_Actions[ActSeeExaAnn].ActCod,

4
swad_action.c
View File

@ -4874,12 +4874,12 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions)
/* Icon and text */ /* Icon and text */
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LEFT_MIDDLE\"" "<td class=\"LEFT_MIDDLE\""
" style=\"padding-left:3px;\">"); " style=\"padding-left:2px;\">");
Act_FormStart (Action); Act_FormStart (Action);
Act_LinkFormSubmit (TabMenuStr,The_ClassFormNoWrap[Gbl.Prefs.Theme]); Act_LinkFormSubmit (TabMenuStr,The_ClassFormNoWrap[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s64x64.gif\"" fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s64x64.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON32x32\" style=\"margin:6px;\" />", " class=\"ICON32x32\" style=\"margin:5px;\" />",
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION, Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,
Act_Actions[Action].Icon, Act_Actions[Action].Icon,
MenuStr,TabMenuStr); MenuStr,TabMenuStr);

4
swad_announcement.c
View File

@ -209,7 +209,7 @@ static void Ann_ShowAnnouncement (long AnnCod,const char *Subject,const char *Co
/***** Start yellow note *****/ /***** Start yellow note *****/
fprintf (Gbl.F.Out,"<div class=\"NOTICE_CONTAINER\"" fprintf (Gbl.F.Out,"<div class=\"NOTICE_CONTAINER\""
" style=\"width:600px;\">"); " style=\"width:500px;\">");
/***** Write the content of the announcement *****/ /***** Write the content of the announcement *****/
fprintf (Gbl.F.Out,"<div class=\"NOTICE_SUBJECT\">%s</div>", fprintf (Gbl.F.Out,"<div class=\"NOTICE_SUBJECT\">%s</div>",
@ -220,7 +220,7 @@ static void Ann_ShowAnnouncement (long AnnCod,const char *Subject,const char *Co
Content); Content);
/***** Write form *****/ /***** Write form *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\" style=\"margin:15px;\">"); fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\" style=\"margin:12px;\">");
if (ShowAllAnnouncements) if (ShowAllAnnouncements)
{ {

8
swad_attendance.c
View File

@ -1887,7 +1887,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att)
"<th></th>" "<th></th>"
"<th></th>"); "<th></th>");
if (Gbl.Usrs.Listing.WithPhotos) if (Gbl.Usrs.Listing.WithPhotos)
fprintf (Gbl.F.Out,"<th style=\"width:27px;\"></th>"); fprintf (Gbl.F.Out,"<th style=\"width:22px;\"></th>");
fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"TIT_TBL LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"TIT_TBL LEFT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
@ -1958,7 +1958,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
"<th></th>" "<th></th>"
"<th></th>"); "<th></th>");
if (Gbl.Usrs.Listing.WithPhotos) if (Gbl.Usrs.Listing.WithPhotos)
fprintf (Gbl.F.Out,"<th style=\"width:27px;\"></th>"); fprintf (Gbl.F.Out,"<th style=\"width:22px;\"></th>");
fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"LEFT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
@ -3158,7 +3158,7 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr
if (Gbl.Usrs.Listing.WithPhotos) if (Gbl.Usrs.Listing.WithPhotos)
{ {
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\"" fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\""
" style=\"width:27px;\">", " style=\"width:22px;\">",
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
@ -3292,7 +3292,7 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
/***** Show student's photo *****/ /***** Show student's photo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\"" fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\""
" style=\"width:27px;\">", " style=\"width:22px;\">",
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :

2
swad_banner.c
View File

@ -906,7 +906,7 @@ void Ban_WriteMenuWithBanners (void)
{ {
/* Write data of this banner */ /* Write data of this banner */
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LEFT_MIDDLE\" style=\"width:180px;\">"); "<td class=\"LEFT_MIDDLE\" style=\"width:150px;\">");
Act_FormStart (ActClkBan); Act_FormStart (ActClkBan);
Ban_PutParamBanCod (Gbl.Banners.Lst[NumBan].BanCod); Ban_PutParamBanCod (Gbl.Banners.Lst[NumBan].BanCod);
Par_PutHiddenParamString ("URL",Gbl.Banners.Lst[NumBan].WWW); Par_PutHiddenParamString ("URL",Gbl.Banners.Lst[NumBan].WWW);

4
swad_calendar.c
View File

@ -142,7 +142,7 @@ void Cal_DrawCalendar (void)
/***** Draw several months *****/ /***** Draw several months *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"CENTER_TOP\">" "<td class=\"CENTER_TOP\">"
"<table style=\"border-spacing:7px;\">"); "<table style=\"border-spacing:6px;\">");
for (Row = 0; for (Row = 0;
Row < 4; Row < 4;
Row++) Row++)
@ -152,7 +152,7 @@ void Cal_DrawCalendar (void)
Col < 4; Col < 4;
Col++) Col++)
{ {
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\" style=\"width:180px;\">"); fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\" style=\"width:150px;\">");
Cal_DrawMonth (Year,Month,true,!PrintView,(Gbl.CurrentAct == ActPrnCal)); Cal_DrawMonth (Year,Month,true,!PrintView,(Gbl.CurrentAct == ActPrnCal));
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
if (++Month == 13) if (++Month == 13)

32
swad_centre.c
View File

@ -432,7 +432,7 @@ static void Ctr_Configuration (bool PrintView)
"<td class=\"DAT LEFT_MIDDLE\">", "<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme], The_ClassForm[Gbl.Prefs.Theme],
Txt_QR_code); Txt_QR_code);
QR_LinkTo (300,"ctr",Gbl.CurrentCtr.Ctr.CtrCod); QR_LinkTo (250,"ctr",Gbl.CurrentCtr.Ctr.CtrCod);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
} }
@ -1046,7 +1046,7 @@ void Ctr_WriteSelectorOfCentre (void)
/***** Start form *****/ /***** Start form *****/
Act_FormGoToStart (ActSeeDeg); Act_FormGoToStart (ActSeeDeg);
fprintf (Gbl.F.Out,"<select name=\"ctr\" style=\"width:210px;\""); fprintf (Gbl.F.Out,"<select name=\"ctr\" style=\"width:175px;\"");
if (Gbl.CurrentIns.Ins.InsCod > 0) if (Gbl.CurrentIns.Ins.InsCod > 0)
fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\"", fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\"",
Gbl.FormId); Gbl.FormId);
@ -1164,7 +1164,7 @@ static void Ctr_ListCentresForEdition (void)
/* Centre logo */ /* Centre logo */
fprintf (Gbl.F.Out,"<td title=\"%s\" class=\"LEFT_MIDDLE\"" fprintf (Gbl.F.Out,"<td title=\"%s\" class=\"LEFT_MIDDLE\""
" style=\"width:30px;\">", " style=\"width:25px;\">",
Ctr->FullName); Ctr->FullName);
Log_DrawLogo (Sco_SCOPE_CTR,Ctr->CtrCod,Ctr->ShortName,16,NULL,true); Log_DrawLogo (Sco_SCOPE_CTR,Ctr->CtrCod,Ctr->ShortName,16,NULL,true);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
@ -1175,7 +1175,7 @@ static void Ctr_ListCentresForEdition (void)
{ {
Act_FormStart (ActChgCtrIns); Act_FormStart (ActChgCtrIns);
Ctr_PutParamOtherCtrCod (Ctr->CtrCod); Ctr_PutParamOtherCtrCod (Ctr->CtrCod);
fprintf (Gbl.F.Out,"<select name=\"OthInsCod\" style=\"width:75px;\"" fprintf (Gbl.F.Out,"<select name=\"OthInsCod\" style=\"width:62px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">", " onchange=\"javascript:document.getElementById('%s').submit();\">",
Gbl.FormId); Gbl.FormId);
for (NumIns = 0; for (NumIns = 0;
@ -1199,7 +1199,7 @@ static void Ctr_ListCentresForEdition (void)
{ {
Act_FormStart (ActChgCtrPlc); Act_FormStart (ActChgCtrPlc);
Ctr_PutParamOtherCtrCod (Ctr->CtrCod); Ctr_PutParamOtherCtrCod (Ctr->CtrCod);
fprintf (Gbl.F.Out,"<select name=\"PlcCod\" style=\"width:75px;\"" fprintf (Gbl.F.Out,"<select name=\"PlcCod\" style=\"width:62px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">", " onchange=\"javascript:document.getElementById('%s').submit();\">",
Gbl.FormId); Gbl.FormId);
fprintf (Gbl.F.Out,"<option value=\"0\""); fprintf (Gbl.F.Out,"<option value=\"0\"");
@ -1300,7 +1300,7 @@ static void Ctr_ListCentresForEdition (void)
{ {
Act_FormStart (ActChgCtrSta); Act_FormStart (ActChgCtrSta);
Ctr_PutParamOtherCtrCod (Ctr->CtrCod); Ctr_PutParamOtherCtrCod (Ctr->CtrCod);
fprintf (Gbl.F.Out,"<select name=\"Status\" style=\"width:120px;\"" fprintf (Gbl.F.Out,"<select name=\"Status\" style=\"width:100px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">" " onchange=\"javascript:document.getElementById('%s').submit();\">"
"<option value=\"%u\" selected=\"selected\">%s</option>" "<option value=\"%u\" selected=\"selected\">%s</option>"
"<option value=\"%u\">%s</option>" "<option value=\"%u\">%s</option>"
@ -1319,10 +1319,10 @@ static void Ctr_ListCentresForEdition (void)
/* Centre requester */ /* Centre requester */
UsrDat.UsrCod = Ctr->RequesterUsrCod; UsrDat.UsrCod = Ctr->RequesterUsrCod;
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:150px;\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:125px;\">"
"<table class=\"CELLS_PAD_2\" style=\"width:150px;\">" "<table class=\"CELLS_PAD_2\" style=\"width:125px;\">"
"<tr>"); "<tr>");
Msg_WriteMsgAuthor (&UsrDat,120,10,"DAT",true,NULL); Msg_WriteMsgAuthor (&UsrDat,100,10,"DAT",true,NULL);
fprintf (Gbl.F.Out,"</tr>" fprintf (Gbl.F.Out,"</tr>"
"</table>" "</table>"
"</td>" "</td>"
@ -1960,13 +1960,13 @@ static void Ctr_PutFormToCreateCentre (void)
fprintf (Gbl.F.Out,"<td></td>"); fprintf (Gbl.F.Out,"<td></td>");
/***** Centre logo *****/ /***** Centre logo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:30px;\">"); fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:25px;\">");
Log_DrawLogo (Sco_SCOPE_CTR,-1L,"",16,NULL,true); Log_DrawLogo (Sco_SCOPE_CTR,-1L,"",16,NULL,true);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Institution *****/ /***** Institution *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<select name=\"OthInsCod\" style=\"width:75px;\"" "<select name=\"OthInsCod\" style=\"width:62px;\""
" disabled=\"disabled\">" " disabled=\"disabled\">"
"<option value=\"%ld\" selected=\"selected\">" "<option value=\"%ld\" selected=\"selected\">"
"%s" "%s"
@ -1978,7 +1978,7 @@ static void Ctr_PutFormToCreateCentre (void)
/***** Place *****/ /***** Place *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<select name=\"PlcCod\" style=\"width:75px;\">" "<select name=\"PlcCod\" style=\"width:62px;\">"
"<option value=\"0\""); "<option value=\"0\"");
if (Ctr->PlcCod == 0) if (Ctr->PlcCod == 0)
fprintf (Gbl.F.Out," selected=\"selected\""); fprintf (Gbl.F.Out," selected=\"selected\"");
@ -2029,10 +2029,10 @@ static void Ctr_PutFormToCreateCentre (void)
Txt_CENTRE_STATUS[Ctr_STATUS_PENDING]); Txt_CENTRE_STATUS[Ctr_STATUS_PENDING]);
/***** Centre requester *****/ /***** Centre requester *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:150px;\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:125px;\">"
"<table class=\"CELLS_PAD_2\" style=\"width:150px;\">" "<table class=\"CELLS_PAD_2\" style=\"width:125px;\">"
"<tr>"); "<tr>");
Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,120,10,"DAT",true,NULL); Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,100,10,"DAT",true,NULL);
fprintf (Gbl.F.Out,"</tr>" fprintf (Gbl.F.Out,"</tr>"
"</table>" "</table>"
"</td>" "</td>"
@ -2128,7 +2128,7 @@ static void Ctr_PutHeadCentresForEdition (void)
"<th class=\"RIGHT_MIDDLE\">" "<th class=\"RIGHT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"<th style=\"width:30px;\"></th>" "<th style=\"width:25px;\"></th>"
"<th class=\"LEFT_MIDDLE\">" "<th class=\"LEFT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"

4
swad_changelog.h
View File

@ -98,11 +98,13 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.2.1 (2015/09/27)" #define Log_PLATFORM_VERSION "SWAD 15.3 (2015/09/28)"
// 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.3: Sep 28, 2015 All sizes are multiplied by 0.8333 (25% bigger than those previous to version 15.0). (185148 lines)
Version 15.2.2: Sep 27, 2015 Fixed minor problem in CSS. (185172 lines)
Version 15.2.1: Sep 27, 2015 Change in layout. Background images are changed to CSS linear gradients. (185171 lines) Version 15.2.1: Sep 27, 2015 Change in layout. Background images are changed to CSS linear gradients. (185171 lines)
Version 15.2: Sep 27, 2015 Change in layout. Background images are changed to CSS linear gradients. (185185 lines) Version 15.2: Sep 27, 2015 Change in layout. Background images are changed to CSS linear gradients. (185185 lines)
Version 15.1.3: Sep 27, 2015 Change in CSS. (185173 lines) Version 15.1.3: Sep 27, 2015 Change in CSS. (185173 lines)

4
swad_chat.c
View File

@ -121,7 +121,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
"<ul class=\"LIST_LEFT\">"); "<ul class=\"LIST_LEFT\">");
/***** Title of top level *****/ /***** Title of top level *****/
fprintf (Gbl.F.Out,"<li class=\"DAT\" style=\"height:30px;\">" fprintf (Gbl.F.Out,"<li class=\"DAT\" style=\"height:25px;\">"
"<img src=\"%s/chat16x16.gif\"" "<img src=\"%s/chat16x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />" " class=\"ICON16x16\" />"
@ -301,7 +301,7 @@ static void Cht_WriteLinkToChat1 (const char *RoomCode,const char *RoomShortName
{ {
extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *The_ClassForm[The_NUM_THEMES];
fprintf (Gbl.F.Out,"<li style=\"height:30px;\">"); fprintf (Gbl.F.Out,"<li style=\"height:25px;\">");
Lay_IndentDependingOnLevel (Level,IsLastItemInLevel); Lay_IndentDependingOnLevel (Level,IsLastItemInLevel);
Act_FormStart (ActCht); Act_FormStart (ActCht);
Cht_WriteParamsRoomCodeAndNames (RoomCode,RoomShortName,RoomFullName); Cht_WriteParamsRoomCodeAndNames (RoomCode,RoomShortName,RoomFullName);

4
swad_config.h
View File

@ -73,8 +73,8 @@
#define Cfg_ABOUT_NAME "Centro de Educaci&oacute;n Virtual de la Universidad Nacional de Asunci&oacute;n" #define Cfg_ABOUT_NAME "Centro de Educaci&oacute;n Virtual de la Universidad Nacional de Asunci&oacute;n"
#define Cfg_ABOUT_URL "http://www.cevuna.una.py/" #define Cfg_ABOUT_URL "http://www.cevuna.una.py/"
#define Cfg_ABOUT_LOGO "cevuna.una.py100x32.gif" #define Cfg_ABOUT_LOGO "cevuna.una.py100x32.gif"
#define Cfg_ABOUT_LOGO_WIDTH 150 #define Cfg_ABOUT_LOGO_WIDTH 125
#define Cfg_ABOUT_LOGO_HEIGHT 48 #define Cfg_ABOUT_LOGO_HEIGHT 40
#define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS #define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS
#define Cfg_DEFAULT_ACTION_WHEN_NO_USR_LOGGED ActFrmUsrAcc #define Cfg_DEFAULT_ACTION_WHEN_NO_USR_LOGGED ActFrmUsrAcc

46
swad_connected.c
View File

@ -101,7 +101,7 @@ void Con_ShowConnectedUsrs (void)
/***** Put form to update connected users *****/ /***** Put form to update connected users *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"CENTER_MIDDLE\"" "<td class=\"CENTER_MIDDLE\""
" style=\"padding-bottom:15px;\">"); " style=\"padding-bottom:12px;\">");
Act_FormStart (ActLstCon); Act_FormStart (ActLstCon);
Gbl.Scope.Current = Sco_SCOPE_CRS; Gbl.Scope.Current = Sco_SCOPE_CRS;
if (Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM) if (Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM)
@ -201,23 +201,23 @@ void Con_GetAndShowLastClicks (void)
fprintf (Gbl.F.Out,"<table class=\"TABLE10\">" fprintf (Gbl.F.Out,"<table class=\"TABLE10\">"
"<tr>" "<tr>"
"<th class=\"LEFT_MIDDLE\"" "<th class=\"LEFT_MIDDLE\""
" style=\"width:105px;\">" " style=\"width:87px;\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"LEFT_MIDDLE\"" "<th class=\"LEFT_MIDDLE\""
" style=\"width:90px;\">" " style=\"width:75px;\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"LEFT_MIDDLE\"" "<th class=\"LEFT_MIDDLE\""
" style=\"width:150px;\">" " style=\"width:125px;\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"LEFT_MIDDLE\"" "<th class=\"LEFT_MIDDLE\""
" style=\"width:225px;\">" " style=\"width:187px;\">"
"%s" "%s"
"</th>" "</th>"
"<th class=\"LEFT_MIDDLE\"" "<th class=\"LEFT_MIDDLE\""
" style=\"width:330px;\">" " style=\"width:275px;\">"
"%s" "%s"
"</th>" "</th>"
"</tr>", "</tr>",
@ -297,12 +297,12 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<div class=\"CONNECTED\"" fprintf (Gbl.F.Out,"<div class=\"CONNECTED\""
" style=\"width:165px; \">" " style=\"width:138px; \">"
"<table style=\"width:165px;\">"); "<table style=\"width:138px;\">");
/***** Write total number of sessions *****/ /***** Write total number of sessions *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"CENTER_TOP\" style=\"width:165px;\">" "<td class=\"CENTER_TOP\" style=\"width:138px;\">"
"%u %s" "%u %s"
"</td>" "</td>"
"</tr>", "</tr>",
@ -312,7 +312,7 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Write total number of users *****/ /***** Write total number of users *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"CENTER_TOP\" style=\"width:165px;\">" "<td class=\"CENTER_TOP\" style=\"width:138px;\">"
"%u %s:" "%u %s:"
"</td>" "</td>"
"</tr>", "</tr>",
@ -322,7 +322,7 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Write total number of students *****/ /***** Write total number of students *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"CENTER_TOP\" style=\"width:165px;\">" "<td class=\"CENTER_TOP\" style=\"width:138px;\">"
"%u %s" "%u %s"
"</td>" "</td>"
"</tr>", "</tr>",
@ -332,7 +332,7 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Write total number of teachers *****/ /***** Write total number of teachers *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"CENTER_TOP\" style=\"width:165px;\">" "<td class=\"CENTER_TOP\" style=\"width:138px;\">"
"%u %s" "%u %s"
"</td>" "</td>"
"</tr>", "</tr>",
@ -343,7 +343,7 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Write total number of users who do not belong to any course *****/ /***** Write total number of users who do not belong to any course *****/
if (WithoutCoursesTotal) if (WithoutCoursesTotal)
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"CENTER_TOP\" style=\"width:165px;\">" "<td class=\"CENTER_TOP\" style=\"width:138px;\">"
"%u %s" "%u %s"
"</td>" "</td>"
"</tr>", "</tr>",
@ -457,12 +457,12 @@ void Con_ShowConnectedUsrsBelongingToScope (void)
switch (Gbl.Usrs.Connected.WhereToShow) switch (Gbl.Usrs.Connected.WhereToShow)
{ {
case Con_SHOW_ON_MAIN_ZONE: case Con_SHOW_ON_MAIN_ZONE:
fprintf (Gbl.F.Out,"<div class=\"CONNECTED\" style=\"width:468px;\">" fprintf (Gbl.F.Out,"<div class=\"CONNECTED\" style=\"width:390px;\">"
"<table>"); "<table>");
break; break;
case Con_SHOW_ON_RIGHT_COLUMN: case Con_SHOW_ON_RIGHT_COLUMN:
fprintf (Gbl.F.Out,"<div class=\"CONNECTED\" style=\"width:165px;\">" fprintf (Gbl.F.Out,"<div class=\"CONNECTED\" style=\"width:138px;\">"
"<table style=\"width:165px;\">"); "<table style=\"width:138px;\">");
break; break;
} }
@ -601,7 +601,7 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnRightColum
Gbl.Usrs.Connected.NumUsrsToList = Cfg_MAX_CONNECTED_SHOWN; Gbl.Usrs.Connected.NumUsrsToList = Cfg_MAX_CONNECTED_SHOWN;
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"3\" class=\"CENTER_TOP\"" "<td colspan=\"3\" class=\"CENTER_TOP\""
" style=\"width:165px;\">" " style=\"width:138px;\">"
"%u %s" "%u %s"
"</td>" "</td>"
"</tr>", "</tr>",
@ -1017,7 +1017,7 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
/***** Show photo *****/ /***** Show photo *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LEFT_MIDDLE COLOR%u\"" "<td class=\"LEFT_MIDDLE COLOR%u\""
" style=\"width:27px;\">", " style=\"width:22px;\">",
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
sprintf (Gbl.FormId,"form_con_%d",++Gbl.NumFormConnectedUsrs); sprintf (Gbl.FormId,"form_con_%d",++Gbl.NumFormConnectedUsrs);
Act_FormStartId (ActSeePubPrf,Gbl.FormId); Act_FormStartId (ActSeePubPrf,Gbl.FormId);
@ -1033,7 +1033,7 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
/***** Write full name and link *****/ /***** Write full name and link *****/
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE COLOR%u\"" fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE COLOR%u\""
" style=\"width:81px;\">", " style=\"width:68px;\">",
Font,Gbl.RowEvenOdd); Font,Gbl.RowEvenOdd);
sprintf (Gbl.FormId,"form_con_%d",++Gbl.NumFormConnectedUsrs); sprintf (Gbl.FormId,"form_con_%d",++Gbl.NumFormConnectedUsrs);
Act_FormStartId ((Role == Rol_STUDENT) ? ActSeeRecOneStd : Act_FormStartId ((Role == Rol_STUDENT) ? ActSeeRecOneStd :
@ -1048,7 +1048,7 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
/***** Write time from last access *****/ /***** Write time from last access *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE COLOR%u\"" fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE COLOR%u\""
" style=\"width:57px;\">", " style=\"width:48px;\">",
Font,Gbl.RowEvenOdd); Font,Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<div id=\"hm%u\">", fprintf (Gbl.F.Out,"<div id=\"hm%u\">",
@ -1214,7 +1214,7 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
/***** Show photo *****/ /***** Show photo *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LEFT_MIDDLE COLOR%u\"" "<td class=\"LEFT_MIDDLE COLOR%u\""
" style=\"width:27px;\">", " style=\"width:22px;\">",
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL : Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
@ -1224,7 +1224,7 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
/***** Write full name and link *****/ /***** Write full name and link *****/
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE COLOR%u\"" fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE COLOR%u\""
" style=\"width:384px;\">", " style=\"width:320px;\">",
Font,Gbl.RowEvenOdd); Font,Gbl.RowEvenOdd);
if (PutLinkToRecord) if (PutLinkToRecord)
{ {
@ -1243,7 +1243,7 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
/***** Write time from last access *****/ /***** Write time from last access *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE COLOR%u\"" fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE COLOR%u\""
" style=\"width:57px;\">", " style=\"width:48px;\">",
Font,Gbl.RowEvenOdd); Font,Gbl.RowEvenOdd);
Hours = Seconds / (60 * 60); Hours = Seconds / (60 * 60);
Minutes = (Seconds / 60) % 60; Minutes = (Seconds / 60) % 60;

8
swad_country.c
View File

@ -350,7 +350,7 @@ static void Cty_Configuration (bool PrintView)
"<td class=\"DAT LEFT_MIDDLE\">", "<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme], The_ClassForm[Gbl.Prefs.Theme],
Txt_QR_code); Txt_QR_code);
QR_LinkTo (300,"cty",Gbl.CurrentCty.Cty.CtyCod); QR_LinkTo (250,"cty",Gbl.CurrentCty.Cty.CtyCod);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
} }
@ -665,8 +665,8 @@ void Cty_ListCountries2 (void)
/***** Div for Google Geochart *****/ /***** Div for Google Geochart *****/
if (Gbl.CurrentAct == ActSeeCty) if (Gbl.CurrentAct == ActSeeCty)
{ {
fprintf (Gbl.F.Out,"<div id='chart_div' style=\"width:750px;" fprintf (Gbl.F.Out,"<div id='chart_div' style=\"width:625px;"
" margin:15px auto;\">" " margin:12px auto;\">"
"</div>"); "</div>");
} }
@ -972,7 +972,7 @@ void Cty_WriteSelectorOfCountry (void)
/***** Start form *****/ /***** Start form *****/
Act_FormGoToStart (ActSeeIns); Act_FormGoToStart (ActSeeIns);
fprintf (Gbl.F.Out,"<select name=\"cty\" style=\"width:210px;\"" fprintf (Gbl.F.Out,"<select name=\"cty\" style=\"width:175px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">" " onchange=\"javascript:document.getElementById('%s').submit();\">"
"<option value=\"\"", "<option value=\"\"",
Gbl.FormId); Gbl.FormId);

44
swad_course.c
View File

@ -113,7 +113,7 @@ void Crs_ShowIntroduction (void)
{ {
/***** Course configuration *****/ /***** Course configuration *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\"" fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
" style=\"margin-bottom:30px;\">"); " style=\"margin-bottom:25px;\">");
Crs_Configuration (false); Crs_Configuration (false);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
@ -362,7 +362,7 @@ static void Crs_Configuration (bool PrintView)
"<td class=\"DAT LEFT_MIDDLE\">", "<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme], The_ClassForm[Gbl.Prefs.Theme],
Txt_QR_code); Txt_QR_code);
QR_LinkTo (300,"crs",Gbl.CurrentCrs.Crs.CrsCod); QR_LinkTo (250,"crs",Gbl.CurrentCrs.Crs.CrsCod);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
} }
@ -568,7 +568,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
"<ul class=\"LIST_LEFT\">"); "<ul class=\"LIST_LEFT\">");
/***** Write link to platform *****/ /***** Write link to platform *****/
fprintf (Gbl.F.Out,"<li style=\"height:30px;\">"); fprintf (Gbl.F.Out,"<li style=\"height:25px;\">");
Act_FormGoToStart (ActMnu); Act_FormGoToStart (ActMnu);
Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) TabSys); Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) TabSys);
Act_LinkFormSubmit (Txt_System, Act_LinkFormSubmit (Txt_System,
@ -604,7 +604,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lay_ShowErrorAndExit ("Country not found."); Lay_ShowErrorAndExit ("Country not found.");
/***** Write link to country *****/ /***** Write link to country *****/
fprintf (Gbl.F.Out,"<li style=\"height:30px;\">"); fprintf (Gbl.F.Out,"<li style=\"height:25px;\">");
IsLastItemInLevel[1] = (NumCty == NumCtys - 1); IsLastItemInLevel[1] = (NumCty == NumCtys - 1);
Lay_IndentDependingOnLevel (1,IsLastItemInLevel); Lay_IndentDependingOnLevel (1,IsLastItemInLevel);
Act_FormStart (ActSeeCtyInf); Act_FormStart (ActSeeCtyInf);
@ -647,7 +647,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lay_ShowErrorAndExit ("Institution not found."); Lay_ShowErrorAndExit ("Institution not found.");
/***** Write link to institution *****/ /***** Write link to institution *****/
fprintf (Gbl.F.Out,"<li style=\"height:30px;\">"); fprintf (Gbl.F.Out,"<li style=\"height:25px;\">");
IsLastItemInLevel[2] = (NumIns == NumInss - 1); IsLastItemInLevel[2] = (NumIns == NumInss - 1);
Lay_IndentDependingOnLevel (2,IsLastItemInLevel); Lay_IndentDependingOnLevel (2,IsLastItemInLevel);
Act_FormStart (ActSeeInsInf); Act_FormStart (ActSeeInsInf);
@ -685,7 +685,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lay_ShowErrorAndExit ("Centre not found."); Lay_ShowErrorAndExit ("Centre not found.");
/***** Write link to centre *****/ /***** Write link to centre *****/
fprintf (Gbl.F.Out,"<li style=\"height:30px;\">"); fprintf (Gbl.F.Out,"<li style=\"height:25px;\">");
IsLastItemInLevel[3] = (NumCtr == NumCtrs - 1); IsLastItemInLevel[3] = (NumCtr == NumCtrs - 1);
Lay_IndentDependingOnLevel (3,IsLastItemInLevel); Lay_IndentDependingOnLevel (3,IsLastItemInLevel);
Act_FormStart (ActSeeCtrInf); Act_FormStart (ActSeeCtrInf);
@ -723,7 +723,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lay_ShowErrorAndExit ("Degree not found."); Lay_ShowErrorAndExit ("Degree not found.");
/***** Write link to degree *****/ /***** Write link to degree *****/
fprintf (Gbl.F.Out,"<li style=\"height:30px;\">"); fprintf (Gbl.F.Out,"<li style=\"height:25px;\">");
IsLastItemInLevel[4] = (NumDeg == NumDegs - 1); IsLastItemInLevel[4] = (NumDeg == NumDegs - 1);
Lay_IndentDependingOnLevel (4,IsLastItemInLevel); Lay_IndentDependingOnLevel (4,IsLastItemInLevel);
Act_FormStart (ActSeeDegInf); Act_FormStart (ActSeeDegInf);
@ -761,7 +761,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lay_ShowErrorAndExit ("Course not found."); Lay_ShowErrorAndExit ("Course not found.");
/***** Write link to course *****/ /***** Write link to course *****/
fprintf (Gbl.F.Out,"<li style=\"height:30px;\">"); fprintf (Gbl.F.Out,"<li style=\"height:25px;\">");
IsLastItemInLevel[5] = (NumCrs == NumCrss - 1); IsLastItemInLevel[5] = (NumCrs == NumCrss - 1);
Lay_IndentDependingOnLevel (5,IsLastItemInLevel); Lay_IndentDependingOnLevel (5,IsLastItemInLevel);
Act_FormStart (ActSeeCrsInf); Act_FormStart (ActSeeCrsInf);
@ -942,7 +942,7 @@ void Crs_WriteSelectorOfCourse (void)
/***** Start form *****/ /***** Start form *****/
Act_FormGoToStart (ActSeeCrsInf); Act_FormGoToStart (ActSeeCrsInf);
fprintf (Gbl.F.Out,"<select name=\"crs\" style=\"width:210px;\""); fprintf (Gbl.F.Out,"<select name=\"crs\" style=\"width:175px;\"");
if (Gbl.CurrentDeg.Deg.DegCod > 0) if (Gbl.CurrentDeg.Deg.DegCod > 0)
fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\"", fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\"",
Gbl.FormId); Gbl.FormId);
@ -1129,8 +1129,8 @@ void Crs_WriteSelectorMyCourses (void)
extern const char *Txt_No_COURSE_SELECTED; extern const char *Txt_No_COURSE_SELECTED;
static const unsigned SelectorWidth[Lay_NUM_LAYOUTS] = static const unsigned SelectorWidth[Lay_NUM_LAYOUTS] =
{ {
210, // Lay_LAYOUT_DESKTOP 175, // Lay_LAYOUT_DESKTOP
360, // Lay_LAYOUT_MOBILE 300, // Lay_LAYOUT_MOBILE
}; };
unsigned NumMyCrs; unsigned NumMyCrs;
bool IBelongToCurrentCrs = false; bool IBelongToCurrentCrs = false;
@ -1454,7 +1454,7 @@ static void Crs_ListCoursesForEdition (void)
Act_FormStart (ActChgCrsDeg); Act_FormStart (ActChgCrsDeg);
Crs_PutParamOtherCrsCod (Crs->CrsCod); Crs_PutParamOtherCrsCod (Crs->CrsCod);
fprintf (Gbl.F.Out,"<select name=\"OthDegCod\"" fprintf (Gbl.F.Out,"<select name=\"OthDegCod\""
" style=\"width:120px;\"" " style=\"width:100px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">", " onchange=\"javascript:document.getElementById('%s').submit();\">",
Gbl.FormId); Gbl.FormId);
for (NumDeg = 0; for (NumDeg = 0;
@ -1479,7 +1479,7 @@ static void Crs_ListCoursesForEdition (void)
Act_FormStart (ActChgCrsYea); Act_FormStart (ActChgCrsYea);
Crs_PutParamOtherCrsCod (Crs->CrsCod); Crs_PutParamOtherCrsCod (Crs->CrsCod);
fprintf (Gbl.F.Out,"<select name=\"OthCrsYear\"" fprintf (Gbl.F.Out,"<select name=\"OthCrsYear\""
" style=\"width:60px;\"" " style=\"width:50px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">", " onchange=\"javascript:document.getElementById('%s').submit();\">",
Gbl.FormId); Gbl.FormId);
for (YearAux = 0; for (YearAux = 0;
@ -1576,7 +1576,7 @@ static void Crs_ListCoursesForEdition (void)
Act_FormStart (ActChgCrsSta); Act_FormStart (ActChgCrsSta);
Crs_PutParamOtherCrsCod (Crs->CrsCod); Crs_PutParamOtherCrsCod (Crs->CrsCod);
fprintf (Gbl.F.Out,"<select name=\"Status\"" fprintf (Gbl.F.Out,"<select name=\"Status\""
" style=\"width:120px;\"" " style=\"width:100px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">" " onchange=\"javascript:document.getElementById('%s').submit();\">"
"<option value=\"%u\" selected=\"selected\">%s</option>" "<option value=\"%u\" selected=\"selected\">%s</option>"
"<option value=\"%u\">%s</option>" "<option value=\"%u\">%s</option>"
@ -1596,11 +1596,11 @@ static void Crs_ListCoursesForEdition (void)
UsrDat.UsrCod = Crs->RequesterUsrCod; UsrDat.UsrCod = Crs->RequesterUsrCod;
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\"" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\""
" style=\"width:150px;\">" " style=\"width:125px;\">"
"<table class=\"CELLS_PAD_2\"" "<table class=\"CELLS_PAD_2\""
" style=\"width:150px;\">" " style=\"width:125px;\">"
"<tr>"); "<tr>");
Msg_WriteMsgAuthor (&UsrDat,120,10,"DAT",true,NULL); Msg_WriteMsgAuthor (&UsrDat,100,10,"DAT",true,NULL);
fprintf (Gbl.F.Out,"</tr>" fprintf (Gbl.F.Out,"</tr>"
"</table>" "</table>"
"</td>" "</td>"
@ -1721,7 +1721,7 @@ static void Crs_PutFormToCreateCourse (void)
/***** Degree *****/ /***** Degree *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<select name=\"OthDegCod\"" "<select name=\"OthDegCod\""
" style=\"width:120px;\" disabled=\"disabled\">" " style=\"width:100px;\" disabled=\"disabled\">"
"<option value=\"%ld\">%s</option>" "<option value=\"%ld\">%s</option>"
"</select>" "</select>"
"</td>", "</td>",
@ -1730,7 +1730,7 @@ static void Crs_PutFormToCreateCourse (void)
/***** Year *****/ /***** Year *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<select name=\"OthCrsYear\" style=\"width:60px;\">"); "<select name=\"OthCrsYear\" style=\"width:50px;\">");
for (Year = 0; for (Year = 0;
Year <= Gbl.CurrentDeg.Deg.LastYear; Year <= Gbl.CurrentDeg.Deg.LastYear;
Year++) Year++)
@ -1786,10 +1786,10 @@ static void Crs_PutFormToCreateCourse (void)
Txt_COURSE_STATUS[Crs_STATUS_PENDING]); Txt_COURSE_STATUS[Crs_STATUS_PENDING]);
/***** Course requester *****/ /***** Course requester *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:150px;\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:125px;\">"
"<table class=\"CELLS_PAD_2\" style=\"width:150px;\">" "<table class=\"CELLS_PAD_2\" style=\"width:125px;\">"
"<tr>"); "<tr>");
Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,120,10,"DAT",true,NULL); Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,100,10,"DAT",true,NULL);
fprintf (Gbl.F.Out,"</tr>" fprintf (Gbl.F.Out,"</tr>"
"</table>" "</table>"
"</td>" "</td>"

3
swad_date.c
View File

@ -160,7 +160,8 @@ void Dat_ShowCurrentDateTime (void)
extern const char *The_ClassCurrentTime[The_NUM_THEMES]; extern const char *The_ClassCurrentTime[The_NUM_THEMES];
extern const char *Txt_MONTHS_SMALL_SHORT[12]; extern const char *Txt_MONTHS_SMALL_SHORT[12];
fprintf (Gbl.F.Out,"<div id=\"hm\" class=\"%s\" style=\"padding-top:12px;\">" fprintf (Gbl.F.Out,"<div id=\"hm\" class=\"%s\""
" style=\"padding-top:10px;\">"
"%u %s, %u:%02u" "%u %s, %u:%02u"
"</div>", "</div>",
The_ClassCurrentTime[Gbl.Prefs.Theme], The_ClassCurrentTime[Gbl.Prefs.Theme],

32
swad_degree.c
View File

@ -416,7 +416,7 @@ static void Deg_Configuration (bool PrintView)
"<td class=\"DAT LEFT_MIDDLE\">", "<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme], The_ClassForm[Gbl.Prefs.Theme],
Txt_QR_code); Txt_QR_code);
QR_LinkTo (300,"deg",Gbl.CurrentDeg.Deg.DegCod); QR_LinkTo (250,"deg",Gbl.CurrentDeg.Deg.DegCod);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
} }
@ -481,7 +481,7 @@ void Deg_WriteMenuAllCourses (void)
/***** Start of table *****/ /***** Start of table *****/
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\"" fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\""
" style=\"margin:0 auto 15px auto;\">"); " style=\"margin:0 auto 12px auto;\">");
/***** Write a 1st selector /***** Write a 1st selector
with all the countries *****/ with all the countries *****/
@ -575,7 +575,7 @@ static void Deg_WriteSelectorOfDegree (void)
/***** Start form *****/ /***** Start form *****/
Act_FormGoToStart (ActSeeCrs); Act_FormGoToStart (ActSeeCrs);
fprintf (Gbl.F.Out,"<select name=\"deg\" style=\"width:210px;\""); fprintf (Gbl.F.Out,"<select name=\"deg\" style=\"width:175px;\"");
if (Gbl.CurrentCtr.Ctr.CtrCod > 0) if (Gbl.CurrentCtr.Ctr.CtrCod > 0)
fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\"", fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\"",
Gbl.FormId); Gbl.FormId);
@ -1412,7 +1412,7 @@ static void Deg_ListDegreesForEdition (void)
/* Degree logo */ /* Degree logo */
fprintf (Gbl.F.Out,"<td title=\"%s LEFT_MIDDLE\"" fprintf (Gbl.F.Out,"<td title=\"%s LEFT_MIDDLE\""
" style=\"width:30px;>", " style=\"width:25px;>",
Deg->FullName); Deg->FullName);
Log_DrawLogo (Sco_SCOPE_DEG,Deg->DegCod,Deg->ShortName,16,NULL,true); Log_DrawLogo (Sco_SCOPE_DEG,Deg->DegCod,Deg->ShortName,16,NULL,true);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
@ -1423,7 +1423,7 @@ static void Deg_ListDegreesForEdition (void)
{ {
Act_FormStart (ActChgDegCtr); Act_FormStart (ActChgDegCtr);
Deg_PutParamOtherDegCod (Deg->DegCod); Deg_PutParamOtherDegCod (Deg->DegCod);
fprintf (Gbl.F.Out,"<select name=\"OthCtrCod\" style=\"width:75px;\"" fprintf (Gbl.F.Out,"<select name=\"OthCtrCod\" style=\"width:62px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">", " onchange=\"javascript:document.getElementById('%s').submit();\">",
Gbl.FormId); Gbl.FormId);
for (NumCtr = 0; for (NumCtr = 0;
@ -1478,7 +1478,7 @@ static void Deg_ListDegreesForEdition (void)
Act_FormStart (ActChgDegTyp); Act_FormStart (ActChgDegTyp);
Deg_PutParamOtherDegCod (Deg->DegCod); Deg_PutParamOtherDegCod (Deg->DegCod);
fprintf (Gbl.F.Out,"<select name=\"OthDegTypCod\"" fprintf (Gbl.F.Out,"<select name=\"OthDegTypCod\""
" style=\"width:75px;\"" " style=\"width:62px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">", " onchange=\"javascript:document.getElementById('%s').submit();\">",
Gbl.FormId); Gbl.FormId);
for (NumDegTyp = 0; for (NumDegTyp = 0;
@ -1616,7 +1616,7 @@ static void Deg_ListDegreesForEdition (void)
{ {
Act_FormStart (ActChgDegSta); Act_FormStart (ActChgDegSta);
Deg_PutParamOtherDegCod (Deg->DegCod); Deg_PutParamOtherDegCod (Deg->DegCod);
fprintf (Gbl.F.Out,"<select name=\"Status\" style=\"width:120px;\"" fprintf (Gbl.F.Out,"<select name=\"Status\" style=\"width:100px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">" " onchange=\"javascript:document.getElementById('%s').submit();\">"
"<option value=\"%u\" selected=\"selected\">%s</option>" "<option value=\"%u\" selected=\"selected\">%s</option>"
"<option value=\"%u\">%s</option>" "<option value=\"%u\">%s</option>"
@ -1635,10 +1635,10 @@ static void Deg_ListDegreesForEdition (void)
/* Degree requester */ /* Degree requester */
UsrDat.UsrCod = Deg->RequesterUsrCod; UsrDat.UsrCod = Deg->RequesterUsrCod;
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:150px;\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:125px;\">"
"<table class=\"CELLS_PAD_2\" style=\"width:150px;\">" "<table class=\"CELLS_PAD_2\" style=\"width:125px;\">"
"<tr>"); "<tr>");
Msg_WriteMsgAuthor (&UsrDat,120,10,"DAT",true,NULL); Msg_WriteMsgAuthor (&UsrDat,100,10,"DAT",true,NULL);
fprintf (Gbl.F.Out,"</tr>" fprintf (Gbl.F.Out,"</tr>"
"</table>" "</table>"
"</td>" "</td>"
@ -1809,7 +1809,7 @@ static void Deg_PutFormToCreateDegree (void)
/***** Centre *****/ /***** Centre *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<select name=\"OthCtrCod\"" "<select name=\"OthCtrCod\""
" style=\"width:75px;\" disabled=\"disabled\">" " style=\"width:62px;\" disabled=\"disabled\">"
"<option value=\"%ld\" selected=\"selected\">" "<option value=\"%ld\" selected=\"selected\">"
"%s" "%s"
"</option>" "</option>"
@ -1832,7 +1832,7 @@ static void Deg_PutFormToCreateDegree (void)
/***** Degree type *****/ /***** Degree type *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<select name=\"OthDegTypCod\" style=\"width:75px;\">"); "<select name=\"OthDegTypCod\" style=\"width:62px;\">");
for (NumDegTyp = 0; for (NumDegTyp = 0;
NumDegTyp < Gbl.Degs.DegTypes.Num; NumDegTyp < Gbl.Degs.DegTypes.Num;
NumDegTyp++) NumDegTyp++)
@ -1899,10 +1899,10 @@ static void Deg_PutFormToCreateDegree (void)
Txt_DEGREE_STATUS[Deg_STATUS_PENDING]); Txt_DEGREE_STATUS[Deg_STATUS_PENDING]);
/***** Degree requester *****/ /***** Degree requester *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:150px;\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:125px;\">"
"<table class=\"CELLS_PAD_2\" style=\"width:150px;\">" "<table class=\"CELLS_PAD_2\" style=\"width:125px;\">"
"<tr>"); "<tr>");
Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,120,10,"DAT",true,NULL); Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,100,10,"DAT",true,NULL);
fprintf (Gbl.F.Out,"</tr>" fprintf (Gbl.F.Out,"</tr>"
"</table>" "</table>"
"</td>" "</td>"
@ -2047,7 +2047,7 @@ static void Deg_PutHeadDegreesForEdition (void)
"<th class=\"RIGHT_MIDDLE\">" "<th class=\"RIGHT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"<th style=\"width:30px;\"></th>" "<th style=\"width:25px;\"></th>"
"<th class=\"LEFT_MIDDLE\">" "<th class=\"LEFT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"

6
swad_department.c
View File

@ -527,7 +527,7 @@ static void Dpt_ListDepartmentsForEdition (void)
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"); fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
Act_FormStart (ActChgDptIns); Act_FormStart (ActChgDptIns);
Dpt_PutParamDptCod (Dpt->DptCod); Dpt_PutParamDptCod (Dpt->DptCod);
fprintf (Gbl.F.Out,"<select name=\"OthInsCod\" style=\"width:75px;\"" fprintf (Gbl.F.Out,"<select name=\"OthInsCod\" style=\"width:62px;\""
"onchange=\"javascript:document.getElementById('%s').submit();\">" "onchange=\"javascript:document.getElementById('%s').submit();\">"
"<option value=\"0\"", "<option value=\"0\"",
Gbl.FormId); Gbl.FormId);
@ -895,7 +895,7 @@ static void Dpt_PutFormToCreateDepartment (void)
/***** Institution *****/ /***** Institution *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"CENTER_MIDDLE\">" "<td class=\"CENTER_MIDDLE\">"
"<select name=\"OthInsCod\" style=\"width:75px;\">" "<select name=\"OthInsCod\" style=\"width:62px;\">"
"<option value=\"0\""); "<option value=\"0\"");
if (Dpt->InsCod == 0) if (Dpt->InsCod == 0)
fprintf (Gbl.F.Out," selected=\"selected\""); fprintf (Gbl.F.Out," selected=\"selected\"");
@ -1106,7 +1106,7 @@ void Dpt_WriteSelectorDepartment (long InsCod)
/* Get list of departments */ /* Get list of departments */
Dpt_GetListDepartments (InsCod); Dpt_GetListDepartments (InsCod);
fprintf (Gbl.F.Out,"<select name=\"DptCod\" style=\"width:450px;\">" fprintf (Gbl.F.Out,"<select name=\"DptCod\" style=\"width:375px;\">"
"<option value=\"-1\""); "<option value=\"-1\"");
if (Gbl.Stat.DptCod == -1L) if (Gbl.Stat.DptCod == -1L)
fprintf (Gbl.F.Out," selected=\"selected\""); fprintf (Gbl.F.Out," selected=\"selected\"");

6
swad_enrollment.c
View File

@ -875,7 +875,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
/***** Start list of options *****/ /***** Start list of options *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\"" fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
" style=\"display:inline-block; margin:15px;\">" " style=\"display:inline-block; margin:12px;\">"
"<ul class=\"LIST_LEFT %s\">", "<ul class=\"LIST_LEFT %s\">",
The_ClassForm[Gbl.Prefs.Theme]); The_ClassForm[Gbl.Prefs.Theme]);
@ -2159,7 +2159,7 @@ void Enr_ShowEnrollmentRequests (void)
/***** Selection of scope and roles *****/ /***** Selection of scope and roles *****/
/* Start form */ /* Start form */
Act_FormStart (ActSeeSignUpReq); Act_FormStart (ActSeeSignUpReq);
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:6px;\">"); fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:5px;\">");
/* Scope (whole platform, current centre, current degree or current course) */ /* Scope (whole platform, current centre, current degree or current course) */
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -2591,7 +2591,7 @@ void Enr_ShowEnrollmentRequests (void)
/***** User photo *****/ /***** User photo *****/
fprintf (Gbl.F.Out,"<td class=\"DAT CENTER_TOP\"" fprintf (Gbl.F.Out,"<td class=\"DAT CENTER_TOP\""
" style=\"width:27px;\">"); " style=\"width:22px;\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL : Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL, NULL,

4
swad_exam.c
View File

@ -762,7 +762,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
} }
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable ("750px",0,NULL); Lay_StartRoundFrameTable ("625px",0,NULL);
if (TypeViewExamAnnouncement == Exa_NORMAL_VIEW) if (TypeViewExamAnnouncement == Exa_NORMAL_VIEW)
{ {
@ -805,7 +805,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\"" fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\""
" style=\"width:100%%;" " style=\"width:100%%;"
" padding:30px 30px 150px 30px;\">"); // Bottom space used for signatures " padding:25px 25px 125px 25px;\">"); // Bottom space used for signatures
/***** Institution logo *****/ /***** Institution logo *****/
fprintf (Gbl.F.Out,"<tr>" \ fprintf (Gbl.F.Out,"<tr>" \

16
swad_file_browser.c
View File

@ -3089,7 +3089,7 @@ static void Brw_FormToChangeCrsGrpZone (void)
"<img src=\"%s/%s20x20.gif\"" "<img src=\"%s/%s20x20.gif\""
" alt=\"\" title=\"\"" " alt=\"\" title=\"\""
" class=\"ICON20x20\"" " class=\"ICON20x20\""
" style=\"margin-left:7px;\" />" " style=\"margin-left:6px;\" />"
"<input type=\"radio\" name=\"GrpCod\" value=\"%ld\"", "<input type=\"radio\" name=\"GrpCod\" value=\"%ld\"",
(IsGroupZone && (IsGroupZone &&
GrpDat.GrpCod == Gbl.CurrentCrs.Grps.GrpCod) ? "BROWSER_TITLE" : GrpDat.GrpCod == Gbl.CurrentCrs.Grps.GrpCod) ? "BROWSER_TITLE" :
@ -3155,7 +3155,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat)
char PhotoURL[PATH_MAX+1]; char PhotoURL[PATH_MAX+1];
/***** Show user's photo *****/ /***** Show user's photo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:120px;\">"); fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:100px;\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL, NULL,
@ -3163,7 +3163,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat)
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Start form to send a message to this user *****/ /***** Start form to send a message to this user *****/
fprintf (Gbl.F.Out,"<td class=\"MSG_AUT LEFT_TOP\" style=\"width:240px;\">"); fprintf (Gbl.F.Out,"<td class=\"MSG_AUT LEFT_TOP\" style=\"width:200px;\">");
Act_FormStart (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActSeeRecOneStd : Act_FormStart (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActSeeRecOneStd :
ActSeeRecOneTch); ActSeeRecOneTch);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
@ -3525,7 +3525,7 @@ static void Brw_WriteSubtitleOfFileBrowser (void)
extern const char *Txt_nobody_else_can_access_this_content; extern const char *Txt_nobody_else_can_access_this_content;
char Subtitle[1024]; char Subtitle[1024];
fprintf (Gbl.F.Out,"<div style=\"margin:0 auto; min-width:900px;\">"); fprintf (Gbl.F.Out,"<div style=\"margin:0 auto; min-width:750px;\">");
/***** Form to change zone (course and group browsers) *****/ /***** Form to change zone (course and group browsers) *****/
switch (Gbl.FileBrowser.Type) switch (Gbl.FileBrowser.Type)
@ -5287,7 +5287,7 @@ static void Brw_IndentDependingOnLevel (unsigned Level)
for (i = 1; for (i = 1;
i < Level; i < Level;
i++) i++)
fprintf (Gbl.F.Out,"<td style=\"width:24px;\">" fprintf (Gbl.F.Out,"<td style=\"width:20px;\">"
"<img src=\"%s/tr16x16.gif\"" "<img src=\"%s/tr16x16.gif\""
" alt=\"\" title=\"\"" " alt=\"\" title=\"\""
" class=\"ICON16x16B\" />" " class=\"ICON16x16B\" />"
@ -5393,7 +5393,7 @@ static void Brw_PutIconFolder (unsigned Level,Brw_ExpandTree_t ExpandTree,
/***** Start cell *****/ /***** Start cell *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:%upx;\">", fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:%upx;\">",
Level * 24); Level * 20);
/***** Put icon *****/ /***** Put icon *****/
if ((ICanCreate = Brw_CheckIfICanCreateIntoFolder (Level))) // I can create a new file or folder if ((ICanCreate = Brw_CheckIfICanCreateIntoFolder (Level))) // I can create a new file or folder
@ -5771,7 +5771,7 @@ static void Brw_WriteDatesAssignment (void)
Gbl.FileBrowser.Asg.DateTimes[Asg_START_TIME].Time.Minute); Gbl.FileBrowser.Asg.DateTimes[Asg_START_TIME].Time.Minute);
/***** Arrow *****/ /***** Arrow *****/
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\" style=\"width:24px;\">" fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\" style=\"width:20px;\">"
"<img src=\"%s/arrow%s16x12.gif\"" "<img src=\"%s/arrow%s16x12.gif\""
" alt=\"\" title=\"\"" " alt=\"\" title=\"\""
" class=\"ICON16x16B\" />" " class=\"ICON16x16B\" />"
@ -7708,7 +7708,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
Lay_ShowAlert (Lay_INFO,Gbl.Message); Lay_ShowAlert (Lay_INFO,Gbl.Message);
/***** Form to upload files using the library Dropzone.js *****/ /***** Form to upload files using the library Dropzone.js *****/
// Use min-height:150px; or other number to stablish the height? // Use min-height:125px; or other number to stablish the height?
Gbl.NumForm++; Gbl.NumForm++;
fprintf (Gbl.F.Out,"<form method=\"post\" action=\"%s/%s\"" fprintf (Gbl.F.Out,"<form method=\"post\" action=\"%s/%s\""
" class=\"dropzone\"" " class=\"dropzone\""

14
swad_follow.c
View File

@ -100,7 +100,7 @@ void Fol_ShowFollowingAndFollowers (const struct UsrData *UsrDat)
extern const char *Txt_Followers; extern const char *Txt_Followers;
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto 6px auto;\">" fprintf (Gbl.F.Out,"<table style=\"margin:0 auto 5px auto;\">"
"<tr>"); "<tr>");
/***** Followed users *****/ /***** Followed users *****/
@ -132,7 +132,7 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\"" fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\""
" style=\"min-width:150px;\">"); " style=\"min-width:125px;\">");
/* Number */ /* Number */
fprintf (Gbl.F.Out,"<div class=\"%s\">", fprintf (Gbl.F.Out,"<div class=\"%s\">",
(Gbl.CurrentAct == Action) ? "FOLLOW_B" : (Gbl.CurrentAct == Action) ? "FOLLOW_B" :
@ -238,7 +238,7 @@ void Fol_ListFollowing (void)
/***** Start listing *****/ /***** Start listing *****/
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\"" fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\""
" style=\"margin:15px auto;\">"); " style=\"margin:12px auto;\">");
for (NumUsr = 0; for (NumUsr = 0;
NumUsr < NumUsrs; NumUsr < NumUsrs;
@ -315,7 +315,7 @@ void Fol_ListFollowers (void)
/***** Start listing *****/ /***** Start listing *****/
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\"" fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\""
" style=\"margin:15px auto;\">"); " style=\"margin:12px auto;\">");
for (NumUsr = 0; for (NumUsr = 0;
NumUsr < NumUsrs; NumUsr < NumUsrs;
@ -374,7 +374,7 @@ static void Fol_ShowFollowedOrFollowed (const struct UsrData *UsrDat)
/***** Put form to follow / unfollow *****/ /***** Put form to follow / unfollow *****/
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\"" fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\""
" style=\"width:30px; height:75px;\">"); " style=\"width:25px; height:62px;\">");
if (Visible && if (Visible &&
Gbl.Usrs.Me.Logged && Gbl.Usrs.Me.Logged &&
Gbl.Usrs.Me.UsrDat.UsrCod != UsrDat->UsrCod) Gbl.Usrs.Me.UsrDat.UsrCod != UsrDat->UsrCod)
@ -414,7 +414,7 @@ static void Fol_ShowFollowedOrFollowed (const struct UsrData *UsrDat)
/***** Check if I can see the public profile *****/ /***** Check if I can see the public profile *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\"" fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\""
" style=\"width:60px; height:75px;\">"); " style=\"width:50px; height:62px;\">");
if (Visible) if (Visible)
{ {
/***** User's photo *****/ /***** User's photo *****/
@ -427,7 +427,7 @@ static void Fol_ShowFollowedOrFollowed (const struct UsrData *UsrDat)
/***** Put form to go to public profile *****/ /***** Put form to go to public profile *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\"" fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\""
" style=\"min-width:105px; height:75px;\">"); " style=\"min-width:87px; height:62px;\">");
if (Visible && if (Visible &&
UsrDat->Nickname[0]) UsrDat->Nickname[0])
{ {

30
swad_forum.c
View File

@ -916,7 +916,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
For_WriteLinkToAForum (Gbl.Forum.ForumType,true,1,IsLastItemInLevel); For_WriteLinkToAForum (Gbl.Forum.ForumType,true,1,IsLastItemInLevel);
/* Write thread title */ /* Write thread title */
fprintf (Gbl.F.Out,"<li class=\"DAT\" style=\"height:30px;\">"); fprintf (Gbl.F.Out,"<li class=\"DAT\" style=\"height:25px;\">");
IsLastItemInLevel[2] = true; IsLastItemInLevel[2] = true;
Lay_IndentDependingOnLevel (2,IsLastItemInLevel); Lay_IndentDependingOnLevel (2,IsLastItemInLevel);
@ -1079,7 +1079,7 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst
/***** Put an icon with post status *****/ /***** Put an icon with post status *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s CENTER_TOP\" style=\"width:36px;\">" "<td class=\"%s CENTER_TOP\" style=\"width:30px;\">"
"<img src=\"%s/%s16x16.gif\"" "<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />" " class=\"ICON16x16\" />"
@ -1119,7 +1119,7 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst
/***** Form to remove post *****/ /***** Form to remove post *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"CENTER_TOP\" style=\"width:27px;\">"); "<td class=\"CENTER_TOP\" style=\"width:22px;\">");
if (LastPst && Gbl.Usrs.Me.UsrDat.UsrCod == UsrDat.UsrCod) if (LastPst && Gbl.Usrs.Me.UsrDat.UsrCod == UsrDat.UsrCod)
// Post can be removed if post is the last (without answers) and it's mine // Post can be removed if post is the last (without answers) and it's mine
{ {
@ -1179,13 +1179,13 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst
/***** Write author or destinatary, and form to reply (in case of received post) *****/ /***** Write author or destinatary, and form to reply (in case of received post) *****/
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"<td colspan=\"2\" class=\"LEFT_TOP\"" "<td colspan=\"2\" class=\"LEFT_TOP\""
" style=\"width:180px;\">" " style=\"width:150px;\">"
"<table class=\"CELLS_PAD_2\" style=\"width:180px;\">"); "<table class=\"CELLS_PAD_2\" style=\"width:150px;\">");
/* Write author */ /* Write author */
fprintf (Gbl.F.Out,"<tr>"); fprintf (Gbl.F.Out,"<tr>");
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
Msg_WriteMsgAuthor (&UsrDat,150,16,"MSG_AUT",Enabled,NULL); Msg_WriteMsgAuthor (&UsrDat,125,16,"MSG_AUT",Enabled,NULL);
fprintf (Gbl.F.Out,"</tr>"); fprintf (Gbl.F.Out,"</tr>");
if (Enabled) if (Enabled)
{ {
@ -1312,7 +1312,7 @@ static void For_WriteNumberOfPosts (For_ForumType_t ForumType,long UsrCod)
/***** Star table cell *****/ /***** Star table cell *****/
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"MSG_AUT CENTER_TOP\"" fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"MSG_AUT CENTER_TOP\""
" style=\"width:180px;\">"); " style=\"width:150px;\">");
/***** Get number of posts from database *****/ /***** Get number of posts from database *****/
switch (ForumType) switch (ForumType)
@ -1751,7 +1751,7 @@ static void For_PutFormWhichForums (void)
Act_FormStart (ActSeeFor); Act_FormStart (ActSeeFor);
For_PutParamForumOrder (); For_PutParamForumOrder ();
For_PutParamsForumInsDegCrs (); For_PutParamsForumInsDegCrs ();
fprintf (Gbl.F.Out,"<div style=\"margin:15px 0;\">" fprintf (Gbl.F.Out,"<div style=\"margin:12px 0;\">"
"<ul class=\"LIST_CENTER\">"); "<ul class=\"LIST_CENTER\">");
for (WhichForums = (For_WhichForums_t) 0; for (WhichForums = (For_WhichForums_t) 0;
@ -1783,7 +1783,7 @@ static void For_WriteLinkToTopLevelOfForums (void)
extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Forums; extern const char *Txt_Forums;
fprintf (Gbl.F.Out,"<li style=\"height:30px;\">"); fprintf (Gbl.F.Out,"<li style=\"height:25px;\">");
Act_FormStart (ActSeeFor); Act_FormStart (ActSeeFor);
For_PutAllHiddenParamsForum (); For_PutAllHiddenParamsForum ();
Act_LinkFormSubmit (Txt_Forums,The_ClassForm[Gbl.Prefs.Theme]); Act_LinkFormSubmit (Txt_Forums,The_ClassForm[Gbl.Prefs.Theme]);
@ -2122,7 +2122,7 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
The_ClassForm[Gbl.Prefs.Theme]); The_ClassForm[Gbl.Prefs.Theme]);
/***** Start row *****/ /***** Start row *****/
fprintf (Gbl.F.Out,"<li style=\"height:30px;\">"); fprintf (Gbl.F.Out,"<li style=\"height:25px;\">");
/***** Indent forum title *****/ /***** Indent forum title *****/
Lay_IndentDependingOnLevel (Level,IsLastItemInLevel); Lay_IndentDependingOnLevel (Level,IsLastItemInLevel);
@ -2491,10 +2491,10 @@ void For_ShowForumThrs (void)
/***** Heading row *****/ /***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\"" "<th class=\"LEFT_MIDDLE\""
" style=\"width:21px;\">" " style=\"width:18px;\">"
"</th>" "</th>"
"<th class=\"LEFT_MIDDLE\"" "<th class=\"LEFT_MIDDLE\""
" style=\"width:27px;\">" " style=\"width:22px;\">"
"</th>" "</th>"
"<th class=\"LEFT_MIDDLE\">" "<th class=\"LEFT_MIDDLE\">"
"%s" "%s"
@ -3246,7 +3246,7 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi
/***** Show my photo if I have any posts in this thread *****/ /***** Show my photo if I have any posts in this thread *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"RIGHT_TOP %s\" style=\"width:21px;\">", "<td class=\"RIGHT_TOP %s\" style=\"width:18px;\">",
BgColor); BgColor);
if (Thr.NumMyPosts) if (Thr.NumMyPosts)
{ {
@ -3269,7 +3269,7 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Put an icon with thread status *****/ /***** Put an icon with thread status *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP %s\" style=\"width:36px;\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP %s\" style=\"width:30px;\">"
"<img src=\"%s/%s16x16.gif\"" "<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />", " class=\"ICON16x16\" />",
@ -3336,7 +3336,7 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi
/* Write the author of first or last message */ /* Write the author of first or last message */
UsrDat.UsrCod = Thr.UsrCod[Order]; UsrDat.UsrCod = Thr.UsrCod[Order];
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
Msg_WriteMsgAuthor (&UsrDat,82,9,Style,Thr.Enabled[Order],BgColor); Msg_WriteMsgAuthor (&UsrDat,68,9,Style,Thr.Enabled[Order],BgColor);
/* Write the date of first or last message (it's in YYYYMMDDHHMMSS format) */ /* Write the date of first or last message (it's in YYYYMMDDHHMMSS format) */
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP %s\">", fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP %s\">",

18
swad_group.c
View File

@ -278,7 +278,7 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction)
/***** Submit button *****/ /***** Submit button *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"6\" class=\"CENTER_MIDDLE\"" "<td colspan=\"6\" class=\"CENTER_MIDDLE\""
" style=\"padding-top:15px;\">"); " style=\"padding-top:12px;\">");
Act_LinkFormSubmitAnimated (Txt_Update_students_according_to_selected_groups,The_ClassFormBold[Gbl.Prefs.Theme]); Act_LinkFormSubmitAnimated (Txt_Update_students_according_to_selected_groups,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Update_students_according_to_selected_groups,Txt_Update_students); Lay_PutCalculateIconWithText (Txt_Update_students_according_to_selected_groups,Txt_Update_students);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
@ -1159,7 +1159,7 @@ static void Grp_ListGroupTypesForEdition (void)
Act_FormStart (ActChgMdtGrpTyp); Act_FormStart (ActChgMdtGrpTyp);
Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod); Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod);
fprintf (Gbl.F.Out,"<select name=\"MandatoryEnrollment\"" fprintf (Gbl.F.Out,"<select name=\"MandatoryEnrollment\""
" style=\"width:180px;\"" " style=\"width:150px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">" " onchange=\"javascript:document.getElementById('%s').submit();\">"
"<option value=\"N\"", "<option value=\"N\"",
Gbl.FormId); Gbl.FormId);
@ -1181,7 +1181,7 @@ static void Grp_ListGroupTypesForEdition (void)
Act_FormStart (ActChgMulGrpTyp); Act_FormStart (ActChgMulGrpTyp);
Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod); Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod);
fprintf (Gbl.F.Out,"<select name=\"MultipleEnrollment\"" fprintf (Gbl.F.Out,"<select name=\"MultipleEnrollment\""
" style=\"width:180px;\"" " style=\"width:150px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">" " onchange=\"javascript:document.getElementById('%s').submit();\">"
"<option value=\"N\"", "<option value=\"N\"",
Gbl.FormId); Gbl.FormId);
@ -1204,7 +1204,7 @@ static void Grp_ListGroupTypesForEdition (void)
Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod); Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\">" fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\">"
"<tr>" "<tr>"
"<td class=\"LEFT_MIDDLE\" style=\"width:24px;\">" "<td class=\"LEFT_MIDDLE\" style=\"width:20px;\">"
"<img src=\"%s/%s16x16.gif\"" "<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />" " class=\"ICON16x16\" />"
@ -1966,7 +1966,7 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight)
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE"); fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE");
if (Highlight) if (Highlight)
fprintf (Gbl.F.Out," LIGHT_BLUE"); fprintf (Gbl.F.Out," LIGHT_BLUE");
fprintf (Gbl.F.Out,"\" style=\"width:18px;\">" fprintf (Gbl.F.Out,"\" style=\"width:15px;\">"
"<img src=\"%s/%s_off16x16.gif\"" "<img src=\"%s/%s_off16x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />" " class=\"ICON16x16\" />"
@ -2059,7 +2059,7 @@ static void Grp_PutFormToCreateGroupType (void)
/***** Is it mandatory to register in any groups of this type? *****/ /***** Is it mandatory to register in any groups of this type? *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<select name=\"MandatoryEnrollment\"" "<select name=\"MandatoryEnrollment\""
" style=\"width:180px;\">" " style=\"width:150px;\">"
"<option value=\"N\""); "<option value=\"N\"");
if (!Gbl.CurrentCrs.Grps.GrpTyp.MandatoryEnrollment) if (!Gbl.CurrentCrs.Grps.GrpTyp.MandatoryEnrollment)
fprintf (Gbl.F.Out," selected=\"selected\""); fprintf (Gbl.F.Out," selected=\"selected\"");
@ -2076,7 +2076,7 @@ static void Grp_PutFormToCreateGroupType (void)
/***** Is it possible to register in multiple groups of this type? *****/ /***** Is it possible to register in multiple groups of this type? *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<select name=\"MultipleEnrollment\"" "<select name=\"MultipleEnrollment\""
" style=\"width:180px;\">" " style=\"width:150px;\">"
"<option value=\"N\""); "<option value=\"N\"");
if (!Gbl.CurrentCrs.Grps.GrpTyp.MultipleEnrollment) if (!Gbl.CurrentCrs.Grps.GrpTyp.MultipleEnrollment)
fprintf (Gbl.F.Out," selected=\"selected\""); fprintf (Gbl.F.Out," selected=\"selected\"");
@ -2099,7 +2099,7 @@ static void Grp_PutFormToCreateGroupType (void)
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />" " class=\"ICON16x16\" />"
"</td>" "</td>"
"<td class=\"LEFT_BOTTOM\" style=\"width:24px;\">", "<td class=\"LEFT_BOTTOM\" style=\"width:20px;\">",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
Gbl.CurrentCrs.Grps.GrpTyp.MustBeOpened ? "time" : Gbl.CurrentCrs.Grps.GrpTyp.MustBeOpened ? "time" :
"time-off", "time-off",
@ -4175,7 +4175,7 @@ void Grp_ShowSelectorWhichGrps (void)
extern const char *Txt_Show_WHICH_groups[2]; extern const char *Txt_Show_WHICH_groups[2];
Grp_WhichGroups_t WhichGrps; Grp_WhichGroups_t WhichGrps;
fprintf (Gbl.F.Out,"<div style=\"margin:15px 0;\">" fprintf (Gbl.F.Out,"<div style=\"margin:12px 0;\">"
"<ul class=\"LIST_CENTER\">"); "<ul class=\"LIST_CENTER\">");
for (WhichGrps = Grp_ONLY_MY_GROUPS; for (WhichGrps = Grp_ONLY_MY_GROUPS;
WhichGrps <= Grp_ALL_GROUPS; WhichGrps <= Grp_ALL_GROUPS;

8
swad_holiday.c
View File

@ -503,7 +503,7 @@ static void Hld_ListHolidaysForEdition (void)
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"); fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
Act_FormStart (ActChgHldPlc); Act_FormStart (ActChgHldPlc);
Hld_PutParamHldCod (Hld->HldCod); Hld_PutParamHldCod (Hld->HldCod);
fprintf (Gbl.F.Out,"<select name=\"PlcCod\" style=\"width:75px;\"" fprintf (Gbl.F.Out,"<select name=\"PlcCod\" style=\"width:62px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">" " onchange=\"javascript:document.getElementById('%s').submit();\">"
"<option value=\"-1\"", "<option value=\"-1\"",
Gbl.FormId); Gbl.FormId);
@ -526,7 +526,7 @@ static void Hld_ListHolidaysForEdition (void)
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"); fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
Act_FormStart (ActChgHldTyp); Act_FormStart (ActChgHldTyp);
Hld_PutParamHldCod (Hld->HldCod); Hld_PutParamHldCod (Hld->HldCod);
fprintf (Gbl.F.Out,"<select name=\"HldTyp\" style=\"width:75px;\"" fprintf (Gbl.F.Out,"<select name=\"HldTyp\" style=\"width:62px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">", " onchange=\"javascript:document.getElementById('%s').submit();\">",
Gbl.FormId); Gbl.FormId);
for (HolidayType = (Hld_HolidayType_t) 0; for (HolidayType = (Hld_HolidayType_t) 0;
@ -937,7 +937,7 @@ static void Hld_PutFormToCreateHoliday (void)
/***** Holiday place *****/ /***** Holiday place *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"CENTER_MIDDLE\">" "<td class=\"CENTER_MIDDLE\">"
"<select name=\"PlcCod\" style=\"width:75px;\">" "<select name=\"PlcCod\" style=\"width:62px;\">"
"<option value=\"-1\""); "<option value=\"-1\"");
if (Hld->PlcCod <= 0) if (Hld->PlcCod <= 0)
fprintf (Gbl.F.Out," selected=\"selected\""); fprintf (Gbl.F.Out," selected=\"selected\"");
@ -955,7 +955,7 @@ static void Hld_PutFormToCreateHoliday (void)
/***** Holiday type *****/ /***** Holiday type *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<select name=\"HldTyp\" style=\"width:75px;\">"); "<select name=\"HldTyp\" style=\"width:62px;\">");
for (HolidayType = (Hld_HolidayType_t) 0; for (HolidayType = (Hld_HolidayType_t) 0;
HolidayType < Hld_NUM_TYPES_HOLIDAY; HolidayType < Hld_NUM_TYPES_HOLIDAY;
HolidayType++) HolidayType++)

32
swad_institution.c
View File

@ -355,7 +355,7 @@ static void Ins_Configuration (bool PrintView)
"<td class=\"LEFT_MIDDLE\">", "<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme], The_ClassForm[Gbl.Prefs.Theme],
Txt_QR_code); Txt_QR_code);
QR_LinkTo (300,"ins",Gbl.CurrentIns.Ins.InsCod); QR_LinkTo (250,"ins",Gbl.CurrentIns.Ins.InsCod);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
} }
@ -526,7 +526,7 @@ static void Ins_ListOneInstitutionForSeeing (struct Institution *Ins,unsigned Nu
/***** Icon *****/ /***** Icon *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE %s\"" fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE %s\""
" style=\"width:30px;\">" " style=\"width:25px;\">"
"<a href=\"%s\" target=\"_blank\" title=\"%s\">", "<a href=\"%s\" target=\"_blank\" title=\"%s\">",
BgColor, BgColor,
Ins->WWW,Ins->FullName); Ins->WWW,Ins->FullName);
@ -602,7 +602,7 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<th></th>" "<th></th>"
"<th style=\"width:30px;\"></th>"); "<th style=\"width:25px;\"></th>");
for (Order = Ins_ORDER_BY_INSTITUTION; for (Order = Ins_ORDER_BY_INSTITUTION;
Order <= Ins_ORDER_BY_NUM_USRS; Order <= Ins_ORDER_BY_NUM_USRS;
Order++) Order++)
@ -989,7 +989,7 @@ void Ins_WriteSelectorOfInstitution (void)
/***** Start form *****/ /***** Start form *****/
Act_FormGoToStart (ActSeeCtr); Act_FormGoToStart (ActSeeCtr);
fprintf (Gbl.F.Out,"<select name=\"ins\" style=\"width:210px;\""); fprintf (Gbl.F.Out,"<select name=\"ins\" style=\"width:175px;\"");
if (Gbl.CurrentCty.Cty.CtyCod > 0) if (Gbl.CurrentCty.Cty.CtyCod > 0)
fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\"", fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\"",
Gbl.FormId); Gbl.FormId);
@ -1103,7 +1103,7 @@ static void Ins_ListInstitutionsForEdition (void)
/* Institution logo */ /* Institution logo */
fprintf (Gbl.F.Out,"<td title=\"%s\" class=\"LEFT_MIDDLE\"" fprintf (Gbl.F.Out,"<td title=\"%s\" class=\"LEFT_MIDDLE\""
" style=\"width:30px;\">", " style=\"width:25px;\">",
Ins->FullName); Ins->FullName);
Log_DrawLogo (Sco_SCOPE_INS,Ins->InsCod,Ins->ShortName, Log_DrawLogo (Sco_SCOPE_INS,Ins->InsCod,Ins->ShortName,
16,NULL,true); 16,NULL,true);
@ -1115,7 +1115,7 @@ static void Ins_ListInstitutionsForEdition (void)
{ {
Act_FormStart (ActChgInsCty); Act_FormStart (ActChgInsCty);
Ins_PutParamOtherInsCod (Ins->InsCod); Ins_PutParamOtherInsCod (Ins->InsCod);
fprintf (Gbl.F.Out,"<select name=\"OthCtyCod\" style=\"width:120px;\"" fprintf (Gbl.F.Out,"<select name=\"OthCtyCod\" style=\"width:100px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\" />" " onchange=\"javascript:document.getElementById('%s').submit();\" />"
"<option value=\"0\"", "<option value=\"0\"",
Gbl.FormId); Gbl.FormId);
@ -1216,7 +1216,7 @@ static void Ins_ListInstitutionsForEdition (void)
{ {
Act_FormStart (ActChgInsSta); Act_FormStart (ActChgInsSta);
Ins_PutParamOtherInsCod (Ins->InsCod); Ins_PutParamOtherInsCod (Ins->InsCod);
fprintf (Gbl.F.Out,"<select name=\"Status\" style=\"width:120px;\"" fprintf (Gbl.F.Out,"<select name=\"Status\" style=\"width:100px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">" " onchange=\"javascript:document.getElementById('%s').submit();\">"
"<option value=\"%u\" selected=\"selected\">%s</option>" "<option value=\"%u\" selected=\"selected\">%s</option>"
"<option value=\"%u\">%s</option>" "<option value=\"%u\">%s</option>"
@ -1235,10 +1235,10 @@ static void Ins_ListInstitutionsForEdition (void)
/* Degree requester */ /* Degree requester */
UsrDat.UsrCod = Ins->RequesterUsrCod; UsrDat.UsrCod = Ins->RequesterUsrCod;
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:150px;\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:125px;\">"
"<table class=\"CELLS_PAD_2\" style=\"width:150px;\">" "<table class=\"CELLS_PAD_2\" style=\"width:125px;\">"
"<tr>"); "<tr>");
Msg_WriteMsgAuthor (&UsrDat,120,10,"DAT",true,NULL); Msg_WriteMsgAuthor (&UsrDat,100,10,"DAT",true,NULL);
fprintf (Gbl.F.Out,"</tr>" fprintf (Gbl.F.Out,"</tr>"
"</table>" "</table>"
"</td>" "</td>"
@ -1737,14 +1737,14 @@ static void Ins_PutFormToCreateInstitution (void)
fprintf (Gbl.F.Out,"<td></td>"); fprintf (Gbl.F.Out,"<td></td>");
/***** Institution logo *****/ /***** Institution logo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:30px;\">"); fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:25px;\">");
Log_DrawLogo (Sco_SCOPE_INS,-1L,"",16,NULL,true); Log_DrawLogo (Sco_SCOPE_INS,-1L,"",16,NULL,true);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Country *****/ /***** Country *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<select name=\"OthCtyCod\"" "<select name=\"OthCtyCod\""
" style=\"width:120px;\" disabled=\"disabled\">" " style=\"width:100px;\" disabled=\"disabled\">"
"<option value=\"%ld\" selected=\"selected\">" "<option value=\"%ld\" selected=\"selected\">"
"%s" "%s"
"</option>" "</option>"
@ -1788,10 +1788,10 @@ static void Ins_PutFormToCreateInstitution (void)
Txt_INSTITUTION_STATUS[Ins_STATUS_PENDING]); Txt_INSTITUTION_STATUS[Ins_STATUS_PENDING]);
/***** Centre requester *****/ /***** Centre requester *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:150px;\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:125px;\">"
"<table class=\"CELLS_PAD_2\" style=\"width:150px;\">" "<table class=\"CELLS_PAD_2\" style=\"width:125px;\">"
"<tr>"); "<tr>");
Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,120,10,"DAT",true,NULL); Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,100,10,"DAT",true,NULL);
fprintf (Gbl.F.Out,"</tr>" fprintf (Gbl.F.Out,"</tr>"
"</table>" "</table>"
"</td>" "</td>"
@ -1825,7 +1825,7 @@ static void Ins_PutHeadInstitutionsForEdition (void)
"<th class=\"RIGHT_MIDDLE\">" "<th class=\"RIGHT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"<th style=\"width:30px;\"></th>" "<th style=\"width:25px;\"></th>"
"<th class=\"LEFT_MIDDLE\">" "<th class=\"LEFT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"

62
swad_layout.c
View File

@ -293,14 +293,14 @@ void Lay_WriteStartOfPage (void)
{ {
case Lay_LAYOUT_DESKTOP: case Lay_LAYOUT_DESKTOP:
/* Left bar used to expand-contract central zone */ /* Left bar used to expand-contract central zone */
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\" style=\"width:15px;\">"); fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\" style=\"width:12px;\">");
Pre_PutLeftIconToHideShowCols (); Pre_PutLeftIconToHideShowCols ();
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
if (Gbl.Prefs.Menu == Mnu_MENU_VERTICAL) if (Gbl.Prefs.Menu == Mnu_MENU_VERTICAL)
{ {
/* Tab content, including vertical menu (left) and main zone (right) */ /* Tab content, including vertical menu (left) and main zone (right) */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:210px;\">"); fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:175px;\">");
Mnu_WriteVerticalMenuThisTabDesktop (); Mnu_WriteVerticalMenuThisTabDesktop ();
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
} }
@ -324,7 +324,7 @@ void Lay_WriteStartOfPage (void)
/***** Main zone *****/ /***** Main zone *****/
/* Start of main zone for actions output */ /* Start of main zone for actions output */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\"" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\""
" style=\"padding:0 15px 15px 15px;\">"); " style=\"padding:0 12px 12px 12px;\">");
if (Gbl.Prefs.Layout == Lay_LAYOUT_DESKTOP && if (Gbl.Prefs.Layout == Lay_LAYOUT_DESKTOP &&
Gbl.Prefs.Menu == Mnu_MENU_HORIZONTAL) Gbl.Prefs.Menu == Mnu_MENU_HORIZONTAL)
@ -353,7 +353,7 @@ void Lay_WriteStartOfPage (void)
Gbl.Now.Date.Day == 1) Gbl.Now.Date.Day == 1)
{ {
fprintf (Gbl.F.Out,"<div class=\"ASG_TITLE CENTER_MIDDLE\"" fprintf (Gbl.F.Out,"<div class=\"ASG_TITLE CENTER_MIDDLE\""
" style=\"margin:75px;\">"); " style=\"margin:62px;\">");
fprintf (Gbl.F.Out,Txt_NEW_YEAR_GREETING,Gbl.Now.Date.Year); fprintf (Gbl.F.Out,Txt_NEW_YEAR_GREETING,Gbl.Now.Date.Year);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -376,7 +376,7 @@ static void Lay_WriteEndOfPage (void)
if (Gbl.Prefs.Layout == Lay_LAYOUT_DESKTOP) if (Gbl.Prefs.Layout == Lay_LAYOUT_DESKTOP)
{ {
/* Right bar used to expand-contract central zone */ /* Right bar used to expand-contract central zone */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:15px;\">"); fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:12px;\">");
Pre_PutRigthIconToHideShowCols (); Pre_PutRigthIconToHideShowCols ();
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
} }
@ -617,10 +617,10 @@ static void Lay_WritePageTopHeading (void)
} LogoLayout[Lay_NUM_LAYOUTS] = } LogoLayout[Lay_NUM_LAYOUTS] =
{ {
{ // Lay_LAYOUT_DESKTOP { // Lay_LAYOUT_DESKTOP
"swad112x32.gif",168,48, "swad112x32.gif",140,40,
}, },
{ // Lay_LAYOUT_MOBILE { // Lay_LAYOUT_MOBILE
"swad168x48.gif",252,72, "swad168x48.gif",210,60,
}, },
}; };
const char *ClassHeadRow1[The_NUM_THEMES] = const char *ClassHeadRow1[The_NUM_THEMES] =
@ -635,7 +635,7 @@ static void Lay_WritePageTopHeading (void)
/***** 1st. row, 1st. column: logo *****/ /***** 1st. row, 1st. column: logo *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\" style=\"width:%upx;\">", fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\" style=\"width:%upx;\">",
LogoLayout[Gbl.Prefs.Layout].Width + 24); LogoLayout[Gbl.Prefs.Layout].Width + 20);
/* Left logo */ /* Left logo */
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">" fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">"
@ -685,7 +685,7 @@ static void Lay_WritePageTopHeading (void)
"</td>"); "</td>");
/***** 1st. row, 3rd. column: link to open/close session *****/ /***** 1st. row, 3rd. column: link to open/close session *****/
fprintf (Gbl.F.Out,"<td class=\"%s CENTER_MIDDLE\" style=\"width:192px;\">", fprintf (Gbl.F.Out,"<td class=\"%s CENTER_MIDDLE\" style=\"width:160px;\">",
The_ClassHead[Gbl.Prefs.Theme]); The_ClassHead[Gbl.Prefs.Theme]);
if (Gbl.Usrs.Me.Logged) if (Gbl.Usrs.Me.Logged)
Usr_PutFormLogOut (); Usr_PutFormLogOut ();
@ -703,14 +703,14 @@ static void Lay_WritePageTopHeading (void)
/***** 2nd. row, 1st. column *****/ /***** 2nd. row, 1st. column *****/
/* Clock with hour:minute (server hour is shown) */ /* Clock with hour:minute (server hour is shown) */
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\"" fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\""
" style=\"width:192px; height:96px;\">"); " style=\"width:160px; height:80px;\">");
Dat_ShowCurrentDateTime (); Dat_ShowCurrentDateTime ();
fprintf (Gbl.F.Out,"</td>"); // End of first column fprintf (Gbl.F.Out,"</td>"); // End of first column
/***** 2nd. row, 2nd. column: degree and course *****/ /***** 2nd. row, 2nd. column: degree and course *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\" style=\"height:96px;\">" fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\" style=\"height:80px;\">"
"<div class=\"CENTER_TOP\"" "<div class=\"CENTER_TOP\""
" style=\"padding-top:6px;\">"); " style=\"padding-top:5px;\">");
Deg_WriteCtyInsCtrDeg (); Deg_WriteCtyInsCtrDeg ();
Crs_WriteSelectorMyCourses (); Crs_WriteSelectorMyCourses ();
Deg_WriteBigNameCtyInsCtrDegCrs (); Deg_WriteBigNameCtyInsCtrDegCrs ();
@ -719,19 +719,19 @@ static void Lay_WritePageTopHeading (void)
/***** 2nd. row, 3rd. column *****/ /***** 2nd. row, 3rd. column *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\"" fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\""
" style=\"width:192px; height:96px;\">"); " style=\"width:160px; height:80px;\">");
if (Gbl.Usrs.Me.Logged) if (Gbl.Usrs.Me.Logged)
{ {
/* Number of new messages (not seen) */ /* Number of new messages (not seen) */
fprintf (Gbl.F.Out,"<div id=\"msg\"" // Used for AJAX based refresh fprintf (Gbl.F.Out,"<div id=\"msg\"" // Used for AJAX based refresh
" style=\"padding-top:12px;\">"); " style=\"padding-top:10px;\">");
Ntf_WriteNumberOfNewNtfs (); Ntf_WriteNumberOfNewNtfs ();
fprintf (Gbl.F.Out,"</div>"); // Used for AJAX based refresh fprintf (Gbl.F.Out,"</div>"); // Used for AJAX based refresh
} }
break; break;
case Lay_LAYOUT_MOBILE: case Lay_LAYOUT_MOBILE:
fprintf (Gbl.F.Out,"<td colspan=\"3\" class=\"CENTER_MIDDLE\"" fprintf (Gbl.F.Out,"<td colspan=\"3\" class=\"CENTER_MIDDLE\""
" style=\"height:48px;\">"); " style=\"height:40px;\">");
Deg_WriteCtyInsCtrDeg (); Deg_WriteCtyInsCtrDeg ();
Crs_WriteSelectorMyCourses (); Crs_WriteSelectorMyCourses ();
break; break;
@ -759,7 +759,7 @@ static void Lay_WritePageTopHeading (void)
if (Gbl.Prefs.SideCols & Lay_SHOW_RIGHT_COLUMN) // Right column visible if (Gbl.Prefs.SideCols & Lay_SHOW_RIGHT_COLUMN) // Right column visible
{ {
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"CENTER_TOP\"" fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"CENTER_TOP\""
" style=\"width:192px;\">"); " style=\"width:160px;\">");
Lay_ShowRightColumn (); Lay_ShowRightColumn ();
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
} }
@ -771,7 +771,7 @@ static void Lay_WritePageTopHeading (void)
if (Gbl.Prefs.SideCols & Lay_SHOW_LEFT_COLUMN) // Left column visible if (Gbl.Prefs.SideCols & Lay_SHOW_LEFT_COLUMN) // Left column visible
{ {
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\"" fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\""
" style=\"width:192px;\">"); " style=\"width:160px;\">");
Lay_ShowLeftColumn (); Lay_ShowLeftColumn ();
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
} }
@ -799,7 +799,7 @@ static void Lay_WriteTitleAction (void)
/***** Container start *****/ /***** Container start *****/
fprintf (Gbl.F.Out,"<div id=\"action_title\"" fprintf (Gbl.F.Out,"<div id=\"action_title\""
" style=\"background-image:url('%s/%s/%s64x64.gif');" " style=\"background-image:url('%s/%s/%s64x64.gif');"
" background-size:96px 96px;\">", " background-size:80px 80px;\">",
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION, Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,
Act_Actions[Act_Actions[Gbl.CurrentAct].SuperAction].Icon); Act_Actions[Act_Actions[Gbl.CurrentAct].SuperAction].Icon);
@ -826,10 +826,10 @@ static void Lay_ShowLeftColumn (void)
{ {
struct Act_ListMFUActions ListMFUActions; struct Act_ListMFUActions ListMFUActions;
fprintf (Gbl.F.Out,"<table style=\"width:192px;\">" fprintf (Gbl.F.Out,"<table style=\"width:160px;\">"
"<tr>" "<tr>"
"<td class=\"LEFT_TOP\">" "<td class=\"LEFT_TOP\">"
"<table style=\"width:192px; border-spacing:6px;\">"); "<table style=\"width:160px; border-spacing:5px;\">");
/***** Most frequently used actions *****/ /***** Most frequently used actions *****/
if (Gbl.Usrs.Me.Logged) if (Gbl.Usrs.Me.Logged)
@ -884,8 +884,8 @@ static void Lay_ShowRightColumn (void)
fprintf (Gbl.F.Out,"<table style=\"width:100%%;\">" fprintf (Gbl.F.Out,"<table style=\"width:100%%;\">"
"<tr>" "<tr>"
"<td class=\"RIGHT_TOP\">" "<td class=\"RIGHT_TOP\">"
"<table style=\"width:100%%; padding-top:84px;" "<table style=\"width:100%%; padding-top:70px;"
" border-spacing:6px;\">"); " border-spacing:5px;\">");
/***** Banners *****/ /***** Banners *****/
Ban_WriteMenuWithBanners (); Ban_WriteMenuWithBanners ();
@ -924,7 +924,7 @@ static void Lay_ShowRightColumn (void)
" target=\"_blank\" title=\"%s\">" " target=\"_blank\" title=\"%s\">"
"<img src=\"%s/SWADroid120x200.png\"" "<img src=\"%s/SWADroid120x200.png\""
" alt=\"SWADroid\" title=\"SWADroid\"" " alt=\"SWADroid\" title=\"SWADroid\""
" style=\"width:180px; height:300px;\" />" " style=\"width:150px; height:250px;\" />"
"</a>" "</a>"
"</td>" "</td>"
"</tr>", "</tr>",
@ -995,7 +995,7 @@ void Lay_PutIconWithText (const char *Icon,const char *Alt,const char *Text)
void Lay_PutCalculateIconWithText (const char *Alt,const char *Text) void Lay_PutCalculateIconWithText (const char *Alt,const char *Text)
{ {
fprintf (Gbl.F.Out,"<div class=\"ICON_HIGHLIGHT\"" fprintf (Gbl.F.Out,"<div class=\"ICON_HIGHLIGHT\""
" style=\"margin:0 7px; display:inline;\">" " style=\"margin:0 6px; display:inline;\">"
"<img id=\"update_%d\" src=\"%s/recycle16x16.gif\"" "<img id=\"update_%d\" src=\"%s/recycle16x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />" " class=\"ICON16x16\" />"
@ -1313,7 +1313,7 @@ void Lay_ShowAlert (Lay_AlertType_t MsgType,const char *Message)
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">"
"<div class=\"ALERT\"" "<div class=\"ALERT\""
" style=\"background-image:url('%s/%s16x16.gif');" " style=\"background-image:url('%s/%s16x16.gif');"
" background-size:24px 24px;\">" " background-size:20px 20px;\">"
"%s" "%s"
"</div>" "</div>"
"</div>", "</div>",
@ -1399,7 +1399,7 @@ void Lay_WritePageFooter (void)
Lay_WriteFootFromHTMLFile (); Lay_WriteFootFromHTMLFile ();
fprintf (Gbl.F.Out,"<div class=\"FOOT CENTER_MIDDLE\"" fprintf (Gbl.F.Out,"<div class=\"FOOT CENTER_MIDDLE\""
" style=\"padding-bottom:15px;\">"); " style=\"padding-bottom:12px;\">");
/***** Institution and centre hosting the platform *****/ /***** Institution and centre hosting the platform *****/
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"FOOT\" target=\"_blank\">" fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"FOOT\" target=\"_blank\">"
@ -1485,12 +1485,12 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
/***** Table start *****/ /***** Table start *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"%u\" class=\"CENTER_MIDDLE\">" "<td colspan=\"%u\" class=\"CENTER_MIDDLE\">"
"<table style=\"width:100%%; padding:15px;\">" "<table style=\"width:100%%; padding:12px;\">"
"<tr>", "<tr>",
NumColumns); NumColumns);
/***** First column: institution logo *****/ /***** First column: institution logo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:96px;\">"); fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:80px;\">");
if (InsCod > 0) if (InsCod > 0)
{ {
if (!PrintView) if (!PrintView)
@ -1537,7 +1537,7 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Third column: degree logo *****/ /***** Third column: degree logo *****/
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\" style=\"width:96px;\">"); fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\" style=\"width:80px;\">");
if (DegCod > 0) if (DegCod > 0)
{ {
if (!PrintView) if (!PrintView)
@ -1644,7 +1644,7 @@ void Lay_AdvertisementMobile (void)
if (!(rand () % Lay_SHOW_ADVERTISEMENT_ONE_TIME_OF_X)) if (!(rand () % Lay_SHOW_ADVERTISEMENT_ONE_TIME_OF_X))
{ {
fprintf (Gbl.F.Out,"<div style=\"margin-top:30px;\">"); fprintf (Gbl.F.Out,"<div style=\"margin-top:25px;\">");
/***** Table start *****/ /***** Table start *****/
Lay_StartRoundFrameTable (NULL,8,NULL); Lay_StartRoundFrameTable (NULL,8,NULL);
@ -1657,7 +1657,7 @@ void Lay_AdvertisementMobile (void)
"%s<br /><br />" "%s<br /><br />"
"<img src=\"%s/SWADroid200x300.png\"" "<img src=\"%s/SWADroid200x300.png\""
" alt=\"SWADroid\" title=\"%s\"" " alt=\"SWADroid\" title=\"%s\""
" style=\"width:300px; height:450px;\" />" " style=\"width:250px; height:375px;\" />"
"</a>" "</a>"
"</td>" "</td>"
"</tr>", "</tr>",

2
swad_link.c
View File

@ -111,7 +111,7 @@ void Lnk_WriteMenuWithInstitutionalLinks (void)
{ {
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"INS_LNK CENTER_MIDDLE\"" "<td class=\"INS_LNK CENTER_MIDDLE\""
" style=\"width:180px;\">" " style=\"width:150px;\">"
"<div id=\"institutional_links\">"); "<div id=\"institutional_links\">");
Lnk_WriteListOfLinks (); Lnk_WriteListOfLinks ();
fprintf (Gbl.F.Out,"</div>" fprintf (Gbl.F.Out,"</div>"

4
swad_menu.c
View File

@ -127,7 +127,7 @@ void Mnu_WriteVerticalMenuThisTabDesktop (void)
/***** Icon *****/ /***** Icon *****/
fprintf (Gbl.F.Out,"<div class=\"MENU_OPTION\"" fprintf (Gbl.F.Out,"<div class=\"MENU_OPTION\""
" style=\"background-image:url('%s/%s/%s64x64.gif');" " style=\"background-image:url('%s/%s/%s64x64.gif');"
" background-size:48px 48px;\"\">", " background-size:40px 40px;\">",
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION, Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,
Act_Actions[NumAct].Icon); Act_Actions[NumAct].Icon);
@ -277,7 +277,7 @@ void Mnu_WriteMenuThisTabMobile (void)
The_ClassMenuOff[Gbl.Prefs.Theme]); The_ClassMenuOff[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s/%s64x64.gif\"" fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s/%s64x64.gif\""
" alt=\"%s\" class=\"ICON64x64\"" " alt=\"%s\" class=\"ICON64x64\""
" style=\"margin:6px;\" />" " style=\"margin:5px;\" />"
"<div>%s</div>" "<div>%s</div>"
"</a>", "</a>",
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION, Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,

22
swad_message.c
View File

@ -2600,7 +2600,7 @@ static void Msg_ShowASentOrReceivedMessage (Msg_TypeOfMessages_t TypeOfMessages,
Txt_MSG_Unopened) : Txt_MSG_Unopened) :
Txt_MSG_Sent; Txt_MSG_Sent;
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s CENTER_TOP\" style=\"width:24px;\">" "<td class=\"%s CENTER_TOP\" style=\"width:20px;\">"
"<img src=\"%s/msg-%s16x16.gif\"" "<img src=\"%s/msg-%s16x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />", " class=\"ICON16x16\" />",
@ -2625,7 +2625,7 @@ static void Msg_ShowASentOrReceivedMessage (Msg_TypeOfMessages_t TypeOfMessages,
/***** Write message author *****/ /***** Write message author *****/
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
Msg_WriteMsgAuthor (&UsrDat,120,11, Msg_WriteMsgAuthor (&UsrDat,100,11,
Open ? "MSG_AUT_BG" : Open ? "MSG_AUT_BG" :
"MSG_AUT_BG_NEW", // Style "MSG_AUT_BG_NEW", // Style
true,NULL); true,NULL);
@ -2757,7 +2757,7 @@ void Msg_GetNotifMessage (char *SummaryStr,char **ContentStr,long MsgCod,unsigne
void Msg_WriteMsgNumber (unsigned long MsgNum,bool NewMsg) void Msg_WriteMsgNumber (unsigned long MsgNum,bool NewMsg)
{ {
fprintf (Gbl.F.Out,"<td class=\"%s CENTER_TOP\" style=\"width:54px;\">" fprintf (Gbl.F.Out,"<td class=\"%s CENTER_TOP\" style=\"width:45px;\">"
"%lu:" "%lu:"
"</td>", "</td>",
NewMsg ? "MSG_TIT_BG_NEW" : NewMsg ? "MSG_TIT_BG_NEW" :
@ -2824,7 +2824,7 @@ void Msg_WriteMsgAuthor (struct UsrData *UsrDat,unsigned WidthOfNameColumn,unsig
fprintf (Gbl.F.Out,"<td class=\"%s CENTER_TOP",Style); fprintf (Gbl.F.Out,"<td class=\"%s CENTER_TOP",Style);
if (BgColor) if (BgColor)
fprintf (Gbl.F.Out," %s",BgColor); fprintf (Gbl.F.Out," %s",BgColor);
fprintf (Gbl.F.Out,"\" style=\"width:36px;\">"); fprintf (Gbl.F.Out,"\" style=\"width:30px;\">");
/***** Write author name or don't write it? *****/ /***** Write author name or don't write it? *****/
if (Enabled) if (Enabled)
@ -2981,7 +2981,7 @@ static void Msg_WriteMsgFrom (struct UsrData *UsrDat,bool Deleted)
/***** Put an icon to show if user has read the message *****/ /***** Put an icon to show if user has read the message *****/
fprintf (Gbl.F.Out,"<table>" fprintf (Gbl.F.Out,"<table>"
"<tr>" "<tr>"
"<td class=\"LEFT_MIDDLE\" style=\"width:24px;\">" "<td class=\"LEFT_MIDDLE\" style=\"width:20px;\">"
"<img src=\"%s/%s16x16.gif\"" "<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />" " class=\"ICON16x16\" />"
@ -2995,7 +2995,7 @@ static void Msg_WriteMsgFrom (struct UsrData *UsrDat,bool Deleted)
Txt_MSG_Sent); Txt_MSG_Sent);
/***** Put user's photo *****/ /***** Put user's photo *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\" style=\"width:36px;\">"); fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\" style=\"width:30px;\">");
ShowPhoto = (Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL)); ShowPhoto = (Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL));
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL, NULL,
@ -3127,7 +3127,7 @@ static void Msg_WriteMsgTo (Msg_TypeOfMessages_t TypeOfMessages,long MsgCod)
(Deleted ? Txt_MSG_Deleted_without_opening : (Deleted ? Txt_MSG_Deleted_without_opening :
Txt_MSG_Unopened); Txt_MSG_Unopened);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LEFT_MIDDLE\" style=\"width:24px;\">" "<td class=\"LEFT_MIDDLE\" style=\"width:20px;\">"
"<img src=\"%s/%s16x16.gif\"" "<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />" " class=\"ICON16x16\" />"
@ -3140,7 +3140,7 @@ static void Msg_WriteMsgTo (Msg_TypeOfMessages_t TypeOfMessages,long MsgCod)
Title,Title); Title,Title);
/* Put user's photo */ /* Put user's photo */
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\" style=\"width:36px;\">"); fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\" style=\"width:30px;\">");
ShowPhoto = (UsrValid ? Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL) : ShowPhoto = (UsrValid ? Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL) :
false); false);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL : Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
@ -3212,7 +3212,7 @@ static void Msg_WriteMsgTo (Msg_TypeOfMessages_t TypeOfMessages,long MsgCod)
void Msg_WriteMsgDate (const char *DateTime,const char *ClassBackground) void Msg_WriteMsgDate (const char *DateTime,const char *ClassBackground)
{ {
/***** Start cell *****/ /***** Start cell *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\" style=\"width:127px;\">", fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\" style=\"width:106px;\">",
ClassBackground); ClassBackground);
/***** Write date and time (DateTime holds date and time in YYYYMMDDHHMMSS format) *****/ /***** Write date and time (DateTime holds date and time in YYYYMMDDHHMMSS format) *****/
@ -3308,7 +3308,7 @@ static void Msg_PutFormToBanSender (struct UsrData *UsrDat)
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/open_on16x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" style=\"margin-left:15px;\" />", " class=\"ICON16x16\" style=\"margin-left:12px;\" />",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
Txt_Sender_permitted_click_to_ban_him, Txt_Sender_permitted_click_to_ban_him,
Txt_Sender_permitted_click_to_ban_him); Txt_Sender_permitted_click_to_ban_him);
@ -3518,7 +3518,7 @@ void Msg_ListBannedUsrs (void)
/* Show photo */ /* Show photo */
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\"" fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\""
" style=\"width:36px;\">"); " style=\"width:30px;\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL : Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL, NULL,

10
swad_network.c
View File

@ -164,7 +164,7 @@ void Net_ShowWebsAndSocialNets (const struct UsrData *UsrDat)
char URL[Cns_MAX_BYTES_URL+1]; char URL[Cns_MAX_BYTES_URL+1];
/***** Start container *****/ /***** Start container *****/
fprintf (Gbl.F.Out,"<div style=\"width:216px; margin:0 auto;\">"); fprintf (Gbl.F.Out,"<div style=\"width:180px; margin:0 auto;\">");
/***** Show link to public profile *****/ /***** Show link to public profile *****/
Net_ShowAWebOrSocialNet (Prf_GetURLPublicProfile (URL,UsrDat->Nickname), Net_ShowAWebOrSocialNet (Prf_GetURLPublicProfile (URL,UsrDat->Nickname),
@ -227,7 +227,7 @@ static void Net_ShowAWebOrSocialNet (const char *URL,
/********************* Show form to edit my social networks ******************/ /********************* Show form to edit my social networks ******************/
/*****************************************************************************/ /*****************************************************************************/
#define Net_COL2_WIDTH 600 #define Net_COL2_WIDTH 500
void Net_ShowFormMyWebsAndSocialNets (void) void Net_ShowFormMyWebsAndSocialNets (void)
{ {
@ -274,7 +274,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
"<img src=\"%s/%s16x16.gif\"" "<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\"" " class=\"ICON16x16\""
" style=\"margin-right:15px;\" />" " style=\"margin-right:12px;\" />"
"%s:</td>" "%s:</td>"
"<td class=\"LEFT_MIDDLE\" style=\"width:%upx;\">", "<td class=\"LEFT_MIDDLE\" style=\"width:%upx;\">",
The_ClassForm[Gbl.Prefs.Theme], The_ClassForm[Gbl.Prefs.Theme],
@ -286,7 +286,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
Act_FormStart (ActChgMyNet); Act_FormStart (ActChgMyNet);
Par_PutHiddenParamUnsigned ("Web",(unsigned) NumURL); Par_PutHiddenParamUnsigned ("Web",(unsigned) NumURL);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"URL\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"URL\""
" style=\"width:600px;\" maxlength=\"%u\" value=\"%s\"" " style=\"width:500px;\" maxlength=\"%u\" value=\"%s\""
" onchange=\"javascript:document.getElementById('%s').submit();\" />", " onchange=\"javascript:document.getElementById('%s').submit();\" />",
Cns_MAX_LENGTH_URL,URL, Cns_MAX_LENGTH_URL,URL,
Gbl.FormId); Gbl.FormId);
@ -492,7 +492,7 @@ void Net_ShowWebAndSocialNetworksStats (void)
"<img src=\"%s/%s16x16.gif\"" "<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\"" " class=\"ICON16x16\""
" style=\"margin-right:15px;\" />" " style=\"margin-right:12px;\" />"
"%s</td>" "%s</td>"
"<td class=\"DAT RIGHT_MIDDLE\">" "<td class=\"DAT RIGHT_MIDDLE\">"
"%u" "%u"

6
swad_notice.c
View File

@ -51,8 +51,8 @@ extern struct Globals Gbl;
const unsigned Not_ContainerWidth[Not_NUM_TYPES_LISTING] = const unsigned Not_ContainerWidth[Not_NUM_TYPES_LISTING] =
{ {
150, // Not_LIST_BRIEF_NOTICES 125, // Not_LIST_BRIEF_NOTICES
600, // Not_LIST_FULL_NOTICES 500, // Not_LIST_FULL_NOTICES
}; };
const unsigned Not_MaxCharsURLOnScreen[Not_NUM_TYPES_LISTING] = const unsigned Not_MaxCharsURLOnScreen[Not_NUM_TYPES_LISTING] =
@ -380,7 +380,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
if (NumNotices) if (NumNotices)
{ {
sprintf (StrWidth,"%upx", sprintf (StrWidth,"%upx",
Not_ContainerWidth[Not_LIST_FULL_NOTICES] + 60); Not_ContainerWidth[Not_LIST_FULL_NOTICES] + 50);
Lay_StartRoundFrameTable (StrWidth,2,Txt_All_notices); Lay_StartRoundFrameTable (StrWidth,2,Txt_All_notices);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"CENTER_TOP\">"); "<td class=\"CENTER_TOP\">");

4
swad_notification.c
View File

@ -429,7 +429,7 @@ void Ntf_ShowMyNotifications (void)
/***** Write row for this notification *****/ /***** Write row for this notification *****/
/* Write event icon */ /* Write event icon */
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s LEFT_TOP\" style=\"width:30px;\">", "<td class=\"%s LEFT_TOP\" style=\"width:25px;\">",
ClassBackground); ClassBackground);
if (PutLink) if (PutLink)
{ {
@ -551,7 +551,7 @@ void Ntf_ShowMyNotifications (void)
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\"></td>" "<td colspan=\"2\"></td>"
"<td colspan=\"5\" class=\"DAT LEFT_TOP\"" "<td colspan=\"5\" class=\"DAT LEFT_TOP\""
" style=\"padding-bottom:15px;\">" " style=\"padding-bottom:12px;\">"
"%s" "%s"
"</td>" "</td>"
"</tr>", "</tr>",

2
swad_pagination.c
View File

@ -188,7 +188,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
if (Pagination->MoreThanOnePage) if (Pagination->MoreThanOnePage)
{ {
/***** Links to several pages start here *****/ /***** Links to several pages start here *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:7px;\">" fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:6px;\">"
"<tr>" "<tr>"
"<td class=\"%s LEFT_MIDDLE\">" "<td class=\"%s LEFT_MIDDLE\">"
"[" "["

2
swad_password.c
View File

@ -884,7 +884,7 @@ void Pwd_AskForConfirmationOnDangerousAction (void)
extern const char *Txt_I_understand_that_this_action_may_have_serious_consequences_and_can_not_be_undone; extern const char *Txt_I_understand_that_this_action_may_have_serious_consequences_and_can_not_be_undone;
extern const char *Txt_For_security_enter_your_password; extern const char *Txt_For_security_enter_your_password;
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\" style=\"margin:15px;\">" fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\" style=\"margin:12px;\">"
"<input type=\"checkbox\" name=\"Consent\" value=\"Y\" />" "<input type=\"checkbox\" name=\"Consent\" value=\"Y\" />"
"<span class=\"%s\">%s</span><br />" "<span class=\"%s\">%s</span><br />"
"<span class=\"%s\">%s: </span>" "<span class=\"%s\">%s: </span>"

12
swad_photo.c
View File

@ -2261,14 +2261,14 @@ static void Pho_ShowDegreeAvgPhotoAndStat (struct Degree *Deg,Pho_AvgPhotoSeeOrP
/*****************************************************************************/ /*****************************************************************************/
/******** Compute photo width and height for class photo of degrees **********/ /******** Compute photo width and height for class photo of degrees **********/
/*****************************************************************************/ /*****************************************************************************/
#define MIN_WIDTH_PHOTO 12 #define MIN_WIDTH_PHOTO 10
#define MIN_HEIGHT_PHOTO 18 #define MIN_HEIGHT_PHOTO 15
#define MIN_PIXELS_PHOTO (MIN_WIDTH_PHOTO * MIN_HEIGHT_PHOTO) #define MIN_PIXELS_PHOTO (MIN_WIDTH_PHOTO * MIN_HEIGHT_PHOTO)
#define DEF_WIDTH_PHOTO 54 #define DEF_WIDTH_PHOTO 45
#define DEF_HEIGHT_PHOTO 72 #define DEF_HEIGHT_PHOTO 60
#define DEF_PIXELS_PHOTO (DEF_WIDTH_PHOTO * DEF_HEIGHT_PHOTO) #define DEF_PIXELS_PHOTO (DEF_WIDTH_PHOTO * DEF_HEIGHT_PHOTO)
#define MAX_WIDTH_PHOTO 108 #define MAX_WIDTH_PHOTO 90
#define MAX_HEIGHT_PHOTO 144 #define MAX_HEIGHT_PHOTO 120
#define MAX_PIXELS_PHOTO (MAX_WIDTH_PHOTO * MAX_HEIGHT_PHOTO) #define MAX_PIXELS_PHOTO (MAX_WIDTH_PHOTO * MAX_HEIGHT_PHOTO)
static void Pho_ComputePhotoSize (int NumStds,int NumStdsWithPhoto,unsigned *PhotoWidth,unsigned *PhotoHeight) static void Pho_ComputePhotoSize (int NumStds,int NumStdsWithPhoto,unsigned *PhotoWidth,unsigned *PhotoHeight)

4
swad_photo.h
View File

@ -31,8 +31,8 @@
/************************* Public types and constants ************************/ /************************* Public types and constants ************************/
/*****************************************************************************/ /*****************************************************************************/
#define Pho_PHOTO_REAL_WIDTH 225 #define Pho_PHOTO_REAL_WIDTH 186
#define Pho_PHOTO_REAL_HEIGHT 300 #define Pho_PHOTO_REAL_HEIGHT 248
/***** Zoom? *****/ /***** Zoom? *****/
typedef enum typedef enum

8
swad_plugin.c
View File

@ -99,7 +99,7 @@ void Plg_ListPlugins (void)
/***** Write table heading *****/ /***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<th style=\"width:48px;\">" "<th style=\"width:40px;\">"
"</th>" "</th>"
"<th class=\"LEFT_MIDDLE\">" "<th class=\"LEFT_MIDDLE\">"
"%s" "%s"
@ -119,7 +119,7 @@ void Plg_ListPlugins (void)
/* Plugin logo */ /* Plugin logo */
// TODO: Change plugin icons to 32x32 // TODO: Change plugin icons to 32x32
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT LEFT_MIDDLE\" style=\"width:54px;\">" "<td class=\"DAT LEFT_MIDDLE\" style=\"width:45px;\">"
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">" "<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">"
"<img src=\"%s/%s/%s24x24.gif\"" "<img src=\"%s/%s/%s24x24.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
@ -383,7 +383,7 @@ static void Plg_ListPluginsForEdition (void)
/* Plugin logo */ /* Plugin logo */
// TODO: Change plugin icons to 32x32 // TODO: Change plugin icons to 32x32
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\" style=\"width:54px;\">" fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\" style=\"width:45px;\">"
"<img src=\"%s/%s/%s24x24.gif\"" "<img src=\"%s/%s/%s24x24.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON32x32\" />" " class=\"ICON32x32\" />"
@ -929,7 +929,7 @@ static void Plg_PutHeadPlugins (void)
"<th class=\"RIGHT_MIDDLE\">" "<th class=\"RIGHT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"
"<th style=\"width:42px;\"></th>" "<th style=\"width:35px;\"></th>"
"<th class=\"LEFT_MIDDLE\">" "<th class=\"LEFT_MIDDLE\">"
"%s" "%s"
"</th>" "</th>"

10
swad_preference.c
View File

@ -73,7 +73,7 @@ void Pre_EditPrefs (void)
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
/***** Layout, side columns, theme, icon set & menu *****/ /***** Layout, side columns, theme, icon set & menu *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:20px 0;\">" fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:16px 0;\">"
"<tr>" "<tr>"
"<td>"); "<td>");
Lay_PutIconsToSelectLayout (); // 1. Layout Lay_PutIconsToSelectLayout (); // 1. Layout
@ -89,7 +89,7 @@ void Pre_EditPrefs (void)
} }
fprintf (Gbl.F.Out,"</tr>" fprintf (Gbl.F.Out,"</tr>"
"</table>" "</table>"
"<table style=\"margin:0 auto; border-spacing:20px 0;\">" "<table style=\"margin:0 auto; border-spacing:16px 0;\">"
"<tr>" "<tr>"
"<td>"); "<td>");
The_PutIconsToSelectTheme (); // 4. Theme The_PutIconsToSelectTheme (); // 4. Theme
@ -229,8 +229,8 @@ void Pre_PutSelectorToSelectLanguage (void)
Txt_Language_t Lan; Txt_Language_t Lan;
static const unsigned SelectorWidth[Lay_NUM_LAYOUTS] = static const unsigned SelectorWidth[Lay_NUM_LAYOUTS] =
{ {
135, // Lay_LAYOUT_DESKTOP 112, // Lay_LAYOUT_DESKTOP
180, // Lay_LAYOUT_MOBILE 150, // Lay_LAYOUT_MOBILE
}; };
Act_FormStart (ActReqChgLan); Act_FormStart (ActReqChgLan);
@ -356,7 +356,7 @@ static void Pre_PutIconsToSelectSideCols (void)
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/layout%u%u_32x20.gif\"" fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/layout%u%u_32x20.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" style=\"display:block;" " style=\"display:block;"
" width:48px; height:30px;\" />", " width:40px; height:25px;\" />",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
SideCols >> 1,SideCols & 1, SideCols >> 1,SideCols & 1,
Txt_LAYOUT_SIDE_COLUMNS[SideCols], Txt_LAYOUT_SIDE_COLUMNS[SideCols],

21
swad_profile.c
View File

@ -327,15 +327,8 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
// char StrTimeGenerationInMicroseconds[64]; // char StrTimeGenerationInMicroseconds[64];
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 15px;\">"); fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 12px;\">");
/*
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
{
Sta_ComputeTimeToGeneratePage ();
Sta_WriteTime (StrTimeGenerationInMicroseconds,Gbl.TimeGenerationInMicroseconds);
fprintf (Gbl.F.Out,"<tr><td>%s</td></tr>",StrTimeGenerationInMicroseconds);
}
*/
/***** Number of courses in which the user is teacher or student *****/ /***** Number of courses in which the user is teacher or student *****/
if ((NumCrssUsrIsTeacher = Usr_GetNumCrssOfUsrWithARole (UsrDat->UsrCod,Rol_TEACHER))) if ((NumCrssUsrIsTeacher = Usr_GetNumCrssOfUsrWithARole (UsrDat->UsrCod,Rol_TEACHER)))
{ {
@ -1319,7 +1312,7 @@ void Prf_ShowRankingFigure (const char *Query)
fprintf (Gbl.F.Out,"<tr>"); fprintf (Gbl.F.Out,"<tr>");
Prf_ShowUsrInRanking (&UsrDat,Rank); Prf_ShowUsrInRanking (&UsrDat,Rank);
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE COLOR%u\"" fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE COLOR%u\""
" style=\"height:60px;\">" " style=\"height:50px;\">"
"%ld" "%ld"
"</td>" "</td>"
"</tr>", "</tr>",
@ -1464,7 +1457,7 @@ void Prf_GetAndShowRankingClicksPerDay (void)
fprintf (Gbl.F.Out,"<tr>"); fprintf (Gbl.F.Out,"<tr>");
Prf_ShowUsrInRanking (&UsrDat,Rank); Prf_ShowUsrInRanking (&UsrDat,Rank);
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE COLOR%u\"" fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE COLOR%u\""
" style=\"height:60px;\">", " style=\"height:50px;\">",
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
Str_WriteFloatNum (NumClicksPerDay); Str_WriteFloatNum (NumClicksPerDay);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
@ -1493,11 +1486,11 @@ void Prf_ShowUsrInRanking (const struct UsrData *UsrDat,unsigned Rank)
bool Visible = Pri_ShowIsAllowed (UsrDat->ProfileVisibility,UsrDat->UsrCod); bool Visible = Pri_ShowIsAllowed (UsrDat->ProfileVisibility,UsrDat->UsrCod);
fprintf (Gbl.F.Out,"<td class=\"RANK RIGHT_MIDDLE COLOR%u\"" fprintf (Gbl.F.Out,"<td class=\"RANK RIGHT_MIDDLE COLOR%u\""
" style=\"height:60px;\">" " style=\"height:50px;\">"
"#%u" "#%u"
"</td>" "</td>"
"<td class=\"COLOR%u\"" "<td class=\"COLOR%u\""
" style=\"width:42px; height:60px;\">", " style=\"width:35px; height:50px;\">",
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
Rank, Rank,
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
@ -1513,7 +1506,7 @@ void Prf_ShowUsrInRanking (const struct UsrData *UsrDat,unsigned Rank)
} }
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"<td class=\"COLOR%u\" style=\"height:60px;\">", "<td class=\"COLOR%u\" style=\"height:50px;\">",
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
/***** Put form to go to public profile *****/ /***** Put form to go to public profile *****/

32
swad_record.c
View File

@ -209,7 +209,7 @@ void Rec_ListFieldsRecordsForEdition (void)
Act_FormStart (ActRenFie); Act_FormStart (ActRenFie);
Par_PutHiddenParamLong ("FieldCod",Gbl.CurrentCrs.Records.LstFields.Lst[NumField].FieldCod); Par_PutHiddenParamLong ("FieldCod",Gbl.CurrentCrs.Records.LstFields.Lst[NumField].FieldCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FieldName\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FieldName\""
" style=\"width:600px;\" maxlength=\"%u\" value=\"%s\"" " style=\"width:500px;\" maxlength=\"%u\" value=\"%s\""
" onchange=\"javascript:document.getElementById('%s').submit();\" />", " onchange=\"javascript:document.getElementById('%s').submit();\" />",
Rec_MAX_LENGTH_NAME_FIELD, Rec_MAX_LENGTH_NAME_FIELD,
Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Name, Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Name,
@ -282,7 +282,7 @@ void Rec_ShowFormCreateRecordField (void)
/***** Field name *****/ /***** Field name *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<input type=\"text\" name=\"FieldName\"" "<input type=\"text\" name=\"FieldName\""
" style=\"width:600px;\" maxlength=\"%u\" value=\"%s\" />" " style=\"width:500px;\" maxlength=\"%u\" value=\"%s\" />"
"</td>", "</td>",
Rec_MAX_LENGTH_NAME_FIELD,Gbl.CurrentCrs.Records.Field.Name); Rec_MAX_LENGTH_NAME_FIELD,Gbl.CurrentCrs.Records.Field.Name);
@ -915,7 +915,7 @@ void Rec_ListRecordsGsts (void)
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) // Get from the database the data of the student if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) // Get from the database the data of the student
{ {
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\"" fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
" style=\"margin-bottom:15px;"); " style=\"margin-bottom:12px;");
if (Gbl.CurrentAct == ActPrnRecSevGst && if (Gbl.CurrentAct == ActPrnRecSevGst &&
NumUsrs != 0 && NumUsrs != 0 &&
(NumUsrs % Gbl.Usrs.Listing.RecsPerPag) == 0) (NumUsrs % Gbl.Usrs.Listing.RecsPerPag) == 0)
@ -1082,7 +1082,7 @@ void Rec_ListRecordsStds (void)
true); true);
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\"" fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
" style=\"margin-bottom:15px;"); " style=\"margin-bottom:12px;");
if (Gbl.CurrentAct == ActPrnRecSevStd && if (Gbl.CurrentAct == ActPrnRecSevStd &&
NumUsrs != 0 && NumUsrs != 0 &&
(NumUsrs % Gbl.Usrs.Listing.RecsPerPag) == 0) (NumUsrs % Gbl.Usrs.Listing.RecsPerPag) == 0)
@ -1169,7 +1169,7 @@ static void Rec_ShowRecordOneTchCrs (void)
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\"" fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
" style=\"margin-bottom:15px;\">"); " style=\"margin-bottom:12px;\">");
/* Common record */ /* Common record */
Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat); Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
@ -1258,7 +1258,7 @@ void Rec_ListRecordsTchs (void)
true); true);
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\"" fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
" style=\"margin-bottom:15px;"); " style=\"margin-bottom:12px;");
if (Gbl.CurrentAct == ActPrnRecSevTch && if (Gbl.CurrentAct == ActPrnRecSevTch &&
NumUsrs != 0 && NumUsrs != 0 &&
(NumUsrs % Gbl.Usrs.Listing.RecsPerPag) == 0) (NumUsrs % Gbl.Usrs.Listing.RecsPerPag) == 0)
@ -1348,7 +1348,7 @@ static void Rec_WriteFormShowOfficeHours (bool ShowOfficeHours,const char *ListU
Par_PutHiddenParamChar ("ParamOfficeHours",'Y'); Par_PutHiddenParamChar ("ParamOfficeHours",'Y');
/***** End form *****/ /***** End form *****/
fprintf (Gbl.F.Out,"<div style=\"margin:0 7px; display:inline;\">" fprintf (Gbl.F.Out,"<div style=\"margin:0 6px; display:inline;\">"
"<input type=\"checkbox\" name=\"ShowOfficeHours\" value=\"Y\""); "<input type=\"checkbox\" name=\"ShowOfficeHours\" value=\"Y\"");
if (ShowOfficeHours) if (ShowOfficeHours)
fprintf (Gbl.F.Out," checked=\"checked\""); fprintf (Gbl.F.Out," checked=\"checked\"");
@ -1608,7 +1608,7 @@ void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat)
if (ICanEdit) // Show with form if (ICanEdit) // Show with form
{ {
fprintf (Gbl.F.Out,"<textarea name=\"Field%ld\" rows=\"%u\"" fprintf (Gbl.F.Out,"<textarea name=\"Field%ld\" rows=\"%u\""
" style=\"width:540px;\">", " style=\"width:450px;\">",
Gbl.CurrentCrs.Records.LstFields.Lst[NumField].FieldCod, Gbl.CurrentCrs.Records.LstFields.Lst[NumField].FieldCod,
Gbl.CurrentCrs.Records.LstFields.Lst[NumField].NumLines); Gbl.CurrentCrs.Records.LstFields.Lst[NumField].NumLines);
if (ThisFieldHasText) if (ThisFieldHasText)
@ -2187,7 +2187,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
if (PutFormLinks && Gbl.Usrs.Me.Logged) if (PutFormLinks && Gbl.Usrs.Me.Logged)
{ {
fprintf (Gbl.F.Out,"<div style=\"width:30px; margin:9px auto;\">"); fprintf (Gbl.F.Out,"<div style=\"width:25px; margin:8px auto;\">");
/***** Button to edit my record card *****/ /***** Button to edit my record card *****/
if (ItsMe) if (ItsMe)
@ -3385,7 +3385,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
Lay_ShowAlert (Lay_WARNING,Txt_Please_fill_in_your_centre_and_department); Lay_ShowAlert (Lay_WARNING,Txt_Please_fill_in_your_centre_and_department);
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable ("840px",3, Lay_StartRoundFrameTable ("700px",3,
IAmTeacher ? Txt_Institution_centre_and_department : IAmTeacher ? Txt_Institution_centre_and_department :
Txt_Institution); Txt_Institution);
@ -3407,7 +3407,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
/* Start form to select the country of my institution */ /* Start form to select the country of my institution */
Act_FormGoToStart (ActChgCtyMyIns); Act_FormGoToStart (ActChgCtyMyIns);
fprintf (Gbl.F.Out,"<select name=\"OthCtyCod\" style=\"width:600px;\"" fprintf (Gbl.F.Out,"<select name=\"OthCtyCod\" style=\"width:500px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">" " onchange=\"javascript:document.getElementById('%s').submit();\">"
"<option value=\"-1\"", "<option value=\"-1\"",
Gbl.FormId); Gbl.FormId);
@ -3446,7 +3446,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
/* Start form to select institution */ /* Start form to select institution */
Act_FormGoToStart (ActChgMyIns); Act_FormGoToStart (ActChgMyIns);
fprintf (Gbl.F.Out,"<select name=\"OthInsCod\" style=\"width:600px;\"" fprintf (Gbl.F.Out,"<select name=\"OthInsCod\" style=\"width:500px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">" " onchange=\"javascript:document.getElementById('%s').submit();\">"
"<option value=\"-1\"", "<option value=\"-1\"",
Gbl.FormId); Gbl.FormId);
@ -3492,7 +3492,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
/* Start form to select centre */ /* Start form to select centre */
Act_FormGoToStart (ActChgMyCtr); Act_FormGoToStart (ActChgMyCtr);
fprintf (Gbl.F.Out,"<select name=\"OthCtrCod\" style=\"width:600px;\"" fprintf (Gbl.F.Out,"<select name=\"OthCtrCod\" style=\"width:500px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">" " onchange=\"javascript:document.getElementById('%s').submit();\">"
"<option value=\"-1\"", "<option value=\"-1\"",
Gbl.FormId); Gbl.FormId);
@ -3536,7 +3536,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
/* Start form to select department */ /* Start form to select department */
Act_FormGoToStart (ActChgMyDpt); Act_FormGoToStart (ActChgMyDpt);
fprintf (Gbl.F.Out,"<select name=\"DptCod\" style=\"width:600px;\"" fprintf (Gbl.F.Out,"<select name=\"DptCod\" style=\"width:500px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">" " onchange=\"javascript:document.getElementById('%s').submit();\">"
"<option value=\"-1\"", "<option value=\"-1\"",
Gbl.FormId); Gbl.FormId);
@ -3575,7 +3575,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
Act_FormGoToStart (ActChgMyOff); Act_FormGoToStart (ActChgMyOff);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Office\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Office\""
" maxlength=\"%u\" value=\"%s\"" " maxlength=\"%u\" value=\"%s\""
" style=\"width:600px;\"" " style=\"width:500px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\" />", " onchange=\"javascript:document.getElementById('%s').submit();\" />",
Cns_MAX_LENGTH_STRING, Cns_MAX_LENGTH_STRING,
Gbl.Usrs.Me.UsrDat.Tch.Office, Gbl.Usrs.Me.UsrDat.Tch.Office,
@ -3595,7 +3595,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
Act_FormGoToStart (ActChgMyOffPho); Act_FormGoToStart (ActChgMyOffPho);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"OfficePhone\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"OfficePhone\""
" maxlength=\"%u\" value=\"%s\"" " maxlength=\"%u\" value=\"%s\""
" style=\"width:600px;\"" " style=\"width:500px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\" />", " onchange=\"javascript:document.getElementById('%s').submit();\" />",
Usr_MAX_LENGTH_PHONE, Usr_MAX_LENGTH_PHONE,
Gbl.Usrs.Me.UsrDat.Tch.OfficePhone, Gbl.Usrs.Me.UsrDat.Tch.OfficePhone,

20
swad_record.h
View File

@ -35,17 +35,17 @@
/***************************** Public constants ******************************/ /***************************** Public constants ******************************/
/*****************************************************************************/ /*****************************************************************************/
#define Rec_RECORD_WIDTH_WIDE 840 #define Rec_RECORD_WIDTH_WIDE 700
#define Rec_C1_TOP_WIDE 78 #define Rec_C1_TOP_WIDE 65
#define Rec_C2_TOP_WIDE 531 #define Rec_C2_TOP_WIDE 442
#define Rec_C3_TOP_WIDE 231 #define Rec_C3_TOP_WIDE 192
#define Rec_C1_BOTTOM_WIDE (240-3) #define Rec_C1_BOTTOM_WIDE (200-2)
#define Rec_C2_BOTTOM_WIDE (600-3) #define Rec_C2_BOTTOM_WIDE (500-2)
#define Rec_RECORD_WIDTH_NARROW 690 #define Rec_RECORD_WIDTH_NARROW 575
#define Rec_C1_TOP_NARROW 78 #define Rec_C1_TOP_NARROW 65
#define Rec_C2_TOP_NARROW 381 #define Rec_C2_TOP_NARROW 317
#define Rec_C3_TOP_NARROW 231 #define Rec_C3_TOP_NARROW 192
#define Rec_MAX_LENGTH_NAME_FIELD 255 #define Rec_MAX_LENGTH_NAME_FIELD 255
#define Rec_MIN_LINES_IN_EDITION_FIELD 1 #define Rec_MIN_LINES_IN_EDITION_FIELD 1

4
swad_role.c
View File

@ -288,8 +288,8 @@ void Rol_PutFormToChangeMyRole (bool FormInHead)
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
static const unsigned SelectorWidth[Lay_NUM_LAYOUTS] = static const unsigned SelectorWidth[Lay_NUM_LAYOUTS] =
{ {
135, // Lay_LAYOUT_DESKTOP 112, // Lay_LAYOUT_DESKTOP
135, // Lay_LAYOUT_MOBILE 112, // Lay_LAYOUT_MOBILE
}; };
Rol_Role_t Role; Rol_Role_t Role;

2
swad_search.c
View File

@ -250,7 +250,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
/***** What to search? *****/ /***** What to search? *****/
fprintf (Gbl.F.Out,"<select name=\"WhatToSearch\" style=\"width:225px;\">"); fprintf (Gbl.F.Out,"<select name=\"WhatToSearch\" style=\"width:186px;\">");
for (WhatToSearch = (Sch_WhatToSearch_t) 0; for (WhatToSearch = (Sch_WhatToSearch_t) 0;
WhatToSearch < Sch_NUM_WHAT_TO_SEARCH; WhatToSearch < Sch_NUM_WHAT_TO_SEARCH;
WhatToSearch++) WhatToSearch++)

73
swad_statistic.c
View File

@ -570,7 +570,7 @@ void Sta_AskSeeGblAccesses (void)
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)) Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM))
{ {
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\"" fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
" style=\"padding-bottom:15px;\">"); " style=\"padding-bottom:12px;\">");
Sta_PutFormToRequestAccessesCrs (); Sta_PutFormToRequestAccessesCrs ();
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -706,7 +706,8 @@ static void Sta_WriteSelectorAction (void)
"%s:" "%s:"
"</td>" "</td>"
"<td class=\"LEFT_TOP\">" "<td class=\"LEFT_TOP\">"
"<select name=\"StatAct\" id=\"StatAct\" style=\"width:450px;\">", "<select name=\"StatAct\" id=\"StatAct\""
" style=\"width:375px;\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Action); The_ClassForm[Gbl.Prefs.Theme],Txt_Action);
for (NumAction = (Act_Action_t) 0; for (NumAction = (Act_Action_t) 0;
NumAction < Act_NUM_ACTIONS; NumAction < Act_NUM_ACTIONS;
@ -1827,7 +1828,7 @@ static void Sta_ShowNumAccessesPerUsr (unsigned long NumRows,MYSQL_RES *mysql_re
MaxPagesGenerated = NumPagesGenerated; MaxPagesGenerated = NumPagesGenerated;
if (MaxPagesGenerated > 0.0) if (MaxPagesGenerated > 0.0)
{ {
BarWidth = (unsigned) (((NumPagesGenerated * 450.0) / MaxPagesGenerated) + 0.5); BarWidth = (unsigned) (((NumPagesGenerated * 375.0) / MaxPagesGenerated) + 0.5);
if (BarWidth == 0) if (BarWidth == 0)
BarWidth = 1; BarWidth = 1;
} }
@ -1839,7 +1840,7 @@ static void Sta_ShowNumAccessesPerUsr (unsigned long NumRows,MYSQL_RES *mysql_re
fprintf (Gbl.F.Out,"<img src=\"%s/%c1x14.gif\"" fprintf (Gbl.F.Out,"<img src=\"%s/%c1x14.gif\""
" alt=\"\" title=\"\"" " alt=\"\" title=\"\""
" class=\"LEFT_TOP\"" " class=\"LEFT_TOP\""
" style=\"width:%upx; height:21px;\" />" " style=\"width:%upx; height:18px;\" />"
"&nbsp;", "&nbsp;",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? 'c' : UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? 'c' :
@ -1949,7 +1950,7 @@ static void Sta_ShowNumAccessesPerDays (unsigned long NumRows,MYSQL_RES *mysql_r
'c', 'c',
D == NumDaysFromLastDateToCurrDate ? NumPagesGenerated : D == NumDaysFromLastDateToCurrDate ? NumPagesGenerated :
0.0, 0.0,
MaxPagesGenerated,TotalPagesGenerated,600); MaxPagesGenerated,TotalPagesGenerated,500);
/* Decrease day */ /* Decrease day */
Dat_GetDateBefore (&Date,&Date); Dat_GetDateBefore (&Date,&Date);
@ -1986,7 +1987,7 @@ static void Sta_ShowNumAccessesPerDays (unsigned long NumRows,MYSQL_RES *mysql_r
/* Draw bar proportional to number of pages generated */ /* Draw bar proportional to number of pages generated */
Sta_DrawBarNumClicks (NumDayWeek == 6 ? 'r' : Sta_DrawBarNumClicks (NumDayWeek == 6 ? 'r' :
'c', 'c',
0.0,MaxPagesGenerated,TotalPagesGenerated,600); 0.0,MaxPagesGenerated,TotalPagesGenerated,500);
/* Decrease day */ /* Decrease day */
Dat_GetDateBefore (&Date,&Date); Dat_GetDateBefore (&Date,&Date);
@ -1997,7 +1998,7 @@ static void Sta_ShowNumAccessesPerDays (unsigned long NumRows,MYSQL_RES *mysql_r
/************ Show graphic of number of pages generated per hour *************/ /************ Show graphic of number of pages generated per hour *************/
/*****************************************************************************/ /*****************************************************************************/
#define GRAPH_DISTRIBUTION_PER_HOUR_HOUR_WIDTH 30 #define GRAPH_DISTRIBUTION_PER_HOUR_HOUR_WIDTH 25
#define GRAPH_DISTRIBUTION_PER_HOUR_TOTAL_WIDTH (GRAPH_DISTRIBUTION_PER_HOUR_HOUR_WIDTH*24) #define GRAPH_DISTRIBUTION_PER_HOUR_TOTAL_WIDTH (GRAPH_DISTRIBUTION_PER_HOUR_HOUR_WIDTH*24)
static void Sta_ShowDistrAccessesPerDaysAndHour (unsigned long NumRows,MYSQL_RES *mysql_res) static void Sta_ShowDistrAccessesPerDaysAndHour (unsigned long NumRows,MYSQL_RES *mysql_res)
@ -2514,7 +2515,7 @@ static void Sta_ShowNumAccessesPerWeeks (unsigned long NumRows,MYSQL_RES *mysql_
Sta_DrawBarNumClicks ('c', Sta_DrawBarNumClicks ('c',
W == NumWeeksBetweenLastDateAndCurrentDate ? NumPagesGenerated : W == NumWeeksBetweenLastDateAndCurrentDate ? NumPagesGenerated :
0.0, 0.0,
MaxPagesGenerated,TotalPagesGenerated,600); MaxPagesGenerated,TotalPagesGenerated,500);
/* Decrement week */ /* Decrement week */
Dat_GetWeekBefore (&Date,&Date); Dat_GetWeekBefore (&Date,&Date);
@ -2537,7 +2538,7 @@ static void Sta_ShowNumAccessesPerWeeks (unsigned long NumRows,MYSQL_RES *mysql_
Date.Week,Date.Year % 100); Date.Week,Date.Year % 100);
/* Draw bar proportional to number of pages generated */ /* Draw bar proportional to number of pages generated */
Sta_DrawBarNumClicks ('c',0.0,MaxPagesGenerated,TotalPagesGenerated,600); Sta_DrawBarNumClicks ('c',0.0,MaxPagesGenerated,TotalPagesGenerated,500);
/* Decrement week */ /* Decrement week */
Dat_GetWeekBefore (&Date,&Date); Dat_GetWeekBefore (&Date,&Date);
@ -2619,7 +2620,7 @@ static void Sta_ShowNumAccessesPerMonths (unsigned long NumRows,MYSQL_RES *mysql
Sta_DrawBarNumClicks ('c', Sta_DrawBarNumClicks ('c',
M == NumMesesEntreLastDateYAct ? NumPagesGenerated : M == NumMesesEntreLastDateYAct ? NumPagesGenerated :
0.0, 0.0,
MaxPagesGenerated,TotalPagesGenerated,600); MaxPagesGenerated,TotalPagesGenerated,500);
/* Decrease month */ /* Decrease month */
Dat_GetMonthBefore (&Date,&Date); Dat_GetMonthBefore (&Date,&Date);
@ -2641,7 +2642,7 @@ static void Sta_ShowNumAccessesPerMonths (unsigned long NumRows,MYSQL_RES *mysql
Date.Month,Date.Year % 100); Date.Month,Date.Year % 100);
/* Draw bar proportional to number of pages generated */ /* Draw bar proportional to number of pages generated */
Sta_DrawBarNumClicks ('c',0.0,MaxPagesGenerated,TotalPagesGenerated,600); Sta_DrawBarNumClicks ('c',0.0,MaxPagesGenerated,TotalPagesGenerated,500);
/* Decrease month */ /* Decrease month */
Dat_GetMonthBefore (&Date,&Date); Dat_GetMonthBefore (&Date,&Date);
@ -2652,7 +2653,7 @@ static void Sta_ShowNumAccessesPerMonths (unsigned long NumRows,MYSQL_RES *mysql
/**************** Show graphic of number of pages generated per hour ***************/ /**************** Show graphic of number of pages generated per hour ***************/
/*****************************************************************************/ /*****************************************************************************/
#define DIGIT_WIDTH 7 #define DIGIT_WIDTH 6
static void Sta_ShowNumAccessesPerHour (unsigned long NumRows,MYSQL_RES *mysql_res) static void Sta_ShowNumAccessesPerHour (unsigned long NumRows,MYSQL_RES *mysql_res)
{ {
@ -2683,7 +2684,7 @@ static void Sta_ShowNumAccessesPerHour (unsigned long NumRows,MYSQL_RES *mysql_r
/* Maximum number of dígits. If less than 4, set it to 4 to ensure a minimum width */ /* Maximum number of dígits. If less than 4, set it to 4 to ensure a minimum width */
NumDigits = (MaxPagesGenerated >= 1000) ? (unsigned) floor (log10 ((double) MaxPagesGenerated)) + 1 : NumDigits = (MaxPagesGenerated >= 1000) ? (unsigned) floor (log10 ((double) MaxPagesGenerated)) + 1 :
4; 4;
ColumnWidth = NumDigits * DIGIT_WIDTH + 3; ColumnWidth = NumDigits * DIGIT_WIDTH + 2;
/***** Draw the graphic *****/ /***** Draw the graphic *****/
mysql_data_seek (mysql_res, 0); mysql_data_seek (mysql_res, 0);
@ -2735,12 +2736,12 @@ static void Sta_WriteAccessHour (unsigned Hour,float NumPagesGenerated,float Max
TotalPagesGenerated) + 0.5)); TotalPagesGenerated) + 0.5));
Str_WriteFloatNum (NumPagesGenerated); Str_WriteFloatNum (NumPagesGenerated);
fprintf (Gbl.F.Out,"<br />"); fprintf (Gbl.F.Out,"<br />");
BarHeight = (unsigned) (((NumPagesGenerated * 600.0) / MaxPagesGenerated) + 0.5); BarHeight = (unsigned) (((NumPagesGenerated * 500.0) / MaxPagesGenerated) + 0.5);
if (BarHeight == 0) if (BarHeight == 0)
BarHeight = 1; BarHeight = 1;
fprintf (Gbl.F.Out,"<img src=\"%s/c8x1.gif\"" fprintf (Gbl.F.Out,"<img src=\"%s/c8x1.gif\""
" alt=\"\" title=\"\"" " alt=\"\" title=\"\""
" style=\"width:12px; height:%upx;\" />", " style=\"width:10px; height:%upx;\" />",
Gbl.Prefs.IconsURL,BarHeight); Gbl.Prefs.IconsURL,BarHeight);
} }
else else
@ -2755,7 +2756,7 @@ static void Sta_WriteAccessHour (unsigned Hour,float NumPagesGenerated,float Max
/*****************************************************************************/ /*****************************************************************************/
#define NUM_MINUTES_PER_DAY (60*24) // 1440 minutes in a day #define NUM_MINUTES_PER_DAY (60*24) // 1440 minutes in a day
#define WIDTH_SEMIDIVISION_GRAPHIC 36 #define WIDTH_SEMIDIVISION_GRAPHIC 30
#define NUM_DIVISIONS_X 10 #define NUM_DIVISIONS_X 10
static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *mysql_res) static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *mysql_res)
@ -2869,7 +2870,7 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
/****** Write labels of the X axis in the graphic of clicks per minute *******/ /****** Write labels of the X axis in the graphic of clicks per minute *******/
/*****************************************************************************/ /*****************************************************************************/
#define WIDTH_DIVISION_GRAPHIC (WIDTH_SEMIDIVISION_GRAPHIC*2) // 72 #define WIDTH_DIVISION_GRAPHIC (WIDTH_SEMIDIVISION_GRAPHIC*2) // 60
static void Sta_WriteLabelsXAxisAccMin (float IncX,const char *Format) static void Sta_WriteLabelsXAxisAccMin (float IncX,const char *Format)
{ {
@ -2894,7 +2895,7 @@ static void Sta_WriteLabelsXAxisAccMin (float IncX,const char *Format)
/***** Write a row of the graphic with number of clicks in every minute ******/ /***** Write a row of the graphic with number of clicks in every minute ******/
/*****************************************************************************/ /*****************************************************************************/
#define WIDTH_GRAPHIC (WIDTH_DIVISION_GRAPHIC*NUM_DIVISIONS_X) // 72*10=720 #define WIDTH_GRAPHIC (WIDTH_DIVISION_GRAPHIC*NUM_DIVISIONS_X) // 60*10=600
static void Sta_WriteAccessMinute (unsigned Minute,float NumPagesGenerated,float MaxX) static void Sta_WriteAccessMinute (unsigned Minute,float NumPagesGenerated,float MaxX)
{ {
@ -2909,7 +2910,7 @@ static void Sta_WriteAccessMinute (unsigned Minute,float NumPagesGenerated,float
fprintf (Gbl.F.Out,"<td rowspan=\"30\" class=\"LOG LEFT_TOP\"" fprintf (Gbl.F.Out,"<td rowspan=\"30\" class=\"LOG LEFT_TOP\""
" style=\"width:%upx;" " style=\"width:%upx;"
" background-image:url('%s/ejey24x30.gif');" " background-image:url('%s/ejey24x30.gif');"
" background-size:36px 45px;" " background-size:30px 30px;"
" background-repeat:repeat;\">" " background-repeat:repeat;\">"
"00h" "00h"
"</td>", "</td>",
@ -2919,7 +2920,7 @@ static void Sta_WriteAccessMinute (unsigned Minute,float NumPagesGenerated,float
fprintf (Gbl.F.Out,"<td rowspan=\"30\" class=\"LOG LEFT_BOTTOM\"" fprintf (Gbl.F.Out,"<td rowspan=\"30\" class=\"LOG LEFT_BOTTOM\""
" style=\"width:%upx;" " style=\"width:%upx;"
" background-image:url('%s/ejey24x30.gif');" " background-image:url('%s/ejey24x30.gif');"
" background-size:36px 45px;" " background-size:30px 30px;"
" background-repeat:repeat;\">" " background-repeat:repeat;\">"
"24h" "24h"
"</td>", "</td>",
@ -2929,7 +2930,7 @@ static void Sta_WriteAccessMinute (unsigned Minute,float NumPagesGenerated,float
fprintf (Gbl.F.Out,"<td rowspan=\"60\" class=\"LOG LEFT_MIDDLE\"" fprintf (Gbl.F.Out,"<td rowspan=\"60\" class=\"LOG LEFT_MIDDLE\""
" style=\"width:%upx;" " style=\"width:%upx;"
" background-image:url('%s/ejey24x60.gif');" " background-image:url('%s/ejey24x60.gif');"
" background-size:36px 90px;" " background-size:30px 60px;"
" background-repeat:repeat;\">" " background-repeat:repeat;\">"
"%02uh" "%02uh"
"</td>", "</td>",
@ -2939,7 +2940,7 @@ static void Sta_WriteAccessMinute (unsigned Minute,float NumPagesGenerated,float
fprintf (Gbl.F.Out,"<td colspan=\"%u\" class=\"LEFT_BOTTOM\"" fprintf (Gbl.F.Out,"<td colspan=\"%u\" class=\"LEFT_BOTTOM\""
" style=\"width:%upx; height:1px;" " style=\"width:%upx; height:1px;"
" background-image:url('%s/malla%c48x1.gif');" " background-image:url('%s/malla%c48x1.gif');"
" background-size:72px 1px;" " background-size:60px 1px;"
" background-repeat:repeat;\">", " background-repeat:repeat;\">",
NUM_DIVISIONS_X*2,WIDTH_GRAPHIC,Gbl.Prefs.IconsURL, NUM_DIVISIONS_X*2,WIDTH_GRAPHIC,Gbl.Prefs.IconsURL,
(Minute % 60) == 0 ? 'v' : (Minute % 60) == 0 ? 'v' :
@ -3029,7 +3030,7 @@ static void Sta_ShowNumAccessesPerAction (unsigned long NumRows,MYSQL_RES *mysql
/* Draw bar proportional to number of pages generated */ /* Draw bar proportional to number of pages generated */
NumPagesGenerated = Str_GetFloatNumFromStr (row[1]); NumPagesGenerated = Str_GetFloatNumFromStr (row[1]);
Sta_DrawBarNumClicks ('c',NumPagesGenerated,MaxPagesGenerated,TotalPagesGenerated,600); Sta_DrawBarNumClicks ('c',NumPagesGenerated,MaxPagesGenerated,TotalPagesGenerated,500);
} }
} }
@ -3095,7 +3096,7 @@ static void Sta_ShowNumAccessesPerPlugin (unsigned long NumRows,MYSQL_RES *mysql
/* Draw bar proportional to number of pages generated */ /* Draw bar proportional to number of pages generated */
NumPagesGenerated = Str_GetFloatNumFromStr (row[1]); NumPagesGenerated = Str_GetFloatNumFromStr (row[1]);
Sta_DrawBarNumClicks ('c',NumPagesGenerated,MaxPagesGenerated,TotalPagesGenerated,600); Sta_DrawBarNumClicks ('c',NumPagesGenerated,MaxPagesGenerated,TotalPagesGenerated,500);
} }
} }
@ -3159,7 +3160,7 @@ static void Sta_ShowNumAccessesPerWSFunction (unsigned long NumRows,MYSQL_RES *m
/* Draw bar proportional to number of pages generated */ /* Draw bar proportional to number of pages generated */
NumPagesGenerated = Str_GetFloatNumFromStr (row[1]); NumPagesGenerated = Str_GetFloatNumFromStr (row[1]);
Sta_DrawBarNumClicks ('c',NumPagesGenerated,MaxPagesGenerated,TotalPagesGenerated,600); Sta_DrawBarNumClicks ('c',NumPagesGenerated,MaxPagesGenerated,TotalPagesGenerated,500);
} }
} }
@ -3222,7 +3223,7 @@ static void Sta_ShowNumAccessesPerBanner (unsigned long NumRows,MYSQL_RES *mysql
"<img src=\"%s/%s/%s\"" "<img src=\"%s/%s/%s\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"BANNER_SMALL\"" " class=\"BANNER_SMALL\""
" style=\"margin:0 12px 6px 0;\" />" " style=\"margin:0 10px 5px 0;\" />"
"</a>", "</a>",
Ban.WWW, Ban.WWW,
Ban.FullName, Ban.FullName,
@ -3233,7 +3234,7 @@ static void Sta_ShowNumAccessesPerBanner (unsigned long NumRows,MYSQL_RES *mysql
/* Draw bar proportional to number of clicks */ /* Draw bar proportional to number of clicks */
NumClicks = Str_GetFloatNumFromStr (row[1]); NumClicks = Str_GetFloatNumFromStr (row[1]);
Sta_DrawBarNumClicks ('c',NumClicks,MaxClicks,TotalClicks,600); Sta_DrawBarNumClicks ('c',NumClicks,MaxClicks,TotalClicks,500);
} }
} }
@ -3309,7 +3310,7 @@ static void Sta_ShowNumAccessesPerDegree (unsigned long NumRows,MYSQL_RES *mysql
/* Draw bar proportional to number of pages generated */ /* Draw bar proportional to number of pages generated */
NumPagesGenerated = Str_GetFloatNumFromStr (row[1]); NumPagesGenerated = Str_GetFloatNumFromStr (row[1]);
Sta_DrawBarNumClicks ('c',NumPagesGenerated,MaxPagesGenerated,TotalPagesGenerated,450); Sta_DrawBarNumClicks ('c',NumPagesGenerated,MaxPagesGenerated,TotalPagesGenerated,375);
} }
} }
@ -3425,7 +3426,7 @@ static void Sta_ShowNumAccessesPerCourse (unsigned long NumRows,MYSQL_RES *mysql
/* Draw bar proportional to number of pages generated */ /* Draw bar proportional to number of pages generated */
NumPagesGenerated = Str_GetFloatNumFromStr (row[1]); NumPagesGenerated = Str_GetFloatNumFromStr (row[1]);
Sta_DrawBarNumClicks ('c',NumPagesGenerated,MaxPagesGenerated,TotalPagesGenerated,450); Sta_DrawBarNumClicks ('c',NumPagesGenerated,MaxPagesGenerated,TotalPagesGenerated,375);
} }
} }
@ -3477,7 +3478,7 @@ static void Sta_DrawBarNumClicks (char Color,float NumPagesGenerated,float MaxPa
fprintf (Gbl.F.Out,"<img src=\"%s/%c1x14.gif\"" fprintf (Gbl.F.Out,"<img src=\"%s/%c1x14.gif\""
" alt=\"\" title=\"\"" " alt=\"\" title=\"\""
" class=\"LEFT_TOP\"" " class=\"LEFT_TOP\""
" style=\"width:%upx; height:21px;\" />" " style=\"width:%upx; height:18px;\" />"
"&nbsp;", "&nbsp;",
Gbl.Prefs.IconsURL,Color,BarWidth); Gbl.Prefs.IconsURL,Color,BarWidth);
@ -3554,7 +3555,7 @@ void Sta_ReqUseOfPlatform (void)
/***** Start form *****/ /***** Start form *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\"" fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
" style=\"padding-bottom:15px;\">"); " style=\"padding-bottom:12px;\">");
Act_FormStart (ActSeeUseGbl); Act_FormStart (ActSeeUseGbl);
/***** Compute stats for anywhere, degree or course? *****/ /***** Compute stats for anywhere, degree or course? *****/
@ -6743,7 +6744,7 @@ static void Sta_GetAndShowForumStats (void)
/***** Write table heading *****/ /***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_TOP\" style=\"width:24px;\">" "<th class=\"LEFT_TOP\" style=\"width:20px;\">"
"<img src=\"%s/forum16x16.gif\"" "<img src=\"%s/forum16x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />" " class=\"ICON16x16\" />"
@ -6969,7 +6970,7 @@ static void Sta_WriteForumTitleAndStats (For_ForumType_t ForumType,
/***** Write forum name and stats *****/ /***** Write forum name and stats *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LEFT_TOP\" style=\"width:24px;\">" "<td class=\"LEFT_TOP\" style=\"width:20px;\">"
"<img src=\"%s/%s\"" "<img src=\"%s/%s\""
" alt=\"%s%s\" title=\"%s%s\"" " alt=\"%s%s\" title=\"%s%s\""
" class=\"ICON16x16\" />" " class=\"ICON16x16\" />"
@ -7028,7 +7029,7 @@ static void Sta_WriteForumTotalStats (struct Sta_StatsForum *StatsForum)
/***** Write forum name and stats *****/ /***** Write forum name and stats *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT_N_LINE_TOP\" style=\"width:24px;\">" "<td class=\"DAT_N_LINE_TOP\" style=\"width:20px;\">"
"</td>" "</td>"
"<td class=\"DAT_N_LINE_TOP LEFT_MIDDLE\">" "<td class=\"DAT_N_LINE_TOP LEFT_MIDDLE\">"
"%s" "%s"
@ -7693,7 +7694,7 @@ static void Sta_GetAndShowNumUsrsPerTheme (void)
"<td class=\"CENTER_MIDDLE\">" "<td class=\"CENTER_MIDDLE\">"
"<img src=\"%s/%s/%s/theme_32x20.gif\"" "<img src=\"%s/%s/%s/theme_32x20.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" style=\"width:48px; height:30px;\" />" " style=\"width:40px; height:25px;\" />"
"</td>" "</td>"
"<td class=\"DAT RIGHT_MIDDLE\">" "<td class=\"DAT RIGHT_MIDDLE\">"
"%u" "%u"
@ -8101,7 +8102,7 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
"<td class=\"CENTER_MIDDLE\">" "<td class=\"CENTER_MIDDLE\">"
"<img src=\"%s/layout%u%u_32x20.gif\"" "<img src=\"%s/layout%u%u_32x20.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" style=\"width:48px; height:30px;\" />" " style=\"width:40px; height:25px;\" />"
"</td>" "</td>"
"<td class=\"DAT RIGHT_MIDDLE\">" "<td class=\"DAT RIGHT_MIDDLE\">"
"%u" "%u"

8
swad_survey.c
View File

@ -3164,7 +3164,7 @@ static void Svy_WriteAnswersOfAQst (struct Survey *Svy,struct SurveyQuestion *Sv
} }
/* Write the number of option */ /* Write the number of option */
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\" style=\"width:60px;\">" fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\" style=\"width:50px;\">"
"%u)" "%u)"
"</td>", "</td>",
NumAns + 1); NumAns + 1);
@ -3194,7 +3194,7 @@ static void Svy_WriteAnswersOfAQst (struct Survey *Svy,struct SurveyQuestion *Sv
/***************** Draw a bar with the percentage of answers *****************/ /***************** Draw a bar with the percentage of answers *****************/
/*****************************************************************************/ /*****************************************************************************/
#define Svy_MAX_BAR_WIDTH 150 #define Svy_MAX_BAR_WIDTH 125
static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs) static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
{ {
@ -3213,7 +3213,7 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
/***** Draw bar with a with proportional to the number of clicks *****/ /***** Draw bar with a with proportional to the number of clicks *****/
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\" style=\"width:%upx;\">", fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\" style=\"width:%upx;\">",
Svy_MAX_BAR_WIDTH + 150); Svy_MAX_BAR_WIDTH + 125);
if (NumUsrs && MaxUsrs) if (NumUsrs && MaxUsrs)
BarWidth = (unsigned) ((((float) NumUsrs * (float) Svy_MAX_BAR_WIDTH) / BarWidth = (unsigned) ((((float) NumUsrs * (float) Svy_MAX_BAR_WIDTH) /
(float) MaxUsrs) + 0.5); (float) MaxUsrs) + 0.5);
@ -3222,7 +3222,7 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
fprintf (Gbl.F.Out,"<img src=\"%s/c1x16.gif\"" fprintf (Gbl.F.Out,"<img src=\"%s/c1x16.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"LEFT_TOP\"" " class=\"LEFT_TOP\""
" style=\"width:%upx; height:24px;\" />" " style=\"width:%upx; height:20px;\" />"
"&nbsp;", "&nbsp;",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
Gbl.Title, Gbl.Title,

4
swad_syllabus.c
View File

@ -55,7 +55,7 @@ extern struct Globals Gbl;
#define Syl_MAX_LENGTH_TEXT_ITEM 1024 #define Syl_MAX_LENGTH_TEXT_ITEM 1024
#define Syl_MAX_BYTES_TEXT_ITEM (Syl_MAX_LENGTH_TEXT_ITEM*Str_MAX_CHARACTER) #define Syl_MAX_BYTES_TEXT_ITEM (Syl_MAX_LENGTH_TEXT_ITEM*Str_MAX_CHARACTER)
#define Syl_WIDTH_NUM_SYLLABUS 24 #define Syl_WIDTH_NUM_SYLLABUS 20
static const char *StyleSyllabus[1+Syl_MAX_LEVELS_SYLLABUS] = static const char *StyleSyllabus[1+Syl_MAX_LEVELS_SYLLABUS] =
{ {
@ -136,7 +136,7 @@ void Syl_PutFormWhichSyllabus (void)
/***** Form to select which forums I want to see /***** Form to select which forums I want to see
(all my forums or only the forums of current institution/degree/course) *****/ (all my forums or only the forums of current institution/degree/course) *****/
Act_FormStart (ActSeeSyl); Act_FormStart (ActSeeSyl);
fprintf (Gbl.F.Out,"<div style=\"margin:15px 0;\">" fprintf (Gbl.F.Out,"<div style=\"margin:12px 0;\">"
"<ul class=\"LIST_CENTER\">"); "<ul class=\"LIST_CENTER\">");
for (WhichSyllabus = (Syl_WhichSyllabus_t) 0; for (WhichSyllabus = (Syl_WhichSyllabus_t) 0;

10
swad_tab.c
View File

@ -91,7 +91,7 @@ void Tab_DrawTabs (void)
ColspanCentralPart = 2; ColspanCentralPart = 2;
} }
fprintf (Gbl.F.Out,"<td colspan=\"%u\" class=\"CENTER_TOP\"" fprintf (Gbl.F.Out,"<td colspan=\"%u\" class=\"CENTER_TOP\""
" style=\"height:84px;\">" " style=\"height:70px;\">"
"<div id=\"tabs_container\">", "<div id=\"tabs_container\">",
ColspanCentralPart); ColspanCentralPart);
switch (Gbl.Prefs.Layout) switch (Gbl.Prefs.Layout)
@ -162,7 +162,7 @@ static void Tab_DrawTabsDeskTop (void)
The_ClassTabOff[Gbl.Prefs.Theme]); The_ClassTabOff[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s64x64.gif\"" fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s64x64.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON32x32\" style=\"margin:6px;\" />" " class=\"ICON32x32\" style=\"margin:5px;\" />"
"<div>%s</div>" "<div>%s</div>"
"</a>", "</a>",
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION, Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,
@ -176,7 +176,7 @@ static void Tab_DrawTabsDeskTop (void)
fprintf (Gbl.F.Out,"<div class=\"ICON_HIDDEN\">" fprintf (Gbl.F.Out,"<div class=\"ICON_HIDDEN\">"
"<img src=\"%s/%s/%s64x64.gif\"" "<img src=\"%s/%s/%s64x64.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON32x32\" style=\"margin:6px;\" />" " class=\"ICON32x32\" style=\"margin:5px;\" />"
"<div class=\"%s\">%s</div>", "<div class=\"%s\">%s</div>",
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION, Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,
Tab_TabIcons[NumTab], Tab_TabIcons[NumTab],
@ -231,7 +231,7 @@ void Tab_DrawTabsMobile (void)
Act_LinkFormSubmit (Txt_TABS_FULL_TXT[NumTab],The_ClassMenuOff[Gbl.Prefs.Theme]); Act_LinkFormSubmit (Txt_TABS_FULL_TXT[NumTab],The_ClassMenuOff[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s/%s64x64.gif\"" fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s/%s64x64.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICON64x64\"" " alt=\"%s\" title=\"%s\" class=\"ICON64x64\""
" style=\"margin:6px;\" />" " style=\"margin:5px;\" />"
"<div>%s</div>" "<div>%s</div>"
"</a>", "</a>",
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION, Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,
@ -246,7 +246,7 @@ void Tab_DrawTabsMobile (void)
fprintf (Gbl.F.Out,"<div class=\"ICON_HIDDEN\">" fprintf (Gbl.F.Out,"<div class=\"ICON_HIDDEN\">"
"<img src=\"%s/%s/%s64x64.gif\"" "<img src=\"%s/%s/%s64x64.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON64x64\" style=\"margin:6px;\" />" " class=\"ICON64x64\" style=\"margin:5px;\" />"
"<div class=\"%s\">%s</div>" "<div class=\"%s\">%s</div>"
"</div>", "</div>",
Gbl.Prefs.PathIconSet, Gbl.Prefs.PathIconSet,

6
swad_test.c
View File

@ -1614,7 +1614,7 @@ static void Tst_ShowFormConfigTst (void)
"%s:" "%s:"
"</td>" "</td>"
"<td class=\"LEFT_TOP\">" "<td class=\"LEFT_TOP\">"
"<table style=\"border-spacing:3px;\">", "<table style=\"border-spacing:2px;\">",
The_ClassForm[Gbl.Prefs.Theme], The_ClassForm[Gbl.Prefs.Theme],
Txt_No_of_questions); Txt_No_of_questions);
@ -4204,7 +4204,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/***** Write the tags already existing in a selector *****/ /***** Write the tags already existing in a selector *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<select id=\"SelDesc%u\" name=\"SelDesc%u\"" "<select id=\"SelDesc%u\" name=\"SelDesc%u\""
" style=\"width:345px;\" onchange=\"changeTxtTag('%u')\">", " style=\"width:288px;\" onchange=\"changeTxtTag('%u')\">",
NumTag,NumTag,NumTag); NumTag,NumTag,NumTag);
fprintf (Gbl.F.Out,"<option value=\"\">&nbsp;</option>"); fprintf (Gbl.F.Out,"<option value=\"\">&nbsp;</option>");
mysql_data_seek (mysql_res, 0); mysql_data_seek (mysql_res, 0);
@ -5914,7 +5914,7 @@ void Tst_SelUsrsToSeeUsrsTstExams (void)
Act_FormStart (ActSeeUsrTstExa); Act_FormStart (ActSeeUsrTstExa);
Grp_PutParamsCodGrps (); Grp_PutParamsCodGrps ();
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">"
"<table style=\"margin:0 auto; border-spacing:6px;\">" "<table style=\"margin:0 auto; border-spacing:5px;\">"
"<tr>" "<tr>"
"<td colspan=\"2\" class=\"LEFT_MIDDLE\">"); "<td colspan=\"2\" class=\"LEFT_MIDDLE\">");

2
swad_theme.c
View File

@ -247,7 +247,7 @@ void The_PutIconsToSelectTheme (void)
fprintf (Gbl.F.Out,"<input type=\"image\"" fprintf (Gbl.F.Out,"<input type=\"image\""
" src=\"%s/%s/%s/theme_32x20.gif\" alt=\"%s\"" " src=\"%s/%s/%s/theme_32x20.gif\" alt=\"%s\""
" title=\"%s\" style=\"display:block;" " title=\"%s\" style=\"display:block;"
" width:48px; height:30px; margin:0 auto;\" />", " width:40px; height:25px; margin:0 auto;\" />",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
Cfg_ICON_FOLDER_THEMES, Cfg_ICON_FOLDER_THEMES,
The_ThemeId[Theme], The_ThemeId[Theme],

10
swad_timetable.c
View File

@ -749,7 +749,7 @@ static void TT_DrawTimeTable (void)
} }
/***** Table start *****/ /***** Table start *****/
fprintf (Gbl.F.Out,"<table style=\"min-width:840px; margin:0 auto;\">"); fprintf (Gbl.F.Out,"<table style=\"min-width:700px; margin:0 auto;\">");
/***** Top row used for column adjustement *****/ /***** Top row used for column adjustement *****/
TT_TimeTableDrawAdjustRow (); TT_TimeTableDrawAdjustRow ();
@ -1096,7 +1096,7 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns
if (HourType == TT_FREE_HOUR) // If cell is empty... if (HourType == TT_FREE_HOUR) // If cell is empty...
fprintf (Gbl.F.Out,"<img src=\"%s/tr1x16.gif\"" fprintf (Gbl.F.Out,"<img src=\"%s/tr1x16.gif\""
" alt=\"\" title=\"\"" " alt=\"\" title=\"\""
" style=\"width:1px; height:24px;\" />", " style=\"width:1px; height:20px;\" />",
Gbl.Prefs.IconsURL); Gbl.Prefs.IconsURL);
else else
{ {
@ -1149,7 +1149,7 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns
fprintf (Gbl.F.Out,"<span class=\"DAT_SMALL\">"); fprintf (Gbl.F.Out,"<span class=\"DAT_SMALL\">");
/***** Class type *****/ /***** Class type *****/
fprintf (Gbl.F.Out,"<select name=\"ModTTCellType\" style=\"width:81px;\"" fprintf (Gbl.F.Out,"<select name=\"ModTTCellType\" style=\"width:68px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">", " onchange=\"javascript:document.getElementById('%s').submit();\">",
Gbl.FormId); Gbl.FormId);
for (CT = (TT_ClassType_t) 0; for (CT = (TT_ClassType_t) 0;
@ -1187,7 +1187,7 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns
else else
{ {
/***** Class duration *****/ /***** Class duration *****/
fprintf (Gbl.F.Out,"<select name=\"ModTTDur\" style=\"width:69px;\"" fprintf (Gbl.F.Out,"<select name=\"ModTTDur\" style=\"width:57px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">", " onchange=\"javascript:document.getElementById('%s').submit();\">",
Gbl.FormId); Gbl.FormId);
for (H = Hour + TimeTable[Day][Hour].Columns[Column].Duration; for (H = Hour + TimeTable[Day][Hour].Columns[Column].Duration;
@ -1217,7 +1217,7 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns
/***** Group *****/ /***** Group *****/
fprintf (Gbl.F.Out,"<br />%s" fprintf (Gbl.F.Out,"<br />%s"
"<select name=\"ModTTGrpCod\"" "<select name=\"ModTTGrpCod\""
" style=\"width:132px;\"" " style=\"width:110px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">", " onchange=\"javascript:document.getElementById('%s').submit();\">",
Txt_Group,Gbl.FormId); Txt_Group,Gbl.FormId);
fprintf (Gbl.F.Out,"<option value=\"-1\""); fprintf (Gbl.F.Out,"<option value=\"-1\"");

2
swad_user.c
View File

@ -1512,7 +1512,7 @@ void Usr_WelcomeUsr (void)
if (Gbl.Usrs.Me.UsrDat.Prefs.Language == Txt_Current_CGI_SWAD_Language) if (Gbl.Usrs.Me.UsrDat.Prefs.Language == Txt_Current_CGI_SWAD_Language)
{ {
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\"" fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
" style=\"margin:15px;\">"); " style=\"margin:12px;\">");
/***** User's first name *****/ /***** User's first name *****/
if (Gbl.Usrs.Me.UsrDat.FirstName[0]) if (Gbl.Usrs.Me.UsrDat.FirstName[0])