Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-15 13:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.51.4

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2015-11-30 19:50:06 +01:00
parent c5da57f68a
commit e575204b5b
8 changed files with 80 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
css/swad15.51.3.css
View File

@ -140,12 +140,17 @@ a:hover {text-decoration:underline;}
background-color:#201420; background-color:#201420;
} }
#head_row_1_left
{
display:table-cell;
text-align:left;
vertical-align:middle;
}
@media only screen and (max-width: 899px) @media only screen and (max-width: 899px)
{ /* For mobile-phones */ { /* For mobile-phones */
#head_row_1_logo_small #head_row_1_logo_small
{ {
display:table-cell; display:inline-block;
vertical-align:middle;
} }
#head_row_1_logo_big #head_row_1_logo_big
{ {
@ -160,15 +165,13 @@ a:hover {text-decoration:underline;}
} }
#head_row_1_logo_big #head_row_1_logo_big
{ {
display:table-cell; display:inline-block;
vertical-align:middle;
} }
} }
#head_row_1_search #head_row_1_search
{ {
display:table-cell; display:inline-block;
text-align:left; padding:0 20px;
vertical-align:middle;
} }
@media only screen and (max-width: 1279px) @media only screen and (max-width: 1279px)
{ /* For mobile phones and tablets */ { /* For mobile phones and tablets */
@ -355,7 +358,7 @@ a:hover {text-decoration:underline;}
display:table; display:table;
box-sizing:border-box; box-sizing:border-box;
width:492px; /* 82 px * 6 visible tabs */ width:492px; /* 82 px * 6 visible tabs */
height:68px; height:70px;
margin:0 auto; margin:0 auto;
border-spacing:1px; border-spacing:1px;
} }
@ -364,7 +367,7 @@ a:hover {text-decoration:underline;}
display:table-cell; display:table-cell;
box-sizing:border-box; box-sizing:border-box;
width:80px; width:80px;
height:66px; height:68px;
margin:0; margin:0;
padding:0; padding:0;
border-radius:6px 6px 0 0; border-radius:6px 6px 0 0;
@ -378,7 +381,7 @@ a:hover {text-decoration:underline;}
display:table-cell; display:table-cell;
box-sizing:border-box; box-sizing:border-box;
width:80px; width:80px;
height:66px; height:68px;
margin:0; margin:0;
padding:0; padding:0;
border-radius:6px 6px 0 0; border-radius:6px 6px 0 0;
@ -399,7 +402,7 @@ a:hover {text-decoration:underline;}
display:table; display:table;
box-sizing:border-box; box-sizing:border-box;
width:660px; /* 110 px * 6 visible tabs */ width:660px; /* 110 px * 6 visible tabs */
height:68px; height:70px;
margin:0 auto; margin:0 auto;
border-spacing:1px; border-spacing:1px;
} }
@ -408,7 +411,7 @@ a:hover {text-decoration:underline;}
display:table-cell; display:table-cell;
box-sizing:border-box; box-sizing:border-box;
width:108px; width:108px;
height:66px; height:68px;
margin:0; margin:0;
padding:0; padding:0;
border-radius:6px 6px 0 0; border-radius:6px 6px 0 0;
@ -422,7 +425,7 @@ a:hover {text-decoration:underline;}
display:table-cell; display:table-cell;
box-sizing:border-box; box-sizing:border-box;
width:108px; width:108px;
height:66px; height:68px;
margin:0; margin:0;
padding:0; padding:0;
border-radius:6px 6px 0 0; border-radius:6px 6px 0 0;
@ -570,7 +573,7 @@ a:hover {text-decoration:underline;}
box-sizing:border-box; box-sizing:border-box;
min-width:900px; min-width:900px;
min-height:900px; min-height:900px;
margin:-6px 0 0 0; margin:-8px 0 0 0;
padding:8px 0; padding:8px 0;
border-radius:6px; border-radius:6px;
box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2); box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2);
@ -594,9 +597,9 @@ a:hover {text-decoration:underline;}
{ {
display:table; display:table;
box-sizing:border-box; box-sizing:border-box;
height:76px; height:60px;
margin:0 auto; margin:0 auto;
padding:8px 16px; padding:0 8px;
list-style-type:none; list-style-type:none;
} }
#main_horizontal .MENU_LIST_ITEM #main_horizontal .MENU_LIST_ITEM
@ -653,9 +656,9 @@ a:hover {text-decoration:underline;}
{ {
display:table; display:table;
box-sizing:border-box; box-sizing:border-box;
height:76px; height:60px;
margin:0 auto; margin:0 auto;
padding:8px 16px; padding:0 8px;
list-style-type:none; list-style-type:none;
} }
#main_vertical .MENU_LIST_ITEM #main_vertical .MENU_LIST_ITEM
@ -869,55 +872,55 @@ a:hover {text-decoration:underline;}
.MONTH .MONTH
{ {
color:#4D88A1; color:#4D88A1;
font-size:10pt; font-size:9pt;
white-space:nowrap; white-space:nowrap;
} }
.DAY_WRK_HEAD .DAY_WRK_HEAD
{ {
color:#4D88A1; color:#4D88A1;
font-size:10pt; font-size:9pt;
text-align:center; text-align:center;
} }
.DAY_NO_WRK_HEAD .DAY_NO_WRK_HEAD
{ {
color:#FF0000; color:#FF0000;
font-size:10pt; font-size:9pt;
text-align:center; text-align:center;
} }
.DAY_WRK .DAY_WRK
{ {
color:#202020; color:#202020;
font-size:10pt; font-size:9pt;
text-align:center; text-align:center;
} }
.DAY_NO_WORK .DAY_NO_WORK
{ {
color:#C04080; color:#C04080;
font-size:10pt; font-size:9pt;
text-align:center; text-align:center;
} }
.DAY_HLD .DAY_HLD
{ {
color:#FF0000; color:#FF0000;
font-size:10pt; font-size:9pt;
text-align:center; text-align:center;
} }
.DAY_WRK_LIGHT .DAY_WRK_LIGHT
{ {
color:#E0E0E0; color:#E0E0E0;
font-size:10pt; font-size:9pt;
text-align:center; text-align:center;
} }
.DAY_NO_WORK_LIGHT .DAY_NO_WORK_LIGHT
{ {
color:#FFE0FF; color:#FFE0FF;
font-size:10pt; font-size:9pt;
text-align:center; text-align:center;
} }
.DAY_HLD_LIGHT .DAY_HLD_LIGHT
{ {
color:#FFE0E0; color:#FFE0E0;
font-size:10pt; font-size:9pt;
text-align:center; text-align:center;
} }
.DAY .DAY

