Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-05-30 13:25:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.150.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-03-18 19:23:30 +01:00
parent 200522b468
commit 686e30d6a7
4 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
css/swad15.146.css → css/swad15.150.2.css
View File

@ -1273,7 +1273,7 @@ a:hover /* Default ==> underlined */
display:inline-block;
box-sizing:border-box;
margin:5px 0;
padding:12px;
padding:8px 12px 12px 12px;
background-color:white;
border-radius:4px;
box-shadow:1px 1px 2px #CCC;
@ -1297,7 +1297,8 @@ a:hover /* Default ==> underlined */
}
.FRAME_ICONS
{
float:left;
display:table;
height:20px;
}
.FRAME_TABLE
{
@ -1306,8 +1307,11 @@ a:hover /* Default ==> underlined */
}
.FRAME_TABLE_TITLE
{
display:table;
box-sizing:border-box;
margin:12px;
width:100%;
margin:0 auto;
padding:0 12px 20px 12px;
color:#808080;
font-size:20pt;
font-weight:bold;
@ -1335,6 +1339,7 @@ a:hover /* Default ==> underlined */
/********** Title of country,institution,centre,degree,course ************/
.TITLE_LOCATION
{
display:inline-block;
font-size:25pt;
font-weight:bold;
color:#808080;

6
swad_changelog.h
View File

@ -134,13 +134,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.150.1 (2016-03-18)"
#define CSS_FILE "swad15.146.css"
#define Log_PLATFORM_VERSION "SWAD 15.150.2 (2016-03-18)"
#define CSS_FILE "swad15.150.2.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.150.2: Mar 18, 2016 Icon to print course configuration integrated in frame.
Changes in layour of frames. (195950 lines)
Version 15.150.1: Mar 18, 2016 Icon to view timetable integrated in frame. (195936 lines)
Version 15.150: Mar 18, 2016 Icons to edit/print timetable integrated in frame. (195923 lines)
Version 15.149.1: Mar 18, 2016 Button Done after internal editor of syllabus.

61
swad_course.c
View File

@ -74,6 +74,7 @@ extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
/*****************************************************************************/
static void Crs_Configuration (bool PrintView);
static void Crs_PutIconToPrint (void);
static void Crs_WriteListMyCoursesToSelectOne (void);
@ -141,7 +142,6 @@ void Crs_PrintConfiguration (void)
static void Crs_Configuration (bool PrintView)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Print;
extern const char *Txt_Course;
extern const char *Txt_Short_name;
extern const char *Txt_Year_OF_A_DEGREE;
@ -164,31 +164,22 @@ static void Crs_Configuration (bool PrintView)
/***** Messages and links above the frame *****/
if (!PrintView)
{
/***** Links to print view and request enrollment *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to print view */
Lay_PutContextualLink (ActPrnCrsInf,NULL,"print64x64.png",
Txt_Print,Txt_Print);
/* Link to request enrollment in the current course */
if (Gbl.Usrs.Me.LoggedRole == Rol__GUEST_ ||
Gbl.Usrs.Me.LoggedRole == Rol_VISITOR)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Enr_PutLinkToRequestSignUp ();
fprintf (Gbl.F.Out,"</div>");
/* Start form */
if (IsForm)
Act_FormStart (ActChgCrsLog);
fprintf (Gbl.F.Out,"</div>");
}
}
/***** Start frame *****/
Lay_StartRoundFrameTable (NULL,2,NULL);
Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL :
Crs_PutIconToPrint);
/***** Title *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"TITLE_LOCATION\">");
fprintf (Gbl.F.Out,"<div class=\"TITLE_LOCATION\">");
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">",
@ -199,10 +190,16 @@ static void Crs_Configuration (bool PrintView)
if (PutLink)
fprintf (Gbl.F.Out,"</a>");
fprintf (Gbl.F.Out,"<br />%s"
"</td>"
"</tr>",
"</div>",
Gbl.CurrentCrs.Crs.FullName);
/***** Start form *****/
if (IsForm)
Act_FormStart (ActChgCrsLog);
/***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
/***** Course full name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_MIDDLE\">"
@ -377,15 +374,29 @@ static void Crs_Configuration (bool PrintView)
Indicators.CountIndicators,Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS);
}
/***** Send button and end frame *****/
if (IsForm)
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
else
Lay_EndRoundFrameTable ();
/***** End table *****/
fprintf (Gbl.F.Out,"</table>");
/***** End form *****/
/***** Send button and end form *****/
if (IsForm)
{
Lay_PutConfirmButton (Txt_Save);
Act_FormEnd ();
}
/***** End frame *****/
Lay_EndRoundFrame ();
}
/*****************************************************************************/
/************* Put icon to print the configuration of a course ***************/
/*****************************************************************************/
static void Crs_PutIconToPrint (void)
{
extern const char *Txt_Print;
Lay_PutContextualLink (ActPrnCrsInf,NULL,"print64x64.png",Txt_Print,NULL);
}
/*****************************************************************************/

6
swad_layout.c
View File

@ -1225,12 +1225,10 @@ void Lay_StartRoundFrame (const char *Width,const char *Title,void (*FunctionToD
fprintf (Gbl.F.Out," style=\"box-sizing:border-box; width:%s;\"",Width);
fprintf (Gbl.F.Out,">");
fprintf (Gbl.F.Out,"<div class=\"FRAME_ICONS\">");
if (FunctionToDrawContextualIcons)
{
fprintf (Gbl.F.Out,"<div class=\"FRAME_ICONS\">");
FunctionToDrawContextualIcons ();
fprintf (Gbl.F.Out,"</div>");
}
fprintf (Gbl.F.Out,"</div>");
if (Title)
fprintf (Gbl.F.Out,"<div class=\"FRAME_TABLE_TITLE CENTER_MIDDLE\">"