From: pvtroshin <pvtroshin@e3abac25-378b-4346-85de-24260fe3988d>
Date: Thu, 23 Dec 2010 16:31:53 +0000 (+0000)
Subject: Style issues are resolved - the copy from JABA production release
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d1defb666ca612788ef47de238e8e5e5abeee020;p=jabaws.git

Style issues are resolved - the copy from JABA production release

git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@3576 e3abac25-378b-4346-85de-24260fe3988d
---

diff --git a/website/download.html b/website/download.html
index 9364478..2712c20 100644
--- a/website/download.html
+++ b/website/download.html
@@ -35,7 +35,7 @@ class="headeru">S</span>ervices</h2></td>
 
 <!-- panel end-->
 <div id="content">
-<h4><a name="minclient" id="minclient"></a>JABAWS Client</h4>
+<h4 id="headtitle" style="text-align:left"><a name="minclient" id="minclient"></a>JABAWS Client</h4>
 
 <p>The command line client is an  executable Java program which can use JABAWS. It is good for scripting against JABA web services. If you prefer point-and-click interface - download the Graphical User Interface (GUI) client, the <a href="http://www.jalview.org">Jalview</a>. If you intend to write you own client and need a template - download a command line client source package. For a help on generating GUI's for JABA web services you can consult <a href="http://www.jalview.org/source/jalview_2_6_1.tar.gz">Jalview source code</a>. </p>
 
@@ -79,7 +79,16 @@ if you intend to run JABAWS services locally.</p>
 
 <p>Please bear in mind that server for Windows supports only Muscle and Clustal web services! Please refer to the <a href="howto.html#jabaonwin">how to</a> pages to find out why. If you want to run other web services on Windows choose Virtual Appliance package below.  </p>
 <h4>A JABAWS Server Virtual Appliance </h4>
-<p>JABAWS <a href="http://en.wikipedia.org/wiki/Virtual_appliance">virtual appliance</a> is a complete installation of JABAWS software on <a href="http://www.turnkeylinux.org/">TurnKey Linux</a>. By using virtual appliance you can completely avoid JABAWS  installation. The appliance comes fully configured to run JABAWS. All JABAWS clients, such as Jalview can be easily configured to use the appliance. You can run the appliance with freely available <a href="http://www.vmware.com/products/player">VMWare Player</a> or <a href="http://www.virtualbox.org/wiki/Downloads">Oracle VirtualBox.</a> We have tested JABAWS appliance with VMWare Player on Windows and Linux, and VirtualBox on Windows, Linux and Mac. However, you are not limited to these virtualization systems and can use JABAWS appliance with any commercial alternative. </p>
+<p>The JABAWS <a href="http://en.wikipedia.org/wiki/Virtual_appliance">virtual appliance</a> is a way to run JABAWS server locally without the need to connect to the internet.
+It is a complete installation of the JABAWS software on <a href="http://www.turnkeylinux.org/">TurnKey Linux</a>. 
+To run the appliance you must first install one of the freely available VMWare Player or Oracle VirtualBox virtualisation systems. 
+By using virtual appliance you can completely avoid the JABAWS installation as the appliance comes fully configured to run the JABAWS. 
+All JABAWS clients, such as Jalview can be easily configured to use the appliance. 
+You can run the appliance with freely available 
+<a href="http://www.vmware.com/products/player">VMWare Player</a> or 
+<a href="http://www.virtualbox.org/wiki/Downloads">Oracle VirtualBox.</a> 
+We have tested JABAWS appliance with VMWare Player on Windows and Linux, and VirtualBox on Windows, Linux and Mac. 
+However, you are not limited to these virtualization systems and can use JABAWS appliance with any commercial alternative. </p>
 <ul>
   <li> JABAWS Virtual Appliance: <a href="http://www.compbio.dundee.ac.uk/jabaws/archive/jabaws-vm.zip">download</a> (520M) </li>
   </ul>
diff --git a/website/howto.html b/website/howto.html
index 0bad40b..6a3d5e4 100644
--- a/website/howto.html
+++ b/website/howto.html
@@ -32,7 +32,7 @@ class="headeru">S</span>ervices</h2></td>
 
 
 
-<h2 align="center">JABAWS How To</h2>
+<h2 id="headtitle">JABAWS How To</h2>
 <h3>Table of content </h3>
 <h4>About </h4>
 <ul>
