From a02159adf3de14ea276d0da6007f6cd080e17645 Mon Sep 17 00:00:00 2001
From: dmex <dmex@21ef857c-d57f-4fe0-8362-d861dc6d29cd>
Date: Fri, 14 Dec 2012 08:58:52 +0000
Subject: [PATCH] Fixed jquery version loading, Fixed navigation positions,
 updated faq and about page

git-svn-id: svn://svn.code.sf.net/p/processhacker/code@5208 21ef857c-d57f-4fe0-8362-d861dc6d29cd
---
 misc/website/websitev2/about.php     | 160 +++++++++++++--------------
 misc/website/websitev2/downloads.php |  29 +++--
 misc/website/websitev2/faq.php       |  75 ++++++-------
 misc/website/websitev2/footer.php    |   4 +-
 misc/website/websitev2/index.php     |  29 +++--
 5 files changed, 146 insertions(+), 151 deletions(-)

diff --git a/misc/website/websitev2/about.php b/misc/website/websitev2/about.php
index b68dc3137..33f2b423e 100644
--- a/misc/website/websitev2/about.php
+++ b/misc/website/websitev2/about.php
@@ -1,103 +1,103 @@
 <?php $pagetitle = "About"; include "header.php"; ?>
 
 <div id="page">
-    <div class="yui-d0">
-        <nav>
-            <img class="flowed-block" src="images/logo_64x64.png" alt="Project Logo" width="64" height="64">
-
-            <div class="flowed-block">
-                <h2>Process Hacker</h2>
-                <ul class="facetmenu">
-                    <li><a href="/">Overview</a></li>
-                    <li><a href="downloads.php">Downloads</a></li>
-                    <li><a href="faq.php">FAQ</a></li>
-                    <li class="active"><a href="about.php">About</a></li>
-                    <li><a href="forums/">Forum</a></li>
-                </ul>
-            </div>
-        </nav>
-		
+    <div class="yui-d0">		
 		<div class="yui-t4">
-            <div class="yui-g">
-                <div class="yui-u first">
-                    <div class="portlet">
-                        <div id="about">
+            <div class="summary">
+				<nav>
+					<img class="flowed-block" src="images/logo_64x64.png" alt="Project Logo" width="64" height="64">
+
+					<div class="flowed-block">
+						<h2>Process Hacker</h2>
+						<ul class="facetmenu">
+							<li><a href="/">Overview</a></li>
+							<li><a href="downloads.php">Downloads</a></li>
+							<li><a href="faq.php">FAQ</a></li>
+							<li class="active"><a href="about.php">About</a></li>
+							<li><a href="forums/">Forum</a></li>
+						</ul>
+					</div>
+				</nav>
+			
+			    <div class="yui-g">
+					<div class="yui-u first">
+						<div class="portlet">
 							<p>Process Hacker was started in 2008 as an open source alternative to programs such as Task Manager and Process Explorer.</p>
 							<ul>
 								<li class="about-li"><strong>Registered:</strong> 16-10-2008</li>
 								<li class="about-li"><strong>Licence:</strong> GNU General Public License version 3.0
-									<a href="http://processhacker.svn.sourceforge.net/viewvc/processhacker/2.x/trunk/LICENSE.txt">GPLv3</a></li>
+										<a href="http://processhacker.svn.sourceforge.net/viewvc/processhacker/2.x/trunk/LICENSE.txt">GPLv3</a></li>
 								<li class="about-li"><strong>Language:</strong> English</li>
 								<li class="about-li"><strong>Intended Audience:</strong> Advanced End Users, Developers</li>
 								<li class="about-li"><strong>Programming Language:</strong> C, C#</li>
 							</ul>
+						</div>
+					</div>
+
+					<div class="yui-g">
+						<div class="portlet">
 							<script src="http://www.ohloh.net/p/329666/widgets/project_basic_stats.js"></script>  
