diff --git a/css/swad16.146.css b/css/swad16.146.css
index 3f46ca9e..6a5e7b75 100644
--- a/css/swad16.146.css
+++ b/css/swad16.146.css
@@ -1598,6 +1598,30 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
}
/************************** Map and name of country **************************/
+.COUNTRY_SMALL
+ {
+ display:inline-block;
+ box-sizing:border-box;
+ max-width:300px;
+ margin-left:4px;
+ text-align:left;
+ vertical-align:middle;
+ white-space:nowrap;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ }
+.COUNTRY_TINY
+ {
+ display:inline-block;
+ box-sizing:border-box;
+ max-width:120px;
+ margin-left:4px;
+ text-align:left;
+ vertical-align:middle;
+ white-space:nowrap;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ }
.COUNTRY_MAP_TITLE
{
box-sizing:border-box;
@@ -1606,13 +1630,6 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
margin-right:10px;
vertical-align:top;
}
-.COUNTRY_MAP_TINY
- {
- box-sizing:border-box;
- width:20px;
- height:20px;
- vertical-align:middle;
- }
.COUNTRY_MAP_SMALL
{
box-sizing:border-box;
@@ -1620,6 +1637,13 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
height:64px;
vertical-align:middle;
}
+.COUNTRY_MAP_TINY
+ {
+ box-sizing:border-box;
+ width:20px;
+ height:20px;
+ vertical-align:middle;
+ }
.COUNTRY_MAP_SHOW
{
box-sizing:border-box;
@@ -1634,12 +1658,12 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
height:625px;
margin:12px;
}
-.COUNTRY_TXT
+
+/********************* List of my courses ************************************/
+.MY_CRSS_LNK
{
- display:inline-block;
box-sizing:border-box;
- max-width:100px;
- margin-left:4px;
+ max-width:500px;
text-align:left;
vertical-align:middle;
white-space:nowrap;
diff --git a/swad_changelog.h b/swad_changelog.h
index 47abce7c..afb5bb04 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -197,13 +197,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 16.146.6 (2017-03-04)"
+#define Log_PLATFORM_VERSION "SWAD 16.146.7 (2017-03-04)"
#define CSS_FILE "swad16.146.css"
#define JS_FILE "swad16.144.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.146.7: Mar 03, 2017 Changes in layout of my courses. (216339 lines)
Version 16.146.6: Mar 03, 2017 Changes in layout of countries. (216331 lines)
Version 16.146.5: Mar 03, 2017 Code refactoring related with author of assignments, attendance events and surveys. (216319 lines)
Version 16.146.4: Mar 03, 2017 Changes in layout of surveys. (216349 lines)
diff --git a/swad_country.c b/swad_country.c
index e42db5ec..2ae771de 100644
--- a/swad_country.c
+++ b/swad_country.c
@@ -164,7 +164,9 @@ void Cty_SeeCtyWithPendingInss (void)
"| ",
BgColor);
Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeIns,
- "DAT_NOBR","COUNTRY_MAP_SMALL");
+ "COUNTRY_SMALL",
+ "COUNTRY_MAP_SMALL",
+ "DAT");
fprintf (Gbl.F.Out," | ");
/* Number of pending institutions (row[1]) */
@@ -703,7 +705,9 @@ static void Cty_ListOneCountryForSeeing (struct Country *Cty,unsigned NumCty)
/***** Country map (and link to WWW if exists) *****/
fprintf (Gbl.F.Out,"",BgColor);
Cty_DrawCountryMapAndNameWithLink (Cty,ActSeeIns,
- "DAT_N","COUNTRY_MAP_SMALL");
+ "COUNTRY_SMALL",
+ "COUNTRY_MAP_SMALL",
+ "DAT_N");
fprintf (Gbl.F.Out," | ");
/* Write stats of this country */
@@ -794,7 +798,9 @@ static unsigned Cty_GetNumUsrsWhoClaimToBelongToCty (long CtyCod)
/*****************************************************************************/
void Cty_DrawCountryMapAndNameWithLink (struct Country *Cty,Act_Action_t Action,
- const char *ClassLink,const char *ClassMap)
+ const char *ClassContainer,
+ const char *ClassMap,
+ const char *ClassLink)
{
extern const char *Txt_Go_to_X;
char CountryName[Cty_MAX_BYTES_COUNTRY_NAME + 1];
@@ -802,6 +808,7 @@ void Cty_DrawCountryMapAndNameWithLink (struct Country *Cty,Act_Action_t Action,
/***** Start form *****/
Act_FormGoToStart (Action);
Cty_PutParamCtyCod (Cty->CtyCod);
+ fprintf (Gbl.F.Out,"",ClassContainer);
/***** Link to action *****/
sprintf (Gbl.Title,Txt_Go_to_X,Cty->Name[Gbl.Prefs.Language]);
@@ -813,8 +820,9 @@ void Cty_DrawCountryMapAndNameWithLink (struct Country *Cty,Act_Action_t Action,
/***** Write country name and end link *****/
Str_Copy (CountryName,Cty->Name[Gbl.Prefs.Language],
Cty_MAX_BYTES_COUNTRY_NAME);
- fprintf (Gbl.F.Out,"
%s (%s)
"
- "",
+ fprintf (Gbl.F.Out," %s (%s)"
+ ""
+ "
![\"%s\"](\"%s/dot64x64.png\"" "\\"%s\\"\"")
",
+ " class=\"ICO20x20\" />"
+ " %s"
+ "",
Gbl.Prefs.IconsURL,
Crs.ShrtName,
+ Crs.FullName,
Crs.FullName);
- Str_Copy (CrsFullName,Crs.FullName,
- Crs_MAX_LENGTH_COURSE_FULL_NAME);
- Str_LimitLengthHTMLStr (CrsFullName,Crs_MAX_BYTES_TXT_LINK);
- fprintf (Gbl.F.Out," %s",CrsFullName);
Act_FormEnd ();
-
- /***** Write link to RSS file *****/
- sprintf (PathRelRSSFile,"%s/%s/%ld/%s/%s",
- Cfg_PATH_SWAD_PUBLIC,Cfg_FOLDER_CRS,Crs.CrsCod,Cfg_RSS_FOLDER,Cfg_RSS_FILE);
- if (!Fil_CheckIfPathExists (PathRelRSSFile))
- RSS_UpdateRSSFileForACrs (&Crs);
- fprintf (Gbl.F.Out," "
- "![\"RSS\"](\"%s/rss16x16.gif\"" "\\"RSS\\"\"")
"
- "",
- Gbl.Prefs.IconsURL);
-
fprintf (Gbl.F.Out,"