www/server/staging body-include-1.html body-inc...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 19/12/16 16:52:29

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

Log message:
        Add body-includes to match new layout.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-1.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-2.html?cvsroot=www&r1=1.7&r2=1.8

Patches:
Index: body-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-1.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- body-include-1.html 12 Dec 2019 19:32:31 -0000      1.12
+++ body-include-1.html 16 Dec 2019 21:52:29 -0000      1.13
@@ -10,39 +10,43 @@
 
 <div id="toplinks">
  <span id="skip"><a title="Skip to main text"
- href="#content">Article &#9660;</a></span>
+ href="#content">Skip to main text</a></span>
 
- <input type="checkbox" id="search-button" />
- <label for="search-button">
+<div id="searcher">
+ <a href="https://www.gnu.org/cgi-bin/estseek.cgi";>
   <img id="search-icon"
        src="/server/staging/layout/search.png"
        alt="&nbsp;[Search icon]&nbsp;"
        title="Search www.gnu.org" />
- </label>
-<div id="searcher">
+ </a>
  <form method="get" action="//www.gnu.org/cgi-bin/estseek.cgi" class="header">
   <div>
-   <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
+   <input name="phrase" id="phrase" type="text" accesskey="s"
           value="Why GNU/Linux?" onfocus="this.value=''" />
    <input type="submit" value="Search" />
   </div>
  </form>
 </div><!-- /searcher -->
 
-<div id="set-language">
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="language_selector" -->
- Set language<span class="gnun-split"></span><!--#echo encoding="none"
- var="closing_anchor" --></div>
-
-<div id="page-languages">
+<div id="language-container">
  <input type="checkbox" id="language-button" />
  <label for="language-button">
+  <span class="text">LANGUAGES</span> <span>&#9660;</span>
   <img id="language-icon"
-       src="/server/staging/layout/flags.png"
-       alt="&nbsp;[Translation icon]&nbsp;"
-       title="Available languages for this page" />
+       src="/server/staging/layout/Ætoms_-_Translation.png"
+       alt="&nbsp;[Translation icon by AEtoms]&nbsp;"
+       title="Translations" />
  </label>
+
+<div id=languages>
+<div id="set-language">
+ <span class="gnun-split"></span><!--#echo
+ encoding="none" var="language_selector" -->Set
+ <span>preferred</span> language<span class="gnun-split"></span><!--#echo
+ encoding="none" var="closing_anchor" -->
+ <p><span>Available for this page:</span></p>
+</div>
+
 <!--#if expr="$TRANSLATION_LIST" -->
 <!--#echo encoding="none" var="TRANSLATION_LIST" -->
 <!--#elif expr="$INITIAL_TRANSLATIONS_LIST = included" -->
@@ -51,8 +55,9 @@
      div#translations in its body, and we mustn't duplicate it here. -->
 <!--#include virtual="/server/gnun/initial-translations-list.html" -->
 <!--#endif -->
-</div>
-</div>
-<div style="clear: both"></div>
+</div><!-- /languages -->
+</div><!-- /language-container -->
+<div class="clear: opt"></div>
+</div><!-- /toplinks -->
 
 <!-- end of server/body-include-1.html -->

Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-2.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- body-include-2.html 12 Dec 2019 19:32:31 -0000      1.7
+++ body-include-2.html 16 Dec 2019 21:52:29 -0000      1.8
@@ -1,7 +1,20 @@
 <!-- start of server/body-include-2 -->
-<div style="clear: both"></div>
-
 <div id="header">
+
+<input type="checkbox" id="menu-button" />
+<label for="menu-button">
+ <img id="menu-icon" src="/server/staging/layout/menu.png"
+      alt="[3-bar menu icon]&nbsp;"
+      title="Main menu" />
+</label>
+
+<div id="gnu-banner">
+ <a href="/">
+<img src="/graphics/heckert_gnu.transp.small.png"
+      alt=" [A GNU head] " /><strong>GNU</strong> <span>Operating 
System</span></a>
+<p id="fsf-support">Sponsored by the <a href="#mission-statement">Free 
Software Foundation</a></p>
+</div><!-- /gnu-banner -->
+
 <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">
@@ -15,7 +28,7 @@
   <input name="_qf_default" type="hidden" value="Edit:cancel" />
  </div>
  <p>
-  <input type="text" id="frmEmail" name="email-Primary" size="18" 
maxlength="80"
+  <input type="text" id="frmEmail" name="email-Primary"
          value="email address" onfocus="this.value=''"/>
   <input type="submit" name="_qf_Edit_next" value="Sign up" />
  </p>
@@ -23,20 +36,6 @@
 </div><!-- /fssbox -->
 </div><!-- /fsf-frame -->
 
-<div id="gnu-banner">
- <a href="/">
-<img src="/graphics/heckert_gnu.transp.small.png"
-      alt=" [A GNU head] " /> <strong>GNU</strong> <span>Operating 
System</span></a>
-<p id="fsf-support">Sponsored by the <a href="#mission-statement">Free 
Software Foundation</a></p>
-</div><!-- /gnu-banner -->
-
-<input type="checkbox" id="menu-button" />
-<label for="menu-button">
- <img id="menu-icon" src="/server/staging/layout/menu.png"
-      alt="&nbsp;[3-bar menu icon]&nbsp;"
-      title="Main menu" />
-</label>
-<div style="clear: both"></div>
 <div id="navigation">
  <ul>
 <!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
@@ -101,6 +100,17 @@
 <!--#else -->
   <li id="tabDoc"><a href="/doc/doc.html">DOCS</a></li>
 <!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/proprietary\//" -->
+  <li id="tabMalware" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/proprietary/proprietary.html">MALWARE</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+  <li id="tabMalware"><a href="/proprietary/proprietary.html">MALWARE</a>
+</li>
+<!--#endif -->
 <!--#if expr="$REQUEST_URI = /^\/help\//" -->
   <li id="tabHelp" class="active">
     <!--#echo encoding="none" var="MARK_START" -->