Version 15.55

swad_changelog.h

@@ -117,12 +117,14 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 15.54.6 (2015/12/01)"
+#define Log_PLATFORM_VERSION	"SWAD 15.55 (2015/12/01)"
-#define CSS_FILE		"swad15.54.4.css"
+#define CSS_FILE		"swad15.55.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.55:    Dec 01, 2015	Change in layout background. (186805 lines)
+        Version 15.54.7:  Dec 01, 2015	Change in title (country, institution, centre, degree, course). (186783 lines)
         Version 15.54.6:  Dec 01, 2015	Change in layout of file browser. (186768 lines)
         Version 15.54.5:  Dec 01, 2015	Fixed bug in file browser, reported by Jacinto Domínguez Rull. (186763 lines)
         Version 15.54.4:  Dec 01, 2015	Fixed bug in title (country, institution, centre, degree, course). (186761 lines)

swad_degree.c

@@ -745,11 +745,10 @@ void Deg_WriteBigNameCtyInsCtrDegCrs (void)
    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 ||
+   fprintf (Gbl.F.Out,"<h1 id=\"big_name\" class=\"%s\">",
-       Gbl.CurrentIns.Ins.InsCod > 0 ||
+	    The_ClassCourse[Gbl.Prefs.Theme]);
-       Gbl.CurrentCtr.Ctr.CtrCod > 0 ||
+
-       Gbl.CurrentDeg.Deg.DegCod > 0 ||
+   if (Gbl.CurrentCty.Cty.CtyCod > 0)	// Country selected
-       Gbl.CurrentCrs.Crs.CrsCod > 0)
      {
       /* Limit length of short name */
       strncpy (ShortName,
@@ -773,8 +772,6 @@ void Deg_WriteBigNameCtyInsCtrDegCrs (void)
       FullName[Deg_MAX_LENGTH_ORIGINAL_NAME] = '\0';
       Str_LimitLengthHTMLStr (FullName ,Deg_MAX_LENGTH_FULL_NAME_ON_PAGE_HEAD);
 
-      fprintf (Gbl.F.Out,"<h1 id=\"big_name\" class=\"%s\">",
-	       The_ClassCourse[Gbl.Prefs.Theme]);
       if (Gbl.CurrentCrs.Crs.CrsCod <= 0)
 	{
          if (Gbl.CurrentDeg.Deg.DegCod > 0)
@@ -789,11 +786,25 @@ void Deg_WriteBigNameCtyInsCtrDegCrs (void)
 	 else if (Gbl.CurrentCty.Cty.CtyCod > 0)
             Cty_DrawCountryMap (&Gbl.CurrentCty.Cty,"COUNTRY_MAP_TITLE");
 	}
-      fprintf (Gbl.F.Out,"<div id=\"big_full_name\">%s</div>"
+      fprintf (Gbl.F.Out,"<div id=\"big_full_name\">"
-	                 "<abbr id=\"big_short_name\">%s</abbr>"
+	                 "%s"
-	                 "</h1>",
+	                 "</div>"
+	                 "<abbr id=\"big_short_name\">"
+	                 "%s"
+	                 "</abbr>",
 	       FullName,ShortName);
      }
+   else	// No country selected
+      /* This main title takes up space but it is invisible */
+      fprintf (Gbl.F.Out,"<div id=\"big_full_name\" class=\"INVISIBLE\">"
+	                 "%s"
+	                 "</div>"
+	                 "<abbr id=\"big_short_name\" class=\"INVISIBLE\">"
+	                 "%s"
+	                 "</abbr>",
+	       Cfg_PLATFORM_FULL_NAME,Cfg_PLATFORM_SHORT_NAME);
+
+   fprintf (Gbl.F.Out,"</h1>");
   }
 
 /*****************************************************************************/

swad_layout.c

@@ -104,13 +104,6 @@ void Lay_WriteStartOfPage (void)
    extern const unsigned Txt_Current_CGI_SWAD_Language;
    extern const char *The_TabOnBgColors[The_NUM_THEMES];
    extern const char *Txt_NEW_YEAR_GREETING;
-   const char *ClassWholePage[The_NUM_THEMES] =
-     {
-      "WHOLE_PAGE_WHITE",	// The_THEME_WHITE
-      "WHOLE_PAGE_GREY",	// The_THEME_GREY
-      "WHOLE_PAGE_BLUE",	// The_THEME_BLUE
-      "WHOLE_PAGE_YELLOW",	// The_THEME_YELLOW
-     };
    const char *LayoutMainZone[Mnu_NUM_MENUS] =
      {
       "main_horizontal",	// Mnu_MENU_HORIZONTAL
@@ -257,8 +250,7 @@ void Lay_WriteStartOfPage (void)
      }
 
    /***** Start of box that contains the whole page except the foot *****/
-   fprintf (Gbl.F.Out,"<div id=\"whole_page\" class=\"%s\">",
+   fprintf (Gbl.F.Out,"<div id=\"whole_page\">");
-            ClassWholePage[Gbl.Prefs.Theme]);
 
    /***** Header of layout *****/
    Lay_WritePageTopHeading ();
@@ -677,6 +669,20 @@ static void Lay_WritePageTopHeading (void)
       "HEAD_ROW_1_BLUE",	// The_THEME_BLUE
       "HEAD_ROW_1_YELLOW",	// The_THEME_YELLOW
       };