-						</div> 
-                    </div>
-                </div>
-
-                <div class="yui-g">
-                    <div class="portlet">
-                        <div class="portlet dev">
-							<p>
-								<img class="user-avatar" src="http://www.gravatar.com/avatar/4dab4ece81a9b8832323ef2f73fcf12e" alt="User avatar" width="80" height="80">
-								<a class="coder" href="http://wj32.org"><strong>wj32</strong></a>
-							</p>
-							<ul>
-								<li>Project Founder</li>
-								<li>Joined: 16-10-2008</li>
-								<li>Status: Active</li>
-								<li><a href="http://processhacker.sourceforge.net/forums/memberlist.php?mode=email&amp;u=2">Send Message</a></li>
-							</ul>
-
-							<img class="ohloh-kudos" src="http://www.ohloh.net/accounts/47453/widgets/account_rank.gif" alt="Ohloh kudos" width="32" height="24"/>
-
-							<a href="http://www.ohloh.net/p/processhacker/contributors/1415904688650589" target="_blank">
-								<img class="ohloh-commits" src="http://www.ohloh.net/p/processhacker/contributors/144925/commits_spark.png" alt="wj32 commit history" width="182" height="32"/>
-							</a>
 						</div>
+					</div>
+					<div class="yui-u">
+						<div id="structural-subscription-content-box"></div>
+					</div>
+				</div>
+				
+				
+                <div class="dev">
+					<p>
+						<img class="user-avatar" src="http://www.gravatar.com/avatar/4dab4ece81a9b8832323ef2f73fcf12e" alt="User avatar" width="80" height="80">
+						<a class="coder" href="http://wj32.org"><strong>wj32</strong></a>
+					</p>
+					<ul style="list-style-type: none;">
+						<li>Project Founder</li>
+						<li>Joined: 16-10-2008</li>
+						<li>Status: Active</li>
+						<li><a href="http://processhacker.sourceforge.net/forums/memberlist.php?mode=email&amp;u=2">Send Message</a></li>
+					</ul>
+					<img class="ohloh-kudos" src="http://www.ohloh.net/accounts/47453/widgets/account_rank.gif" alt="Ohloh kudos" width="32" height="24"/>
+					<a href="http://www.ohloh.net/p/processhacker/contributors/1415904688650589" target="_blank">
+						<img class="ohloh-commits" src="http://www.ohloh.net/p/processhacker/contributors/144925/commits_spark.png" alt="wj32 commit history" width="182" height="32"/>
+					</a>
+				</div>
 
-						<div class="portlet dev">
-							<p>
-								<img class="user-avatar" src="http://www.gravatar.com/avatar/989904e05fb257009009d2c6e2c8808f" alt="User avatar" width="80" height="80">
-								<a class="coder" href="http://sourceforge.net/users/dmex/"><strong>dmex</strong></a>
-							</p>
-							<ul>
-								<li>Project Maintainer</li>
-								<li>Joined: 28-08-2009</li>
-								<li>Status: Active</li>
-								<li><a href="http://processhacker.sourceforge.net/forums/memberlist.php?mode=email&amp;u=54">Send Message</a></li>
-							</ul>
+				<div class="dev">
+					<p>
+						<img class="user-avatar" src="http://www.gravatar.com/avatar/989904e05fb257009009d2c6e2c8808f" alt="User avatar" width="80" height="80">
+						<a class="coder" href="http://sourceforge.net/users/dmex/"><strong>dmex</strong></a>
+					</p>
+					<ul style="list-style-type: none;">
+						<li>Project Maintainer</li>
+						<li>Joined: 28-08-2009</li>
+						<li>Status: Active</li>
+						<li><a href="http://processhacker.sourceforge.net/forums/memberlist.php?mode=email&amp;u=54">Send Message</a></li>
+					</ul>
 
-							<img class="ohloh-kudos" src="http://www.ohloh.net/accounts/56334/widgets/account_rank.gif" alt="Ohloh kudos" width="32" height="24"/>
+					<img class="ohloh-kudos" src="http://www.ohloh.net/accounts/56334/widgets/account_rank.gif" alt="Ohloh kudos" width="32" height="24"/>
 
-							<a href="http://www.ohloh.net/p/processhacker/contributors/1415904688659470" target="_blank">
-								<img class="ohloh-commits" src="http://www.ohloh.net/p/processhacker/contributors/368201/commits_spark.png" alt="dmex commit history" width="182" height="32"/>
-							</a>
-						</div>
+					<a href="http://www.ohloh.net/p/processhacker/contributors/1415904688659470" target="_blank">
+						<img class="ohloh-commits" src="http://www.ohloh.net/p/processhacker/contributors/368201/commits_spark.png" alt="dmex commit history" width="182" height="32"/>
+					</a>
+				</div>
 
