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

This commit is contained in:
Antonio Cañas Vargas 2015-07-25 19:23:40 +02:00
parent e39fb6a264
commit 84a71c95f9
10 changed files with 38 additions and 63 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;}
.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;}

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;}
.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;}

4
swad_account.c
View File

@ -138,7 +138,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
else
NewNicknameWithArroba[0] = '\0';
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
@ -155,7 +155,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
/***** E-mail *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"

8
swad_announcement.c
View File

@ -220,9 +220,7 @@ static void Ann_ShowAnnouncement (long AnnCod,const char *Subject,const char *Co
Content);
/***** Write form *****/
fprintf (Gbl.F.Out,"<div class=\"%s\""
" style=\"text-align:center; margin:10px;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin:10px;\">");
if (ShowAllAnnouncements)
{
@ -326,7 +324,7 @@ void Ann_ShowFormAnnouncement (void)
/***** Message subject and body *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right; vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
@ -335,7 +333,7 @@ void Ann_ShowFormAnnouncement (void)
"</td>"
"</tr>"
"<tr>"
"<td class=\"%s\" style=\"text-align:right; vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"

27
swad_centre.c
View File

@ -366,7 +366,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Centre full name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
" style=\"vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT_N\""
@ -384,8 +384,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Centre short name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -401,8 +400,7 @@ static void Ctr_Configuration (bool PrintView)
if (Gbl.CurrentCtr.Ctr.WWW[0])
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -421,8 +419,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Shortcut to the centre *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -441,8 +438,7 @@ static void Ctr_Configuration (bool PrintView)
{
/***** QR code with link to the centre *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -457,8 +453,7 @@ static void Ctr_Configuration (bool PrintView)
{
/***** Number of degrees *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -472,8 +467,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Number of courses *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -487,8 +481,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -502,8 +495,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Number of students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\" style=\"vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -1963,7 +1955,6 @@ void Ctr_ChangeCtrPhotoAttribution (void)
static void Ctr_PutFormToCreateCentre (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_New_centre_of_INSTITUTION_X;
extern const char *Txt_Another_place;
extern const char *Txt_CENTRE_STATUS[Ctr_NUM_STATUS_TXT];

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.119.5 (2015/07/24)"
#define Log_PLATFORM_VERSION "SWAD 14.120 (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: Jul 25, 2015 Changes in CSS of forms. (184879 lines)
Version 14.119.5: Jul 24, 2015 Changes in CSS of lists. (184902 lines)
Version 14.119.4: Jul 24, 2015 New layout of institutional links as a list. (184872 lines)
Version 14.119.3: Jul 24, 2015 New layout of MFU actions as a list. (184875 lines)

32
swad_chat.c
View File

@ -91,7 +91,6 @@ void Cht_ShowChatRooms (void)
void Cht_ShowListOfAvailableChatRooms (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Chat_rooms;
extern const char *Txt_General;
extern const char *Txt_SEX_PLURAL_Abc[Usr_NUM_SEXS];
@ -117,24 +116,20 @@ void Cht_ShowListOfAvailableChatRooms (void)
Usr_GetMyDegrees ();
/***** Table start *****/
Lay_StartRoundFrameTable (NULL,0,Txt_Chat_rooms);
fprintf (Gbl.F.Out,"<tr>"
"<td>"
"<div style=\"display:inline-block; 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]);
Lay_StartRoundFrame (NULL,Txt_Chat_rooms);
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:0 auto;\">"
"<ul class=\"LIST_LEFT\">");
/***** Title of top level *****/
fprintf (Gbl.F.Out,"<li style=\"height:20px;\">"
fprintf (Gbl.F.Out,"<li class=\"DAT\" style=\"height:20px;\">"
"<img src=\"%s/chat16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" style=\"vertical-align:middle;\" />"
" %s"
"</li>",
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,"</ul>"
"</div>"
"</td>"
"</tr>");
Lay_EndRoundFrameTable ();
"</div>");
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,"<li style=\"height:20px;\">");
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,"<strong>");
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);

4
swad_global.h
View File

@ -588,10 +588,6 @@ struct Globals
{
unsigned CurrentPage;
} Pag;
// struct
// {
// char WindowName[256];
// } Chat;
struct
{
unsigned Day,Hour,Column;

3
swad_notice.c
View File

@ -594,8 +594,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
/***** Write form to delete this notice *****/
if (ICanEditNotices)
{
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;\">");
/* Form to delete notice */
Act_FormStart (ActRemNot);

4
swad_password.c
View File

@ -735,7 +735,7 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
sprintf (Gbl.Message,Txt_HELP_password,Pwd_MIN_LENGTH_PLAIN_PASSWORD);
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
@ -744,7 +744,7 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
"</td>"
"</tr>"
"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"