Version 15.159.5

This commit is contained in:
Antonio Cañas Vargas 2016-03-21 18:37:28 +01:00
parent c044476526
commit 793aabb27d
13 changed files with 30 additions and 40 deletions

View File

@ -1330,6 +1330,12 @@ a:hover /* Default ==> underlined */
box-sizing:border-box; box-sizing:border-box;
width:100%; width:100%;
} }
.FRAME_TABLE_MARGIN
{
box-sizing:border-box;
width:100%;
margin-bottom:20px;
}
.FRAME_TABLE_TITLE .FRAME_TABLE_TITLE
{ {
display:table; display:table;
@ -1620,6 +1626,11 @@ a:hover img.CENTRE_PHOTO_SHOW
.BROWSER_TITLE {color:#94745C; font-size:13pt; font-weight:bold;} .BROWSER_TITLE {color:#94745C; font-size:13pt; font-weight:bold;}
.BROWSER_TITLE_LIGHT {color:#D5C6BB; font-size:13pt; font-weight:bold;} .BROWSER_TITLE_LIGHT {color:#D5C6BB; font-size:13pt; font-weight:bold;}
.BROWSER_SUBTITLE {color:#94745C; font-size:12pt;} .BROWSER_SUBTITLE {color:#94745C; font-size:12pt;}
.BROWSER_TABLE
{
box-sizing:border-box;
width:100%;
}
.T1 {color:#404040; font-size:15pt;} .T1 {color:#404040; font-size:15pt;}
.T2 {color:#404040; font-size:13pt;} .T2 {color:#404040; font-size:13pt;}

View File

@ -147,7 +147,7 @@ static void Asg_ShowAllAssignments (void)
if (Gbl.Asgs.Num) if (Gbl.Asgs.Num)
{ {
/***** Table head *****/ /***** Table head *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">" fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">"
"<tr>"); "<tr>");
for (Order = Asg_ORDER_BY_START_DATE; for (Order = Asg_ORDER_BY_START_DATE;
Order <= Asg_ORDER_BY_END_DATE; Order <= Asg_ORDER_BY_END_DATE;

View File

@ -214,7 +214,7 @@ static void Att_ShowAllAttEvents (void)
if (Gbl.AttEvents.Num) if (Gbl.AttEvents.Num)
{ {
/***** Table head *****/ /***** Table head *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">" fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">"
"<tr>"); "<tr>");
for (Order = Att_ORDER_BY_START_DATE; for (Order = Att_ORDER_BY_START_DATE;
Order <= Att_ORDER_BY_END_DATE; Order <= Att_ORDER_BY_END_DATE;
@ -2928,7 +2928,6 @@ static void Att_PutButtonToShowDetails (void)
extern const char *Txt_Show_more_details; extern const char *Txt_Show_more_details;
/***** Button to show more details *****/ /***** Button to show more details *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
Act_FormStart (Gbl.Action.Act); Act_FormStart (Gbl.Action.Act);
Par_PutHiddenParamChar ("ShowDetails",'Y'); Par_PutHiddenParamChar ("ShowDetails",'Y');
Grp_PutParamsCodGrps (); Grp_PutParamsCodGrps ();
@ -2937,7 +2936,6 @@ static void Att_PutButtonToShowDetails (void)
Par_PutHiddenParamString ("AttCods",Gbl.AttEvents.StrAttCodsSelected); Par_PutHiddenParamString ("AttCods",Gbl.AttEvents.StrAttCodsSelected);
Lay_PutConfirmButton (Txt_Show_more_details); Lay_PutConfirmButton (Txt_Show_more_details);
Act_FormEnd (); Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
} }
/*****************************************************************************/ /*****************************************************************************/
@ -3061,6 +3059,9 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView,
unsigned NumStd; unsigned NumStd;
unsigned NumAttEvent; unsigned NumAttEvent;
unsigned Total; unsigned Total;
bool PutButtonShowDetails = (!Gbl.AttEvents.ShowDetails &&
(TypeOfView == Att_NORMAL_VIEW_ONLY_ME ||
TypeOfView == Att_NORMAL_VIEW_STUDENTS));
/***** Initialize structure with user's data *****/ /***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat); Usr_UsrDataConstructor (&UsrDat);
@ -3070,7 +3071,9 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView,
(TypeOfView == Att_NORMAL_VIEW_ONLY_ME) ? Att_PutIconToPrintMyList : (TypeOfView == Att_NORMAL_VIEW_ONLY_ME) ? Att_PutIconToPrintMyList :
((TypeOfView == Att_NORMAL_VIEW_STUDENTS) ? Att_PutIconToPrintStdsList : ((TypeOfView == Att_NORMAL_VIEW_STUDENTS) ? Att_PutIconToPrintStdsList :
NULL)); NULL));
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"); fprintf (Gbl.F.Out,"<table class=\"%s CELLS_PAD_2\">",
PutButtonShowDetails ? "FRAME_TABLE_MARGIN" :
"FRAME_TABLE");
/***** Heading row *****/ /***** Heading row *****/
Att_WriteTableHeadSeveralAttEvents (); Att_WriteTableHeadSeveralAttEvents ();
@ -3122,9 +3125,7 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView,
fprintf (Gbl.F.Out,"</table>"); fprintf (Gbl.F.Out,"</table>");
/***** Button to show more details *****/ /***** Button to show more details *****/
if (!Gbl.AttEvents.ShowDetails && if (PutButtonShowDetails)
(TypeOfView == Att_NORMAL_VIEW_ONLY_ME ||
TypeOfView == Att_NORMAL_VIEW_STUDENTS))
Att_PutButtonToShowDetails (); Att_PutButtonToShowDetails ();
/***** End frame *****/ /***** End frame *****/

View File

@ -607,8 +607,7 @@ static void Ctr_ListCentres (void)
if (Gbl.Ctrs.Num) // There are centres in the current institution if (Gbl.Ctrs.Num) // There are centres in the current institution
{ {
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\"" fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">");
" style=\"margin-bottom:20px;\">");
Ctr_PutHeadCentresForSeeing (true); // Order selectable Ctr_PutHeadCentresForSeeing (true); // Order selectable
/***** Write all the centres and their nuber of teachers *****/ /***** Write all the centres and their nuber of teachers *****/

View File

@ -134,13 +134,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.159.4 (2016-03-21)" #define Log_PLATFORM_VERSION "SWAD 15.159.5 (2016-03-21)"
#define CSS_FILE "swad15.157.css" #define CSS_FILE "swad15.159.5.css"
#define JS_FILE "swad15.131.3.js" #define JS_FILE "swad15.131.3.js"
// 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.159.5: Mar 21, 2016 Changes in CSS related to tables. (196423 lines)
Version 15.159.4: Mar 21, 2016 Icon to print stats on degrees integrated in frame. (196426 lines) Version 15.159.4: Mar 21, 2016 Icon to print stats on degrees integrated in frame. (196426 lines)
Version 15.159.3: Mar 21, 2016 Icon to add new announcement integrated in frame. Version 15.159.3: Mar 21, 2016 Icon to add new announcement integrated in frame.
Button to add new announcement. (196427 lines) Button to add new announcement. (196427 lines)

View File

@ -1131,8 +1131,7 @@ static void Crs_ListCourses (void)
if (Gbl.CurrentDeg.Deg.NumCrss) // There are courses in the current degree if (Gbl.CurrentDeg.Deg.NumCrss) // There are courses in the current degree
{ {
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\"" fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">");
" style=\"margin-bottom:20px;\">");
Crs_PutHeadCoursesForSeeing (); Crs_PutHeadCoursesForSeeing ();
/***** List the courses *****/ /***** List the courses *****/

View File

@ -1598,8 +1598,7 @@ static void Deg_ListDegrees (void)
if (Gbl.CurrentCtr.Ctr.NumDegs) // There are degrees in the current centre if (Gbl.CurrentCtr.Ctr.NumDegs) // There are degrees in the current centre
{ {
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\"" fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">");
" style=\"margin-bottom:20px;\">");
Deg_PutHeadDegreesForSeeing (); Deg_PutHeadDegreesForSeeing ();
/***** List the degrees *****/ /***** List the degrees *****/

View File

@ -3478,7 +3478,7 @@ static void Brw_ShowFileBrowser (void)
FunctionToDrawContextualIcons); FunctionToDrawContextualIcons);
/***** Title *****/ /***** Title *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE\">" fprintf (Gbl.F.Out,"<table class=\"BROWSER_TABLE\">"
"<tr>" "<tr>"
"<td class=\"CENTER_MIDDLE\" colspan=\"%u\">", "<td class=\"CENTER_MIDDLE\" colspan=\"%u\">",
Brw_NumColumnsInExpTree[Gbl.FileBrowser.Type]); Brw_NumColumnsInExpTree[Gbl.FileBrowser.Type]);

View File

@ -990,13 +990,8 @@ void Inf_FormToEnterIntegratedEditor (Inf_InfoSrc_t InfoSrc)
{ {
extern const char *Txt_Edit; extern const char *Txt_Edit;
/***** Start form *****/
Act_FormStart (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); Act_FormStart (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]);
/***** Send button *****/
Lay_PutConfirmButton (Txt_Edit); Lay_PutConfirmButton (Txt_Edit);
/***** End form *****/
Act_FormEnd (); Act_FormEnd ();
} }
@ -1008,13 +1003,8 @@ void Inf_FormToEnterPlainTextEditor (Inf_InfoSrc_t InfoSrc)
{ {
extern const char *Txt_Edit_plain_text; extern const char *Txt_Edit_plain_text;
/***** Start form *****/
Act_FormStart (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); Act_FormStart (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]);
/***** Send button *****/
Lay_PutConfirmButton (Txt_Edit_plain_text); Lay_PutConfirmButton (Txt_Edit_plain_text);
/***** End form *****/
Act_FormEnd (); Act_FormEnd ();
} }
@ -1026,13 +1016,8 @@ void Inf_FormToEnterRichTextEditor (Inf_InfoSrc_t InfoSrc)
{ {
extern const char *Txt_Edit_rich_text; extern const char *Txt_Edit_rich_text;
/***** Start form *****/
Act_FormStart (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); Act_FormStart (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]);
/***** Send button *****/
Lay_PutConfirmButton (Txt_Edit_rich_text); Lay_PutConfirmButton (Txt_Edit_rich_text);
/***** End form *****/
Act_FormEnd (); Act_FormEnd ();
} }

View File

@ -550,8 +550,7 @@ static void Ins_ListInstitutions (void)
if (Gbl.Inss.Num) // There are institutions in the current country if (Gbl.Inss.Num) // There are institutions in the current country
{ {
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\"" fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">");
" style=\"margin-bottom:20px;\">");
Ins_PutHeadInstitutionsForSeeing (true); // Order selectable Ins_PutHeadInstitutionsForSeeing (true); // Order selectable
/***** Write all the institutions and their nuber of users *****/ /***** Write all the institutions and their nuber of users *****/

View File

@ -1854,12 +1854,10 @@ void Rec_ShowFormSignUpWithMyCommonRecord (void)
extern const char *Txt_Sign_up; extern const char *Txt_Sign_up;
/***** Show the form *****/ /***** Show the form *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
Act_FormStart (ActSignUp); Act_FormStart (ActSignUp);
Rec_ShowSharedUsrRecord (Rec_FORM_SIGN_UP,&Gbl.Usrs.Me.UsrDat); Rec_ShowSharedUsrRecord (Rec_FORM_SIGN_UP,&Gbl.Usrs.Me.UsrDat);
Lay_PutConfirmButton (Txt_Sign_up); Lay_PutConfirmButton (Txt_Sign_up);
Act_FormEnd (); Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -213,8 +213,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
if (Gbl.Svys.Num) if (Gbl.Svys.Num)
{ {
/***** Table head *****/ /***** Table head *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\"" fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">"
" style=\"margin-bottom:20px;\">"
"<tr>"); "<tr>");
for (Order = Svy_ORDER_BY_START_DATE; for (Order = Svy_ORDER_BY_START_DATE;
Order <= Svy_ORDER_BY_END_DATE; Order <= Svy_ORDER_BY_END_DATE;

View File

@ -2459,8 +2459,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m
Lay_StartRoundFrame (NULL,Txt_Questions,Tst_PutIconToCreateNewTstQst); Lay_StartRoundFrame (NULL,Txt_Questions,Tst_PutIconToCreateNewTstQst);
/***** Write the heading *****/ /***** Write the heading *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\"" fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">"
" style=\"margin-bottom:20px;\">"
"<tr>" "<tr>"
"<th colspan=\"2\"></th>" "<th colspan=\"2\"></th>"
"<th class=\"CENTER_TOP\">" "<th class=\"CENTER_TOP\">"