diff --git a/website/index.html b/website/index.html
index f58a9fd..a8c65fb 100644
--- a/website/index.html
+++ b/website/index.html
@@ -51,7 +51,7 @@ href="manual.html">Manual</a> <a href="howto.html">How To</a>
 
 <!-- panel end-->
 <div id="content">
-<h4>What is JABAWS?</h4>
+<h4 id="headtitle" style="text-align:left">What is JABAWS?</h4>
 
 <p><span class="u">JA</span>va <span class=
 "u">B</span>ioinformatics <span class="u">A</span>nalysis <span
diff --git a/website/manual.html b/website/manual.html
index dd862e2..fe1928e 100644
--- a/website/manual.html
+++ b/website/manual.html
@@ -37,13 +37,14 @@ href="manual.html">Manual</a> <a href="howto.html">How To</a>
 
 <!-- panel end-->
 <div id="content">
-<h2 align="center">JABAWS Manual</h2>
+<h2 id="headtitle">JABAWS Manual</h2>
 
 <h3>Table of content</h3>
 <h4>JABAWS Virtual Appliance 
 </h4>
 <ul>
     <li><a href="#whenvm">When to use virtual appliance</a> </li>
+    <li><a href="#howtoinstallvm">How to install VMWare Player or VirtualBox</a> </li>
 	<li><a href="#virtualbox">VirtualBox appliance configuration</a></li>
 	<li><a href="#vmplayer">VMware Player appliance configuration </a></li>
 	<li><a href="#jabawsAppliance">JABAWS Appliance details </a></li>
@@ -93,21 +94,31 @@ href="manual.html">Manual</a> <a href="howto.html">How To</a>
 </ul>
 <h3>JABAWS Virtual Appliance </h3>
 <h4><a name="whenvm" id="whenvm"/></a>When to use the virtual  appliance </h4>
-<p>The appliance best suits for individual users who want to use the JABA web services locally, without Internet connection, want to keep their  data private and uses Windows as their main OS. The appliance is a self contained unit of software and as such may be an attractive option for Linux, UNIX or Mac users but they can always deploy a <a href="#instwar">war distribution</a> instead.  <br />
-To run the appliance you would need to have relatively  powerful computer. The appliance comes pre configured to use 1 CPU and 512M of  memory and the minimum amount of memory required is about 378M.    </p>
+<p>The appliance best suits users who would like to use the JABA web services locally, without an Internet connection, or want to keep their data private 
+and uses Windows as their main OS. The appliance is a self contained unit of software and as such may be an attractive option for Linux, UNIX or Mac users but they can always deploy a <a href="#instwar">war distribution</a> instead.  <br />
+The appliance comes pre configured to use 1 CPU and 512M of  memory and the minimum amount of memory required is about 378M.    </p>
+
+<h4><a name="howtoinstallvm" id="howtoinstallvm"></a>How to install VMWare Player or VirtualBox</h4>
+<p>Please see the <a href="http://downloads.vmware.com/d/info/desktop_downloads/vmware_player/3_0">VMware Player</a>  
+and <a href="http://www.virtualbox.org/wiki/Downloads">Oracle VirtualBox</a> websites for up to date instructions and downloads.</p>
+
 <h4><a name="virtualbox" id="virtualbox"/>VirtualBox appliance configuration</h4>
 <p>VirtualBox can be used to run JABAWS services from Windows, Linux, Solaris or Mac host operating systems. Use the VitualBox &quot;Import  Appliance&quot; option to import the JABAWS. Please bear in mind that to benefit from multiple CPU support under the VirtualBox software you need to enable<a href="http://en.wikipedia.org/wiki/X86_virtualization"> hardware virtualization extensions</a>, such as  Intel Virtualization VT-x or AMD-V support in the BIOS of your computer. Unfortunately, we were unable to find a reliable way to do it on Mac, so some Macs running VirtualBox will be limited to one CPU only, irrespective of the number of CPUs of the host machine. </p>
 <p>We found that, by default, virtualization extensions are enabled in VirtualBox irrespective of whether your computer supports them. You will get the <a href="howto.html#vmbexc"></a><a href="howto.html#vmbexc">VERR_VMX_MSR_LOCKED_OR_DISABLED</a> exception if your computer does not support the extensions or their support is disabled. Just deselect the checkboxes shown on the screen shot below to solve the problem. </p>
 <p>VirtualBox JABAWS VM configuration screen shot displaying virtualization settings.</p>
 <p><img src="images/vmb_virtual.png" alt="VT-x extension on VirtualBox" width="669" height="535" /></p>