-						<div class="portlet dev">
-							<p>
-								<img class="user-avatar" src="http://www.gravatar.com/avatar/e37759b1ea0125d4e97b1e00b5eed26f.png" alt="User avatar" width="80" height="80">
-								<a id="xhmikosr" href="http://sourceforge.net/users/xhmikosr/"><strong>XhmikosR</strong></a>
-							</p>
-							<ul>
-								<li>Installer Maintainer, Website improvements</li>
-								<li>Joined: 20-02-2009</li>
-								<li>Status: Active</li>
-							</ul>
+				<div class="dev">
+					<p>
+						<img class="user-avatar" src="http://www.gravatar.com/avatar/e37759b1ea0125d4e97b1e00b5eed26f.png" alt="User avatar" width="80" height="80">
+						<a id="xhmikosr" href="http://sourceforge.net/users/xhmikosr/"><strong>XhmikosR</strong></a>
+					</p>
+					<ul style="list-style-type: none;">
+						<li>Installer Maintainer, Website improvements</li>
+						<li>Joined: 20-02-2009</li>
+						<li>Status: Active</li>
+					</ul>
 
-							<img class="ohloh-kudos" src="http://www.ohloh.net/accounts/60504/widgets/account_rank.gif" alt="Ohloh kudos" width="32" height="24"/>
+					<img class="ohloh-kudos" src="http://www.ohloh.net/accounts/60504/widgets/account_rank.gif" alt="Ohloh kudos" width="32" height="24"/>
 
-							<a href="http://www.ohloh.net/p/processhacker/contributors/1415904688663640" target="_blank">
-								<img class="ohloh-commits" src="http://www.ohloh.net/p/processhacker/contributors/145086/commits_spark.png" alt="XhmikosR commit history" width="182" height="32"/>
-							</a>
-						</div>
-                    </div>
-                </div>
-                <div class="yui-u">
-                    <div id="structural-subscription-content-box"></div>
-                </div>
+					<a href="http://www.ohloh.net/p/processhacker/contributors/1415904688663640" target="_blank">
+						<img class="ohloh-commits" src="http://www.ohloh.net/p/processhacker/contributors/145086/commits_spark.png" alt="XhmikosR commit history" width="182" height="32"/>
+					</a>
+				</div>
 			</div>
 		</div>
     </div>
diff --git a/misc/website/websitev2/downloads.php b/misc/website/websitev2/downloads.php
index 34da23f71..4fcd7f345 100644
--- a/misc/website/websitev2/downloads.php
+++ b/misc/website/websitev2/downloads.php
@@ -2,22 +2,21 @@
 
 <div id="page">
     <div class="yui-d0">
-        <nav>
-            <img class="flowed-block" src="images/logo_64x64.png" alt="Project Logo" width="64" height="64">
-
-            <div class="flowed-block">
-                <h2>Process Hacker</h2>
-                <ul class="facetmenu">
-                    <li><a href="/">Overview</a></li>
-                    <li class="active"><a href="downloads.php">Downloads</a></li>
-                    <li><a href="faq.php">FAQ</a></li>
-                    <li><a href="about.php">About</a></li>
-                    <li><a href="forums/">Forum</a></li>
-                </ul>
-            </div>
-        </nav>
-
         <div class="yui-t4">
+			<nav>
+				<img class="flowed-block" src="images/logo_64x64.png" alt="Project Logo" width="64" height="64">
+
+				<div class="flowed-block">
+					<h2>Process Hacker</h2>
+					<ul class="facetmenu">
+						<li><a href="/">Overview</a></li>
+						<li class="active"><a href="downloads.php">Downloads</a></li>
+						<li><a href="faq.php">FAQ</a></li>
+						<li><a href="about.php">About</a></li>
+						<li><a href="forums/">Forum</a></li>
+					</ul>
+				</div>
+			</nav>
             <!--<div class="yui-b side">
                 <div class="portlet">
                     <h2 class="center">Quick Links</h2>
diff --git a/misc/website/websitev2/faq.php b/misc/website/websitev2/faq.php
index ed9c39e37..31ac2fef9 100644
--- a/misc/website/websitev2/faq.php
+++ b/misc/website/websitev2/faq.php
@@ -2,54 +2,51 @@
 
 <div id="page">
     <div class="yui-d0">