+   const char *ClassHeadRow2[The_NUM_THEMES] =
+     {
+      "HEAD_ROW_2_WHITE",	// The_THEME_WHITE
+      "HEAD_ROW_2_GREY",	// The_THEME_GREY
+      "HEAD_ROW_2_BLUE",	// The_THEME_BLUE
+      "HEAD_ROW_2_YELLOW",	// The_THEME_YELLOW
+      };
+   const char *ClassHeadRow3[The_NUM_THEMES] =
+     {
+      "HEAD_ROW_3_WHITE",	// The_THEME_WHITE
+      "HEAD_ROW_3_GREY",	// The_THEME_GREY
+      "HEAD_ROW_3_BLUE",	// The_THEME_BLUE
+      "HEAD_ROW_3_YELLOW",	// The_THEME_YELLOW
+      };
 
    /***** 1st. row *****/
    /* Start of 1st. row */
@@ -745,7 +751,8 @@ static void Lay_WritePageTopHeading (void)
 
    /***** 2nd. row *****/
    /* Start of second row */
-   fprintf (Gbl.F.Out,"<div id=\"head_row_2\">");
+   fprintf (Gbl.F.Out,"<div id=\"head_row_2\" class=\"%s\">",
+            ClassHeadRow2[Gbl.Prefs.Theme]);
 
    /* 2nd. row, 1st. column
       Clock with hour:minute (server hour is shown) */
@@ -772,7 +779,8 @@ static void Lay_WritePageTopHeading (void)
    fprintf (Gbl.F.Out,"</div>");
 
    /***** 3rd. row (tabs) *****/
-   fprintf (Gbl.F.Out,"<div id=\"head_row_3\">");
+   fprintf (Gbl.F.Out,"<div class=\"%s\">",
+            ClassHeadRow3[Gbl.Prefs.Theme]);
    Tab_DrawTabs ();
    fprintf (Gbl.F.Out,"</div>");
   }

swad_tab.c

@@ -90,7 +90,8 @@ void Tab_DrawTabs (void)
    bool ICanViewTab;
 
    /***** Table start *****/
-   fprintf (Gbl.F.Out,"<ul class=\"LIST_CENTER\">");
+   fprintf (Gbl.F.Out,"<div id=\"tabs\">"
+	              "<ul class=\"LIST_CENTER\">");
 
    /***** Draw the tabs *****/
    for (NumTab = (Act_Tab_t) 1;
@@ -158,7 +159,8 @@ void Tab_DrawTabs (void)
      }
 
    /***** End of the table *****/
-   fprintf (Gbl.F.Out,"</ul>");
+   fprintf (Gbl.F.Out,"</ul>"
+	              "</div>");
   }
 
 /*****************************************************************************/