WebsiteV3: Sync code to SVN

git-svn-id: svn://svn.code.sf.net/p/processhacker/code@6326 21ef857c-d57f-4fe0-8362-d861dc6d29cd
mirror · Jan 28, 2016 · 146ca47 · 146ca47
1 parent 83095b3
commit 146ca47
Show file tree

Hide file tree

Showing 11 changed files with 99 additions and 108 deletions.
diff --git a/misc/website/websitev3/.htaccess b/misc/website/websitev3/.htaccess
diff --git a/misc/website/websitev3/about.php b/misc/website/websitev3/about.php
@@ -88,8 +88,8 @@
                     <h3 class="panel-title">Quick Links</h3>
                 </div>
                 <div class="list-group">
-                    <a href="http://processhacker.sourceforge.net/forums/viewforum.php?f=5" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-comment"></i> Ask a question</a>
-                    <a href="http://processhacker.sourceforge.net/forums/viewforum.php?f=24" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-fire"></i> Report a bug</a>
+                    <a href="forums/viewforum.php?f=5" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-comment"></i> Ask a question</a>
+                    <a href="forums/viewforum.php?f=24" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-fire"></i> Report a bug</a>
                     <a href="http://sourceforge.net/projects/processhacker/" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-globe"></i> SourceForge project page</a>
                     <a href="http://sourceforge.net/p/processhacker/code/" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-check"></i> Browse source code</a>
                     <a href="http://processhacker.sourceforge.net/doc/" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-edit"></i> Source code documentation</a>

diff --git a/misc/website/websitev3/css/custom.css b/misc/website/websitev3/css/custom.css
@@ -9,22 +9,39 @@ body {
 	font-family: "Segoe UI", sans-serif, Verdana, Helvetica, Arial;*/
 }
 
+a {
+    outline: 0 !important;
+}
+
+.nav a:visited {
+color:#fff;
+}
+.nav a:hover {
+color:#000;
+}
+.nav a:active {
+color:#000;
+}
+.nav a:focus {
+color:#000;
+}
+
 p {
-margin: 0 0 5px;
+    margin: 0 0 5px;
 }
 
 .jumbotron {
-padding: 30px 15px;
+    padding: 30px 15px;
 }
 
 #forumitem {
-font-size: 12px;
-font-family: ;
+    font-size: 12px;
+    font-family: ;
 }
 
 #forumitem img {
