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

This commit is contained in:
Antonio Cañas Vargas 2015-12-02 00:32:46 +01:00
parent 811f2914cc
commit 02124a45b2
5 changed files with 100 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
css/swad15.55.css → css/swad15.56.css
View File

@ -1806,7 +1806,7 @@ a:hover img.CENTRE_PHOTO_SHOW
/********************************** Page foot ********************************/
@media only screen and (max-width: 899px)
{ /* For mobile-phones */
#foot_zone
#foot_zone, #about_zone
{
display:none;
}
@ -1817,11 +1817,11 @@ a:hover img.CENTRE_PHOTO_SHOW
{
padding:20px;
}
}
.FOOT
{
color:#A0A0A0;
font-size:12pt;
#about_zone
{
padding:20px;
text-align:center;
}
}
.FOOT_LIST_CONTAINER
{
@ -1852,6 +1852,11 @@ a:hover img.CENTRE_PHOTO_SHOW
{
color:#2C90C9;
}
.ABOUT
{
color:#A0A0A0;
font-size:12pt;
}
/************ Something that takes up space but which is invisible ***********/
.INVISIBLE

2
html/foot.html
View File

@ -102,5 +102,3 @@
</ul>
</div>
</div>
<br style="clear:both;" />

5
swad_changelog.h
View File

@ -117,12 +117,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.55 (2015/12/01)"
#define CSS_FILE "swad15.55.css"
#define Log_PLATFORM_VERSION "SWAD 15.56 (2015/12/02)"
#define CSS_FILE "swad15.56.css"
// 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.56: Dec 02, 2015 Fixed bug and changes in layout related to time to generate and send page. (188597 lines)
Version 15.55: Dec 01, 2015 Change in layout background. (186805 lines)
Version 15.54.7: Dec 01, 2015 Change in title (country, institution, centre, degree, course). (186783 lines)
Version 15.54.6: Dec 01, 2015 Change in layout of file browser. (186768 lines)

156
swad_layout.c
View File

@ -90,6 +90,7 @@ static void Lay_WriteTitleAction (void);
static void Lay_ShowLeftColumn (void);
static void Lay_ShowRightColumn (void);
static void Lay_WriteAboutZone (void);
static void Lay_WriteFootFromHTMLFile (void);
static void Lay_HelpTextEditor (const char *Text,const char *InlineMath,const char *Equation);
@ -353,7 +354,7 @@ static void Lay_WriteEndOfPage (void)
/***** Write page footer *****/
if (Act_Actions[Gbl.CurrentAct].BrowserWindow == Act_MAIN_WINDOW)
Lay_WritePageFooter ();
Lay_WriteFootFromHTMLFile ();
/***** End of main zone and page *****/
fprintf (Gbl.F.Out,"</div>" // main_zone_central
@ -1224,41 +1225,47 @@ void Lay_ShowErrorAndExit (const char *Message)
/***** Free memory and close all the open files *****/
Gbl_Cleanup ();
/***** Page is generated (except </body> and </html>). Compute time to generate page *****/
/***** Page is generated (except </body> and </html>).
Compute time to generate page *****/
if (Gbl.CurrentAct != ActRefCon && // Refreshing connected users
Gbl.CurrentAct != ActRefLstClk) // Refreshing last clics
Sta_ComputeTimeToGeneratePage ();
/***** Send page. The HTML output is now in Gbl.F.Out file ==> copy it to standard output *****/
if (!Gbl.WebService.IsWebService)
{
rewind (Gbl.F.Out);
Fil_FastCopyOfOpenFiles (Gbl.F.Out,stdout);
Fil_CloseAndRemoveFileForHTMLOutput ();
}
if (Gbl.WebService.IsWebService) // Serving a plugin request
{
/***** Log access *****/
Gbl.TimeSendInMicroseconds = 0L;
Sta_LogAccess (Message);
}
else if (Gbl.CurrentAct != ActRefCon && // Refreshing connected users
Gbl.CurrentAct != ActRefLstClk) // Refreshing last clicks
else
{
/***** Compute time to send page *****/
Sta_ComputeTimeToSendPage ();
/***** Send page.
The HTML output is now in Gbl.F.Out file ==>
==> copy it to standard output *****/
rewind (Gbl.F.Out);
Fil_FastCopyOfOpenFiles (Gbl.F.Out,stdout);
Fil_CloseAndRemoveFileForHTMLOutput ();
/***** Log access *****/
Sta_LogAccess (Message);
if (Gbl.CurrentAct != ActRefCon && // Refreshing connected users
Gbl.CurrentAct != ActRefLstClk) // Refreshing last clicks
{
/***** Compute time to send page *****/
Sta_ComputeTimeToSendPage ();
/***** End the output *****/
if (!Gbl.Layout.HTMLEndWritten)
{
fprintf (Gbl.F.Out,"</body>\n"
"</html>\n");
Gbl.Layout.HTMLEndWritten = true;
}
/***** Log access *****/
Sta_LogAccess (Message);
/***** End the output *****/
if (!Gbl.Layout.HTMLEndWritten)
{
// Here Gbl.F.Out is stdout
Lay_WriteAboutZone ();
fprintf (Gbl.F.Out,"</body>\n"
"</html>\n");
Gbl.Layout.HTMLEndWritten = true;
}
}
}
/***** Close database connection *****/
@ -1300,6 +1307,58 @@ void Lay_ShowAlert (Lay_AlertType_t MsgType,const char *Message)
Message);
}
/*****************************************************************************/
/***************** Write about zone at the end of the page *******************/
/*****************************************************************************/
static void Lay_WriteAboutZone (void)
{
extern const char *Txt_About_X;
extern const char *Txt_Questions_and_problems;
/***** About zone start *****/
fprintf (Gbl.F.Out,"<div id=\"about_zone\" class=\"ABOUT\">");
/***** Institution and centre hosting the platform *****/
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"ABOUT\" target=\"_blank\">"
"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" style=\"width:%upx; height:%upx;\" />"
"<div>%s</div>"
"</a>",
Cfg_ABOUT_URL,
Gbl.Prefs.IconsURL,Cfg_ABOUT_LOGO,
Cfg_ABOUT_NAME,Cfg_ABOUT_NAME,
Cfg_ABOUT_LOGO_WIDTH,Cfg_ABOUT_LOGO_HEIGHT,
Cfg_ABOUT_NAME);
/***** Questions and problems *****/
fprintf (Gbl.F.Out,"<div>"
"<a href=\"%s\" class=\"ABOUT\" target=\"_blank\">%s:</a> "
"<a href=\"mailto:%s\" class=\"ABOUT\" target=\"_blank\">%s</a>"
"</div>",
Cfg_HELP_WEB,Txt_Questions_and_problems,
Cfg_PLATFORM_RESPONSIBLE_E_MAIL,Cfg_PLATFORM_RESPONSIBLE_E_MAIL);
/***** About and time to generate and send page *****/
fprintf (Gbl.F.Out,"<div>");
/* About */
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"ABOUT\" target=\"_blank\">",
Cfg_ABOUT_SWAD_URL);
fprintf (Gbl.F.Out,Txt_About_X,Log_PLATFORM_VERSION);
fprintf (Gbl.F.Out,"</a>"
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
/* Time to generate and send page */
Sta_WriteTimeToGenerateAndSendPage ();
fprintf (Gbl.F.Out,"</div>");
/***** About zone end *****/
fprintf (Gbl.F.Out,"</div>"); // about_zone
}
/*****************************************************************************/
/*********** Refresh notifications and connected users via AJAX **************/
/*****************************************************************************/
@ -1362,53 +1421,6 @@ void Lay_RefreshLastClicks (void)
Gbl.Layout.DivsEndWritten = Gbl.Layout.HTMLEndWritten = true;
}
/*****************************************************************************/
/*************************** Write footer of page ****************************/
/*****************************************************************************/
void Lay_WritePageFooter (void)
{
extern const char *Txt_About_X;
extern const char *Txt_Questions_and_problems;
fprintf (Gbl.F.Out,"<div id=\"foot_zone\" class=\"FOOT\">");
Lay_WriteFootFromHTMLFile ();
/***** Institution and centre hosting the platform *****/
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"FOOT\" target=\"_blank\">"
"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" style=\"width:%upx; height:%upx;\" />"
"<div>%s</div>"
"</a>",
Cfg_ABOUT_URL,
Gbl.Prefs.IconsURL,Cfg_ABOUT_LOGO,
Cfg_ABOUT_NAME,Cfg_ABOUT_NAME,
Cfg_ABOUT_LOGO_WIDTH,Cfg_ABOUT_LOGO_HEIGHT,
Cfg_ABOUT_NAME);
fprintf (Gbl.F.Out,"<div>"
"<a href=\"%s\" class=\"FOOT\" target=\"_blank\">%s:</a> "
"<a href=\"mailto:%s\" class=\"FOOT\" target=\"_blank\">%s</a>"
"</div>",
Cfg_HELP_WEB,Txt_Questions_and_problems,
Cfg_PLATFORM_RESPONSIBLE_E_MAIL,Cfg_PLATFORM_RESPONSIBLE_E_MAIL);
/***** About *****/
fprintf (Gbl.F.Out,"<div>"
"<a href=\"%s\" class=\"FOOT\" target=\"_blank\">",
Cfg_ABOUT_SWAD_URL);
fprintf (Gbl.F.Out,Txt_About_X,Log_PLATFORM_VERSION);
fprintf (Gbl.F.Out,"</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
/***** Write time to generate and send page *****/
Sta_WriteTimeToGenerateAndSendPage ();
fprintf (Gbl.F.Out,"</div>"
"</div>");
}
/*****************************************************************************/
/************************ Write the end of the page **************************/
/*****************************************************************************/
@ -1420,9 +1432,13 @@ static void Lay_WriteFootFromHTMLFile (void)
/***** Open file with the HTML page for the chat *****/
if ((FileHTML = fopen (Cfg_PATH_AND_FILE_REL_HTML_PRIVATE,"rb")))
{
fprintf (Gbl.F.Out,"<div id=\"foot_zone\">");
/***** Copy HTML to output file *****/
Fil_FastCopyOfOpenFiles (FileHTML,Gbl.F.Out);
fclose (FileHTML);
fprintf (Gbl.F.Out,"</div>");
}
}

1
swad_layout.h
View File

@ -100,7 +100,6 @@ void Lay_ShowErrorAndExit (const char *Message);
void Lay_ShowAlert (Lay_AlertType_t MsgType,const char *Message);
void Lay_RefreshNotifsAndConnected (void);
void Lay_RefreshLastClicks (void);
void Lay_WritePageFooter (void);
void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingClassPhoto,
long InsCod,long DegCod,long CrsCod);