www/server/staging/ghm2016 body-include-2.html

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 16/06/13 13:43:53

Modified files:
        server/staging/ghm2016: body-include-2.html 

Log message:
        Place the link over '9th GHM Meeting' (Ineiev) and capitalize the main 
navbar (www-discuss May 30 21:12:50 EDT 2016).

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/body-include-2.html?cvsroot=www&r1=1.2&r2=1.3

Patches:
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/body-include-2.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- body-include-2.html 13 Jun 2016 06:26:44 -0000      1.2
+++ body-include-2.html 13 Jun 2016 13:43:53 -0000      1.3
@@ -1,14 +1,14 @@
 <!-- start of server/body-include-2 -->
 
-<p class="c" style="font-size:1.1em; line-height: 1.7em; margin: 0;
-   border-top: .2em solid #e74c3c; border-bottom: .2em solid #e74c3c;
-   background: #ececec">
-The <strong>9th HACKERS MEETING</strong> will be held in Rennes (France)
-from&nbsp;August&nbsp;18&nbsp;to&nbsp;20. &nbsp;<a
-href="/ghm/upcoming.html">More&nbsp;info</a>
+<p class="c" style="font-size:1.1em; margin: 0; padding: .2em; background: 
#ececec;
+   border-top: .2em solid #e74c3c ; border-bottom: .2em solid #e74c3c">
+The&nbsp; <strong><a
+href="/ghm/upcoming.html">9th HACKERS MEETING</a></strong>&nbsp;
+will be held in Rennes (France) from&nbsp;August&nbsp;18&nbsp;to&nbsp;20.
 </p>
 
 <div id="header">
+
 <div id="fsf-frame">
 <p id="join-fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN&nbsp;THE&nbsp;FSF</a></p>
 <div id="fssbox">
@@ -44,72 +44,72 @@
 <!--#if expr="$REQUEST_URI = /^\/gnu\//" -->
   <li id="tabAboutGNU" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
-    <a href="/gnu/gnu.html">About&nbsp;GNU</a>
+    <a href="/gnu/gnu.html">ABOUT&nbsp;GNU</a>
     <span class="gnun-split"></span>
     <!--#echo encoding="none" var="MARK_END" -->
   </li>
 <!--#else -->
-   <li id="tabAboutGNU"><a href="/gnu/gnu.html">About&nbsp;GNU</a></li>
+   <li id="tabAboutGNU"><a href="/gnu/gnu.html">ABOUT&nbsp;GNU</a></li>
 <!--#endif -->
 <!--#if expr="$REQUEST_URI = /^\/philosophy\//" -->
   <li id="tabPhilosophy" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
-    <a href="/philosophy/philosophy.html">Philosophy</a>
+    <a href="/philosophy/philosophy.html">PHILOSOPHY</a>
     <span class="gnun-split"></span>
     <!--#echo encoding="none" var="MARK_END" -->
   </li>
 <!--#else -->
-  <li id="tabPhilosophy"><a 
href="/philosophy/philosophy.html">Philosophy</a></li>
+  <li id="tabPhilosophy"><a 
href="/philosophy/philosophy.html">PHILOSOPHY</a></li>
 <!--#endif -->
 <!--#if expr="$REQUEST_URI = /^\/licenses\//" -->
   <li id="tabLicenses" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
-    <a href="/licenses/licenses.html">Licenses</a>
+    <a href="/licenses/licenses.html">LICENSES</a>
     <span class="gnun-split"></span>
     <!--#echo encoding="none" var="MARK_END" -->
   </li>
 <!--#else -->
-  <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
+  <li id="tabLicenses"><a href="/licenses/licenses.html">LICENSES</a></li>
 <!--#endif -->
 <!--#if expr="$REQUEST_URI = /^\/education\//" -->
   <li id="tabEducation" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
-    <a href="/education/education.html">Education</a>
+    <a href="/education/education.html">EDUCATION</a>
     <span class="gnun-split"></span>
     <!--#echo encoding="none" var="MARK_END" -->
   </li>
 <!--#else -->
-  <li id="tabEducation"><a href="/education/education.html">Education</a></li>
+  <li id="tabEducation"><a href="/education/education.html">EDUCATION</a></li>
 <!--#endif -->
 <!--#if expr="$REQUEST_URI = /^\/software\//" -->
   <li id="tabSoftware" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
-    <a href="/software/software.html">Software</a>
+    <a href="/software/software.html">SOFTWARE</a>
     <span class="gnun-split"></span>
     <!--#echo encoding="none" var="MARK_END" -->
   </li>
 <!--#else -->
-  <li id="tabSoftware"><a href="/software/software.html">Software</a></li>
+  <li id="tabSoftware"><a href="/software/software.html">SOFTWARE</a></li>
 <!--#endif -->
 <!--#if expr="$REQUEST_URI = /^\/doc\// || $REQUEST_URI = /^\/manual\//" -->
   <li id="tabDoc" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
-    <a href="/doc/doc.html">Documentation</a>
+    <a href="/doc/doc.html">DOCUMENTATION</a>
     <span class="gnun-split"></span>
     <!--#echo encoding="none" var="MARK_END" -->
   </li>
 <!--#else -->
-  <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
+  <li id="tabDoc"><a href="/doc/doc.html">DOCUMENTATION</a></li>
 <!--#endif -->
 <!--#if expr="$REQUEST_URI = /^\/help\//" -->
   <li id="tabHelp" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
-    <a href="/help/help.html">Help&nbsp;GNU</a>
+    <a href="/help/help.html">HELP&nbsp;GNU</a>
     <span class="gnun-split"></span>
     <!--#echo encoding="none" var="MARK_END" -->
   </li>
 <!--#else -->
-  <li id="tabHelp"><a href="/help/help.html">Help&nbsp;GNU</a></li>
+  <li id="tabHelp"><a href="/help/help.html">HELP&nbsp;GNU</a></li>
 <!--#endif -->
  </ul>
 </div><!--  /navigation -->