-width: 16px;
-height: 16px;
+    width: 16px;
+    height: 16px;
 }
 
 .footer {

diff --git a/misc/website/websitev3/downloads.php b/misc/website/websitev3/downloads.php
@@ -7,13 +7,13 @@
     </div>
 </div>
 
-<div class="container">
+<!-- <div class="container">
     <div class="col-sm-12">
         <div class="alert alert-danger">
-            <h4>advertisement</h4>
+            <h4></h4>
         </div>
     </div>
-</div>
+</div> -->
 
 <div class="container">
 
@@ -36,7 +36,7 @@
             <h3 class="media-heading">Installer (recommended)</h3>
             <p>Prebuilt installer for easy and simple software deployment.</p>
             <p>
-                <a href="https://processhacker.googlecode.com/files/processhacker-<?php echo $LATEST_PH_VERSION ?>-setup.exe" class="btn btn-primary" role="button" onclick="ga('send', 'event', 'DownloadPage', 'click', 'Download_EXE');">
+                <a href="http://sourceforge.net/projects/processhacker/files/processhacker2/processhacker-<?php echo $LATEST_PH_VERSION ?>-setup.exe/download?use_mirror=autoselect" class="btn btn-primary" role="button" onclick="ga('send', 'event', 'DownloadPage', 'click', 'Download_EXE');">
                     <i class="glyphicon glyphicon-download-alt"></i> processhacker-<?php echo $LATEST_PH_VERSION ?>-setup.exe
                 </a>
             </p>
@@ -48,7 +48,7 @@
             <h3 class="media-heading">Binaries (portable)</h3>
             <p>Compiled and zipped executable (includes plugins) without installer for advanced portable software deployment.</p>
             <p>
-                <a href="https://processhacker.googlecode.com/files/processhacker-<?php echo $LATEST_PH_VERSION ?>-bin.zip" class="btn btn-primary" role="button" onclick="ga('send', 'event', 'DownloadPage', 'click', 'Download_BIN');">
+                <a href="http://sourceforge.net/projects/processhacker/files/processhacker2/processhacker-<?php echo $LATEST_PH_VERSION ?>-bin.zip/download?use_mirror=autoselect" class="btn btn-primary" role="button" onclick="ga('send', 'event', 'DownloadPage', 'click', 'Download_BIN');">
                     <i class="glyphicon glyphicon-download-alt"></i> processhacker-<?php echo $LATEST_PH_VERSION ?>-bin.zip
                 </a>
             </p>
@@ -60,7 +60,7 @@
             <h3 class="media-heading">Source code</h3>
             <p>Raw source code; Requires a compiler such as Visual Studio and some configuration.</p>
             <p>
-                <a href="https://processhacker.googlecode.com/files/processhacker-<?php echo $LATEST_PH_VERSION ?>-src.zip" class="btn btn-primary" role="button" onclick="ga('send', 'event', 'DownloadPage', 'click', 'Download_SRC');">
+                <a href="http://sourceforge.net/projects/processhacker/files/processhacker2/processhacker-<?php echo $LATEST_PH_VERSION ?>-src.zip/download?use_mirror=autoselect" class="btn btn-primary" role="button" onclick="ga('send', 'event', 'DownloadPage', 'click', 'Download_SRC');">
                     <i class="glyphicon glyphicon-download-alt"></i> processhacker-<?php echo $LATEST_PH_VERSION ?>-src.zip
                 </a>
             </p>
@@ -77,10 +77,10 @@
                 </div>
                 <div class="list-group">
                     <a href="<?php echo $LATEST_PH_RELEASE_NEWS; ?>" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-comment"></i> Release Notes</a>
-                    <a href="http://svn.code.sf.net/p/processhacker/code/2.x/trunk/LICENSE.txt" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-comment"></i> End User License Agreement</a>
-                    <a href="" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-comment"></i> Checksums</a>
-                    <a href="http://processhacker.sourceforge.net/forums/viewforum.php?f=5" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-comment"></i> Ask a question</a>
-                    <a href="http://processhacker.sourceforge.net/forums/viewforum.php?f=24" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-fire"></i> Report a bug</a>
+                    <!--<a href="http://svn.code.sf.net/p/processhacker/code/2.x/trunk/LICENSE.txt" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-comment"></i> End User License Agreement</a>
+                    <a href="" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-comment"></i> Checksums</a>-->
+                    <a href="forums/viewforum.php?f=5" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-comment"></i> Ask a question</a>
+                    <a href="forums/viewforum.php?f=24" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-fire"></i> Report a bug</a>
                     <a href="http://sourceforge.net/projects/processhacker/" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-globe"></i> SourceForge project page</a>
                     <a href="http://sourceforge.net/p/processhacker/code/" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-check"></i> Browse source code</a>
                     <a href="http://processhacker.sourceforge.net/doc/" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-edit"></i> Source code documentation</a>

diff --git a/misc/website/websitev3/faq.php b/misc/website/websitev3/faq.php
@@ -34,16 +34,19 @@
                 <h3>Symbols don't work properly!</h3>
       			Firstly, you need the latest <code>dbghelp.dll</code> version:<br>
                 <br>
-                1) Install the latest Windows SDK.<br>
+                1) Install the latest Windows SDK (e.g. Windows 10 SDK).<br>
                 2) Open Process Hacker options via the main menu: Hacker &gt; Options<br>
                 3) Click Symbols, and locate <code>dbghelp.dll</code><br><br>
                 <dl>
                     <dd>
                         Windows XP, Vista and Windows 7 SDK:<br>
                         <code>\Program Files\Debugging Tools for Windows (x86)\</code><br><br>
-                        Windows 8 or above SDK:<br>
+                        Windows 8 or 8.1 SDK:<br>
                         32bit Windows: <code>\Program Files (x86)\Windows Kits\8.x\Debuggers\x86\</code><br>
-                        64bit Windows: <code>\Program Files (x86)\Windows Kits\8.x\Debuggers\x64\</code><br>
+                        64bit Windows: <code>\Program Files (x86)\Windows Kits\8.x\Debuggers\x64\</code><br><br>
+                        Windows 10 SDK:<br>
+                        32bit Windows: <code>\Program Files (x86)\Windows Kits\10\Debuggers\x86\</code><br>
+                        64bit Windows: <code>\Program Files (x86)\Windows Kits\10\Debuggers\x64\</code><br>
                     </dd>
                 </dl>
                 Secondly, you need to configure the search path. If you don't know what to do, enter:<br>
@@ -70,8 +73,8 @@
                     <h3 class="panel-title">Quick Links</h3>
                 </div>
                 <div class="list-group">
