diff --git a/css/swad_desktop.css b/css/swad_desktop.css index a9c9ff907..e87111a93 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -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;} -.GREY_FORM {color:#4D88A1; font-size:11pt;} -.BLUE_FORM {color:#4D88A1; font-size:11pt;} -.YELLOW_FORM {color:#7C4D2A; font-size:11pt;} +.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_NOWRAP {color:#4D88A1; font-size:11pt; white-space:nowrap;} .GREY_FORM_NOWRAP {color:#4D88A1; font-size:11pt; white-space:nowrap;} diff --git a/css/swad_mobile.css b/css/swad_mobile.css index 122e77510..29caca0cf 100644 --- a/css/swad_mobile.css +++ b/css/swad_mobile.css @@ -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;} -.GREY_FORM {color:#4D88A1; font-size:16pt;} -.BLUE_FORM {color:#4D88A1; font-size:16pt;} -.YELLOW_FORM {color:#FF4301; font-size:16pt;} +.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_NOWRAP {color:#4D88A1; font-size:16pt; white-space:nowrap;} .GREY_FORM_NOWRAP {color:#4D88A1; font-size:16pt; white-space:nowrap;} diff --git a/swad_account.c b/swad_account.c index 4c44be476..13fa21cc3 100644 --- a/swad_account.c +++ b/swad_account.c @@ -138,7 +138,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith else NewNicknameWithArroba[0] = '\0'; fprintf (Gbl.F.Out,"" - "" + "" "%s: " "" "" @@ -155,7 +155,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith /***** E-mail *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s: " "" "" diff --git a/swad_announcement.c b/swad_announcement.c index 4c3a36005..50fa8da35 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -220,9 +220,7 @@ static void Ann_ShowAnnouncement (long AnnCod,const char *Subject,const char *Co Content); /***** Write form *****/ - fprintf (Gbl.F.Out,"
", - The_ClassFormul[Gbl.Prefs.Theme]); + fprintf (Gbl.F.Out,"
"); if (ShowAllAnnouncements) { @@ -326,7 +324,7 @@ void Ann_ShowFormAnnouncement (void) /***** Message subject and body *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s: " "" "" @@ -335,7 +333,7 @@ void Ann_ShowFormAnnouncement (void) "" "" "" - "" + "" "%s: " "" "" diff --git a/swad_centre.c b/swad_centre.c index 76990033c..447ec3747 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -366,7 +366,7 @@ static void Ctr_Configuration (bool PrintView) /***** Centre full name *****/ fprintf (Gbl.F.Out,"" "" + " style=\"vertical-align:middle;\">" "%s:" "" "" - "" + "" "%s:" "" "" - "" + "" "%s:" "" "" - "" + "" "%s:" "" "" - "" + "" "%s:" "" "" - "" + "" "%s:" "" "" - "" + "" "%s:" "" "" - "" + "" "%s:" "" "" - "" + "" "%s:" "" "" - "" - "
" - "
    ", - The_ClassFormul[Gbl.Prefs.Theme]); + Lay_StartRoundFrame (NULL,Txt_Chat_rooms); + fprintf (Gbl.F.Out,"
    " + "
      "); /***** Title of top level *****/ - fprintf (Gbl.F.Out,"
    • " + fprintf (Gbl.F.Out,"
    • " "\"%s\"" " %s" "
    • ", Gbl.Prefs.IconsURL, - Txt_Chat_rooms,Txt_Chat_rooms, + Txt_Chat_rooms, + Txt_Chat_rooms, Txt_Chat_rooms); /***** Link to chat available for all the users *****/ @@ -147,10 +142,10 @@ void Cht_ShowListOfAvailableChatRooms (void) " alt=\"%s\" title=\"%s\" class=\"ICON16x16\"" " style=\"vertical-align:middle;\" />", Gbl.Prefs.IconsURL, - ThisRoomFullName,ThisRoomFullName); + ThisRoomFullName, + ThisRoomFullName); Cht_WriteLinkToChat2 ("GBL_USR",ThisRoomFullName); - IsLastItemInLevel[1] = !Gbl.Usrs.Me.MyDegrees.Num; switch (Gbl.Usrs.Me.LoggedRole) { @@ -233,10 +228,8 @@ void Cht_ShowListOfAvailableChatRooms (void) /***** End table *****/ fprintf (Gbl.F.Out,"
    " - "
    " - "" - ""); - Lay_EndRoundFrameTable (); + "
"); + Lay_EndRoundFrame (); } /*****************************************************************************/ @@ -310,8 +303,6 @@ static void Cht_WriteLinkToChat1 (const char *RoomCode,const char *RoomShortName { extern const char *The_ClassFormul[The_NUM_THEMES]; - // sprintf (Gbl.Chat.WindowName,"%s_%s",RoomCode,Gbl.UniqueNameEncrypted); - fprintf (Gbl.F.Out,"
  • "); Lay_IndentDependingOnLevel (Level,IsLastItemInLevel); Act_FormStart (ActCht); @@ -321,14 +312,13 @@ static void Cht_WriteLinkToChat1 (const char *RoomCode,const char *RoomShortName static void Cht_WriteLinkToChat2 (const char *RoomCode,const char *RoomFullName) { - extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *Txt_connected_PLURAL; extern const char *Txt_connected_SINGULAR; unsigned NumUsrsInRoom = Cht_GetNumUsrsInChatRoom (RoomCode); if (NumUsrsInRoom) fprintf (Gbl.F.Out,""); - fprintf (Gbl.F.Out,"%s",RoomFullName); + fprintf (Gbl.F.Out," %s",RoomFullName); if (NumUsrsInRoom > 1) fprintf (Gbl.F.Out," [%d %s]", NumUsrsInRoom,Txt_connected_PLURAL); diff --git a/swad_global.h b/swad_global.h index f3444cac2..537114473 100644 --- a/swad_global.h +++ b/swad_global.h @@ -588,10 +588,6 @@ struct Globals { unsigned CurrentPage; } Pag; - // struct - // { - // char WindowName[256]; - // } Chat; struct { unsigned Day,Hour,Column; diff --git a/swad_notice.c b/swad_notice.c index 1b14cbae6..e92421f54 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -594,8 +594,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing, /***** Write form to delete this notice *****/ if (ICanEditNotices) { - fprintf (Gbl.F.Out,"
    ", - The_ClassFormul[Gbl.Prefs.Theme]); + fprintf (Gbl.F.Out,"
    "); /* Form to delete notice */ Act_FormStart (ActRemNot); diff --git a/swad_password.c b/swad_password.c index c2e1c7aca..6a1d05763 100644 --- a/swad_password.c +++ b/swad_password.c @@ -735,7 +735,7 @@ void Pwd_PutFormToGetNewPasswordTwice (void) sprintf (Gbl.Message,Txt_HELP_password,Pwd_MIN_LENGTH_PLAIN_PASSWORD); fprintf (Gbl.F.Out,"" - "" + "" "%s: " "" "" @@ -744,7 +744,7 @@ void Pwd_PutFormToGetNewPasswordTwice (void) "" "" "" - "" + "" "%s: " "" ""