-        <nav>
-            <img class="flowed-block" src="images/logo_64x64.png" alt="Project Logo" width="64" height="64">
-
-            <div class="flowed-block">
-                <h2>Process Hacker</h2>
-                <ul class="facetmenu">
-                    <li><a href="/">Overview</a></li>
-                    <li><a href="downloads.php">Downloads</a></li>
-                    <li class="active"><a href="faq.php">FAQ</a></li>
-                    <li><a href="about.php">About</a></li>
-                    <li><a href="forums/">Forum</a></li>
-                </ul>
-            </div>
-        </nav>
-
         <div class="yui-t4">
-            <div class="yui-b side">
-                <div class="portlet" >
-                    <h2 class="center">Get Involved</h2>
-                    <ul class="involvement">
-                        <li><a href="forums/viewforum.php?f=24">Report a bug</a></li>
-                        <li><a href="forums/viewforum.php?f=5">Ask a question</a></li>
-                    </ul>
-                </div>
-            </div>
-
             <div class="summary">
+				<nav>
+					<img class="flowed-block" src="images/logo_64x64.png" alt="Project Logo" width="64" height="64">
+
+					<div class="flowed-block">
+						<h2>Process Hacker</h2>
+						<ul class="facetmenu">
+							<li><a href="/">Overview</a></li>
+							<li><a href="downloads.php">Downloads</a></li>
+							<li class="active"><a href="faq.php">FAQ</a></li>
+							<li><a href="about.php">About</a></li>
+							<li><a href="forums/">Forum</a></li>
+						</ul>
+					</div>
+				</nav>
+			
                 <dl>
                     <dt>Why is there annoying bug X in Process Hacker? Why is Process Hacker missing feature Y?</dt>
                     <dd>Please report any bugs or feature requests in the <a href="forums">forums</a>.</dd>
 
                     <dt>Is Process Hacker a portable application?</dt>
                     <dd>
-                        Yes. If you want settings to be saved on your USB drive, create a file named
-                        <code>ProcessHacker.exe.settings.xml</code> in the same directory as <code>ProcessHacker.exe</code>.
-                        Settings will then automatically be saved there.
+                        Yes. In the same directory as <code>ProcessHacker.exe</code>, create a file named <code>ProcessHacker.exe.settings.xml</code>,
+                        settings will then be automatically saved here.
                     </dd>
 
-                    <dt>"Process Hacker"? Is this a dangerous "hacking" tool?</dt>
+                    <dt>"Process Hacker"? Is this a dangerous 'hacking' tool?</dt>
                     <dd>No. Please read about the <a href="http://catb.org/~esr/faqs/hacker-howto.html#what_is">correct definition of "hacker"</a>.</dd>
 
                     <dt>Symbols don't work properly!</dt>
                     <dd>
-                        Firstly, you need the latest <code>dbghelp.dll</code> version. Install the latest Windows SDK (information and links are located below), open Process Hacker options, click on Symbols, and locate <code>dbghelp.dll</code>.
-                        It is usually in <code>C:\Program Files\Debugging Tools for Windows (x86)</code> or if you're using the Windows 8 SDK it'll be located at <code>C:\Program Files (x86)\Windows Kits\8.0\Debuggers</code>. Next, you need
-                        to configure the search path. If you don't know what to do, enter
-                        <code>SRV*SOME_FOLDER*http://msdl.microsoft.com/download/symbols</code>.
-                        Replace <code>SOME_FOLDER</code> with any folder you can write to, like <code>D:\Symbols</code>.
+                        Firstly, you need the latest <code>dbghelp.dll</code> version:</br>
+						</br>
+						1) Install the latest Windows SDK. (links are below)</br>
+                        2) Open Process Hacker options via the main menu: Hacker > Options</br>
+                        3) Click Symbols, and locate<code>dbghelp.dll</code></br>
+						<dl><dd>
+						It is usually in <code>C:\Program Files\Debugging Tools for Windows (x86)\</code> 
+							or if you're using the Windows 8 SDK it'll be located at <code>\Program Files (x86)\Windows Kits\8.0\Debuggers\x86\</code> for 32bit users 
+							or at <code>\Program Files (x86)\Windows Kits\8.0\Debuggers\x64\</code> for 64bit users.</br>
+						</dd></dl>
+						Secondly, you need to configure the search path:</br>
+						If you don't know what to do, enter <code>SRV*SOME_FOLDER*http://msdl.microsoft.com/download/symbols</code>.
+						Replace <code>SOME_FOLDER</code> with any folder you can write to, like <code>D:\Symbols</code>.
                         Now you can restart Process Hacker and view full symbols.
                     </dd>
 