BIN
icon/openswad220x40.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
icon/swad140x40.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

28
js/swad.js
View File

@ -626,18 +626,18 @@ function disableDetailedClicks() {
function Cal_DrawCalendar (id,FirstDayOfWeek,TimeUTC,CurrentPlcCod,PrintView, function Cal_DrawCalendar (id,FirstDayOfWeek,TimeUTC,CurrentPlcCod,PrintView,
CGI,FormGoToCalendarParams,FormEventParams) { CGI,FormGoToCalendarParams,FormEventParams) {
var StartingMonth = [ // Calendar starts one row before current month var StartingMonth = [ // Calendar starts one row before current month
9, // January --> September 10, // January --> October
9, // February --> September 10, // February --> October
9, // Mars --> September 10, // Mars --> October
9, // April --> September 1, // April --> January
1, // May --> January 1, // May --> January
1, // June --> January 1, // June --> January
1, // July --> January 4, // July --> April
1, // August --> January 4, // August --> April
5, // September --> May 4, // September --> April
5, // October --> May 7, // October --> July
5, // November --> May 7, // November --> July
5 // December --> May 7 // December --> July
]; ];
var d = new Date; var d = new Date;
d.setTime(TimeUTC * 1000); d.setTime(TimeUTC * 1000);
@ -656,11 +656,11 @@ function Cal_DrawCalendar (id,FirstDayOfWeek,TimeUTC,CurrentPlcCod,PrintView,
Gbl_HTMLContent += '<table style="margin:0 auto; border-spacing:6px;">'; Gbl_HTMLContent += '<table style="margin:0 auto; border-spacing:6px;">';
for (Row = 0; for (Row = 0;
Row < 4; Row < 5;
Row++) { Row++) {
Gbl_HTMLContent += '<tr>'; Gbl_HTMLContent += '<tr>';
for (Col = 0; for (Col = 0;
Col < 4; Col < 3;
Col++) { Col++) {
MonthIdNum++; MonthIdNum++;
MonthId = id + '_month_' + MonthIdNum; MonthId = id + '_month_' + MonthIdNum;

21
swad_calendar.c
View File

@ -213,20 +213,21 @@ void Cal_DrawCurrentMonth (void)
/*****************************************************************************/ /*****************************************************************************/
/* Current Starting /* Current Starting
month month month month
1 -> 9 1 -> 10
2 -> 9 2 -> 10
3 -> 9 3 -> 10
4 -> 9
4 -> 1
5 -> 1 5 -> 1
6 -> 1 6 -> 1
7 -> 1
8 -> 1
9 -> 5 7 -> 4
10 -> 5 8 -> 4
11 -> 5 9 -> 4
12 -> 5
10 -> 7
11 -> 7
12 -> 7
*/ */
void Cal_DrawCalendar (void) void Cal_DrawCalendar (void)
{ {

6
swad_changelog.h
View File

@ -117,12 +117,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.51.3 (2015/11/30)" #define Log_PLATFORM_VERSION "SWAD 15.51.4 (2015/11/30)"
#define CSS_FILE "swad15.51.3.css" #define CSS_FILE "swad15.51.4.css"
// Number of lines (includes comments but not blank lines) has been got with the following command: // Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.51.4: Nov 30, 2015 Calendar is now distributed in rows with 3 months instead of 4.
Changes in layout. (186644 lines)
Version 15.51.3: Nov 30, 2015 Responsive design in login-logout. (186641 lines) Version 15.51.3: Nov 30, 2015 Responsive design in login-logout. (186641 lines)
Version 15.51.2: Nov 30, 2015 Responsive design in tabs. (186688 lines) Version 15.51.2: Nov 30, 2015 Responsive design in tabs. (186688 lines)
Version 15.51.1: Nov 30, 2015 Responsive design in logo. Version 15.51.1: Nov 30, 2015 Responsive design in logo.

16
swad_config.h
View File

@ -62,8 +62,8 @@
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40 #define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40
#define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40 #define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40
#define Cfg_PLATFORM_LOGO_BIG_FILENAME "openswad240x40.png" #define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad140x40.png"
#define Cfg_PLATFORM_LOGO_BIG_WIDTH 240 #define Cfg_PLATFORM_LOGO_BIG_WIDTH 140
#define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40 #define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40
#define Cfg_PLATFORM_RESPONSIBLE_NAME "Antonio Ca&ntilde;as Vargas" // Main responsible for the platform #define Cfg_PLATFORM_RESPONSIBLE_NAME "Antonio Ca&ntilde;as Vargas" // Main responsible for the platform
@ -115,8 +115,8 @@
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40 #define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40
#define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40 #define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40
#define Cfg_PLATFORM_LOGO_BIG_FILENAME "openswad240x40.png" #define Cfg_PLATFORM_LOGO_BIG_FILENAME "openswad220x40.png"
#define Cfg_PLATFORM_LOGO_BIG_WIDTH 240 #define Cfg_PLATFORM_LOGO_BIG_WIDTH 220
#define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40 #define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40
#define Cfg_PLATFORM_RESPONSIBLE_NAME "Antonio Cañas Vargas" // Main responsible for the platform #define Cfg_PLATFORM_RESPONSIBLE_NAME "Antonio Cañas Vargas" // Main responsible for the platform
@ -185,8 +185,8 @@
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40 #define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40
#define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40 #define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40
#define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad160x40.png" #define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad140x40.png"
#define Cfg_PLATFORM_LOGO_BIG_WIDTH 160 #define Cfg_PLATFORM_LOGO_BIG_WIDTH 140
#define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40 #define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40
#define Cfg_PLATFORM_RESPONSIBLE_NAME "CEVUG" // Main responsible for the platform #define Cfg_PLATFORM_RESPONSIBLE_NAME "CEVUG" // Main responsible for the platform
@ -245,8 +245,8 @@
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40 #define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40
#define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40 #define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40
#define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad160x40.png" #define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad140x40.png"
#define Cfg_PLATFORM_LOGO_BIG_WIDTH 160 #define Cfg_PLATFORM_LOGO_BIG_WIDTH 140
#define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40 #define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40
#define Cfg_PLATFORM_RESPONSIBLE_NAME "Carmen Varela B&aacute;ez" // Main responsible for the platform #define Cfg_PLATFORM_RESPONSIBLE_NAME "Carmen Varela B&aacute;ez" // Main responsible for the platform

26
swad_layout.c
View File

@ -683,33 +683,32 @@ static void Lay_WritePageTopHeading (void)
fprintf (Gbl.F.Out,"<div id=\"head_row_1\" class=\"%s\">", fprintf (Gbl.F.Out,"<div id=\"head_row_1\" class=\"%s\">",
ClassHeadRow1[Gbl.Prefs.Theme]); ClassHeadRow1[Gbl.Prefs.Theme]);
/* 1st. row, 1st. column: logo */ /* 1st. row, 1st. column: logo and search */
fprintf (Gbl.F.Out,"<div id=\"head_row_1_logo_small\" style=\"width:%upx;\">" fprintf (Gbl.F.Out,"<div id=\"head_row_1_left\">");
fprintf (Gbl.F.Out,"<div id=\"head_row_1_logo_small\">"
"<a href=\"%s\" target=\"_blank\">" "<a href=\"%s\" target=\"_blank\">"
"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\"" "<img src=\"%s/%s\" alt=\"%s\" title=\"%s\""
" class=\"CENTER_MIDDLE\"" " class=\"CENTER_MIDDLE\""
" style=\"width:%upx; height:%upx;\" />" " style=\"width:%upx; height:%upx;\" />"
"</a>" "</a>"
"</div>", "</div>", // head_row_1_logo_small
Cfg_PLATFORM_LOGO_SMALL_WIDTH,
Cfg_HTTPS_URL_SWAD_CGI, Cfg_HTTPS_URL_SWAD_CGI,
Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_SMALL_FILENAME, Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_SMALL_FILENAME,
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME, Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
Cfg_PLATFORM_LOGO_SMALL_WIDTH,Cfg_PLATFORM_LOGO_SMALL_HEIGHT); Cfg_PLATFORM_LOGO_SMALL_WIDTH,Cfg_PLATFORM_LOGO_SMALL_HEIGHT);
fprintf (Gbl.F.Out,"<div id=\"head_row_1_logo_big\" style=\"width:%upx;\">" fprintf (Gbl.F.Out,"<div id=\"head_row_1_logo_big\">"
"<a href=\"%s\" target=\"_blank\">" "<a href=\"%s\" target=\"_blank\">"
"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\"" "<img src=\"%s/%s\" alt=\"%s\" title=\"%s\""
" class=\"CENTER_MIDDLE\"" " class=\"CENTER_MIDDLE\""
" style=\"width:%upx; height:%upx;\" />" " style=\"width:%upx; height:%upx;\" />"
"</a>" "</a>"
"</div>", "</div>", // head_row_1_logo_big
Cfg_PLATFORM_LOGO_BIG_WIDTH,
Cfg_HTTPS_URL_SWAD_CGI, Cfg_HTTPS_URL_SWAD_CGI,
Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_BIG_FILENAME, Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_BIG_FILENAME,
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME, Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT); Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT);
/* 1st. row, 2nd. column: search */
fprintf (Gbl.F.Out,"<div id=\"head_row_1_search\">"); fprintf (Gbl.F.Out,"<div id=\"head_row_1_search\">");
Act_FormStart ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsSch : Act_FormStart ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsSch :
(Gbl.CurrentDeg.Deg.DegCod > 0 ? ActDegSch : (Gbl.CurrentDeg.Deg.DegCod > 0 ? ActDegSch :
@ -720,7 +719,9 @@ static void Lay_WritePageTopHeading (void)
Sco_PutParamScope (Sco_SCOPE_SYS); Sco_PutParamScope (Sco_SCOPE_SYS);
Sch_PutFormToSearch (Gbl.Prefs.PathTheme,"head_search_text"); Sch_PutFormToSearch (Gbl.Prefs.PathTheme,"head_search_text");
Act_FormEnd (); Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>"); // head_row_1_search
fprintf (Gbl.F.Out,"</div>"); // head_row_1_left
/* 1st. row, 3rd. column: logged user or language selection, /* 1st. row, 3rd. column: logged user or language selection,
and link to open/close session */ and link to open/close session */
@ -1427,8 +1428,6 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
struct Institution Ins; struct Institution Ins;
struct Degree Deg; struct Degree Deg;
struct Course Crs; struct Course Crs;
unsigned Size = (PrintView ? 64 :
32);
/***** Get data of institution *****/ /***** Get data of institution *****/
Ins.InsCod = InsCod; Ins.InsCod = InsCod;
@ -1456,7 +1455,7 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
if (!PrintView) if (!PrintView)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">",Ins.WWW); fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">",Ins.WWW);
Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName, Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName,
Size,NULL,true); 32,NULL,true);
if (!PrintView) if (!PrintView)
fprintf (Gbl.F.Out,"</a>"); fprintf (Gbl.F.Out,"</a>");
} }
@ -1504,7 +1503,8 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TIT_CLASSPHOTO\">", " class=\"TIT_CLASSPHOTO\">",
Deg.WWW); Deg.WWW);
Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,Size,NULL,true); Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,
32,NULL,true);
if (!PrintView) if (!PrintView)
fprintf (Gbl.F.Out,"</a>"); fprintf (Gbl.F.Out,"</a>");
} }