-                    <a href="http://processhacker.sourceforge.net/forums/viewforum.php?f=5" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-comment"></i> Ask a question</a>
-                    <a href="http://processhacker.sourceforge.net/forums/viewforum.php?f=24" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-fire"></i> Report a bug</a>
+                    <a href="forums/viewforum.php?f=5" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-comment"></i> Ask a question</a>
+                    <a href="forums/viewforum.php?f=24" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-fire"></i> Report a bug</a>
                     <a href="http://sourceforge.net/projects/processhacker/" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-globe"></i> SourceForge project page</a>
                     <a href="http://sourceforge.net/p/processhacker/code/" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-check"></i> Browse source code</a>
                     <a href="http://processhacker.sourceforge.net/doc/" target="_blank" class="list-group-item"><i class="glyphicon glyphicon-edit"></i> Source code documentation</a>

diff --git a/misc/website/websitev3/img/sflogo.png b/misc/website/websitev3/img/sflogo.png
diff --git a/misc/website/websitev3/include/config.php b/misc/website/websitev3/include/config.php
@@ -1,21 +1,21 @@
 <?php
-$LATEST_PH_VERSION = "2.35";
-$LATEST_PH_BUILD = "5898";
-$LATEST_PH_RELEASE_DATE = "18th of May 2015";
+$LATEST_PH_VERSION = "2.36";
+$LATEST_PH_BUILD = "6153";
+$LATEST_PH_RELEASE_DATE = "29th of June 2015";
 
 $LATEST_PH_BIN_SIZE = "2.9 MB";
-$LATEST_PH_BIN_SHA1 = "0fa4d6c9348fb1ae0565188fbd8f6a6c9acd0e9d";
+$LATEST_PH_BIN_SHA1 = "d11b09885431f38c0fb3fc49eb6386630e5a4096";
 
-$LATEST_PH_SDK_SIZE = "3.0 MB";
-$LATEST_PH_SDK_SHA1 = "2c3753c5f8f3581cf9dbd9ecb6cfd47c8c5ae2e4";
+$LATEST_PH_SDK_SIZE = "3.2 MB";
+$LATEST_PH_SDK_SHA1 = "570ebf76afa4dd8f7d26a5fa0848f93fdbf821be";
 
 $LATEST_PH_SETUP_SIZE = "2.0 MB";
-$LATEST_PH_SETUP_SHA1 = "9ccf9400340624e68a07b81954c46c62ed830708";
+$LATEST_PH_SETUP_SHA1 = "0acf5f4c30bc187797548c72eeab24a133f42fd9";
 
-$LATEST_PH_SOURCE_SIZE = "2.8 MB";
-$LATEST_PH_SOURCE_SHA1 = "fe254b842dd98cfb4a39f0c8315257407b945c6d";
+$LATEST_PH_SOURCE_SIZE = "2.7 MB";
+$LATEST_PH_SOURCE_SHA1 = "34c9e698e5155fa9bd2bdbbeb91204c8e03916c0";
 
-$LATEST_PH_RELEASE_NEWS = "http://processhacker.sourceforge.net/forums/viewtopic.php?f=1&t=1877";
+$LATEST_PH_RELEASE_NEWS = "http://processhacker.sourceforge.net/forums/viewtopic.php?f=1&t=1969";
 
 $LATEST_PH_RELEASE_URL = "http://sourceforge.net/projects/processhacker/files/processhacker2/processhacker-".$LATEST_PH_VERSION."-setup.exe/download?use_mirror=autoselect";
 ?>
diff --git a/misc/website/websitev3/include/footer.php b/misc/website/websitev3/include/footer.php
@@ -1,10 +1,10 @@
 <div class="container footer">
     <hr>
-    <div class="pull-right">
-        <a class="thumbnail" href="http://sourceforge.net/projects/processhacker/">
-            <img src="img/sflogo.png" alt="SourceForge logo" title="Process Hacker is hosted by SourceForge.net" width="120" height="30">
+    <!--<div class="pull-right">
+        <a class="thumbnail" href="https://wj32.org/processhacker/">
+            <img src="img/logo_64x64.png" alt="Process Hacker logo" title="Process Hacker" width="32" height="32">
         </a>
-    </div>
+    </div>-->
     <div class="pull-left">
         <p><small>Copyright &copy; 2008-2016 - Wen Jia Liu (wj32)</small></p>
         <a href="index.php">Overview</a> | 
