diff --git a/css/swad15.150.2.css b/css/swad15.150.2.css
index 2c264b5e6..f2d793e84 100644
--- a/css/swad15.150.2.css
+++ b/css/swad15.150.2.css
@@ -1339,7 +1339,6 @@ a:hover /* Default ==> underlined */
/********** Title of country,institution,centre,degree,course ************/
.TITLE_LOCATION
{
- display:inline-block;
font-size:25pt;
font-weight:bold;
color:#808080;
diff --git a/swad_changelog.h b/swad_changelog.h
index b06400c5f..01a12e20e 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -125,6 +125,7 @@
// TODO: Fix bug in marks reported by Francisco Ocaņa
// TODO: When a new user (a guest not registered in any course) creates a new course ==> register him/her automatically as a teacher in the course just created
+// TODO: Icon to the left in list of forums is not correct when scope is system
// TODO: Move info about number of files to bottom of file browsers
// TODO: Show tagline at top, near logo
// TODO: Show big header h1 when no country specified
@@ -134,13 +135,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 15.150.3 (2016-03-18)"
+#define Log_PLATFORM_VERSION "SWAD 15.150.4 (2016-03-18)"
#define CSS_FILE "swad15.150.2.css"
#define JS_FILE "swad15.131.3.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 15.150.4: Mar 18, 2016 Icon to print country configuration integrated in frame. (195952 lines)
Version 15.150.3: Mar 18, 2016 Changes in layout of course info. (195956 lines)
Version 15.150.2: Mar 18, 2016 Icon to print course configuration integrated in frame.
Changes in layout of frames. (195950 lines)
diff --git a/swad_country.c b/swad_country.c
index 594c8690d..d5de2a2a5 100644
--- a/swad_country.c
+++ b/swad_country.c
@@ -65,6 +65,7 @@ extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
/*****************************************************************************/
static void Cty_Configuration (bool PrintView);
+static void Cty_PutIconToPrint (void);
static void Cty_PutIconToEditCountries (void);
@@ -205,7 +206,6 @@ static void Cty_Configuration (bool PrintView)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Institutions;
- extern const char *Txt_Print;
extern const char *Txt_Country;
extern const char *Txt_Shortcut;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
@@ -220,24 +220,12 @@ static void Cty_Configuration (bool PrintView)
if (Gbl.CurrentCty.Cty.CtyCod > 0)
{
- if (!PrintView)
- {
- /***** Links to show institutions and to print view *****/
- fprintf (Gbl.F.Out,"");
- }
-
/***** Start frame *****/
- Lay_StartRoundFrameTable (NULL,2,NULL);
+ Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL :
+ Cty_PutIconToPrint);
/***** Title *****/
- fprintf (Gbl.F.Out,""
- "| ");
+ fprintf (Gbl.F.Out," | "
- "
");
+ fprintf (Gbl.F.Out,"");
/***** Country map (and link to WWW if exists) *****/
if (Cty_CheckIfCountryMapExists (&Gbl.CurrentCty.Cty))
@@ -256,9 +243,7 @@ static void Cty_Configuration (bool PrintView)
Cty_GetMapAttribution (Gbl.CurrentCty.Cty.CtyCod,&MapAttribution);
/* Map image */
- fprintf (Gbl.F.Out,""
- "| ");
+ fprintf (Gbl.F.Out," | "
- "
");
+ fprintf (Gbl.F.Out,"");
/* Map attribution */
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM && !PrintView)
{
- fprintf (Gbl.F.Out,""
- "| ");
+ fprintf (Gbl.F.Out," ");
Act_FormStart (ActChgCtyMapAtt);
fprintf (Gbl.F.Out,"");
Act_FormEnd ();
- fprintf (Gbl.F.Out," | "
- "
");
+ fprintf (Gbl.F.Out,"");
}
else if (MapAttribution)
- fprintf (Gbl.F.Out,""
- "| "
+ fprintf (Gbl.F.Out," "
"%s"
- " | "
- "
",
+ "",
MapAttribution);
/* Free memory used for map attribution */
Cty_FreeMapAttribution (&MapAttribution);
}
+ /***** Start table *****/
+ fprintf (Gbl.F.Out,"");
+
/***** Country name (an link to WWW if exists) *****/
fprintf (Gbl.F.Out,""
"| "
@@ -455,11 +438,25 @@ static void Cty_Configuration (bool PrintView)
Usr_GetNumUsrsInCrssOfCty (Rol_UNKNOWN,Gbl.CurrentCty.Cty.CtyCod));
}
+ /***** End table *****/
+ fprintf (Gbl.F.Out," |
");
+
/***** End frame *****/
- Lay_EndRoundFrameTable ();
+ Lay_EndRoundFrame ();
}
}
+/*****************************************************************************/
+/************* Put icon to print the configuration of a course ***************/
+/*****************************************************************************/
+
+static void Cty_PutIconToPrint (void)
+ {
+ extern const char *Txt_Print;
+
+ Lay_PutContextualLink (ActPrnCtyInf,NULL,"print64x64.png",Txt_Print,NULL);
+ }
+
/*****************************************************************************/
/*************************** List all the countries **************************/
/*****************************************************************************/