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 15.51

This commit is contained in:
Antonio Cañas Vargas 2015-11-30 11:00:53 +01:00
parent 743f5a2513
commit f3a63406cf
10 changed files with 54 additions and 1736 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1708
css/swad.css
View File

File diff suppressed because it is too large Load Diff

2
swad_calendar.c
View File

@ -72,7 +72,7 @@ void Cal_PutIconsToSelectFirstDayOfWeek (void)
{
extern const char *Txt_Calendar;
Lay_StartRoundFrameTable (NULL,2,Txt_Calendar);
Lay_StartRoundFrameTable (NULL,0,Txt_Calendar);
Cal_ShowFormToSelectFirstDayOfWeek (ActChg1stDay,"ICON32x32");
Lay_EndRoundFrameTable ();
}

6
swad_changelog.h
View File

@ -117,11 +117,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.50.1 (2015/11/30)"
#define Log_PLATFORM_VERSION "SWAD 15.51 (2015/11/30)"
#define CSS_FILE "swad15.51.css"
// 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.51: Nov 30, 2015 Responsive design in title (country, institution, centre, degree, course).
CSS file is renamed after changes in order to invalidate browser cache. (186564 lines)
Version 15.50.2: Nov 30, 2015 Changes in layout of preferences. (186517 lines)
Version 15.50.1: Nov 30, 2015 Changes in layout of heading. (186494 lines)
Version 15.50: Nov 30, 2015 Changes in layout of menus.
Responsive design in menu: when screen is small, horizontal menu is drawn. (186514 lines)

4
swad_copy.sh
View File

@ -19,8 +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.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.css
chown $APACHE_USER:$APACHE_GROUP $PUBLIC_HTML/swad*.css

34
swad_degree.c
View File

@ -735,13 +735,15 @@ void Deg_WriteCtyInsCtrDeg (void)
/**************** Write course full name in the top of the page **************/
/*****************************************************************************/
#define Deg_MAX_LENGTH_FULL_NAME 255 // Maximum length of full name
#define Deg_MAX_LENGTH_FULL_NAME_ON_PAGE_HEAD 55 // Maximum lenght on screen. Set this value depending on the size of the style used
#define Deg_MAX_LENGTH_ORIGINAL_NAME 255 // Maximum length of full name
#define Deg_MAX_LENGTH_SHORT_NAME_ON_PAGE_HEAD 32 // Maximum lenght on screen
#define Deg_MAX_LENGTH_FULL_NAME_ON_PAGE_HEAD 55 // Maximum lenght on screen
void Deg_WriteBigNameCtyInsCtrDegCrs (void)
{
extern const char *The_ClassCourse[The_NUM_THEMES];
char FullName[Deg_MAX_LENGTH_FULL_NAME+1]; // Full name of course / degree
char ShortName[Deg_MAX_LENGTH_ORIGINAL_NAME+1]; // Short name of country, institution, centre, degree or course
char FullName [Deg_MAX_LENGTH_ORIGINAL_NAME+1]; // Full name of country, institution, centre, degree or course
if (Gbl.CurrentCty.Cty.CtyCod > 0 ||
Gbl.CurrentIns.Ins.InsCod > 0 ||
@ -749,16 +751,29 @@ void Deg_WriteBigNameCtyInsCtrDegCrs (void)
Gbl.CurrentDeg.Deg.DegCod > 0 ||
Gbl.CurrentCrs.Crs.CrsCod > 0)
{
/* Limit length of short name */
strncpy (ShortName,
(Gbl.CurrentCrs.Crs.CrsCod > 0) ? Gbl.CurrentCrs.Crs.ShortName :
((Gbl.CurrentDeg.Deg.DegCod > 0) ? Gbl.CurrentDeg.Deg.ShortName :
((Gbl.CurrentCtr.Ctr.CtrCod > 0) ? Gbl.CurrentCtr.Ctr.ShortName :
((Gbl.CurrentIns.Ins.InsCod > 0) ? Gbl.CurrentIns.Ins.ShortName :
Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]))),
Deg_MAX_LENGTH_ORIGINAL_NAME);
ShortName[Deg_MAX_LENGTH_ORIGINAL_NAME] = '\0';
Str_LimitLengthHTMLStr (ShortName,Deg_MAX_LENGTH_SHORT_NAME_ON_PAGE_HEAD);
/* Limit length of full name */
strncpy (FullName,
(Gbl.CurrentCrs.Crs.CrsCod > 0) ? Gbl.CurrentCrs.Crs.FullName :
((Gbl.CurrentDeg.Deg.DegCod > 0) ? Gbl.CurrentDeg.Deg.FullName :
((Gbl.CurrentCtr.Ctr.CtrCod > 0) ? Gbl.CurrentCtr.Ctr.FullName :
((Gbl.CurrentIns.Ins.InsCod > 0) ? Gbl.CurrentIns.Ins.FullName :
Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]))),
Deg_MAX_LENGTH_FULL_NAME);
FullName[Deg_MAX_LENGTH_FULL_NAME] = '\0';
Str_LimitLengthHTMLStr (FullName,Deg_MAX_LENGTH_FULL_NAME_ON_PAGE_HEAD);
fprintf (Gbl.F.Out,"<div class=\"%s\">",
Deg_MAX_LENGTH_ORIGINAL_NAME);
FullName[Deg_MAX_LENGTH_ORIGINAL_NAME] = '\0';
Str_LimitLengthHTMLStr (FullName ,Deg_MAX_LENGTH_FULL_NAME_ON_PAGE_HEAD);
fprintf (Gbl.F.Out,"<div id=\"big_name\" class=\"%s\">",
The_ClassCourse[Gbl.Prefs.Theme]);
if (Gbl.CurrentCrs.Crs.CrsCod <= 0)
{
@ -774,9 +789,10 @@ void Deg_WriteBigNameCtyInsCtrDegCrs (void)
else if (Gbl.CurrentCty.Cty.CtyCod > 0)
Cty_DrawCountryMap (&Gbl.CurrentCty.Cty,"COUNTRY_MAP_TITLE");
}
fprintf (Gbl.F.Out,"%s"
fprintf (Gbl.F.Out,"<h1 id=\"big_full_name\">%s</h1>"
"<abbr id=\"big_short_name\">%s</abbr>"
"</div>",
FullName);
FullName,ShortName);
}
}

