From 8199c09afaa9ee70760b1e1008438c970beb040f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sat, 12 Nov 2016 21:39:29 +0100 Subject: [PATCH] Version 16.51 --- css/{swad16.50.2.css => swad16.51.css} | 12 +++++++++++- icon/help64x64.png | Bin 0 -> 979 bytes swad_changelog.h | 7 +++++-- swad_layout.c | 23 +++++++++++++++++++++-- swad_layout.h | 6 ++++-- swad_text.c | 21 +++++++++++++++++++++ 6 files changed, 62 insertions(+), 7 deletions(-) rename css/{swad16.50.2.css => swad16.51.css} (99%) create mode 100644 icon/help64x64.png diff --git a/css/swad16.50.2.css b/css/swad16.51.css similarity index 99% rename from css/swad16.50.2.css rename to css/swad16.51.css index a4443340e..62b0d8c5d 100644 --- a/css/swad16.50.2.css +++ b/css/swad16.51.css @@ -1339,8 +1339,18 @@ a:hover /* Default ==> underlined */ } .FRAME_ICONS { - display:table; + box-sizing:border-box; height:20px; + text-align:left; + } +.FRAME_ICONS_LEFT + { + display:inline-block; + } +.FRAME_ICONS_RIGHT + { + display:inline-block; + float:right; } .FRAME_TABLE { diff --git a/icon/help64x64.png b/icon/help64x64.png new file mode 100644 index 0000000000000000000000000000000000000000..dc28e557ef13fc425e76ea43844f5de610703be3 GIT binary patch literal 979 zcmV;^11$WBP)ok+yN9QP@q78L=?Mx-B`=eX-mKIx9KAd zk=a`v-`NtpQQ}Q+;WkE*Lk(*-?wvcv8nA;~oFO26sPV6xo#>heGEnag0?B9tU<~EV z>^XjyI}5^~lCJ4`2^_=|Z)5;S%wnz}od27`M0 zI&3co?TKEv%}nS}!v{Hzz=Fh3d!e}GJA+Np>wzLUG=TjGcRN0dX=)17m~}fFK=OeS zIS4R=7#D7kZlaH9A`*6Q2vcX08gRmOe7JGDOd>SsP|59qlL)EPC#!Ouf+n0{E0)&> zYKoYxFa9|Lu>iW?VxOwQ5uQMG-u57uOL3GZ0G3M9CUC9w36VjBy$hGcW;v_AK-mC* zuhy2o;(?Y$i!LMqV21=Z0rRvhg=irN(0NalLHClzotNs^M5nns=m0>+2u_!$e~PFW zVy{&^ROswD@tVw3{z^sj()b}<24Kvw>jWYkW5;A9U|WY)7zwMgTzDVnzU9)X$tA_mQ~@jj$N9-H*r8H6N>(9?u5h&kMwdyla274u4KvyQN-|H%WCsM{A=Pmoh}#t$kQK0*2%KUEZbtQ5>CX zX~tS0fZZBIi+2}nSSD-+F0tNp$egkeo_nnH@Fd+Z{002ovPDHLkV1i^K Bv$OyJ literal 0 HcmV?d00001 diff --git a/swad_changelog.h b/swad_changelog.h index 18d28a2e4..b15621fac 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -156,13 +156,16 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.50.2 (2016-11-12)" -#define CSS_FILE "swad16.50.2.css" +#define Log_PLATFORM_VERSION "SWAD 16.51 (2016-11-12)" +#define CSS_FILE "swad16.51.css" #define JS_FILE "swad16.46.1.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 16.51: Nov 12, 2016 Contextual help on the top right corner of frames. (206606 lines) +Copy icon/help64x64.png to icon directory + Version 16.50.2: Nov 12, 2016 Changes in layout of record cards. (206556 lines) Version 16.50.1: Nov 12, 2016 Minor corrections in some messages. (206559 lines) Version 16.50: Nov 10, 2016 My frequent actions are moved from PROFILE tab to STATS tab. diff --git a/swad_layout.c b/swad_layout.c index 7f87cd5c7..670bb25a6 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1236,7 +1236,8 @@ void Lay_WriteTitle (const char *Title) /*****************************************************************************/ // CellPadding must be 0, 1, 2, 4 or 8 -void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding,const char *Title) +void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding, + const char *Title) { Lay_StartRoundFrame (Width,Title,NULL); @@ -1246,8 +1247,11 @@ void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding,const char fprintf (Gbl.F.Out,"\">"); } -void Lay_StartRoundFrame (const char *Width,const char *Title,void (*FunctionToDrawContextualIcons) (void)) +void Lay_StartRoundFrame (const char *Width,const char *Title, + void (*FunctionToDrawContextualIcons) (void)) { + extern const char *Txt_Help; + fprintf (Gbl.F.Out,"
" "
"); if (FunctionToDrawContextualIcons) + { + fprintf (Gbl.F.Out,"
"); FunctionToDrawContextualIcons (); + fprintf (Gbl.F.Out,"
"); + } + // if (HelpLink) + // { + fprintf (Gbl.F.Out,"
"); + + fprintf (Gbl.F.Out,"", + "https://github.com/acanas/swad-core/wiki/User%20guide"); + Lay_PutIconWithText ("help64x64.png",Txt_Help,NULL); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,"
"); + // } fprintf (Gbl.F.Out,"
"); if (Title) diff --git a/swad_layout.h b/swad_layout.h index 48a0211b7..1b5808284 100644 --- a/swad_layout.h +++ b/swad_layout.h @@ -94,8 +94,10 @@ void Lay_PutConfirmButtonInline (const char *Text); void Lay_PutRemoveButton (const char *Text); void Lay_PutRemoveButtonInline (const char *Text); -void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding,const char *Title); -void Lay_StartRoundFrame (const char *Width,const char *Title,void (*FunctionToDrawContextualIcons) (void)); +void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding, + const char *Title); +void Lay_StartRoundFrame (const char *Width,const char *Title, + void (*FunctionToDrawContextualIcons) (void)); void Lay_StartRoundFrameTableShadow (const char *Width,unsigned CellPadding); void Lay_EndRoundFrameTable (void); void Lay_EndRoundFrame (void); diff --git a/swad_text.c b/swad_text.c index 2b65057e9..c3a7f1ec1 100644 --- a/swad_text.c +++ b/swad_text.c @@ -13762,6 +13762,27 @@ const char *Txt_Happy_birthday = "Feliz aniversário!"; #endif +const char *Txt_Help = +#if L==1 + "Ajuda"; +#elif L==2 + "Hilfe"; +#elif L==3 + "Help"; +#elif L==4 + "Ayuda"; +#elif L==5 + "Aide"; +#elif L==6 + "Pytyvõ"; +#elif L==7 + "Aiuto"; +#elif L==8 + "Pomoc"; +#elif L==9 + "Ajuda"; +#endif + const char *Txt_HELP_email = #if L==1 "Exemple: garcia@exemplemail.com";