cvs commit: www/test/style screen.css

jeroen at linuxfromscratch.org jeroen at linuxfromscratch.org
Thu Aug 21 16:22:08 PDT 2003


jeroen      03/08/21 17:22:08

  Modified:    test     search.html website-top.html
               test/cgi-bin lfscounter.cgi
               test/style screen.css
  Log:
  Rework the forms on the search page; they're now encapsulated in tables. Adjust the stylesheet accordingly.
  
  Revision  Changes    Path
  1.21      +51 -34    www/test/search.html
  
  Index: search.html
  ===================================================================
  RCS file: /home/cvsroot/www/test/search.html,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- search.html	21 Aug 2003 19:21:06 -0000	1.20
  +++ search.html	21 Aug 2003 23:22:08 -0000	1.21
  @@ -41,51 +41,68 @@
   <div id="rootcontent">
   	<em><a href="#generalnav" class="hidden">Skip to sitewide navigation</a></em>
   <h2>Search the website and the mailinglists</h2>
  -<fieldset>
  -<legend>Search with swish:</legend>
  -	<form method="get" action="http://search.linuxfromscratch.org/index.cgi" enctype="application/x-www-form-urlencoded" class="form">
  -	<p>
  -		<input maxlength="200" size="32" type="text" name="query" onfocus="if(this.value==this.defaultValue) this.value='';" value="Search the site index" />
  -		<input value="Go!" type="submit" name="submit"/>
  -	</p>
  -	<p>Limit search to:</p>
  -	<p>
  -		<label title="Search title AND body"><input type="radio" name="metaname" value="swishdefault" checked="checked" />Title & Body</label>
  -		<label title="Search only title"><input type="radio" name="metaname" value="swishtitle" />Title</label>
  +
  +<h3>Swish search</h3>
  +<form method="get" action="http://search.linuxfromscratch.org/index.cgi" enctype="application/x-www-form-urlencoded" class="form">
  +<table><tbody>
  +<tr>
  +	<th>Limit search to:</th>
  +	<td>
  +		<label title="Search title AND body"><input type="radio" name="metaname" value="swishdefault" checked="checked" />Title & Body</label><br />
  +		<label title="Search only title"><input type="radio" name="metaname" value="swishtitle" />Title</label><br />
   		<label title="Search on document path"><input type="radio" name="metaname" value="swishdocpath" />Document Path</label>
  -	</p>
  -	<p>Sort by:
  +	</td>
  +</tr><tr>
  +	<th>Sort by:</th>
  +	<td>
   	<select name="sort">
   		<option selected="selected" value="swishrank">Rank</option>
   		<option value="swishlastmodified">Last Modified Date</option>
   		<option value="swishtitle">Title</option>
   		<option value="swishdocpath">Document Path</option>
   	</select>
  -	<input type="checkbox" name="reverse" value="on" />Reverse Sort</p>
  +	<input type="checkbox" name="reverse" value="on" />Reverse Sort
  +	</td>
  +</tr><tr>
  +	<th><label for="query">Search with swish:</label></th>
  +	<td>
  +		<input maxlength="200" size="32" type="text" name="query" onfocus="if(this.value==this.defaultValue) this.value='';" value="Enter text here" />
  +		<label title="Submit the search query">
  +			<button type="submit">Go!</button>
  +		</label>
  +	</td>
  +</tr>
  +</tbody></table>
  +</form>
   
  -	<p><em>Search Tips: A multiple word search can include logical constructs such as "and", "or", and "not". A boolean "and" between words is assumed, meaning documents that contain all of the words will be found. If you wish to find all of the documents that have any one of the specified words, then include an "or" between the words.</em></p>
  -	<p><em>To truncate a word, type an asterisk (*) at the end of the word. For example, searching for "serv*" will find documents that contain the words "server", "serving", and "service", among others.</em></p>
  -	<p><a href="http://swish-e.org/"><img alt="Powered by SWISH-E" width="109" height="35" src="images/powered_by_swish-e_109x35.gif" /></a></p>
  -	</form>
  -</fieldset>
  +<p><em>Search Tips: A multiple word search can include logical constructs such as "and", "or", and "not". A boolean "and" between words is assumed, meaning documents that contain all of the words will be found. If you wish to find all of the documents that have any one of the specified words, then include an "or" between the words.</em></p>
  +<p><em>To truncate a word, type an asterisk (*) at the end of the word. For example, searching for "serv*" will find documents that contain the words "server", "serving", and "service", among others.</em></p>
  +<p><a href="http://swish-e.org/"><img alt="Powered by SWISH-E" width="109" height="35" src="images/powered_by_swish-e_109x35.gif" /></a></p>
   
  -<br />
  -<fieldset>
  -<legend>Search with google:</legend>
  -	<form method="get" action="http://www.google.com/search">
  -	<p>
  -		<label title="Search google with site:linuxfromscratch.org"><input type="radio" name="sitesearch" value="linuxfromscratch.org" checked="checked" />linuxfromscratch.org</label><br />
  -		<label title="Search WWW on google"><input type="radio" name="sitesearch" value="WWW" />WWW</label>
  -	</p>
  -	<p>
  -		<label title="Enter the search terms"><input type="text" size="32" tabindex="3" id="inputField" name="q" maxlength="255"  onfocus="if(this.value==this.defaultValue) this.value='';" value="Search with google" /></label> 
  -		<label title="Submit the search query"><input type="submit" value="Go!" tabindex="4" /></label>
  +<h3>Google search</h3>
  +<form method="get" action="http://www.google.com/search">
  +<table><tbody>
  +<tr>
  +	<th>Choose the domain:</th>
  +	<td><label title="Search google with site:linuxfromscratch.org"><input type="radio" name="sitesearch" value="linuxfromscratch.org" checked="checked" />linuxfromscratch.org</label>
  +	<br />
  +	<label title="Search WWW on google"><input type="radio" name="sitesearch" value="WWW" />WWW</label>
  +	</td>
  +</tr><tr>
  +	<th><label for="query">Search with google:</label></th>
  +	<td>
  +		<label title="Enter the search terms"><input type="text" size="32" tabindex="3" id="inputField" name="q" maxlength="255"  onfocus="if(this.value==this.defaultValue) this.value='';" value="Enter text here" /></label> 
  +		<label title="Submit the search query">
  +				<button type="submit">Go!</button></label>
   		<input type="hidden" name="domains" value="linuxfromscratch.org" />
   		<em><a href="http://www.google.com/help/features.html">Search help</a></em>
  -	</p>
  -	<p><a href="http://www.google.com/"><img alt="Powered by Google" width="135" height="35" src="images/powered_by_google_135x35.gif" /></a></p>
  -	</form>
  -</fieldset>
  +	</td>
  +</tr>
  +</tbody></table>
  +</form>
  +
  +<p><a href="http://www.google.com/"><img alt="Powered by Google" width="135" height="35" src="images/powered_by_google_135x35.gif" /></a></p>
  +
   
   </div> <!-- end content -->
   
  
  
  
  1.4       +3 -3      www/test/website-top.html
  
  Index: website-top.html
  ===================================================================
  RCS file: /home/cvsroot/www/test/website-top.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- website-top.html	21 Aug 2003 21:32:26 -0000	1.3
  +++ website-top.html	21 Aug 2003 23:22:08 -0000	1.4
  @@ -71,8 +71,8 @@
   		<table summary="Browsers which display this website as intended, and browsers with bugs">
   		<tbody>
   			<tr>
  -				<th width="20%">Browser</th>
  -				<th width="10%">Versions tested</th>
  +				<th>Browser</th>
  +				<th>Versions tested</th>
   				<th>Known display bugs</th>
   			</tr><tr>
   				<td><a href="http://www.texturizer.net/firebird/">Mozilla Firebird</a></td>
  @@ -80,7 +80,7 @@
   				<td>None</td>
   			</tr><tr>
   				<td><a href="http://www.mozilla.org">Mozilla</a></td>
  -				<td><a href="http://ftp.mozilla.org/pub/mozilla/releases/mozilla1.3/">1.3</a>,<a href="http://ftp.mozilla.org/pub/mozilla/releases/mozilla1.4/">1.4</a>
  +				<td><a href="http://ftp.mozilla.org/pub/mozilla/releases/mozilla1.3/">1.3</a>,<a href="http://ftp.mozilla.org/pub/mozilla/releases/mozilla1.4/">1.4</a></td>
   				<td>None</td>
   			</tr><tr>
   				<td><a href="http://channels.netscape.com/ns/browsers/default.jsp">Netscape</a></td>
  
  
  
  1.8       +3 -4      www/test/cgi-bin/lfscounter.cgi
  
  Index: lfscounter.cgi
  ===================================================================
  RCS file: /home/cvsroot/www/test/cgi-bin/lfscounter.cgi,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- lfscounter.cgi	21 Aug 2003 19:50:44 -0000	1.7
  +++ lfscounter.cgi	21 Aug 2003 23:22:08 -0000	1.8
  @@ -172,7 +172,7 @@
   
   <p>If you can't remember the exact version you downloaded, just enter your best guess.</p>
   
  -<table class="form">
  +<table>
   <tbody>
   <tr>
   	<th>Name:</th>
  @@ -250,15 +250,14 @@
   
   <p id="query">You can query the database to look for a particular userid, name or
   first lfs version used, or any combination of these. Just hitting the Query
  -button without filling anything will result in the entire LFS users
  -database to be shown.</p>
  +button without entering anything will show the entire LFS users database.</p>
   
   <p>The value for <code>Name</code> will be matched according to this regular
   expression <code>^.*your_value.*</code> and will be case insensitive.</p>
   
   <form method="post" action="$me">
   <p><input type="hidden" name="query" value="1" /></p>
  -<table class="form">
  +<table>
   <tbody>
   <tr>
   	<th>LFS ID:</th><td><input type="text" name="id"
  
  
  
  1.35      +20 -27    www/test/style/screen.css
  
  Index: screen.css
  ===================================================================
  RCS file: /home/cvsroot/www/test/style/screen.css,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- screen.css	21 Aug 2003 21:32:26 -0000	1.34
  +++ screen.css	21 Aug 2003 23:22:08 -0000	1.35
  @@ -96,10 +96,10 @@
   table, td {
   	background-color: #ddd;
   	border: solid 1px #ccc;
  -	margin: 2em;
  +	margin: 1em;
   	padding: 0.5em;
   	width: 90%;
  -	\width: auto; 
  +	\width: auto; /* Otherwise IE5 makes pages too wide */
   	w\idth: 90%;
   }
   
  @@ -141,12 +141,6 @@
   	font-style: italic;
   }
   
  -fieldset {
  -	padding: 1em;
  -	border: 1px solid #aaa;
  -	background: #f9f9f9;
  -}
  -
   input {
   	background-color: #dfdfdf;
   	color: #000;
  @@ -156,25 +150,34 @@
   	margin: 0 0 5px 0;
   }
   
  -i\nput { border: 1px solid #666; }
  +i\nput { border: 1px solid #ccc; }
   	/* Workaround for Konqueror, see http://centricle.com/ref/css/filters/ */
   
   input:active, input:hover {
   	background-color: #eee;
   }
   
  -input:focus {
  +input:focus, #rootcontent input:focus {
   	background-color:#fff;
   	color:#000;
   }
   
  -legend {
  -	padding: 0.2em 0.5em;
  -	border:1px solid #aaa;
  -	font-size: 130%;
  -	color:  #34e;
  -	font-family: "Bitstream Vera Sans Mono", "Lucida Console", "Lucida Sans", "Andale Mono", Arial, sans-serif;
  -	font-weight: bold;
  +form table th {
  +	width: 30%;
  +	text-align: right;
  +}
  +
  +form table td {
  +	background-color: #e3e3e3;
  +}
  +
  +form table th.button {
  +	width: 100%;
  +	text-align: center;
  +}
  +
  +#rootcontent input {
  +	background-color: #efefef;
   }
   
   /* Custom classes */
  @@ -194,16 +197,6 @@
   
   .accesskeys dt {
   	display: run-in;
  -}
  -
  -table.form th {
  -	width: 30%;
  -	text-align: right;
  -}
  -
  -table.form th.button {
  -	width: 100%;
  -	text-align: center;
   }
   
   /* Layout styling */
  
  
  



More information about the website mailing list