From 1b6f41c46c33fc7e0ec580e2d95b909b33bb410b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 20 Jan 2016 14:07:15 +0100 Subject: [PATCH] Version 15.121.5 --- css/{swad15.121.3.css => swad15.121.5.css} | 33 ++++++++++++--------- swad_changelog.h | 7 ++--- swad_file_browser.c | 11 +++---- swad_layout.c | 2 +- swad_social.c | 34 ++++++++++++++++------ swad_user.c | 2 +- 6 files changed, 55 insertions(+), 34 deletions(-) rename css/{swad15.121.3.css => swad15.121.5.css} (99%) diff --git a/css/swad15.121.3.css b/css/swad15.121.5.css similarity index 99% rename from css/swad15.121.3.css rename to css/swad15.121.5.css index f3de4ae63..f0481b42d 100644 --- a/css/swad15.121.3.css +++ b/css/swad15.121.5.css @@ -1485,7 +1485,7 @@ a:hover img.CENTRE_PHOTO_SHOW margin:10px; text-align:center; color:#808080; - font-size:9pt; + font-size:8pt; } /*********************************** Lists ***********************************/ @@ -1773,7 +1773,7 @@ a:hover img.CENTRE_PHOTO_SHOW { padding-bottom:10px; } -.SOCIAL_TEXTAREA +.SOCIAL_TEXTAREA_POST { box-sizing:border-box; width:480px; @@ -1839,27 +1839,16 @@ a:hover img.CENTRE_PHOTO_SHOW padding-left:4px; vertical-align:bottom; } -.SOCIAL_COMMENTS - { - } .SOCIAL_COMMENT { border-top:1px solid silver; } -.SOCIAL_FORM_COMMENT - { - display:inline-block; - margin-left:56px; - padding-bottom:10px; - width:480px; - text-align:center; - } .SOCIAL_COMMENT_PHOTO { display:inline-block; box-sizing:border-box; width:40px; - height:60px; + height:54px; padding:10px 0; text-align:left; vertical-align:top; @@ -1879,6 +1868,22 @@ a:hover img.CENTRE_PHOTO_SHOW text-align:left; vertical-align:top; } +.SOCIAL_FORM_NEW_COMMENT + { + display:inline-block; + margin-left:56px; + border-top:1px solid silver; + padding-bottom:10px; + width:480px; + text-align:center; + } +.SOCIAL_TEXTAREA_COMMENT + { + box-sizing:border-box; + width:440px; + margin:0; + resize:none; + } /*********************************** Messages ********************************/ .MSG_TO_ONE_RCP diff --git a/swad_changelog.h b/swad_changelog.h index 745ae24a1..d3f1a04e9 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -119,21 +119,20 @@ // TODO: Increment one second after each refresh in social timeline? // TODO: Notifications of new followers should go to follower's profile -// TODO: Textarea in comments smaller and with my photo at left // TODO: Fav comments (remove favs when comment is removed) -// TODO: Fix bugs on comment favourites /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.121.4 (2016-01-20)" -#define CSS_FILE "swad15.121.3.css" +#define Log_PLATFORM_VERSION "SWAD 15.121.5 (2016-01-20)" +#define CSS_FILE "swad15.121.5.css" #define JS_FILE "swad15.118.4.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.121.5: Jan 20, 2016 New layout of form to write a new social comment. (193922 lines) Version 15.121.4: Jan 20, 2016 Fixed bug related to favs in social comments. (193904 lines) Version 15.121.3: Jan 20, 2016 Favs in social comments. Not finished. Changes in layout of social timeline. (193901 lines) diff --git a/swad_file_browser.c b/swad_file_browser.c index ba7fbb106..82ae31b10 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -975,9 +975,9 @@ static const Act_Action_t Brw_ActRecDatFile[Brw_NUM_TYPES_FILE_BROWSER] = #define Brw_MAX_FILES_ASSIG_PER_STD 500 #define Brw_MAX_FOLDS_ASSIG_PER_STD 50 -#define Brw_MAX_QUOTA_WORKS_PER_STD ( 2ULL*Brw_GiB) -#define Brw_MAX_FILES_WORKS_PER_STD 500 -#define Brw_MAX_FOLDS_WORKS_PER_STD 50 +#define Brw_MAX_QUOTA_WORKS_PER_STD ( 2ULL*Brw_GiB) +#define Brw_MAX_FILES_WORKS_PER_STD 500 +#define Brw_MAX_FOLDS_WORKS_PER_STD 50 #define Brw_MAX_QUOTA_MARKS_CRS ( 1ULL*Brw_GiB) #define Brw_MAX_FILES_MARKS_CRS 500 @@ -999,8 +999,8 @@ const unsigned long long Brw_MAX_QUOTA_BRIEF[Rol_NUM_ROLES] = // MaxRole is used 0, // Rol_ROLE_INS_ADM 0, // Rol_ROLE_SYS_ADM }; -#define Brw_MAX_FILES_BRIEF 5000 -#define Brw_MAX_FOLDS_BRIEF 1000 +#define Brw_MAX_FILES_BRIEF 5000 +#define Brw_MAX_FOLDS_BRIEF 1000 /* Extensions allowed for uploaded files */ const char *Brw_FileExtensionsAllowed[] = @@ -1130,6 +1130,7 @@ const char *Brw_MIMETypesAllowed[] = "application/download", // zip files in Firefox caused by an error? "application/excel", // Microsoft Excel xls "application/finale", // Finale .mus + "application/force", // PDF uploaded from Firefox "application/force-download", // RAR uploaded from Firefox "application/futuresplash", // Flash "application/gzip", // GNU ZIP gz, gzip diff --git a/swad_layout.c b/swad_layout.c index 5ae55afa7..15924e1c8 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1750,7 +1750,7 @@ void Lay_HelpPlainEditor (void) Lay_HelpTextEditor (Txt_TEXT_plain, "\\(LaTeX\\)", - "$$LaTeX$$, \\[LaTeX\\]"); + "$$LaTeX$$ \\[LaTeX\\]"); } void Lay_HelpRichEditor (void) diff --git a/swad_social.c b/swad_social.c index 2241edea2..fecac9542 100644 --- a/swad_social.c +++ b/swad_social.c @@ -255,7 +255,7 @@ static void Soc_GetNoteSummary (const struct SocialNote *SocNot, static void Soc_PublishSocialNoteInTimeline (struct SocialPublishing *SocPub); static void Soc_PutFormToWriteNewPost (void); -static void Soc_PutTextarea (const char *Placeholder); +static void Soc_PutTextarea (const char *Placeholder,const char *ClassTextArea); static long Soc_ReceiveSocialPost (void); @@ -1851,7 +1851,7 @@ static void Soc_PutFormToWriteNewPost (void) fprintf (Gbl.F.Out,"