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.152

This commit is contained in:
Antonio Cañas Vargas 2016-03-19 02:21:09 +01:00
parent 2784aab48d
commit be8f6e7b46
6 changed files with 93 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
css/swad15.150.2.css → css/swad15.152.css
View File

@ -166,6 +166,31 @@ a:hover /* Default ==> underlined */
display:inline-block;
}
}
@media only screen and (max-width: 1023px)
{ /* For mobile phones and tablets */
#head_row_1_tagline
{
display:none;
}
}
@media only screen and (min-width: 1024px)
{ /* For mobile phones and tablets */
#head_row_1_tagline
{
display:inline-block;
box-sizing:border-box;
max-width:220px;
padding:0 4px;
color:#B0B0B0;
font-size:11pt;
font-weight:bold;
line-height:110%;
text-align:left;
vertical-align:middle;
}
}
#head_row_1_search
{
display:inline-block;

BIN
icon/swad64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

5
swad_changelog.h
View File

@ -134,13 +134,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.151.5 (2016-03-19)"
#define CSS_FILE "swad15.150.2.css"
#define Log_PLATFORM_VERSION "SWAD 15.152 (2016-03-19)"
#define CSS_FILE "swad15.152.css"
#define JS_FILE "swad15.131.3.js"
// 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
/*
Version 15.152: Mar 19, 2016 Changes in layout of head. Not finished. (? lines)
Version 15.151.5: Mar 19, 2016 Icon to edit holidays integrated in frame. (195931 lines)
Version 15.151.4: Mar 19, 2016 Icon to edit plugins integrated in frame. (195933 lines)
Version 15.151.3: Mar 19, 2016 Icon to edit mail domains integrated in frame. (195934 lines)

8
swad_config.h
View File

@ -59,7 +59,7 @@
#define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc.
#define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad64x64.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40
#define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40
#define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad140x40.png"
@ -111,7 +111,7 @@
#define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc.
#define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad64x64.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40
#define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40
#define Cfg_PLATFORM_LOGO_BIG_FILENAME "openswad220x40.png"
@ -180,7 +180,7 @@
#define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc.
#define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad64x64.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40
#define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40
#define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad140x40.png"
@ -239,7 +239,7 @@
#define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc.
#define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad64x64.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40
#define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40
#define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad140x40.png"

120
swad_degree.c
View File

@ -685,7 +685,7 @@ void Deg_WriteCtyInsCtrDeg (void)
if (Gbl.CurrentCty.Cty.CtyCod > 0) // Country selected...
{
/***** Separator *****/
fprintf (Gbl.F.Out,"<span class=\"%s\"> / </span>",ClassOn);
fprintf (Gbl.F.Out,"<span class=\"%s\"> &gt; </span>",ClassOn);
/***** Form to go to select institutions *****/
Act_FormGoToStart (ActSeeCtyInf);
@ -698,7 +698,7 @@ void Deg_WriteCtyInsCtrDeg (void)
else
{
/***** Separator *****/
fprintf (Gbl.F.Out,"<span class=\"%s\"> / </span>",ClassSemiOff);
fprintf (Gbl.F.Out,"<span class=\"%s\"> &gt; </span>",ClassSemiOff);
/***** Form to go to select countries *****/
Act_FormGoToStart (ActSeeCty);
@ -710,7 +710,7 @@ void Deg_WriteCtyInsCtrDeg (void)
if (Gbl.CurrentIns.Ins.InsCod > 0) // Institution selected...
{
/***** Separator *****/
fprintf (Gbl.F.Out,"<span class=\"%s\"> / </span>",ClassOn);
fprintf (Gbl.F.Out,"<span class=\"%s\"> &gt; </span>",ClassOn);
/***** Form to go to select centres *****/
Act_FormGoToStart (ActSeeInsInf);
@ -723,7 +723,7 @@ void Deg_WriteCtyInsCtrDeg (void)
else if (Gbl.CurrentCty.Cty.CtyCod > 0)
{
/***** Separator *****/
fprintf (Gbl.F.Out,"<span class=\"%s\"> / </span>",ClassSemiOff);
fprintf (Gbl.F.Out,"<span class=\"%s\"> &gt; </span>",ClassSemiOff);
/***** Form to go to select institutions *****/
Act_FormGoToStart (ActSeeIns);
@ -733,13 +733,13 @@ void Deg_WriteCtyInsCtrDeg (void)
}
else
/***** Separator and hidden institution *****/
fprintf (Gbl.F.Out,"<span class=\"%s\"> / %s</span>",
fprintf (Gbl.F.Out,"<span class=\"%s\"> &gt; %s</span>",
ClassOff,Txt_Institution);
if (Gbl.CurrentCtr.Ctr.CtrCod > 0) // Centre selected...
{
/***** Separator *****/
fprintf (Gbl.F.Out,"<span class=\"%s\"> / </span>",ClassOn);
fprintf (Gbl.F.Out,"<span class=\"%s\"> &gt; </span>",ClassOn);
/***** Form to go to the centre *****/
Act_FormGoToStart (ActSeeCtrInf);
@ -752,7 +752,7 @@ void Deg_WriteCtyInsCtrDeg (void)
else if (Gbl.CurrentIns.Ins.InsCod > 0)
{
/***** Separator *****/
fprintf (Gbl.F.Out,"<span class=\"%s\"> / </span>",ClassSemiOff);
fprintf (Gbl.F.Out,"<span class=\"%s\"> &gt; </span>",ClassSemiOff);
/***** Form to go to select centres *****/
Act_FormGoToStart (ActSeeCtr);
@ -762,13 +762,13 @@ void Deg_WriteCtyInsCtrDeg (void)
}
else
/***** Separator and hidden centre *****/
fprintf (Gbl.F.Out,"<span class=\"%s\"> / %s</span>",
fprintf (Gbl.F.Out,"<span class=\"%s\"> &gt; %s</span>",
ClassOff,Txt_Centre);
if (Gbl.CurrentDeg.Deg.DegCod > 0) // Degree selected...
{
/***** Separator *****/
fprintf (Gbl.F.Out,"<span class=\"%s\"> / </span>",ClassOn);
fprintf (Gbl.F.Out,"<span class=\"%s\"> &gt; </span>",ClassOn);
/***** Form to go to the degree *****/
Act_FormGoToStart (ActSeeDegInf);
@ -784,7 +784,7 @@ void Deg_WriteCtyInsCtrDeg (void)
else if (Gbl.CurrentCtr.Ctr.CtrCod > 0)
{
/***** Separator *****/
fprintf (Gbl.F.Out,"<span class=\"%s\"> / </span>",ClassSemiOff);
fprintf (Gbl.F.Out,"<span class=\"%s\"> &gt; </span>",ClassSemiOff);
/***** Form to go to select degrees *****/
Act_FormGoToStart (ActSeeDeg);
@ -794,11 +794,11 @@ void Deg_WriteCtyInsCtrDeg (void)
}
else
/***** Separator and hidden degree *****/
fprintf (Gbl.F.Out,"<span class=\"%s\"> / %s</span>",
fprintf (Gbl.F.Out,"<span class=\"%s\"> &gt; %s</span>",
ClassOff,Txt_Degree);
/***** Separator *****/
fprintf (Gbl.F.Out,"<span class=\"%s\"> / </span>",
fprintf (Gbl.F.Out,"<span class=\"%s\"> &gt; </span>",
(Gbl.CurrentCrs.Crs.CrsCod > 0) ? ClassOn :
((Gbl.CurrentDeg.Deg.DegCod > 0) ? ClassSemiOff :
ClassOff));
@ -815,60 +815,50 @@ void Deg_WriteBigNameCtyInsCtrDegCrs (void)
fprintf (Gbl.F.Out,"<h1 id=\"main_title\" class=\"%s\">",
The_ClassCourse[Gbl.Prefs.Theme]);
if (Gbl.CurrentCty.Cty.CtyCod > 0) // Country selected
{
/***** Logo *****/
if (Gbl.CurrentCrs.Crs.CrsCod > 0 ||
Gbl.CurrentDeg.Deg.DegCod > 0)
Log_DrawLogo (Sco_SCOPE_DEG,Gbl.CurrentDeg.Deg.DegCod,
Gbl.CurrentDeg.Deg.ShortName,40,"TOP_LOGO",false);
else if (Gbl.CurrentCtr.Ctr.CtrCod > 0)
Log_DrawLogo (Sco_SCOPE_CTR,Gbl.CurrentCtr.Ctr.CtrCod,
Gbl.CurrentCtr.Ctr.ShortName,40,"TOP_LOGO",false);
else if (Gbl.CurrentIns.Ins.InsCod > 0)
Log_DrawLogo (Sco_SCOPE_INS,Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentIns.Ins.ShortName,40,"TOP_LOGO",false);
else
Cty_DrawCountryMap (&Gbl.CurrentCty.Cty,"COUNTRY_MAP_TITLE");
/***** Logo *****/
if (Gbl.CurrentCrs.Crs.CrsCod > 0 ||
Gbl.CurrentDeg.Deg.DegCod > 0)
Log_DrawLogo (Sco_SCOPE_DEG,Gbl.CurrentDeg.Deg.DegCod,
Gbl.CurrentDeg.Deg.ShortName,40,"TOP_LOGO",false);
else if (Gbl.CurrentCtr.Ctr.CtrCod > 0)
Log_DrawLogo (Sco_SCOPE_CTR,Gbl.CurrentCtr.Ctr.CtrCod,
Gbl.CurrentCtr.Ctr.ShortName,40,"TOP_LOGO",false);
else if (Gbl.CurrentIns.Ins.InsCod > 0)
Log_DrawLogo (Sco_SCOPE_INS,Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentIns.Ins.ShortName,40,"TOP_LOGO",false);
else if (Gbl.CurrentCty.Cty.CtyCod > 0)
Cty_DrawCountryMap (&Gbl.CurrentCty.Cty,"COUNTRY_MAP_TITLE");
else
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"TOP_LOGO\" />",
Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_SMALL_FILENAME,
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME);
/***** Text *****/
fprintf (Gbl.F.Out,"<div id=\"big_name_container\">"
"<div id=\"big_full_name\">"
"%s" // Full name
"</div>"
"<div class=\"NOT_SHOWN\">"
" / " // To separate
"</div>"
"<div id=\"big_short_name\">"
"%s" // Short name
"</div>"
"</div>",
(Gbl.CurrentCrs.Crs.CrsCod > 0) ? Gbl.CurrentCrs.Crs.FullName :
((Gbl.CurrentDeg.Deg.DegCod > 0) ? Gbl.CurrentDeg.Deg.FullName :
((Gbl.CurrentCtr.Ctr.CtrCod > 0) ? Gbl.CurrentCtr.Ctr.FullName :
((Gbl.CurrentIns.Ins.InsCod > 0) ? Gbl.CurrentIns.Ins.FullName :
Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]))),
(Gbl.CurrentCrs.Crs.CrsCod > 0) ? Gbl.CurrentCrs.Crs.ShortName :
((Gbl.CurrentDeg.Deg.DegCod > 0) ? Gbl.CurrentDeg.Deg.ShortName :
((Gbl.CurrentCtr.Ctr.CtrCod > 0) ? Gbl.CurrentCtr.Ctr.ShortName :
((Gbl.CurrentIns.Ins.InsCod > 0) ? Gbl.CurrentIns.Ins.ShortName :
Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]))));
}
else // No country selected
/* This main title takes up space but it is invisible */
fprintf (Gbl.F.Out,"<div id=\"big_name_container\">"
"<div id=\"big_full_name\" class=\"HIDDEN\">"
"%s" // Full name
"</div>"
"<div class=\"NOT_SHOWN\">"
" / " // To separate
"</div>"
"<div id=\"big_short_name\" class=\"HIDDEN\">"
"%s" // Short name
"</div>"
"</div>",
Cfg_PLATFORM_FULL_NAME,
Cfg_PLATFORM_SHORT_NAME);
/***** Text *****/
fprintf (Gbl.F.Out,"<div id=\"big_name_container\">"
"<div id=\"big_full_name\">"
"%s" // Full name
"</div>"
"<div class=\"NOT_SHOWN\">"
" / " // To separate
"</div>"
"<div id=\"big_short_name\">"
"%s" // Short name
"</div>"
"</div>",
(Gbl.CurrentCrs.Crs.CrsCod > 0) ? Gbl.CurrentCrs.Crs.FullName :
((Gbl.CurrentDeg.Deg.DegCod > 0) ? Gbl.CurrentDeg.Deg.FullName :
((Gbl.CurrentCtr.Ctr.CtrCod > 0) ? Gbl.CurrentCtr.Ctr.FullName :
((Gbl.CurrentIns.Ins.InsCod > 0) ? Gbl.CurrentIns.Ins.FullName :
((Gbl.CurrentCty.Cty.CtyCod > 0) ? Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language] :
Cfg_PLATFORM_FULL_NAME)))),
(Gbl.CurrentCrs.Crs.CrsCod > 0) ? Gbl.CurrentCrs.Crs.ShortName :
((Gbl.CurrentDeg.Deg.DegCod > 0) ? Gbl.CurrentDeg.Deg.ShortName :
((Gbl.CurrentCtr.Ctr.CtrCod > 0) ? Gbl.CurrentCtr.Ctr.ShortName :
((Gbl.CurrentIns.Ins.InsCod > 0) ? Gbl.CurrentIns.Ins.ShortName :
((Gbl.CurrentCty.Cty.CtyCod > 0) ? Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language] :
Cfg_PLATFORM_SHORT_NAME)))));
fprintf (Gbl.F.Out,"</h1>");
}

7
swad_layout.c
View File

@ -758,7 +758,7 @@ static void Lay_WritePageTopHeading (void)
fprintf (Gbl.F.Out,"<div id=\"head_row_1\" class=\"%s\">",
ClassHeadRow1[Gbl.Prefs.Theme]);
/* 1st. row, 1st. column: logo and search */
/* 1st. row, 1st. column: logo, tagline and search */
fprintf (Gbl.F.Out,"<div id=\"head_row_1_left\">");
fprintf (Gbl.F.Out,"<div id=\"head_row_1_logo_small\">"
@ -784,6 +784,11 @@ static void Lay_WritePageTopHeading (void)
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT);
fprintf (Gbl.F.Out,"<div id=\"head_row_1_tagline\">"
"%s"
"</div>", // head_row_1_logo_small
"free platform for learning & educational management"); // TODO: Need translation!!!!!
fprintf (Gbl.F.Out,"<div id=\"head_row_1_search\">");
Act_FormStart ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsSch :
(Gbl.CurrentDeg.Deg.DegCod > 0 ? ActDegSch :