www/server/staging/graphics graphics.html

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 18/06/15 11:49:41

Modified files:
        server/staging/graphics: graphics.html 

Log message:
        Reword SSIs to avoid validation errors.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/graphics/graphics.html?cvsroot=www&r1=1.7&r2=1.8

Patches:
Index: graphics.html
===================================================================
RCS file: /webcvs/www/www/server/staging/graphics/graphics.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- graphics.html       15 Jun 2018 13:44:48 -0000      1.7
+++ graphics.html       15 Jun 2018 15:49:40 -0000      1.8
@@ -1,15 +1,10 @@
-<!--#include virtual="/server/html5-header.html" -->
-<!-- Parent-Version: 1.84
---><!--#if expr="$QUERY_STRING"
-   --><!--#set var="SELECTED" value=' selected="selected"'
---><!--#else
-   --><!--#set var="SELECTED" value=''
---><!--#endif
---><!--#if expr="$QUERY_STRING = /theme=([^&#]+)/"
-   --><!--#set var="THEME" value="$1"
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.84 -->
+   <!--#if expr="$QUERY_STRING = /theme=([^&#]+)/"
+--><!--#set var="THEME" value="$1"
 --><!--#endif
 --><!--#if expr="$QUERY_STRING = /type=([^&#]+)/"
-   --><!--#set var="TYPE" value="$1"
+--><!--#set var="TYPE" value="$1"
 --><!--#endif -->
 <title>The GNU Art Gallery
 - GNU Project - Free Software Foundation</title>
@@ -46,71 +41,72 @@
 <div class="button"><a href="#skip">Skip the selection</a> <span
 class="no-display">(These forms will not work in CSS-unaware browsers.)</span>
 </div>
+<!--#echo encoding="none" var="THEME" -->
 
 <form action="#skip">
 <div class="select"><strong>Select by theme</strong> (one choice):<br />
   <select name="theme" id="theme" multiple="multiple">
     <option value="">reset / all</option>
-    <option<!--#if expr="$THEME = gnuhead"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="gnuhead">Gnu head</option>
-    <option<!--#if expr="$THEME = gnu"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="gnu">Gnu character</option>
-    <option<!--#if expr="$THEME = tux"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="tux">Tux / Freedo</option>
-    <option<!--#if expr="$THEME = rms"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="rms">RMS</option>
-    <option<!--#if expr="$THEME = emacs"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="emacs">Emacs</option>
-    <option<!--#if expr="$THEME = fs"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="fs">Other free software / FSF</option>
-    <option<!--#if expr="$THEME = license"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="license">license</option>
-    <option<!--#if expr="$THEME = drm"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="drm">DRM</option>
-    <option<!--#if expr="$THEME = surveillance"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="surveillance">surveillance</option>
+<!--#if expr="$THEME = gnuhead"
+--><option value="gnuhead">Gnu head</option><!--#else
+--><option value="gnuhead" selected="selected">Gnu head</option><!--#endif -->
+<!--#if expr="$THEME = gnu"
+--><option value="gnu" selected="selected">Gnu character</option><!--#else
+--><option value="gnu">Gnu character</option><!--#endif -->
+<!--#if expr="$THEME = tux"
+--><option value="tux" selected="selected">Tux / Freedo</option><!--#else
+--><option value="tux">Tux / Freedo</option><!--#endif -->
+<!--#if expr="$THEME = rms"
+--><option value="rms" selected="selected">RMS</option><!--#else
+--><option value="rms">RMS</option><!--#endif -->
+<!--#if expr="$THEME = emacs"
+--><option value="emacs" selected="selected">Emacs</option><!--#else
+--><option value="emacs">Emacs</option><!--#endif -->
+<!--#if expr="$THEME = fs"
+--><option value="fs" selected="selected">Other free software / 
FSF</option><!--#else
+--><option value="fs">Other free software / FSF</option><!--#endif -->
+<!--#if expr="$THEME = license"
+--><option value="license" selected="selected">license</option><!--#else
+--><option value="license">license</option><!--#endif -->
+<!--#if expr="$THEME = drm"
+--><option value="drm" selected="selected">DRM</option><!--#else
+--><option value="drm">DRM</option><!--#endif -->
+<!--#if expr="$THEME = surveillance"
+--><option value="surveillance" 
selected="selected">surveillance</option><!--#else
+--><option value="surveillance">surveillance</option><!--#endif -->
   </select>
 </div>
 
 <div class="select"><strong>Select by type</strong> (one choice):<br />
   <select name="type" id="type" multiple="multiple">
     <option value="">reset / all</option>