@@ -18,7 +18,7 @@
 <script src="//cdn.jsdelivr.net/jquery/2.1.3/jquery.min.js"></script>
 <script src="//cdn.jsdelivr.net/bootstrap/3.3.4/js/bootstrap.min.js"></script>
 <script src="//getbootstrap.com/assets/js/ie10-viewport-bug-workaround.js"></script>
-<script src="//processhacker.sourceforge.net/v3/js/lightbox.min.js"></script>
+<script src="js/lightbox.min.js"></script>
 
 <!-- Google Analytics -->
 <script>

diff --git a/misc/website/websitev3/include/header.php b/misc/website/websitev3/include/header.php
@@ -1,34 +1,41 @@
-<?php include "config.php"; include "helpers.php"; /*ob_start('removeWhitespace');*/ ?>
+<?php 
+include "config.php";
+include "helpers.php";
+
+if (!ob_start("ob_gzhandler"))
+    ob_start();
+
+header("Content-Type: text/html; charset=utf-8"); 
+?>
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        <meta charset="utf-8"/>
         <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
         <meta name="description" content="Process Hacker, A free, powerful, multi-purpose tool that helps you monitor system resources, debug software and detect malware."/>
         <meta name="author" content="wj32"/>
 
         <link rel="shortcut icon" href="favicon.ico"/>
 
-        <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/bootstrap/3.3.4/css/bootstrap.min.css"/>
-        <link rel="stylesheet" type="text/css" href="//processhacker.sourceforge.net/v3/css/lightbox.css"/>
-        <link rel="stylesheet" type="text/css" href="//processhacker.sourceforge.net/v3/css/custom.css"/>
+        <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/bootstrap/3.3.5/css/bootstrap.min.css"/>
+        <link rel="stylesheet" type="text/css" href="css/lightbox.css"/>
+        <link rel="stylesheet" type="text/css" href="css/custom.css"/>
 
-        <link rel="alternate" type="application/atom+xml" href="http://processhacker.sourceforge.net/forums/feed.php?f=1" title="Process Hacker - News"/>
+        <link rel="alternate" type="application/atom+xml" href="forums/feed.php?f=1" title="Process Hacker - News"/>
         <link rel="alternate" type="application/atom+xml" href="http://sourceforge.net/p/processhacker/code/feed" title="Process Hacker - SVN"/>
 
         <title><?php echo $pagetitle ?> - Process Hacker</title>
 
         <!--[if lt IE 9]>
-            <script src="//cdn.jsdelivr.net/html5shiv/3.7.2/html5shiv.min.js"></script>
+            <script src="//cdn.jsdelivr.net/html5shiv/3.7.3/html5shiv.min.js"></script>
             <script src="//cdn.jsdelivr.net/respond/1.4.2/respond.min.js"></script> 
         <![endif]-->
 
         <?php if ($pagetitle == 'Overview') {
-                echo "<script type=\"text/javascript\" src=\"http://www.google.com/jsapi\"></script>
+                echo "<script type=\"text/javascript\" src=\"//www.google.com/jsapi\"></script>
         <script type=\"text/javascript\">google.load(\"feeds\", \"1\");</script>
         <script type=\"text/javascript\" src=\"js/feed.js\"></script>
-        <script type=\"text/javascript\" src=\"http://cdn.jsdelivr.net/momentjs/2.10.3/moment.min.js\"></script>";
+        <script type=\"text/javascript\" src=\"//cdn.jsdelivr.net/momentjs/2.10.6/moment.min.js\"></script>";
         } ?>
     </head>
 <body>
@@ -43,7 +50,7 @@
                 <span class="icon-bar"></span>
             </button>
             <a class="navbar-brand" href="index.php">
-                <img style="float:left" alt="SourceForge logo" title="" width="24" height="24" src="/img/logo_64x64.png">
+                <img style="float:left" alt="SourceForge logo" title="" width="24" height="24" src="img/logo_64x64.png">
                 <span style="padding-left:5px;">Process Hacker</span>
             </a>
         </div>
@@ -53,7 +60,7 @@
                 <li <?php if ($pagetitle == 'Downloads') echo "class=\"active\"" ?>><a href="downloads.php">Downloads</a></li>
                 <li <?php if ($pagetitle == 'FAQ') echo "class=\"active\"" ?>><a href="faq.php">FAQ</a></li>
                 <li <?php if ($pagetitle == 'About') echo "class=\"active\"" ?>><a href="about.php">About</a></li>
-                <li><a href="/forums">Forum</a></li>
+                <li><a href="/processhacker/forums" target="_blank">Forum</a></li>
             </ul> 
         </div>
     </div>