+
 <h4><a name="vmplayer" id="vmplayer"/>VMware Player appliance configuration </h4>
-<p>The free <a href="http://downloads.vmware.com/d/info/desktop_downloads/vmware_player/3_0">VMware Player</a> can be used to run the JABAWS services from the Windows and Linux host operating systems, there is no support for Mac  in time of writing. However, <a href="https://www.vmware.com/vmwarestore/buyfusion.html">VMware Fusion</a>, a commercial VMware product, offers virtual machine support for Mac computers too. </p>
+<p>The free <a href="http://downloads.vmware.com/d/info/desktop_downloads/vmware_player/3_0">VMware Player</a> can be used to run the JABAWS services from the Windows and Linux host operating systems, there is no support for Mac at the time of writing (December 2010). 
+However, <a href="https://www.vmware.com/vmwarestore/buyfusion.html">VMware Fusion</a>, a commercial VMware product, offers virtual machine support for Mac computers too. </p>
 <p>To run the JABAWS server on VMware player,  unpack the JABAWS VM into one of the folders on your local hard drive. Open VMware Player, click &quot;Open Virtual Machine&quot; and point the Player to the location of the JABAWS, then choose the JABAWS.vmx file to open an appliance. </p>
 <p>When you play the machine for the first time the Player might ask you whether &quot;This virtual machine may have been moved or copied.&quot;,  say that you have copied it. That is all. </p>
+
 <h4><a name="jabawsAppliance" id="jabawsAppliance"/>JABAWS Appliance details</h4>
 <p>By default, the JABAWS virtual appliance is configured with 512M of memory and 1 CPU, but you are free to change these settings. If you have more than one CPU or CPU core on your computer you can make them available for the JABAWS virtual machine by editing virtual machine settings. Please bear in mind that more CPU power will not make a single calculation go faster, but it will enable the VM to do calculations in parallel. Similarly, you can add more memory to the virtual machine. More memory lets your VM deal with larger tasks, e.g. work with large alignments.</p>
 <p>The VMware Player screen shot below displays JABAWS VM CPU settings. </p>
 <p><img src="images/VMware_cpu.png" alt="vmware cpu settings" width="852" height="267" border="1" /></p>
+
 <p><strong>JABAWS appliance configuration: </strong></p>
 <p><strong>VMware info</strong><br />
   - Date of creation: 8 October 2010<br />
@@ -149,6 +160,8 @@ To run the appliance you would need to have relatively  powerful computer. The a
 <p>If you click on Advanced Menu, you will see the configuration console, similar to the one below.   </p>
 <p><img src="images/VMware_booted.png" alt="JABAWS welcome screen" width="735" height="461" /></p>
 <p>If you need to configure a static IP address the configuration console will help you with this. Shutting down the VM is best from the configuration console as well.</p>
+
+
 <h3>JABAWS Installation</h3>
 <h4><a name="sysreq" id="sysreq"></a>System Requirements</h4>
 
diff --git a/website/template.html b/website/template.html
index 46453f0..23b9bc9 100644
--- a/website/template.html
+++ b/website/template.html
@@ -33,7 +33,7 @@ class="headeru">S</span>ervices</h2></td>
 <!-- panel end-->
 <div id="content">
 
-<h4>Authors</h4>
+<h4 id="headtitle">Authors</h4>
 <p><a name="svn">SVN sou</a>ed. </p>
 <h4>Structure of the project</h4>
 </div>
diff --git a/website/ws.css b/website/ws.css
index 6e28bc4..f7d6098 100644
--- a/website/ws.css
+++ b/website/ws.css
@@ -21,7 +21,7 @@ See index.html banner commented out code for an example of use
 			 line-height:1em;
  }
 
-#wrapper { background:url("images/panel_bg.gif") repeat-y left top; }
+#wrapper { background:url("images/panel_bg.gif") repeat-y left top; margin:0; padding:0; }
 
 ul {
 	list-style-type: circle;
@@ -208,6 +208,11 @@ body {
 
 h3 {border-bottom: 1px solid grey; margin-top: 2em; }
 
+#headtitle { margin:0; text-align:center; }
+
+#banner h2 { margin: 20px 0; }
+
+
 #banner td.bg  {
 	border-collapse: collapse; 
 	background-image:url("images/banner_bg.gif");