-    <option<!--#if expr="$TYPE = ascii"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="ascii">ASCII art</option>
-    <option<!--#if expr="$TYPE = banner"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="banner">banner / badge / T-shirt</option>
-    <option<!--#if expr="$TYPE = buttons"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="buttons">button / icon / avatar / stamp / sticker</option>
-    <option<!--#if expr="$TYPE = cartoon"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="cartoon">cartoon</option>
-    <option<!--#if expr="$TYPE = logo"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="logo">logo</option>
-    <option<!--#if expr="$TYPE = poster"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="poster">poster</option>
-    <option<!--#if expr="$TYPE = artcraft"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="artcraft">artcraft / pumpkin art</option>
-    <option<!--#if expr="$TYPE = svg"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="svg">SVG format</option>
-    <option<!--#if expr="$TYPE = wallpaper"
-    --><!--#echo encoding='none' var='SELECTED' --><!--#endif
-    --> value="wallpaper">wallpaper</option>
+<!--#if expr="$THEME = ascii"
+--><option value="ascii" selected="selected">ASCII</option><!--#else
+--><option value="ascii">ASCII art</option><!--#endif -->
+<!--#if expr="$THEME = banner"
+--><option value="banner" selected="selected">banner / badge / 
T-shirt</option><!--#else
+--><option value="banner">banner / badge / T-shirt</option><!--#endif -->
+<!--#if expr="$THEME = buttons"
+--><option value="buttons" selected="selected">button / icon / avatar / stamp 
/ sticker</option><!--#else
+--><option value="buttons">button / icon / avatar / stamp / 
sticker</option><!--#endif -->
+<!--#if expr="$THEME = cartoon"
+--><option value="cartoon" selected="selected">cartoon</option><!--#else
+--><option value="cartoon">cartoon</option><!--#endif -->
+<!--#if expr="$THEME = craft"
+--><option value="craft" selected="selected">craft</option><!--#else
+--><option value="craft">craft</option><!--#endif -->
+<!--#if expr="$THEME = logo"
+--><option value="logo" selected="selected">logo</option><!--#else
+--><option value="logo">logo</option><!--#endif -->
+<!--#if expr="$THEME = poster"
+--><option value="poster" selected="selected">poster</option><!--#else
+--><option value="poster">poster</option><!--#endif -->
+<!--#if expr="$THEME = svg"
+--><option value="svg" selected="selected">SVG format</option><!--#else
+--><option value="svg">SVG format</option><!--#endif -->
+<!--#if expr="$THEME = wallpaper"
+--><option value="wallpaper" selected="selected">wallpaper</option><!--#else
+--><option value="wallpaper">wallpaper</option><!--#endif -->
   </select>
 </div>
 <div class="input">
@@ -329,16 +325,16 @@
 <li class="gnu tux poster">
   <a href="/graphics/gnulove.html">A Penguin Hugging A GNU</a>
   by Alison Upton</li><!--#endif
---><!--#if expr="$THEME = /(gnuhead|^$)/ && $TYPE = /(artcraft|^$)/" -->
-<li class="gnuhead artcraft">
+--><!--#if expr="$THEME = /(gnuhead|^$)/ && $TYPE = /(craft|^$)/" -->
+<li class="gnuhead craft">
   <a href="/graphics/gnuolantern.html">GNU o Lantern</a>,
   carved by Lorena Cid-Montiel</li><!--#endif
 --><!--#if expr="$THEME = /(gnuhead|fs|^$)/ && $TYPE = /(badge|logo|^$)/" -->
 <li class="gnuhead fs badge logo">
   <a href="/graphics/gnupascal.html">GNU and Blaise Pascal</a>
   by Markus Gerwinski</li><!--#endif
---><!--#if expr="$THEME = /(gnuhead|^$)/ && $TYPE = /(artcraft|^$)/" -->
-<li class="gnuhead artcraft">
+--><!--#if expr="$THEME = /(gnuhead|^$)/ && $TYPE = /(craft|^$)/" -->
+<li class="gnuhead craft">
   <a href="/graphics/gnupumpkin.html">GNU Pumpkin</a>,
   carved by Jimmy Rustles</li><!--#endif
 --><!--#if expr="$THEME = /(gnuhead|^$)/ && $TYPE = /(logo|^$)/" -->
@@ -515,8 +511,8 @@
 --><!--#if expr="$THEME = /(gnuhead|gnu$|^$)/ && $TYPE = /(svg|^$)/" -->
 <li class="gnuhead gnu svg">
   <a href="/graphics/gnusvgart.html">GNU Art in SVG format</a></li><!--#endif
---><!--#if expr="$THEME = /(gnuhead|gnu$|emacs|fs|^$)/ && $TYPE = 
/(banner|poster|buttons|artcraft|^$)/" -->
-<li class="gnuhead gnu emacs fs banner poster buttons artcraft">
+--><!--#if expr="$THEME = /(gnuhead|gnu$|emacs|fs|^$)/ && $TYPE = 
/(banner|poster|buttons|craft|^$)/" -->
+<li class="gnuhead gnu emacs fs banner poster buttons craft">
   <a href="/graphics/historic-gnu-press.html">Historic GNU press 
items</a></li><!--#endif
 --><!--#if expr="$THEME = /(license|^$)/ && $TYPE = /(logo|svg|^$)/" -->
 <li class="license logo svg">
@@ -634,7 +630,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/06/15 13:44:48 $
+$Date: 2018/06/15 15:49:40 $
 <!-- timestamp end -->
 </p>
 </div>