diff --git a/css/swad15.56.1.css b/css/swad15.57.css similarity index 98% rename from css/swad15.56.1.css rename to css/swad15.57.css index d9093154f..adb55fd62 100644 --- a/css/swad15.56.1.css +++ b/css/swad15.57.css @@ -1804,6 +1804,48 @@ a:hover img.CENTRE_PHOTO_SHOW min-width:312px; } +/************* Forms to edit institution, centre, degree, course *************/ +.CODE + { + min-width:60px; + text-align:right; + vertical-align:middle; + } +.INPUT_INS_CODE + { + width:90px; + } +.INPUT_DEGREE + { + width:90px; + } +.INPUT_SHORT_NAME + { + width:90px; + } +.INPUT_FULL_NAME + { + width:180px; + } +.INPUT_WWW + { + width:90px; + } +.STATUS + { + min-width:90px; + text-align:left; + vertical-align:middle; + } +.INPUT_STATUS + { + width:80px; + } +.INPUT_REQUESTER + { + width:90px; + } + /********************************** Page foot ********************************/ @media only screen and (max-width: 899px) { /* For mobile-phones */ diff --git a/swad_banner.c b/swad_banner.c index fab5d9e1e..872b2419c 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -355,7 +355,8 @@ static void Ban_ListBannersForEdition (void) Act_FormStart (ActRenBanSho); Ban_PutParamBanCod (Ban->BanCod); fprintf (Gbl.F.Out,"", Ban_MAX_LENGTH_SHORT_NAME,Ban->ShortName,Gbl.FormId); Act_FormEnd (); @@ -366,7 +367,8 @@ static void Ban_ListBannersForEdition (void) Act_FormStart (ActRenBanFul); Ban_PutParamBanCod (Ban->BanCod); fprintf (Gbl.F.Out,"", Ban_MAX_LENGTH_FULL_NAME,Ban->FullName,Gbl.FormId); Act_FormEnd (); @@ -388,7 +390,8 @@ static void Ban_ListBannersForEdition (void) Act_FormStart (ActChgBanWWW); Ban_PutParamBanCod (Ban->BanCod); fprintf (Gbl.F.Out,"", Cns_MAX_LENGTH_WWW,Ban->WWW,Gbl.FormId); Act_FormEnd (); @@ -749,14 +752,16 @@ static void Ban_PutFormToCreateBanner (void) /***** Banner short name *****/ fprintf (Gbl.F.Out,"" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_SHORT_NAME\" />" "", Ban_MAX_LENGTH_SHORT_NAME,Ban->ShortName); /***** Banner full name *****/ fprintf (Gbl.F.Out,"" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_FULL_NAME\" />" "", Ban_MAX_LENGTH_FULL_NAME,Ban->FullName); @@ -770,7 +775,8 @@ static void Ban_PutFormToCreateBanner (void) /***** Banner WWW *****/ fprintf (Gbl.F.Out,"" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_WWW\" />" "" "", Cns_MAX_LENGTH_WWW,Ban->WWW); diff --git a/swad_centre.c b/swad_centre.c index 6aad92b1e..5132bc25b 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -1197,8 +1197,8 @@ static void Ctr_ListCentresForEdition (void) fprintf (Gbl.F.Out,""); /* Centre code */ - fprintf (Gbl.F.Out,"" - "%ld " + fprintf (Gbl.F.Out,"" + "%ld" "", Ctr->CtrCod); @@ -1272,7 +1272,8 @@ static void Ctr_ListCentresForEdition (void) Act_FormStart (ActRenCtrSho); Ctr_PutParamOtherCtrCod (Ctr->CtrCod); fprintf (Gbl.F.Out,"", Ctr_MAX_LENGTH_CENTRE_SHORT_NAME,Ctr->ShortName,Gbl.FormId); Act_FormEnd (); @@ -1289,7 +1290,8 @@ static void Ctr_ListCentresForEdition (void) Act_FormStart (ActRenCtrFul); Ctr_PutParamOtherCtrCod (Ctr->CtrCod); fprintf (Gbl.F.Out,"", Ctr_MAX_LENGTH_CENTRE_FULL_NAME,Ctr->FullName,Gbl.FormId); Act_FormEnd (); @@ -1306,7 +1308,8 @@ static void Ctr_ListCentresForEdition (void) Act_FormStart (ActChgCtrWWW); Ctr_PutParamOtherCtrCod (Ctr->CtrCod); fprintf (Gbl.F.Out,"", Cns_MAX_LENGTH_WWW,Ctr->WWW,Gbl.FormId); Act_FormEnd (); @@ -1337,13 +1340,13 @@ static void Ctr_ListCentresForEdition (void) /* Centre status */ StatusTxt = Ctr_GetStatusTxtFromStatusBits (Ctr->Status); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM && StatusTxt == Ctr_STATUS_PENDING) { Act_FormStart (ActChgCtrSta); Ctr_PutParamOtherCtrCod (Ctr->CtrCod); - fprintf (Gbl.F.Out,"" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_SHORT_NAME\" />" "", Ctr_MAX_LENGTH_CENTRE_SHORT_NAME,Ctr->ShortName); /***** Centre full name *****/ fprintf (Gbl.F.Out,"" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_FULL_NAME\" />" "", Ctr_MAX_LENGTH_CENTRE_FULL_NAME,Ctr->FullName); /***** Centre WWW *****/ fprintf (Gbl.F.Out,"" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_WWW\" />" "", Cns_MAX_LENGTH_WWW,Ctr->WWW); @@ -2070,30 +2076,23 @@ static void Ctr_PutFormToCreateCentre (void) ""); /***** Centre status *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s" "", Txt_CENTRE_STATUS[Ctr_STATUS_PENDING]); /***** Centre requester *****/ - fprintf (Gbl.F.Out,"" - "" + fprintf (Gbl.F.Out,"" ""); - /***** Send button *****/ - fprintf (Gbl.F.Out,"" - "" - ""); - - /***** End of frame *****/ - Lay_EndRoundFrameTable (); + /***** Send button and end frame *****/ + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_centre); /***** End of form *****/ Act_FormEnd (); @@ -2174,7 +2173,7 @@ static void Ctr_PutHeadCentresForEdition (void) "" - "" + "" "" diff --git a/swad_changelog.h b/swad_changelog.h index c6ef6a2ff..dc1a97e48 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -116,12 +116,13 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.56.6 (2015/12/05)" -#define CSS_FILE "swad15.56.1.css" +#define Log_PLATFORM_VERSION "SWAD 15.57 (2015/12/05)" +#define CSS_FILE "swad15.57.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.57: Dec 05, 2015 Lot of changes in forms to edit institutions, centres, degrees, courses, etc. (186903 lines) Version 15.56.6: Dec 05, 2015 Fixed minor bug in edition of degrees. (186843 lines) Version 15.56.5: Dec 05, 2015 Go to degree in table of degrees (statistic). (186843 lines) Version 15.56.4: Dec 05, 2015 Changed icons in forums and chat. (186844 lines) diff --git a/swad_country.c b/swad_country.c index c1cc41074..99aa8a896 100644 --- a/swad_country.c +++ b/swad_country.c @@ -1329,7 +1329,8 @@ static void Cty_ListCountriesForEdition (void) Cty_PutParamOtherCtyCod (Cty->CtyCod); Par_PutHiddenParamUnsigned ("Lan",(unsigned) Lan); fprintf (Gbl.F.Out,"", Cty_MAX_LENGTH_COUNTRY_WWW, Cty->WWW[Lan],Gbl.FormId); @@ -1683,7 +1684,8 @@ static void Cty_PutFormToCreateCountry (void) /* WWW */ fprintf (Gbl.F.Out,"" "", Txt_STR_LANG_ID[Lan],Cty_MAX_LENGTH_COUNTRY_WWW,Cty->WWW[Lan]); diff --git a/swad_course.c b/swad_course.c index e06a82034..d43b61dfd 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1440,7 +1440,7 @@ static void Crs_ListCoursesForEdition (void) fprintf (Gbl.F.Out,""); /* Course code */ - fprintf (Gbl.F.Out,"", Crs->CrsCod); @@ -1452,10 +1452,10 @@ static void Crs_ListCoursesForEdition (void) Act_FormStart (ActChgInsCrsCod); Crs_PutParamOtherCrsCod (Crs->CrsCod); fprintf (Gbl.F.Out,"", Crs_LENGTH_INSTITUTIONAL_CRS_COD, - Crs_LENGTH_INSTITUTIONAL_CRS_COD, Crs->InstitutionalCrsCod, Gbl.FormId); Act_FormEnd (); @@ -1465,13 +1465,13 @@ static void Crs_ListCoursesForEdition (void) fprintf (Gbl.F.Out,""); /* Degree */ - fprintf (Gbl.F.Out,"
" + "" ""); - Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,100,10,"DAT",true,NULL); + Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,100,6,"DAT",true,NULL); fprintf (Gbl.F.Out,"" "
" "
"); - Lay_PutCreateButton (Txt_Create_centre); - fprintf (Gbl.F.Out,"
" "%s" "" "%s" "" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_WWW\" />" "
" + fprintf (Gbl.F.Out,"" "%ld" ""); + fprintf (Gbl.F.Out,""); if (Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM) { Act_FormStart (ActChgCrsDeg); Crs_PutParamOtherCrsCod (Crs->CrsCod); fprintf (Gbl.F.Out,"", Crs_MAX_LENGTH_COURSE_SHORT_NAME,Crs->ShortName, Gbl.FormId); @@ -1564,7 +1565,8 @@ static void Crs_ListCoursesForEdition (void) Act_FormStart (ActRenCrsFul); Crs_PutParamOtherCrsCod (Crs->CrsCod); fprintf (Gbl.F.Out,"", Crs_MAX_LENGTH_COURSE_FULL_NAME,Crs->FullName, Gbl.FormId); @@ -1588,14 +1590,13 @@ static void Crs_ListCoursesForEdition (void) /* Course status */ StatusTxt = Crs_GetStatusTxtFromStatusBits (Crs->Status); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM && StatusTxt == Crs_STATUS_PENDING) { Act_FormStart (ActChgCrsSta); Crs_PutParamOtherCrsCod (Crs->CrsCod); - fprintf (Gbl.F.Out,"" - "" + fprintf (Gbl.F.Out,"" @@ -1726,22 +1725,22 @@ static void Crs_PutFormToCreateCourse (void) fprintf (Gbl.F.Out,""); /***** Course code *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); /***** Institutional code of the course *****/ fprintf (Gbl.F.Out,"", Crs_LENGTH_INSTITUTIONAL_CRS_COD, - Crs_LENGTH_INSTITUTIONAL_CRS_COD, Crs->InstitutionalCrsCod); /***** Degree *****/ fprintf (Gbl.F.Out,"", @@ -1780,14 +1779,16 @@ static void Crs_PutFormToCreateCourse (void) /***** Course short name *****/ fprintf (Gbl.F.Out,"", Crs_MAX_LENGTH_COURSE_SHORT_NAME,Crs->ShortName); /***** Course full name *****/ fprintf (Gbl.F.Out,"", Crs_MAX_LENGTH_COURSE_FULL_NAME,Crs->FullName); @@ -1802,16 +1803,16 @@ static void Crs_PutFormToCreateCourse (void) ""); /***** Course status *****/ - fprintf (Gbl.F.Out,"", Txt_COURSE_STATUS[Crs_STATUS_PENDING]); /***** Course requester *****/ - fprintf (Gbl.F.Out,"
" + "" ""); - Msg_WriteMsgAuthor (&UsrDat,100,10,"DAT",true,NULL); + Msg_WriteMsgAuthor (&UsrDat,100,6,"DAT",true,NULL); fprintf (Gbl.F.Out,"" "
" "
" - "" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_INS_CODE\" />" "" "" "" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_SHORT_NAME\" />" "" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_FULL_NAME\" />" "" + fprintf (Gbl.F.Out,"" "%s" "" - "" + fprintf (Gbl.F.Out,"" @@ -1898,7 +1899,7 @@ static void Crs_PutHeadCoursesForEdition (void) "" - "" "", Deg->DegCod); @@ -1482,7 +1482,8 @@ static void Deg_ListDegreesForEdition (void) Act_FormStart (ActRenDegSho); Deg_PutParamOtherDegCod (Deg->DegCod); fprintf (Gbl.F.Out,"", Deg_MAX_LENGTH_DEGREE_SHORT_NAME,Deg->ShortName,Gbl.FormId); Act_FormEnd (); @@ -1498,7 +1499,8 @@ static void Deg_ListDegreesForEdition (void) Act_FormStart (ActRenDegFul); Deg_PutParamOtherDegCod (Deg->DegCod); fprintf (Gbl.F.Out,"", Deg_MAX_LENGTH_DEGREE_FULL_NAME,Deg->FullName,Gbl.FormId); Act_FormEnd (); @@ -1622,7 +1624,8 @@ static void Deg_ListDegreesForEdition (void) Act_FormStart (ActChgDegWWW); Deg_PutParamOtherDegCod (Deg->DegCod); fprintf (Gbl.F.Out,"", Cns_MAX_LENGTH_WWW,Deg->WWW,Gbl.FormId); Act_FormEnd (); @@ -1647,13 +1650,13 @@ static void Deg_ListDegreesForEdition (void) /* Degree status */ StatusTxt = Deg_GetStatusTxtFromStatusBits (Deg->Status); - fprintf (Gbl.F.Out,"
" + "" ""); - Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,100,10,"DAT",true,NULL); + Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,100,6,"DAT",true,NULL); fprintf (Gbl.F.Out,"" "
" "
" "%s (%s)" "" + "" "%s" "" diff --git a/swad_degree.c b/swad_degree.c index 307d6f0e3..9eb7cf91f 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -1440,7 +1440,7 @@ static void Deg_ListDegreesForEdition (void) fprintf (Gbl.F.Out,""); /* Degree code */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%ld" ""); + fprintf (Gbl.F.Out,""); if (Gbl.Usrs.Me.LoggedRole >= Rol_CTR_ADM && StatusTxt == Deg_STATUS_PENDING) { Act_FormStart (ActChgDegSta); Deg_PutParamOtherDegCod (Deg->DegCod); - fprintf (Gbl.F.Out,"" - "" + fprintf (Gbl.F.Out,"" @@ -1836,8 +1839,7 @@ static void Deg_PutFormToCreateDegree (void) fprintf (Gbl.F.Out,""); /***** Degree code *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); /***** Degree logo *****/ fprintf (Gbl.F.Out,"", Deg_MAX_LENGTH_DEGREE_SHORT_NAME,Deg->ShortName); /***** Degree full name *****/ fprintf (Gbl.F.Out,"", Deg_MAX_LENGTH_DEGREE_FULL_NAME,Deg->FullName); @@ -1924,7 +1928,8 @@ static void Deg_PutFormToCreateDegree (void) /***** Degree WWW *****/ fprintf (Gbl.F.Out,"", Cns_MAX_LENGTH_WWW,Deg->WWW); @@ -1934,16 +1939,16 @@ static void Deg_PutFormToCreateDegree (void) ""); /***** Degree status *****/ - fprintf (Gbl.F.Out,"", Txt_DEGREE_STATUS[Deg_STATUS_PENDING]); /***** Degree requester *****/ - fprintf (Gbl.F.Out,"
" + "" ""); - Msg_WriteMsgAuthor (&UsrDat,100,10,"DAT",true,NULL); + Msg_WriteMsgAuthor (&UsrDat,100,6,"DAT",true,NULL); fprintf (Gbl.F.Out,"" "
" "
" - ""); @@ -1859,14 +1861,16 @@ static void Deg_PutFormToCreateDegree (void) /***** Degree short name *****/ fprintf (Gbl.F.Out,"" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_SHORT_NAME\" />" "" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_FULL_NAME\" />" "" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_WWW\" />" "" + fprintf (Gbl.F.Out,"" "%s" "" - "" + fprintf (Gbl.F.Out,"" @@ -2022,7 +2027,7 @@ static void Deg_PutHeadDegreeTypesForEdition (void) static void Deg_PutHeadDegreesForSeeing (void) { extern const char *Txt_Degree; - extern const char *Txt_Type_of_BR_degree; + extern const char *Txt_Type; extern const char *Txt_First_BR_year; extern const char *Txt_Last_BR_year; extern const char *Txt_Opt_BR_year; @@ -2055,7 +2060,7 @@ static void Deg_PutHeadDegreesForSeeing (void) "" "", Txt_Degree, - Txt_Type_of_BR_degree, + Txt_Type, Txt_First_BR_year, Txt_Last_BR_year, Txt_Opt_BR_year, @@ -2073,7 +2078,7 @@ static void Deg_PutHeadDegreesForEdition (void) extern const char *Txt_Centre; extern const char *Txt_Short_BR_Name; extern const char *Txt_Full_BR_Name; - extern const char *Txt_Type_of_BR_degree; + extern const char *Txt_Type; extern const char *Txt_First_BR_year; extern const char *Txt_Last_BR_year; extern const char *Txt_Opt_BR_year; @@ -2087,7 +2092,7 @@ static void Deg_PutHeadDegreesForEdition (void) "" - "" + "" "" @@ -2126,7 +2131,7 @@ static void Deg_PutHeadDegreesForEdition (void) Txt_Centre, Txt_Short_BR_Name, Txt_Full_BR_Name, - Txt_Type_of_BR_degree, + Txt_Type, Txt_First_BR_year, Txt_Last_BR_year, Txt_Opt_BR_year, diff --git a/swad_department.c b/swad_department.c index 233241bd0..e4f89f2a0 100644 --- a/swad_department.c +++ b/swad_department.c @@ -551,7 +551,8 @@ static void Dpt_ListDepartmentsForEdition (void) Act_FormStart (ActRenDptSho); Dpt_PutParamDptCod (Dpt->DptCod); fprintf (Gbl.F.Out,"", MAX_LENGTH_DEPARTMENT_SHORT_NAME,Dpt->ShortName,Gbl.FormId); Act_FormEnd (); @@ -562,7 +563,8 @@ static void Dpt_ListDepartmentsForEdition (void) Act_FormStart (ActRenDptFul); Dpt_PutParamDptCod (Dpt->DptCod); fprintf (Gbl.F.Out,"", MAX_LENGTH_DEPARTMENT_FULL_NAME,Dpt->FullName,Gbl.FormId); Act_FormEnd (); @@ -573,7 +575,8 @@ static void Dpt_ListDepartmentsForEdition (void) Act_FormStart (ActChgDptWWW); Dpt_PutParamDptCod (Dpt->DptCod); fprintf (Gbl.F.Out,"", Cns_MAX_LENGTH_WWW,Dpt->WWW,Gbl.FormId); Act_FormEnd (); @@ -917,21 +920,24 @@ static void Dpt_PutFormToCreateDepartment (void) /***** Department short name *****/ fprintf (Gbl.F.Out,"", MAX_LENGTH_DEPARTMENT_SHORT_NAME,Dpt->ShortName); /***** Department full name *****/ fprintf (Gbl.F.Out,"", MAX_LENGTH_DEPARTMENT_FULL_NAME,Dpt->FullName); /***** Department WWW *****/ fprintf (Gbl.F.Out,"" "", Cns_MAX_LENGTH_WWW,Dpt->WWW); diff --git a/swad_institution.c b/swad_institution.c index 9cb66e126..de98ac8a2 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -1149,7 +1149,7 @@ static void Ins_ListInstitutionsForEdition (void) fprintf (Gbl.F.Out,""); /* Institution code */ - fprintf (Gbl.F.Out,"", Ins->InsCod); @@ -1168,7 +1168,7 @@ static void Ins_ListInstitutionsForEdition (void) { Act_FormStart (ActChgInsCty); Ins_PutParamOtherInsCod (Ins->InsCod); - fprintf (Gbl.F.Out,"", Ins_MAX_LENGTH_INSTITUTION_SHORT_NAME,Ins->ShortName, Gbl.FormId); @@ -1216,7 +1217,8 @@ static void Ins_ListInstitutionsForEdition (void) Act_FormStart (ActRenInsFul); Ins_PutParamOtherInsCod (Ins->InsCod); fprintf (Gbl.F.Out,"", Ins_MAX_LENGTH_INSTITUTION_FULL_NAME,Ins->FullName, Gbl.FormId); @@ -1233,7 +1235,8 @@ static void Ins_ListInstitutionsForEdition (void) Act_FormStart (ActChgInsWWW); Ins_PutParamOtherInsCod (Ins->InsCod); fprintf (Gbl.F.Out,"", Cns_MAX_LENGTH_WWW,Ins->WWW, Gbl.FormId); @@ -1264,15 +1267,15 @@ static void Ins_ListInstitutionsForEdition (void) "", Ins->NumCtrs); - /* Degree status */ + /* Institution status */ StatusTxt = Ins_GetStatusTxtFromStatusBits (Ins->Status); - fprintf (Gbl.F.Out,""); - /* Degree requester */ + /* Institution requester */ UsrDat.UsrCod = Ins->RequesterUsrCod; Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); - fprintf (Gbl.F.Out,"
" + "" ""); - Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,100,10,"DAT",true,NULL); + Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,100,6,"DAT",true,NULL); fprintf (Gbl.F.Out,"" "
" "
" "%s" "" "%s" "" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_SHORT_NAME\" />" "" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_FULL_NAME\" />" "" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_WWW\" />" "
" + fprintf (Gbl.F.Out,"" "%ld" ""); + fprintf (Gbl.F.Out,""); if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM && StatusTxt == Ins_STATUS_PENDING) { Act_FormStart (ActChgInsSta); Ins_PutParamOtherInsCod (Ins->InsCod); - fprintf (Gbl.F.Out,"" - "" + fprintf (Gbl.F.Out,"" @@ -1790,7 +1793,7 @@ static void Ins_PutFormToCreateInstitution (void) fprintf (Gbl.F.Out,""); /***** Institution code *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); /***** Institution logo *****/ fprintf (Gbl.F.Out,""); /***** Country *****/ - fprintf (Gbl.F.Out,"", Ins_MAX_LENGTH_INSTITUTION_SHORT_NAME,Ins->ShortName); /***** Institution full name *****/ - fprintf (Gbl.F.Out,"", Ins_MAX_LENGTH_INSTITUTION_FULL_NAME,Ins->FullName); /***** Institution WWW *****/ - fprintf (Gbl.F.Out,"", Cns_MAX_LENGTH_WWW,Ins->WWW); @@ -1840,17 +1846,17 @@ static void Ins_PutFormToCreateInstitution (void) "0" ""); - /***** Centre status *****/ - fprintf (Gbl.F.Out,"", Txt_INSTITUTION_STATUS[Ins_STATUS_PENDING]); - /***** Centre requester *****/ - fprintf (Gbl.F.Out,"
" + "" ""); - Msg_WriteMsgAuthor (&UsrDat,100,10,"DAT",true,NULL); + Msg_WriteMsgAuthor (&UsrDat,100,6,"DAT",true,NULL); fprintf (Gbl.F.Out,"" "
" "
"); @@ -1798,9 +1801,9 @@ static void Ins_PutFormToCreateInstitution (void) fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "" + fprintf (Gbl.F.Out,"" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_SHORT_NAME\" />" "" + fprintf (Gbl.F.Out,"" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_FULL_NAME\" />" "" + fprintf (Gbl.F.Out,"" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_WWW\" />" "" + /***** Institution status *****/ + fprintf (Gbl.F.Out,"" "%s" "" - "" + /***** Institution requester *****/ + fprintf (Gbl.F.Out,"" @@ -1884,7 +1890,7 @@ static void Ins_PutHeadInstitutionsForEdition (void) "" - "" + "" "" diff --git a/swad_link.c b/swad_link.c index 24edd64d4..ce23e3b08 100644 --- a/swad_link.c +++ b/swad_link.c @@ -351,7 +351,8 @@ static void Lnk_ListLinksForEdition (void) Act_FormStart (ActRenLnkSho); Lnk_PutParamLnkCod (Lnk->LnkCod); fprintf (Gbl.F.Out,"", Lnk_MAX_LENGTH_LINK_SHORT_NAME,Lnk->ShortName, Gbl.FormId); @@ -363,7 +364,8 @@ static void Lnk_ListLinksForEdition (void) Act_FormStart (ActRenLnkFul); Lnk_PutParamLnkCod (Lnk->LnkCod); fprintf (Gbl.F.Out,"", Lnk_MAX_LENGTH_LINK_FULL_NAME,Lnk->FullName, Gbl.FormId); @@ -375,7 +377,8 @@ static void Lnk_ListLinksForEdition (void) Act_FormStart (ActChgLnkWWW); Lnk_PutParamLnkCod (Lnk->LnkCod); fprintf (Gbl.F.Out,"", Cns_MAX_LENGTH_WWW,Lnk->WWW, Gbl.FormId); @@ -634,21 +637,24 @@ static void Lnk_PutFormToCreateLink (void) /***** Link short name *****/ fprintf (Gbl.F.Out,"", Lnk_MAX_LENGTH_LINK_SHORT_NAME,Lnk->ShortName); /***** Link full name *****/ fprintf (Gbl.F.Out,"", Lnk_MAX_LENGTH_LINK_FULL_NAME,Lnk->FullName); /***** Link WWW *****/ fprintf (Gbl.F.Out,"" "", Cns_MAX_LENGTH_WWW,Lnk->WWW); diff --git a/swad_message.c b/swad_message.c index 05a9081ad..14e6079c7 100644 --- a/swad_message.c +++ b/swad_message.c @@ -2856,7 +2856,8 @@ static void Msg_WriteSentOrReceivedMsgSubject (Msg_TypeOfMessages_t TypeOfMessag /*****************************************************************************/ // Input: UsrDat must hold user's data -void Msg_WriteMsgAuthor (struct UsrData *UsrDat,unsigned WidthOfNameColumn,unsigned MaxCharsInName, +void Msg_WriteMsgAuthor (struct UsrData *UsrDat, + unsigned WidthOfNameColumn,unsigned MaxCharsInName, const char *Style,bool Enabled,const char *BgColor) { extern const char *Txt_Unknown_or_without_photo; diff --git a/swad_message.h b/swad_message.h index 0447129fa..23f3b273a 100644 --- a/swad_message.h +++ b/swad_message.h @@ -99,7 +99,8 @@ void Msg_GetMsgSubject (long MsgCod,char *Subject); void Msg_GetNotifMessage (char *SummaryStr,char **ContentStr,long MsgCod,unsigned MaxChars,bool GetContent); void Msg_WriteMsgNumber (unsigned long MsgNum,bool NewMsg); -void Msg_WriteMsgAuthor (struct UsrData *UsrDat,unsigned WidthOfNameColumn,unsigned MaxCharsInName, +void Msg_WriteMsgAuthor (struct UsrData *UsrDat, + unsigned WidthOfNameColumn,unsigned MaxCharsInName, const char *Style,bool Enabled,const char *BgColor); bool Msg_WriteCrsOrgMsg (long CrsCod); void Msg_WriteListUsrsDstMsg (long MsgCod); diff --git a/swad_place.c b/swad_place.c index 10bc39bac..fcb4a8afa 100644 --- a/swad_place.c +++ b/swad_place.c @@ -448,7 +448,8 @@ static void Plc_ListPlacesForEdition (void) Act_FormStart (ActRenPlcSho); Plc_PutParamPlcCod (Plc->PlcCod); fprintf (Gbl.F.Out,"", Plc_MAX_LENGTH_PLACE_SHORT_NAME,Plc->ShortName,Gbl.FormId); Act_FormEnd (); @@ -459,7 +460,8 @@ static void Plc_ListPlacesForEdition (void) Act_FormStart (ActRenPlcFul); Plc_PutParamPlcCod (Plc->PlcCod); fprintf (Gbl.F.Out,"", Plc_MAX_LENGTH_PLACE_FULL_NAME,Plc->FullName,Gbl.FormId); Act_FormEnd (); @@ -696,14 +698,16 @@ static void Plc_PutFormToCreatePlace (void) fprintf (Gbl.F.Out,"" "", Plc_MAX_LENGTH_PLACE_SHORT_NAME,Plc->ShortName); /***** Place full name *****/ fprintf (Gbl.F.Out,"" "" "", diff --git a/swad_text.c b/swad_text.c index 1195dd10f..6d7154332 100644 --- a/swad_text.c +++ b/swad_text.c @@ -5466,23 +5466,23 @@ const char *Txt_Courses = const char *Txt_Courses_ABBREVIATION = #if L==0 - "Assignat."; + "Assig."; #elif L==1 - "Veranst."; + "Veran."; #elif L==2 - "Courses"; + "Cours."; #elif L==3 - "Asignat."; + "Asig."; #elif L==4 - "Matiè."; + "Mat."; #elif L==5 - "Asignat."; // Okoteve traducción + "Asig."; // Okoteve traducción #elif L==6 "Corsi"; #elif L==7 - "Kursów"; + "Kurs."; #elif L==8 - "Discip."; + "Disc."; #endif const char *Txt_courses = @@ -45978,27 +45978,6 @@ const char *Txt_Type_of_BR_answers = // Answers of a test "Tipo de
respostas"; #endif -const char *Txt_Type_of_degree = -#if L==0 - "Tipus de titulació"; -#elif L==1 - "Abschlussart"; -#elif L==2 - "Type of degree"; -#elif L==3 - "Tipo de titulación"; -#elif L==4 - "Type d'étude"; -#elif L==5 - "Arandurã lája"; -#elif L==6 - "Tipo di laurea"; -#elif L==7 - "Type of degree"; // Potrzebujesz tlumaczenie -#elif L==8 - "Tipo de titulação"; -#endif - const char *Txt_Type_of_BR_degree = #if L==0 "Tipo de
titulación"; // Necessita traduccio
" + "" ""); - Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,100,10,"DAT",true,NULL); + Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,100,6,"DAT",true,NULL); fprintf (Gbl.F.Out,"" "
" "
" "%s" "" "%s" "" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_SHORT_NAME\" />" "" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_FULL_NAME\" />" "" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_WWW\" />" "
" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_SHORT_NAME\" />" "" "" + " maxlength=\"%u\" value=\"%s\"" + " class=\"INPUT_FULL_NAME\" />" "