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 14.50.3

This commit is contained in:
Antonio Cañas Vargas 2015-01-01 15:50:45 +01:00
parent 5efb56fd61
commit 4c4e514884
8 changed files with 68 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/swad_desktop.css
View File

@ -776,8 +776,8 @@ a:hover img.CENTRE_PHOTO_SHOW
.USR_LIST_TYPE_OFF {border:solid 1px; border-color:#FFFFFF;}
.USR_LIST_TYPE_ON {border:solid 1px; border-color:#50B800;}
.LAYOUT_OFF {border:solid; border-width:0;}
.LAYOUT_ON {border:solid; border-width:1px; border-color:#80E000;}
.LAYOUT_OFF {background-color:white;}
.LAYOUT_ON {background-color:#80E000;}
.LOG {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#606060; font-size:9pt;}
.LOG_R {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#FF0000; font-size:9pt;}

4
css/swad_mobile.css
View File

@ -587,8 +587,8 @@ a:hover img.CENTRE_PHOTO_SHOW
.USR_LIST_TYPE_OFF {border:solid 1px; border-color:#FFFFFF;}
.USR_LIST_TYPE_ON {border:solid 1px; border-color:#50B800;}
.LAYOUT_OFF {border:solid; border-width:0;}
.LAYOUT_ON {border:solid; border-width:1px; border-color:#80E000;}
.LAYOUT_OFF {background-color:white;}
.LAYOUT_ON {background-color:#80E000;}
.LOG {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#606060; font-size:9pt;}
.LOG_R {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#FF0000; font-size:9pt;}

3
swad_changelog.h
View File

@ -35,11 +35,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.50.2 (2015/01/01)"
#define Log_PLATFORM_VERSION "SWAD 14.50.3 (2015/01/01)"
// 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 | tail -1
/*
Version 14.50.3 :Jan 01, 2014 Changes in layout of preferences. (172691 lines)
Version 14.50.2 :Jan 01, 2014 Changes in CSS. (172739 lines)
Version 14.50.1 :Dec 31, 2014 Horizontal menu (not finished). (172736 lines)
Version 14.50 :Dec 31, 2014 Horizontal menu (not finished). (172735 lines)

9
swad_icon.c
View File

@ -66,10 +66,11 @@ const char *Ico_IconSetNames[Ico_NUM_ICON_SETS] =
void Ico_PutIconsToSelectIconSet (void)
{
extern const char *Txt_Icons;
Ico_IconSet_t IconSet;
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_1\">"
"<tr>");
Lay_StartRoundFrameTable10 (NULL,2,Txt_Icons);
fprintf (Gbl.F.Out,"<tr>");
for (IconSet = (Ico_IconSet_t) 0;
IconSet < Ico_NUM_ICON_SETS;
IconSet++)
@ -90,8 +91,8 @@ void Ico_PutIconsToSelectIconSet (void)
Ico_IconSetNames[IconSet],
Ico_IconSetNames[IconSet]);
}
fprintf (Gbl.F.Out,"</tr>"
"</table>");
fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 ();
}
/*****************************************************************************/

24
swad_layout.c
View File

@ -63,7 +63,7 @@ const char *Lay_LayoutIcons[Lay_NUM_LAYOUTS] =
/****************************** Private constants ****************************/
/*****************************************************************************/
// #define HORIZONTAL_MENU 1
#define HORIZONTAL_MENU 1
const char *Lay_TabIcons[Act_NUM_TABS] =
{
@ -336,11 +336,8 @@ void Lay_WriteStartOfPage (void)
" text-align:left; vertical-align:top;\">");
#ifdef HORIZONTAL_MENU
fprintf (Gbl.F.Out,"<div id=\"horizontal_menu_container\">");
Lay_WriteHorizontalMenuThisTabDesktop ();
fprintf (Gbl.F.Out,"</div>");
if (Gbl.Prefs.Layout == Lay_LAYOUT_DESKTOP)
Lay_WriteHorizontalMenuThisTabDesktop ();
#endif
Usr_WarningWhenDegreeTypeDoesntAllowDirectLogin ();
@ -1242,7 +1239,8 @@ static void Lay_WriteHorizontalMenuThisTabDesktop (void)
bool IsTheSelectedAction;
/***** List start *****/
fprintf (Gbl.F.Out,"<ul>");
fprintf (Gbl.F.Out,"<div id=\"horizontal_menu_container\">"
"<ul>");
/***** Loop to write all options in menu. Each row holds an option *****/
for (NumOptInMenu = 0;
@ -1292,7 +1290,8 @@ static void Lay_WriteHorizontalMenuThisTabDesktop (void)
}
/***** List end *****/
fprintf (Gbl.F.Out,"</ul>");
fprintf (Gbl.F.Out,"</ul>"
"</div>");
}
#endif
@ -2024,11 +2023,12 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
void Lay_PutIconsToSelectLayout (void)
{
extern const char *Txt_Layout;
extern const char *Txt_LAYOUT_NAMES[Lay_NUM_LAYOUTS];
Lay_Layout_t Layout;
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\">"
"<tr>");
Lay_StartRoundFrameTable10 (NULL,2,Txt_Layout);
fprintf (Gbl.F.Out,"<tr>");
for (Layout = (Lay_Layout_t) 0;
Layout < Lay_NUM_LAYOUTS;
Layout++)
@ -2047,8 +2047,8 @@ void Lay_PutIconsToSelectLayout (void)
Txt_LAYOUT_NAMES[Layout],
Txt_LAYOUT_NAMES[Layout]);
}
fprintf (Gbl.F.Out,"</tr>"
"</table>");
fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 ();
}
/*****************************************************************************/

6
swad_notification.c
View File

@ -1656,14 +1656,13 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
Ntf_NotifyEvent_t NotifyEvent;
/***** Start table *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL);
Lay_StartRoundFrameTable10 (NULL,0,Txt_Notifications);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
/***** Start form *****/
Act_FormStart (ActChgNtfPrf);
fprintf (Gbl.F.Out,"<p class=\"TIT_TBL\">%s</p>"
"<table class=\"CELLS_PAD_2\">"
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\">"
"<tr>"
"<th></th>"
"<th class=\"TIT_TBL\" style=\"text-align:center;\">"
@ -1673,7 +1672,6 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
"%s"
"</th>"
"</tr>",
Txt_Notifications,
Txt_Create_BR_notification,
Txt_Notify_me_BR_by_e_mail);

129
swad_preference.c
View File

@ -63,98 +63,46 @@ static void Prf_PutFormPublicPhoto (void);
void Prf_EditPrefs (void)
{
extern const char *Txt_Language;
extern const char *Txt_Layout;
extern const char *Txt_Theme_SKIN;
extern const char *Txt_Columns;
extern const char *Txt_Icons;
extern const char *Txt_You_can_only_receive_email_notifications_if_;
char MailDomain[Cns_MAX_BYTES_STRING+1];
/***** Language selection *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL);
/***** Language *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_Language);
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:center;\">"
"%s"
"</td>"
"</tr>"
"<tr>"
"<td style=\"text-align:center;\">",
Txt_Language);
"<td style=\"text-align:center;\">");
Prf_PutSelectorToSelectLanguage ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 ();
/***** Layout selection *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL);
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:center;\">"
"%s"
"</td>"
"</tr>"
/***** Layout & icons *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:10px;\">"
"<tr>"
"<td style=\"text-align:center;\">",
Txt_Layout);
"<td>");
Lay_PutIconsToSelectLayout ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 ();
/***** Theme selection *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL);
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:center;\">"
"%s"
"</td>"
"</tr>"
"<tr>"
"<td style=\"text-align:center;\">",
Txt_Theme_SKIN);
The_PutIconsToSelectTheme ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 ();
/***** Side columns selection *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL);
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:center;\">"
"%s"
"</td>"
"</tr>"
"<tr>"
"<td style=\"text-align:center;\">",
Txt_Columns);
Prf_PutIconsToSelectSideCols ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 ();
/***** Icons selection *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL);
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:center;\">"
"%s"
"</td>"
"</tr>"
"<tr>"
"<td style=\"text-align:center;\">",
Txt_Icons);
"<td>");
Ico_PutIconsToSelectIconSet ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 ();
"</tr>"
"</table>");
/***** Theme & side colums *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:10px;\">"
"<tr>"
"<td>");
The_PutIconsToSelectTheme ();
fprintf (Gbl.F.Out,"</td>"
"<td>");
Prf_PutIconsToSelectSideCols ();
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>");
if (Gbl.Usrs.Me.Logged)
{
/***** Public / private photo *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
Prf_PutFormPublicPhoto ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 ();
/***** Automatic e-mail to notify of new events *****/
Ntf_PutFormChangeNotifSentByEMail ();
@ -384,11 +332,12 @@ Txt_Language_t Prf_GetParamLanguage (void)
void Prf_PutIconsToSelectSideCols (void)
{
unsigned SideCols;
extern const char *Txt_Columns;
extern const char *Txt_LAYOUT_SIDE_COLUMNS[4];
unsigned SideCols;
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_1\">"
"<tr>");
Lay_StartRoundFrameTable10 (NULL,2,Txt_Columns);
fprintf (Gbl.F.Out,"<tr>");
for (SideCols = 0;
SideCols <= Lay_SHOW_BOTH_COLUMNS;
SideCols++)
@ -408,8 +357,8 @@ void Prf_PutIconsToSelectSideCols (void)
Txt_LAYOUT_SIDE_COLUMNS[SideCols],
Txt_LAYOUT_SIDE_COLUMNS[SideCols]);
}
fprintf (Gbl.F.Out,"</tr>"
"</table>");
fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 ();
}
/*****************************************************************************/
@ -591,27 +540,25 @@ static void Prf_PutFormPublicPhoto (void)
extern const char *Txt_Public_photo;
/***** Start form *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_Public_photo);
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">",
The_ClassFormul[Gbl.Prefs.Theme]);
Act_FormStart (ActChgPubPho);
fprintf (Gbl.F.Out,"<table style=\"border-spacing:2px;\">"
"<tr>");
/***** Checkbox to select between public or private photo *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:right;\">"
"<input type=\"checkbox\" name=\"PublicPhoto\" value=\"Y\"");
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"PublicPhoto\" value=\"Y\"");
if (Gbl.Usrs.Me.UsrDat.PublicPhoto)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\" />"
"</td>",
fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\" />",
Gbl.FormId);
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;\">"
"%s"
"</td>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Public_photo);
fprintf (Gbl.F.Out,"%s",Txt_Public_photo);
/***** End form *****/
fprintf (Gbl.F.Out,"</tr>"
"</table>"
"</form>");
fprintf (Gbl.F.Out,"</form>"
"</td>"
"</tr>");
Lay_EndRoundFrameTable10 ();
}
/*****************************************************************************/

9
swad_theme.c
View File

@ -230,10 +230,11 @@ const char *The_ClassFormulB[The_NUM_THEMES] =
void The_PutIconsToSelectTheme (void)
{
extern const char *Txt_Theme_SKIN;
The_Theme_t Theme;
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_1\">"
"<tr>");
Lay_StartRoundFrameTable10 (NULL,2,Txt_Theme_SKIN);
fprintf (Gbl.F.Out,"<tr>");
for (Theme = (The_Theme_t) 0;
Theme < The_NUM_THEMES;
Theme++)
@ -254,8 +255,8 @@ void The_PutIconsToSelectTheme (void)
The_ThemeNames[Theme],
The_ThemeNames[Theme]);
}
fprintf (Gbl.F.Out,"</tr>"
"</table>");
fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 ();
}
/*****************************************************************************/