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 14.120.2

This commit is contained in:
Antonio Cañas Vargas 2015-07-25 20:07:38 +02:00
parent f11ce5361c
commit 608711aaec
11 changed files with 84 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
css/swad_desktop.css
View File

@ -731,10 +731,10 @@ a:hover img.CENTRE_PHOTO_SHOW
.YELLOW_MENU_ON {color:#BD4815; font-size:10pt; font-weight:bold; line-height:110%;}
/********************************* Form fonts ********************************/
.WHITE_FORM {color:#4D88A1; font-size:11pt; text-align:right;}
.GREY_FORM {color:#4D88A1; font-size:11pt; text-align:right;}
.BLUE_FORM {color:#4D88A1; font-size:11pt; text-align:right;}
.YELLOW_FORM {color:#7C4D2A; font-size:11pt; text-align:right;}
.WHITE_FORM {color:#4D88A1; font-size:11pt; text-align:right; vertical-align:middle;}
.GREY_FORM {color:#4D88A1; font-size:11pt; text-align:right; vertical-align:middle;}
.BLUE_FORM {color:#4D88A1; font-size:11pt; text-align:right; vertical-align:middle;}
.YELLOW_FORM {color:#7C4D2A; font-size:11pt; text-align:right; vertical-align:middle;}
.WHITE_FORM_NOWRAP {color:#4D88A1; font-size:11pt; white-space:nowrap;}
.GREY_FORM_NOWRAP {color:#4D88A1; font-size:11pt; white-space:nowrap;}

8
css/swad_mobile.css
View File

@ -542,10 +542,10 @@ a:hover img.CENTRE_PHOTO_SHOW
.YELLOW_MENU_ON {color:#FF4301; font-size:20pt; font-weight:bold; line-height:110%;}
/********************************* Form fonts ********************************/
.WHITE_FORM {color:#4D88A1; font-size:16pt; text-align:right;}
.GREY_FORM {color:#4D88A1; font-size:16pt; text-align:right;}
.BLUE_FORM {color:#4D88A1; font-size:16pt; text-align:right;}
.YELLOW_FORM {color:#FF4301; font-size:16pt; text-align:right;}
.WHITE_FORM {color:#4D88A1; font-size:16pt; text-align:right; vertical-align:middle;}
.GREY_FORM {color:#4D88A1; font-size:16pt; text-align:right; vertical-align:middle;}
.BLUE_FORM {color:#4D88A1; font-size:16pt; text-align:right; vertical-align:middle;}
.YELLOW_FORM {color:#FF4301; font-size:16pt; text-align:right; vertical-align:middle;}
.WHITE_FORM_NOWRAP {color:#4D88A1; font-size:16pt; white-space:nowrap;}
.GREY_FORM_NOWRAP {color:#4D88A1; font-size:16pt; white-space:nowrap;}

23
swad_centre.c
View File

@ -365,8 +365,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Centre full name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT_N\""
@ -384,7 +383,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Centre short name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -400,7 +399,7 @@ static void Ctr_Configuration (bool PrintView)
if (Gbl.CurrentCtr.Ctr.WWW[0])
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -419,7 +418,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Shortcut to the centre *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -438,7 +437,7 @@ static void Ctr_Configuration (bool PrintView)
{
/***** QR code with link to the centre *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -453,7 +452,7 @@ static void Ctr_Configuration (bool PrintView)
{
/***** Number of degrees *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -467,7 +466,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Number of courses *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -481,7 +480,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -495,7 +494,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Number of students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -528,7 +527,7 @@ void Ctr_ShowCtrsOfCurrentIns (void)
Ctr_GetListCentres (Gbl.CurrentIns.Ins.InsCod);
/***** Write menu to select country and institution *****/
Deg_WriteMenuAllCourses (ActSeeIns,ActSeeCtr,ActUnk,ActUnk);
Deg_WriteMenuAllCourses ();
/***** Put link (form) to edit centres in current institution *****/
if (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_)
@ -1070,7 +1069,7 @@ void Ctr_WriteSelectorOfCentre (Act_Action_t NextAction)
/***** Start form *****/
Act_FormGoToStart (NextAction);
fprintf (Gbl.F.Out,"<select name=\"CtrCod\" style=\"width:140px;\"");
fprintf (Gbl.F.Out,"<select name=\"ctr\" style=\"width:140px;\"");
if (Gbl.CurrentIns.Ins.InsCod > 0)
fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\"",
Gbl.FormId);

4
swad_changelog.h
View File

@ -103,11 +103,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.120.1 (2015/07/25)"
#define Log_PLATFORM_VERSION "SWAD 14.120.2 (2015/07/25)"
// 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 14.120.2: Jul 25, 2015 Changes in CSS of forms.
Fixed bug in selectors of country, institution, centre and degree. (184819 lines)
Version 14.120.1: Jul 25, 2015 Changes in CSS of forms.
Update connected users when change scope selection. (184856 lines)
Version 14.120: Jul 25, 2015 Changes in CSS of forms. (184879 lines)

4
swad_connected.c
View File

@ -95,7 +95,9 @@ void Con_ShowConnectedUsrs (void)
Gbl.Scope.Current = Sco_SCOPE_CRS;
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
{
fprintf (Gbl.F.Out,"<label class=\"%s\">%s: </label>",
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
"</label>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Scope);
Sco_SetScopesForListingStudents ();
Sco_GetScope ();

29
swad_country.c
View File

@ -314,8 +314,7 @@ static void Cty_Configuration (bool PrintView)
/***** Country name (an link to WWW if exists) *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT_N\""
@ -333,8 +332,7 @@ static void Cty_Configuration (bool PrintView)
/***** Link to the country inside platform *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -352,8 +350,7 @@ static void Cty_Configuration (bool PrintView)
{
/***** QR code with link to the country *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -368,8 +365,7 @@ static void Cty_Configuration (bool PrintView)
{
/***** Number of institutions *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -383,8 +379,7 @@ static void Cty_Configuration (bool PrintView)
/***** Number of centres *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -398,8 +393,7 @@ static void Cty_Configuration (bool PrintView)
/***** Number of degrees *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -413,8 +407,7 @@ static void Cty_Configuration (bool PrintView)
/***** Number of courses *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -428,8 +421,7 @@ static void Cty_Configuration (bool PrintView)
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -443,8 +435,7 @@ static void Cty_Configuration (bool PrintView)
/***** Number of students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -1005,7 +996,7 @@ void Cty_WriteSelectorOfCountry (Act_Action_t NextAction)
/***** Start form *****/
Act_FormGoToStart (NextAction);
fprintf (Gbl.F.Out,"<select name=\"CtyCod\" style=\"width:140px;\""
fprintf (Gbl.F.Out,"<select name=\"cty\" style=\"width:140px;\""
" onchange=\"javascript:document.getElementById('%s').submit();\">"
"<option value=\"\"",
Gbl.FormId);

58
swad_course.c
View File

@ -226,8 +226,7 @@ static void Crs_Configuration (bool PrintView)
/***** Course full name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT_N\""
@ -241,8 +240,7 @@ static void Crs_Configuration (bool PrintView)
/***** Course short name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -256,8 +254,7 @@ static void Crs_Configuration (bool PrintView)
/***** Course year *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -285,8 +282,7 @@ static void Crs_Configuration (bool PrintView)
/***** Course semester *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -315,8 +311,7 @@ static void Crs_Configuration (bool PrintView)
{
/***** Institutional code of the course *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -335,22 +330,21 @@ static void Crs_Configuration (bool PrintView)
/***** Internal code of the course *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left; vertical-align:middle;\">"
"%ld"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Internal_code,
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Internal_code,
Gbl.CurrentCrs.Crs.CrsCod);
}
/***** Link to the course *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -368,8 +362,7 @@ static void Crs_Configuration (bool PrintView)
{
/***** QR code with link to the course *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -388,8 +381,7 @@ static void Crs_Configuration (bool PrintView)
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -402,8 +394,7 @@ static void Crs_Configuration (bool PrintView)
/***** Number of students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -416,8 +407,7 @@ static void Crs_Configuration (bool PrintView)
/***** Indicators *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -430,7 +420,8 @@ static void Crs_Configuration (bool PrintView)
"</a>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Indicators,
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Indicators,
Cfg_HTTPS_URL_SWAD_CGI,Gbl.CurrentCrs.Crs.CrsCod,Act_Actions[ActReqStaCrs].ActCod,
Indicators.CountIndicators,Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS,
Gbl.Prefs.IconsURL,
@ -464,12 +455,12 @@ static void Crs_PutFormToConfigLogIn (bool IsForm)
/***** Can students enter directly? *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Students_authentication);
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Students_authentication);
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"AllowDirectLogIn\" value=\"N\"");
if (!Gbl.CurrentDegTyp.DegTyp.AllowDirectLogIn &&
@ -582,11 +573,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
/***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_My_courses);
fprintf (Gbl.F.Out,"<div style=\"margin:0 auto;\">"
"<ul class=\"%s\" style=\"list-style-type:none;"
" padding:0; margin:0;"
" text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:0 auto;\">"
"<ul class=\"LIST_LEFT\">");
/***** Write link to platform *****/
fprintf (Gbl.F.Out,"<li style=\"height:20px;\">");
@ -963,7 +951,7 @@ void Crs_ShowCrssOfCurrentDeg (void)
Crs_GetListCoursesInDegree (Crs_ALL_COURSES_EXCEPT_REMOVED);
/***** Write menu to select country, institution, centre and degree *****/
Deg_WriteMenuAllCourses (ActSeeIns,ActSeeCtr,ActSeeDeg,ActSeeCrs);
Deg_WriteMenuAllCourses ();
/***** Put link (form) to edit courses in current degree *****/
if (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_)
@ -1210,7 +1198,6 @@ static void Crs_EditCourses (void)
static void Crs_ListCoursesForSeeing (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Courses_of_DEGREE_X;
extern const char *Txt_COURSE_With_users;
extern const char *Txt_COURSE_Without_users;
@ -2940,8 +2927,7 @@ static void Crs_PutLinkToGoToCrs (struct Course *Crs)
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Go_to_X;
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_FormGoToStart (ActSeeCrsInf);
Crs_PutParamCrsCod (Crs->CrsCod);
sprintf (Gbl.Title,Txt_Go_to_X,Crs->ShortName);

4
swad_date.c
View File

@ -229,7 +229,7 @@ void Dat_WriteFormIniEndDates (void)
extern const char *Txt_Today;
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s:"
"</td>",
The_ClassFormul[Gbl.Prefs.Theme],
@ -242,7 +242,7 @@ void Dat_WriteFormIniEndDates (void)
"</tr>");
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s:"
"</td>",
The_ClassFormul[Gbl.Prefs.Theme],

58
swad_degree.c
View File

@ -343,8 +343,7 @@ static void Deg_Configuration (bool PrintView)
/***** Degree full name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT_N\""
@ -365,8 +364,7 @@ static void Deg_Configuration (bool PrintView)
/***** Degree short name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -382,8 +380,7 @@ static void Deg_Configuration (bool PrintView)
if (Gbl.CurrentDeg.Deg.WWW[0])
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -402,8 +399,7 @@ static void Deg_Configuration (bool PrintView)
/***** Shortcut to the degree *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -422,8 +418,7 @@ static void Deg_Configuration (bool PrintView)
{
/***** QR code with link to the degree *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -438,8 +433,7 @@ static void Deg_Configuration (bool PrintView)
{
/***** Number of courses *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -452,8 +446,7 @@ static void Deg_Configuration (bool PrintView)
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -467,8 +460,7 @@ static void Deg_Configuration (bool PrintView)
/***** Number of students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -490,10 +482,7 @@ static void Deg_Configuration (bool PrintView)
/*** Write menu to select country, institution, centre, degree and course ****/
/*****************************************************************************/
void Deg_WriteMenuAllCourses (Act_Action_t NextActionCty,
Act_Action_t NextActionIns,
Act_Action_t NextActionCtr,
Act_Action_t NextActionDeg)
void Deg_WriteMenuAllCourses (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Country;
@ -508,57 +497,54 @@ void Deg_WriteMenuAllCourses (Act_Action_t NextActionCty,
/***** Write a 1st selector
with all the countries *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Country);
Cty_WriteSelectorOfCountry (NextActionCty);
Cty_WriteSelectorOfCountry (ActSeeIns);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
if (NextActionIns != ActUnk &&
Gbl.CurrentCty.Cty.CtyCod > 0)
if (Gbl.CurrentCty.Cty.CtyCod > 0)
{
/***** Write a 2nd selector
with the institutions of selected country *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Institution);
Ins_WriteSelectorOfInstitution (NextActionIns);
Ins_WriteSelectorOfInstitution (ActSeeCtr);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
if (NextActionCtr != ActUnk &&
Gbl.CurrentIns.Ins.InsCod > 0)
if (Gbl.CurrentIns.Ins.InsCod > 0)
{
/***** Write a 3rd selector
with all the centres of selected institution *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Centre);
Ctr_WriteSelectorOfCentre (NextActionCtr);
Ctr_WriteSelectorOfCentre (ActSeeDeg);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
if (NextActionDeg != ActUnk &&
Gbl.CurrentCtr.Ctr.CtrCod > 0)
if (Gbl.CurrentCtr.Ctr.CtrCod > 0)
{
/***** Write a 4th selector
with all the degrees of selected centre *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Degree);
Deg_WriteSelectorOfDegree (NextActionDeg);
Deg_WriteSelectorOfDegree (ActSeeCrs);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
@ -585,7 +571,7 @@ static void Deg_WriteSelectorOfDegree (Act_Action_t NextAction)
/***** Start form *****/
Act_FormGoToStart (NextAction);
fprintf (Gbl.F.Out,"<select name=\"DegCod\" style=\"width:140px;\"");
fprintf (Gbl.F.Out,"<select name=\"deg\" style=\"width:140px;\"");
if (Gbl.CurrentCtr.Ctr.CtrCod > 0)
fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\"",
Gbl.FormId);
@ -1012,7 +998,7 @@ void Deg_ShowDegsOfCurrentCtr (void)
Deg_GetListDegsOfCurrentCtr ();
/***** Write menu to select country, institution and centre *****/
Deg_WriteMenuAllCourses (ActSeeIns,ActSeeCtr,ActSeeDeg,ActUnk);
Deg_WriteMenuAllCourses ();
/***** Put link (form) to edit degrees of the current centre *****/
if (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_)

5
swad_degree.h
View File

@ -101,10 +101,7 @@ void Deg_SeeDegWithPendingCrss (void);
void Deg_ShowConfiguration (void);
void Deg_PrintConfiguration (void);
void Deg_WriteMenuAllCourses (Act_Action_t NextActionCty,
Act_Action_t NextActionIns,
Act_Action_t NextActionCtr,
Act_Action_t NextActionDeg);
void Deg_WriteMenuAllCourses (void);
void Deg_WriteCtyInsCtrDeg (void);
void Deg_WriteBigNameCtyInsCtrDegCrs (void);
void Deg_InitCurrentCourse (void);

4
swad_institution.c
View File

@ -486,7 +486,7 @@ void Ins_ShowInssOfCurrentCty (void)
Ins_GetListInstitutions (Gbl.CurrentCty.Cty.CtyCod,Ins_GET_EXTRA_DATA);
/***** Write menu to select country *****/
Deg_WriteMenuAllCourses (ActSeeIns,ActUnk,ActUnk,ActUnk);
Deg_WriteMenuAllCourses ();
/***** Put link (form) to edit institutions *****/
if (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_)
@ -1024,7 +1024,7 @@ void Ins_WriteSelectorOfInstitution (Act_Action_t NextAction)
/***** Start form *****/
Act_FormGoToStart (NextAction);
fprintf (Gbl.F.Out,"<select name=\"InsCod\" style=\"width:140px;\"");
fprintf (Gbl.F.Out,"<select name=\"ins\" style=\"width:140px;\"");
if (Gbl.CurrentCty.Cty.CtyCod > 0)
fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\"",
Gbl.FormId);