Version 15.47.1

This commit is contained in:
Antonio Cañas Vargas 2015-11-27 13:45:39 +01:00
parent 907381fa66
commit 4a2a1c31a0
10 changed files with 33 additions and 1190 deletions

File diff suppressed because it is too large Load Diff

View File

@ -115,11 +115,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.47 (2015/11/27)"
#define Log_PLATFORM_VERSION "SWAD 15.47.1 (2015/11/27)"
// 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.47.1: Nov 27, 2015 swad_desktop.css is renamed to swad.css.
swad_mobile.css is removed. (186343 lines)
Version 15.47: Nov 27, 2015 Mobile layout is removed (only 1.45% of users used it and now it is replaced by responsive design). (187426 lines)
3 changes necessary in database:
ALTER TABLE IP_prefs DROP COLUMN Layout;

View File

@ -59,12 +59,9 @@
#define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc.
#define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data
#define Cfg_PLATFORM_LOGO_DESKTOP_FILE "openswad240x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_DESKTOP_WIDTH 240
#define Cfg_PLATFORM_LOGO_DESKTOP_HEIGHT 40
#define Cfg_PLATFORM_LOGO_MOBILE_FILE "openswad330x60.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_MOBILE_WIDTH 330
#define Cfg_PLATFORM_LOGO_MOBILE_HEIGHT 60
#define Cfg_PLATFORM_LOGO_FILE "openswad240x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_WIDTH 240
#define Cfg_PLATFORM_LOGO_HEIGHT 40
#define Cfg_PLATFORM_RESPONSIBLE_NAME "Antonio Cañas Vargas" // Main responsible for the platform
#define Cfg_PLATFORM_RESPONSIBLE_E_MAIL "webmaster@openswad.org" // Main responsible for the platform
@ -112,12 +109,9 @@
#define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc.
#define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data
#define Cfg_PLATFORM_LOGO_DESKTOP_FILE "openswad240x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_DESKTOP_WIDTH 240
#define Cfg_PLATFORM_LOGO_DESKTOP_HEIGHT 40
#define Cfg_PLATFORM_LOGO_MOBILE_FILE "openswad330x60.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_MOBILE_WIDTH 330
#define Cfg_PLATFORM_LOGO_MOBILE_HEIGHT 60
#define Cfg_PLATFORM_LOGO_FILE "openswad240x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_WIDTH 240
#define Cfg_PLATFORM_LOGO_HEIGHT 40
#define Cfg_PLATFORM_RESPONSIBLE_NAME "Antonio Cańas Vargas" // Main responsible for the platform
#define Cfg_PLATFORM_RESPONSIBLE_E_MAIL "webmaster@openswad.org" // Main responsible for the platform
@ -182,12 +176,9 @@
#define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc.
#define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data
#define Cfg_PLATFORM_LOGO_DESKTOP_FILE "swad160x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_DESKTOP_WIDTH 160
#define Cfg_PLATFORM_LOGO_DESKTOP_HEIGHT 40
#define Cfg_PLATFORM_LOGO_MOBILE_FILE "swad210x60.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_MOBILE_WIDTH 210
#define Cfg_PLATFORM_LOGO_MOBILE_HEIGHT 60
#define Cfg_PLATFORM_LOGO_FILE "swad160x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_WIDTH 160
#define Cfg_PLATFORM_LOGO_HEIGHT 40
#define Cfg_PLATFORM_RESPONSIBLE_NAME "CEVUG" // Main responsible for the platform
#define Cfg_PLATFORM_RESPONSIBLE_E_MAIL "sctecnico@ugr.es" // Main responsible for the platform
@ -242,12 +233,9 @@
#define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc.
#define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data
#define Cfg_PLATFORM_LOGO_DESKTOP_FILE "swad160x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_DESKTOP_WIDTH 160
#define Cfg_PLATFORM_LOGO_DESKTOP_HEIGHT 40
#define Cfg_PLATFORM_LOGO_MOBILE_FILE "swad210x60.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_MOBILE_WIDTH 210
#define Cfg_PLATFORM_LOGO_MOBILE_HEIGHT 60
#define Cfg_PLATFORM_LOGO_FILE "swad160x40.png" // Logo displayed in the top of the page
#define Cfg_PLATFORM_LOGO_WIDTH 160
#define Cfg_PLATFORM_LOGO_HEIGHT 40
#define Cfg_PLATFORM_RESPONSIBLE_NAME "Carmen Varela Báez" // Main responsible for the platform
#define Cfg_PLATFORM_RESPONSIBLE_E_MAIL "cevuna@rec.una.py" // Main responsible for the platform

View File

@ -19,9 +19,8 @@ cp -af $CGI/swad_pt $CGI/swad_pt.old
cp -f $CORE/swad_ca $CORE/swad_de $CORE/swad_en $CORE/swad_es $CORE/swad_fr $CORE/swad_gn $CORE/swad_it $CORE/swad_pl $CORE/swad_pt $CGI
cp -f $CORE/js/swad.js $PUBLIC_HTML
cp -f $CORE/css/swad_desktop.css $CORE/css/swad_mobile.css $PUBLIC_HTML
cp -f $CORE/css/swad.css $PUBLIC_HTML
chown -R $APACHE_USER:$APACHE_GROUP $CGI
chown $APACHE_USER:$APACHE_GROUP $PUBLIC_HTML/swad.js
chown $APACHE_USER:$APACHE_GROUP $PUBLIC_HTML/swad_desktop.css
chown $APACHE_USER:$APACHE_GROUP $PUBLIC_HTML/swad_mobile.css
chown $APACHE_USER:$APACHE_GROUP $PUBLIC_HTML/swad.css