4
swad_icon.c
View File

@ -69,7 +69,7 @@ void Ico_PutIconsToSelectIconSet (void)
extern const char *Txt_Icons;
Ico_IconSet_t IconSet;
Lay_StartRoundFrameTable (NULL,2,Txt_Icons);
Lay_StartRoundFrameTable (NULL,0,Txt_Icons);
fprintf (Gbl.F.Out,"<tr>");
for (IconSet = (Ico_IconSet_t) 0;
IconSet < Ico_NUM_ICON_SETS;
@ -82,7 +82,7 @@ void Ico_PutIconsToSelectIconSet (void)
Par_PutHiddenParamString ("IconSet",Ico_IconSetId[IconSet]);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s/%s/%s/heart64x64.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICON32x32B\""
" style=\"margin:0 auto;\" />",
" style=\"margin:0 auto; padding:0;\" />",
Gbl.Prefs.IconsURL,
Cfg_ICON_FOLDER_ICON_SETS,
Ico_IconSetId[IconSet],

4
swad_layout.c
View File

@ -193,8 +193,8 @@ void Lay_WriteStartOfPage (void)
Gbl.Prefs.IconsURL);
/* Style sheet for SWAD */
fprintf (Gbl.F.Out,"<link rel=\"StyleSheet\" href=\"%s/swad.css\" type=\"text/css\" />\n",
Cfg_HTTPS_URL_SWAD_PUBLIC);
fprintf (Gbl.F.Out,"<link rel=\"StyleSheet\" href=\"%s/%s\" type=\"text/css\" />\n",
Cfg_HTTPS_URL_SWAD_PUBLIC,CSS_FILE);
/* Style sheet for Dropzone.js (http://www.dropzonejs.com/) */
// The public directory dropzone must hold:

2
swad_menu.c
View File

@ -153,7 +153,7 @@ void Mnu_PutIconsToSelectMenu (void)
extern const char *Txt_MENU_NAMES[Mnu_NUM_MENUS];
Mnu_Menu_t Menu;
Lay_StartRoundFrameTable (NULL,2,Txt_Menu);
Lay_StartRoundFrameTable (NULL,0,Txt_Menu);
fprintf (Gbl.F.Out,"<tr>");
for (Menu = (Mnu_Menu_t) 0;
Menu < Mnu_NUM_MENUS;

24
swad_preference.c
View File

@ -68,12 +68,12 @@ void Pre_EditPrefs (void)
extern const char *Txt_You_can_only_receive_email_notifications_if_;
char MailDomain[Usr_MAX_BYTES_USR_EMAIL+1];
/***** Language and first day of week *****/
/***** Language, first day of week *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:16px 0;\">"
"<tr>"
"<td>");
Lay_StartRoundFrame (NULL,Txt_Language);
fprintf (Gbl.F.Out,"<div style=\"height:46px;\">");
fprintf (Gbl.F.Out,"<div style=\"height:42px;\">");
Pre_PutSelectorToSelectLanguage (); // 1. Language
fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame ();
@ -84,20 +84,26 @@ void Pre_EditPrefs (void)
"</tr>"
"</table>");
/***** Menu, side columns, theme, icon set *****/
/***** Icon set, theme *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:16px 0;\">"
"<tr>"
"<td>");
Mnu_PutIconsToSelectMenu (); // 3. Menu
Ico_PutIconsToSelectIconSet (); // 3. Icon set
fprintf (Gbl.F.Out,"</td>"
"<td>");
Pre_PutIconsToSelectSideCols (); // 4. Side columns
The_PutIconsToSelectTheme (); // 4. Theme
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>");
/***** Menu, side columns *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:16px 0;\">"
"<tr>"
"<td>");
The_PutIconsToSelectTheme (); // 5. Theme
Mnu_PutIconsToSelectMenu (); // 5. Menu
fprintf (Gbl.F.Out,"</td>"
"<td>");
Ico_PutIconsToSelectIconSet (); // 6. Icon set
"<td>");
Pre_PutIconsToSelectSideCols (); // 6. Side columns
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>");
@ -332,7 +338,7 @@ static void Pre_PutIconsToSelectSideCols (void)
extern const char *Txt_LAYOUT_SIDE_COLUMNS[4];
unsigned SideCols;
Lay_StartRoundFrameTable (NULL,2,Txt_Columns);
Lay_StartRoundFrameTable (NULL,0,Txt_Columns);
fprintf (Gbl.F.Out,"<tr>");
for (SideCols = 0;
SideCols <= Lay_SHOW_BOTH_COLUMNS;

2
swad_theme.c
View File

@ -232,7 +232,7 @@ void The_PutIconsToSelectTheme (void)
extern const char *Txt_Theme_SKIN;
The_Theme_t Theme;
Lay_StartRoundFrameTable (NULL,2,Txt_Theme_SKIN);
Lay_StartRoundFrameTable (NULL,0,Txt_Theme_SKIN);
fprintf (Gbl.F.Out,"<tr>");
for (Theme = (The_Theme_t) 0;
Theme < The_NUM_THEMES;