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.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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
css/swad15.157.css → css/swad15.159.5.css
View File

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

2
swad_assignment.c
View File

@ -147,7 +147,7 @@ static void Asg_ShowAllAssignments (void)
if (Gbl.Asgs.Num)
{
/***** 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>");
for (Order = Asg_ORDER_BY_START_DATE;
Order <= Asg_ORDER_BY_END_DATE;

15
swad_attendance.c
View File

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

3
swad_centre.c
View File

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

5
swad_changelog.h
View File

@ -134,13 +134,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.159.4 (2016-03-21)"
#define CSS_FILE "swad15.157.css"
#define Log_PLATFORM_VERSION "SWAD 15.159.5 (2016-03-21)"
#define CSS_FILE "swad15.159.5.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.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.3: Mar 21, 2016 Icon to add new announcement integrated in frame.
Button to add new announcement. (196427 lines)

3
swad_course.c
View File

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

3
swad_degree.c
View File

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

2
swad_file_browser.c
View File

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

15
swad_info.c
View File

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

3
swad_institution.c
View File

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

2
swad_record.c
View File

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

3
swad_survey.c
View File

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

3
swad_test.c
View File

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