diff --git a/swad_changelog.h b/swad_changelog.h index 3e6533c63..b66669643 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -111,11 +111,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.44.6 (2015/11/24)" +#define Log_PLATFORM_VERSION "SWAD 15.44.7 (2015/11/24)" // 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.44.7: Nov 24, 2015 Code refactoring in layout. (187901 lines) Version 15.44.6: Nov 24, 2015 Code refactoring in layout. (187893 lines) Version 15.44.5: Nov 24, 2015 Code refactoring in layout. (187894 lines) Version 15.44.4: Nov 24, 2015 Code refactoring in layout. (187893 lines) diff --git a/swad_config.h b/swad_config.h index b9ab1f124..d5f9bbf0a 100644 --- a/swad_config.h +++ b/swad_config.h @@ -51,6 +51,8 @@ #define Cfg_PLATFORM_SHORT_NAME "SWAD" #define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)" #define Cfg_PLATFORM_PAGE_TITLE "SWAD local" // This title will appear on browser top +#define Cfg_PLATFORM_LOGO_DESKTOP "openswad220x40.png" // Logo displayed in the top of the page +#define Cfg_PLATFORM_LOGO_MOBILE "openswad330x60.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_SERVER "localhost" // Server name (main part of the URL) #define Cfg_HTTPS_URL_SWAD_CGI "https://localhost/swad" // Without ending slash #define Cfg_HTTPS_URL_SWAD_PUBLIC "https://localhost/swad" // Without ending slash @@ -97,6 +99,8 @@ #define Cfg_PLATFORM_SHORT_NAME "OpenSWAD" #define Cfg_PLATFORM_FULL_NAME "OpenSWAD (Open Shared Workspace At a Distance)" #define Cfg_PLATFORM_PAGE_TITLE "OpenSWAD (free platform for learning & educational management)" // This title will appear on browser top +#define Cfg_PLATFORM_LOGO_DESKTOP "openswad220x40.png" // Logo displayed in the top of the page +#define Cfg_PLATFORM_LOGO_MOBILE "openswad330x60.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_SERVER "openswad.org" // Server name (main part of the URL) #define Cfg_HTTPS_URL_SWAD_CGI "https://openswad.org" // Without ending slash #define Cfg_HTTPS_URL_SWAD_PUBLIC "https://openswad.org/swad" // Without ending slash @@ -160,6 +164,8 @@ #define Cfg_PLATFORM_SHORT_NAME "SWAD" #define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)" #define Cfg_PLATFORM_PAGE_TITLE "SWAD UGR" // This title will appear on browser top +#define Cfg_PLATFORM_LOGO_DESKTOP "swad220x40.png" // Logo displayed in the top of the page +#define Cfg_PLATFORM_LOGO_MOBILE "swad330x60.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_SERVER "swad.ugr.es" // Server name (main part of the URL) #define Cfg_HTTPS_URL_SWAD_CGI "https://swad.ugr.es" // Without ending slash #define Cfg_HTTPS_URL_SWAD_PUBLIC "https://swad.ugr.es/swad" // Without ending slash @@ -213,6 +219,8 @@ #define Cfg_PLATFORM_SHORT_NAME "SWAD" #define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)" #define Cfg_PLATFORM_PAGE_TITLE "SWAD UNA" // This title will appear on browser top +#define Cfg_PLATFORM_LOGO_DESKTOP "swad220x40.png" // Logo displayed in the top of the page +#define Cfg_PLATFORM_LOGO_MOBILE "swad330x60.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_SERVER "www.cevuna.una.py" // Server name (main part of the URL) #define Cfg_HTTPS_URL_SWAD_CGI "https://www.cevuna.una.py/swad" // Without ending slash #define Cfg_HTTPS_URL_SWAD_PUBLIC "https://www.cevuna.una.py/swad" // Without ending slash diff --git a/swad_layout.c b/swad_layout.c index bace6bbde..0faa573a0 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -707,9 +707,8 @@ static void Lay_WritePageTopHeadingDesktop (void) const unsigned Height; } LogoLayout = { - // Lay_LAYOUT_DESKTOP - "swad112x32.gif", - 140, + Cfg_PLATFORM_LOGO_DESKTOP, + 220, 40, }; const char *ClassHeadRow1[The_NUM_THEMES] = @@ -751,8 +750,8 @@ static void Lay_WritePageTopHeadingDesktop (void) "" "", The_ClassHead[Gbl.Prefs.Theme], - Cfg_HTTPS_URL_SWAD_CGI,Gbl.Prefs.PathTheme, - LogoLayout.Icon, + Cfg_HTTPS_URL_SWAD_CGI, + Gbl.Prefs.IconsURL,LogoLayout.Icon, Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME, LogoLayout.Width, LogoLayout.Height); @@ -857,9 +856,8 @@ static void Lay_WritePageTopHeadingMobile (void) const unsigned Height; } LogoLayout = { - // Lay_LAYOUT_MOBILE - "swad168x48.gif", - 210, + Cfg_PLATFORM_LOGO_MOBILE, + 330, 60, }; const char *ClassHeadRow1[The_NUM_THEMES] = @@ -882,8 +880,8 @@ static void Lay_WritePageTopHeadingMobile (void) "", ClassHeadRow1[Gbl.Prefs.Theme], LogoLayout.Width + 20, - Cfg_HTTPS_URL_SWAD_CGI,Gbl.Prefs.PathTheme, - LogoLayout.Icon, + Cfg_HTTPS_URL_SWAD_CGI, + Gbl.Prefs.IconsURL,LogoLayout.Icon, Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME, LogoLayout.Width, LogoLayout.Height);