@@ -61,11 +58,11 @@
 
                     <dt>Why can't I build Process Hacker?</dt>
                     <dd>
-                        The most likely problem is that you do not have the latest Windows SDK installed.
-                        <p>For Windows XP, Vista and Windows 7 you'll need the
-                        <a href="http://msdn.microsoft.com/en-us/windows/bb980924.aspx">Windows SDK for Windows 7 and .NET Framework 4</a>.</p>
-                        <p>For Windows Vista, Windows 7 and Windows 8 you'll need the
-                        <a href="http://msdn.microsoft.com/en-US/windows/hardware/hh852363">Windows 8 SDK</a>.</p>
+                        The most likely problem is that you do not have the latest Windows SDK installed.</br>
+                        For Windows XP, Vista and Windows 7 you'll need the
+                        <a href="http://msdn.microsoft.com/en-us/windows/bb980924.aspx">Windows SDK for Windows 7 and .NET Framework 4</a>.</br>
+                        For Windows Vista, Windows 7 and Windows 8 you'll need the
+                        <a href="http://msdn.microsoft.com/en-US/windows/hardware/hh852363">Windows 8 SDK</a>.
                     </dd>
                 </dl>
             </div>
diff --git a/misc/website/websitev2/footer.php b/misc/website/websitev2/footer.php
index 0d4492984..22ce3e680 100644
--- a/misc/website/websitev2/footer.php
+++ b/misc/website/websitev2/footer.php
@@ -8,9 +8,9 @@
 <?php
 if (@$includejs) {
     echo "<script src=\"http://www.google.com/jsapi\"></script><script>google.load(\"feeds\", \"1\")</script>
-    <script src=\"http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js\"></script>
+    <script src=\"http://code.jquery.com/jquery-latest.js\"></script>
     <script src=\"/js/pack.js\"></script>
-    <script>window.jQuery || document.write('<script src=\"js/jquery-1.8.3.min.js\"><\/script>')</script>";
+    <script>window.jQuery || document.write('<script src=\"http://code.jquery.com/jquery-latest.js\"><\/script>')</script>";
     if ($pagetitle == "Overview") {
         echo "<script src=\"http://s7.addthis.com/js/300/addthis_widget.js#pubid=dmex\"></script>";
     }
diff --git a/misc/website/websitev2/index.php b/misc/website/websitev2/index.php
index 9e7fb3186..74e560f52 100644
--- a/misc/website/websitev2/index.php
+++ b/misc/website/websitev2/index.php
@@ -2,22 +2,21 @@
 
 <div id="page">
     <div class="yui-d0">
-        <nav>
-            <img class="flowed-block" src="images/logo_64x64.png" alt="Project Logo" width="64" height="64">
-
-            <div class="flowed-block">
-                <h2>Process Hacker</h2>
-                <ul class="facetmenu">
-                    <li class="active"><a href="/">Overview</a></li>
-                    <li><a href="downloads.php">Downloads</a></li>
-                    <li><a href="faq.php">FAQ</a></li>
-                    <li><a href="about.php">About</a></li>
-                    <li><a href="forums/">Forum</a></li>
-                </ul>
-            </div>
-        </nav>
-
         <div class="yui-t4">
+		    <nav>
+				<img class="flowed-block" src="images/logo_64x64.png" alt="Project Logo" width="64" height="64">
+				<div class="flowed-block">
+					<h2>Process Hacker</h2>
+					<ul class="facetmenu">
+						<li class="active"><a href="/">Overview</a></li>
+						<li><a href="downloads.php">Downloads</a></li>
+						<li><a href="faq.php">FAQ</a></li>
+						<li><a href="about.php">About</a></li>
+						<li><a href="forums/">Forum</a></li>
+					</ul>
+				</div>
+			</nav>
+			
             <p class="headline main-headline">A <strong>free</strong>, powerful, multi-purpose tool that helps you <strong>monitor system resources</strong>,<br>
             <strong>debug software</strong> and <strong>detect malware</strong>.</p>