View File

@ -188,7 +188,7 @@ void Lay_WriteStartOfPage (void)
Gbl.Prefs.IconsURL);
/* Style sheet for SWAD */
fprintf (Gbl.F.Out,"<link rel=\"StyleSheet\" href=\"%s/swad_desktop.css\" type=\"text/css\" />\n",
fprintf (Gbl.F.Out,"<link rel=\"StyleSheet\" href=\"%s/swad.css\" type=\"text/css\" />\n",
Cfg_HTTPS_URL_SWAD_PUBLIC);
/* Style sheet for Dropzone.js (http://www.dropzonejs.com/) */
@ -300,7 +300,7 @@ void Lay_WriteStartOfPage (void)
{
/* Vertical menu (left) */
fprintf (Gbl.F.Out,"<div id=\"main_zone_menu_vertical\">");
Mnu_WriteVerticalMenuThisTabDesktop ();
Mnu_WriteVerticalMenuThisTab ();
fprintf (Gbl.F.Out,"</div>");
}
@ -309,7 +309,7 @@ void Lay_WriteStartOfPage (void)
if (Gbl.Prefs.Menu == Mnu_MENU_HORIZONTAL)
/* Horizontal menu */
Mnu_WriteHorizontalMenuThisTabDesktop ();
Mnu_WriteHorizontalMenuThisTab ();
/* Write warning when degree type does not allow direct login */
Usr_WarningWhenDegreeTypeDoesntAllowDirectLogin ();
@ -680,12 +680,12 @@ static void Lay_WritePageTopHeading (void)
" style=\"width:%upx; height:%upx;\" />"
"</a>"
"</div>",
Cfg_PLATFORM_LOGO_DESKTOP_WIDTH,
Cfg_PLATFORM_LOGO_WIDTH,
Cfg_HTTPS_URL_SWAD_CGI,
Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_DESKTOP_FILE,
Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_FILE,
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
Cfg_PLATFORM_LOGO_DESKTOP_WIDTH,
Cfg_PLATFORM_LOGO_DESKTOP_HEIGHT);
Cfg_PLATFORM_LOGO_WIDTH,
Cfg_PLATFORM_LOGO_HEIGHT);
/* 1st. row, 1st. column: search */
fprintf (Gbl.F.Out,"<div id=\"head_row_1_search\">");
@ -749,7 +749,7 @@ static void Lay_WritePageTopHeading (void)
/***** 3rd. row (tabs) *****/
fprintf (Gbl.F.Out,"<div id=\"head_row_3\">");
Tab_DrawTabsDeskTop ();
Tab_DrawTabs ();
fprintf (Gbl.F.Out,"</div>");
}

View File

@ -67,10 +67,10 @@ const char *Mnu_MenuIcons[Mnu_NUM_MENUS] =
};
/*****************************************************************************/
/************* Write the menu of current tab (desktop layout) ****************/
/******************* Write vertical menu of current tab **********************/
/*****************************************************************************/
void Mnu_WriteVerticalMenuThisTabDesktop (void)
void Mnu_WriteVerticalMenuThisTab (void)
{
extern const char *The_ClassMenuOn[The_NUM_THEMES];
extern const char *The_ClassMenuOff[The_NUM_THEMES];
@ -163,10 +163,10 @@ void Mnu_WriteVerticalMenuThisTabDesktop (void)
}
/*****************************************************************************/
/********** Write horizontal menu of current tab (desktop layout) ************/
/******************* Write horizontal menu of current tab ********************/
/*****************************************************************************/
void Mnu_WriteHorizontalMenuThisTabDesktop (void)
void Mnu_WriteHorizontalMenuThisTab (void)
{
extern const char *The_ClassMenuOn[The_NUM_THEMES];
extern const char *The_ClassMenuOff[The_NUM_THEMES];

View File

@ -49,8 +49,8 @@ typedef enum
/***************************** Public prototypes *****************************/
/*****************************************************************************/
void Mnu_WriteVerticalMenuThisTabDesktop (void);
void Mnu_WriteHorizontalMenuThisTabDesktop (void);
void Mnu_WriteVerticalMenuThisTab (void);
void Mnu_WriteHorizontalMenuThisTab (void);
void Mnu_PutIconsToSelectMenu (void);
void Mnu_ChangeMenu (void);

View File

@ -78,7 +78,7 @@ static void Tab_WriteBreadcrumbAction (void);
/**************** Draw tabs with the current tab highlighted *****************/
/*****************************************************************************/
void Tab_DrawTabsDeskTop (void)
void Tab_DrawTabs (void)
{
extern const char *The_ClassTabOn[The_NUM_THEMES];
extern const char *The_ClassTabOff[The_NUM_THEMES];

View File

@ -41,7 +41,7 @@
/***************************** Public prototypes *****************************/
/*****************************************************************************/
void Tab_DrawTabsDeskTop (void);
void Tab_DrawTabs (void);
void Tab_DrawBreadcrumb (void);
void Tab_SetCurrentTab (void);