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 16.106

This commit is contained in:
Antonio Cañas Vargas 2016-12-23 22:19:03 +01:00
parent 85100652d5
commit f371a32b0c
10 changed files with 69 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
css/swad16.105.13.css → css/swad16.106.css
View File

@ -2094,8 +2094,16 @@ a:hover img.CENTRE_PHOTO_SHOW
.PRAC {height:20px; background-color:#DBE5E9; border:solid 2px; border-color:#E4EEF2 #D0DADE #D0DADE #E4EEF2;}
.TUTO {height:20px; background-color:#D6E9C3; border:solid 2px; border-color:#DFEEE0 #CAE3B1 #CAE3B1 #DFEEE0;}
/********************************* Preference ********************************/
.PREF_CONTAINER
{
display:inline-block;
padding:0 10px;
border-spacing:0;
}
.PREF_OFF
{
display:table-cell;
box-sizing:border-box;
padding:6px;
text-align:center;
@ -2103,8 +2111,9 @@ a:hover img.CENTRE_PHOTO_SHOW
}
.PREF_ON
{
display:table-cell;
box-sizing:border-box;
padding:6px;
padding:6px;
text-align:center;
vertical-align:middle;
border:solid 1px;
@ -2112,8 +2121,19 @@ a:hover img.CENTRE_PHOTO_SHOW
background-color:#DDECF1;
}
.LOG {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#606060; font-size:11pt;}
.LOG_R {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:red; font-size:11pt;}
/************************************* Log ***********************************/
.LOG
{
font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif;
font-size:11pt;
color:#606060;
}
.LOG_R
{
font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif;
font-size:11pt;
color:red;
}
/***************************** Exam announcement *****************************/
/* Bottom space is used for signatures */

10
swad_calendar.c
View File

@ -77,9 +77,7 @@ void Cal_PutIconsToSelectFirstDayOfWeek (void)
Lay_StartRoundFrame (NULL,Txt_Calendar,
Cal_PutIconsFirstDayOfWeek,
Hlp_PROFILE_Preferences_calendar);
fprintf (Gbl.F.Out,"<div style=\"display:table; margin:0 auto;\">");
Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,NULL,"ICO40x40B");
fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame ();
}
@ -105,13 +103,13 @@ void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,void (*FuncParams) (),
extern const char *Txt_DAYS_SMALL[7];
unsigned FirstDayOfWeek;
fprintf (Gbl.F.Out,"<div style=\"display:table-cell; padding:0 20px;\">");
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
for (FirstDayOfWeek = 0; // Monday
FirstDayOfWeek <= 6; // Sunday
FirstDayOfWeek++)
if (Cal_DayIsValidAsFirstDayOfWeek[FirstDayOfWeek])
{
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"display:table-cell;\">",
fprintf (Gbl.F.Out,"<div class=\"%s\">",
FirstDayOfWeek == Gbl.Prefs.FirstDayOfWeek ? "PREF_ON" :
"PREF_OFF");
Act_FormStart (Action);
@ -261,11 +259,7 @@ void Cal_DrawCalendar (void)
/***** Draw several months *****/
/* Show form to change first day of week */
if (!PrintView)
{
fprintf (Gbl.F.Out,"<div style=\"display:table; margin:0 auto;\">");
Cal_ShowFormToSelFirstDayOfWeek (ActChgCal1stDay,NULL,"ICO25x25");
fprintf (Gbl.F.Out,"</div>");
}
/* JavaScript will write HTML here */
fprintf (Gbl.F.Out,"<div id=\"calendar\">"

5
swad_changelog.h
View File

@ -188,13 +188,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.105.13 (2016-12-23)"
#define CSS_FILE "swad16.105.13.css"
#define Log_PLATFORM_VERSION "SWAD 16.106 (2016-12-23)"
#define CSS_FILE "swad16.106.css"
#define JS_FILE "swad16.101.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.106: Dec 23, 2016 Changes in preferences. (211407 lines)
Version 16.105.13:Dec 23, 2016 Changes in behaviour of labels in forms. (211411 lines)
Version 16.105.12:Dec 21, 2016 Changes in behaviour of labels in forms. (211408 lines)
Version 16.105.11:Dec 21, 2016 Changes in behaviour of labels in forms. (211323 lines)

15
swad_group.c
View File

@ -261,8 +261,8 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction)
Usr_PutExtraParamsUsrList (NextAction);
/***** Select all groups *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT %s\">"
"<label>"
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT\">"
"<label class=\"%s\">"
"<input type=\"checkbox\""
" id=\"AllGroups\" name=\"AllGroups\" value=\"Y\"",
The_ClassForm[Gbl.Prefs.Theme]);
@ -2028,11 +2028,11 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight)
Gbl.Title,Gbl.Title);
/***** Group name *****/
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE");
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE");
if (Highlight)
fprintf (Gbl.F.Out," LIGHT_BLUE");
fprintf (Gbl.F.Out,"\">"
"<label for=\"Grp%ld\">"
"<label for=\"Grp%ld\" class=\"DAT\">"
"%s"
"</label>"
"</td>",
@ -2262,7 +2262,8 @@ static void Grp_PutFormToCreateGroup (void)
"<input type=\"text\" name=\"MaxStudents\""
" size=\"3\" maxlength=\"10\" value=\"");
Grp_WriteMaxStdsGrp (Gbl.CurrentCrs.Grps.MaxStudents);
fprintf (Gbl.F.Out,"\" /></td>");
fprintf (Gbl.F.Out,"\" />"
"</td>");
/***** Current number of students in this group *****/
fprintf (Gbl.F.Out,"<td></td>"
@ -4230,12 +4231,12 @@ void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ())
extern const char *Txt_Show_WHICH_groups[2];
Grp_WhichGroups_t WhichGrps;
fprintf (Gbl.F.Out,"<div style=\"display:table-cell; padding:0 20px;\">");
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
for (WhichGrps = Grp_ONLY_MY_GROUPS;
WhichGrps <= Grp_ALL_GROUPS;
WhichGrps++)
{
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"display:table-cell;\">",
fprintf (Gbl.F.Out,"<div class=\"%s\">",
WhichGrps == Gbl.CurrentCrs.Grps.WhichGrps ? "PREF_ON" :
"PREF_OFF");
Act_FormStart (Action);

12
swad_icon.c
View File

@ -78,20 +78,19 @@ void Ico_PutIconsToSelectIconSet (void)
Lay_StartRoundFrame (NULL,Txt_Icons,
Ico_PutIconsIconSet,Hlp_PROFILE_Preferences_icons);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>");
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
for (IconSet = (Ico_IconSet_t) 0;
IconSet < Ico_NUM_ICON_SETS;
IconSet++)
{
fprintf (Gbl.F.Out,"<td class=\"%s\">",
fprintf (Gbl.F.Out,"<div class=\"%s\">",
IconSet == Gbl.Prefs.IconSet ? "PREF_ON" :
"PREF_OFF");
Act_FormStart (ActChgIco);
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=\"ICO40x40B\""
" style=\"margin:0 auto; padding:0;\" />",
" style=\"margin:0 auto;\" />",
Gbl.Prefs.IconsURL,
Cfg_ICON_FOLDER_ICON_SETS,
Ico_IconSetId[IconSet],
@ -99,10 +98,9 @@ void Ico_PutIconsToSelectIconSet (void)
Ico_IconSetNames[IconSet],
Ico_IconSetNames[IconSet]);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
fprintf (Gbl.F.Out,"</div>");
}
fprintf (Gbl.F.Out,"</tr>"
"</table>");
fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame ();
}

10
swad_menu.c
View File

@ -372,13 +372,12 @@ void Mnu_PutIconsToSelectMenu (void)
Lay_StartRoundFrame (NULL,Txt_Menu,
Mnu_PutIconsMenu,Hlp_PROFILE_Preferences_menu);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>");
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
for (Menu = (Mnu_Menu_t) 0;
Menu < Mnu_NUM_MENUS;
Menu++)
{
fprintf (Gbl.F.Out,"<td class=\"%s\">",
fprintf (Gbl.F.Out,"<div class=\"%s\">",
Menu == Gbl.Prefs.Menu ? "PREF_ON" :
"PREF_OFF");
Act_FormStart (ActChgMnu);
@ -391,10 +390,9 @@ void Mnu_PutIconsToSelectMenu (void)
Txt_MENU_NAMES[Menu],
Txt_MENU_NAMES[Menu]);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
fprintf (Gbl.F.Out,"</div>");
}
fprintf (Gbl.F.Out,"</tr>"
"</table>");
fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame ();
}

34
swad_preference.c
View File

@ -72,39 +72,31 @@ void Pre_EditPrefs (void)
extern const char *Txt_Language;
/***** 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,
Pre_PutIconsLanguage,Hlp_PROFILE_Preferences_language);
fprintf (Gbl.F.Out,"<div style=\"height:42px;\">");
Pre_PutSelectorToSelectLanguage (); // 1. Language
fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame ();
fprintf (Gbl.F.Out,"</td>"
"<td>");
Cal_PutIconsToSelectFirstDayOfWeek (); // 2. First day of week
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>");
/***** Icon set, theme *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:16px 0;\">"
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:10px 0;\">"
"<tr>"
"<td>");
Ico_PutIconsToSelectIconSet (); // 3. Icon set
Ico_PutIconsToSelectIconSet (); // 2. Icon set
fprintf (Gbl.F.Out,"</td>"
"<td>");
The_PutIconsToSelectTheme (); // 4. Theme
Mnu_PutIconsToSelectMenu (); // 3. Menu
fprintf (Gbl.F.Out,"</td>"
"<td>");
Cal_PutIconsToSelectFirstDayOfWeek (); // 4. First day of week
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>");
/***** Menu, side columns *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:16px 0;\">"
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:10px 0;\">"
"<tr>"
"<td>");
Mnu_PutIconsToSelectMenu (); // 5. Menu
The_PutIconsToSelectTheme (); // 5. Theme
fprintf (Gbl.F.Out,"</td>"
"<td>");
Pre_PutIconsToSelectSideCols (); // 6. Side columns
@ -387,13 +379,12 @@ static void Pre_PutIconsToSelectSideCols (void)
Lay_StartRoundFrame (NULL,Txt_Columns,
Pre_PutIconsSideColumns,
Hlp_PROFILE_Preferences_columns);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>");
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
for (SideCols = 0;
SideCols <= Lay_SHOW_BOTH_COLUMNS;
SideCols++)
{
fprintf (Gbl.F.Out,"<td class=\"%s CENTER_MIDDLE\">",
fprintf (Gbl.F.Out,"<div class=\"%s\">",
SideCols == Gbl.Prefs.SideCols ? "PREF_ON" :
"PREF_OFF");
Act_FormStart (ActChgCol);
@ -407,10 +398,9 @@ static void Pre_PutIconsToSelectSideCols (void)
Txt_LAYOUT_SIDE_COLUMNS[SideCols],
Txt_LAYOUT_SIDE_COLUMNS[SideCols]);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
fprintf (Gbl.F.Out,"</div>");
}
fprintf (Gbl.F.Out,"</tr>"
"</table>");
fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame ();
}

10
swad_theme.c
View File

@ -257,13 +257,12 @@ void The_PutIconsToSelectTheme (void)
Lay_StartRoundFrame (NULL,Txt_Theme_SKIN,
The_PutIconsTheme,Hlp_PROFILE_Preferences_theme);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>");
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
for (Theme = (The_Theme_t) 0;
Theme < The_NUM_THEMES;
Theme++)
{
fprintf (Gbl.F.Out,"<td class=\"%s\">",
fprintf (Gbl.F.Out,"<div class=\"%s\">",
Theme == Gbl.Prefs.Theme ? "PREF_ON" :
"PREF_OFF");
Act_FormStart (ActChgThe);
@ -278,10 +277,9 @@ void The_PutIconsToSelectTheme (void)
The_ThemeNames[Theme],
The_ThemeNames[Theme]);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
fprintf (Gbl.F.Out,"</div>");
}
fprintf (Gbl.F.Out,"</tr>"
"</table>");
fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame ();
}

4
swad_timetable.c
View File

@ -286,8 +286,6 @@ void TT_ShowClassTimeTable (void)
TT_ShowTimeTableGrpsSelected ();
else
{
fprintf (Gbl.F.Out,"<div style=\"display:table; margin:0 auto;\">");
/***** Select whether show only my groups or all groups *****/
if ( Gbl.TimeTable.Type == TT_MY_TIMETABLE ||
(Gbl.TimeTable.Type == TT_COURSE_TIMETABLE &&
@ -298,8 +296,6 @@ void TT_ShowClassTimeTable (void)
Cal_ShowFormToSelFirstDayOfWeek (ActChgTT1stDay[Gbl.TimeTable.Type],
Grp_PutParamWhichGrps,
"ICO25x25");
fprintf (Gbl.F.Out,"</div>");
}
/***** Show the time table *****/

16
swad_user.c
View File

@ -5313,10 +5313,10 @@ void Usr_FreeListOtherRecipients (void)
void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction)
{
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
/***** Select Usr_CLASS_PHOTO *****/
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_5\" style=\"margin:4px auto;\">"
"<tr>"
"<td class=\"%s LEFT_MIDDLE\">",
fprintf (Gbl.F.Out,"<div class=\"%s\">",
Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO ? "PREF_ON" :
"PREF_OFF");
Usr_FormToSelectUsrListType (NextAction,Usr_CLASS_PHOTO);
@ -5329,10 +5329,10 @@ void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction)
Usr_PutExtraParamsUsrList (NextAction);
Usr_PutSelectorNumColsClassPhoto ();
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
fprintf (Gbl.F.Out,"</div>");
/***** Select Usr_LIST *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">",
fprintf (Gbl.F.Out,"<div class=\"%s\">",
Gbl.Usrs.Me.ListType == Usr_LIST ? "PREF_ON" :
"PREF_OFF");
Usr_FormToSelectUsrListType (NextAction,Usr_LIST);
@ -5344,9 +5344,9 @@ void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction)
Usr_PutExtraParamsUsrList (NextAction);
Usr_PutCheckboxListWithPhotos ();
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>");
fprintf (Gbl.F.Out,"</div>");
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/