Merge branch 'develop'

2012-04-12 02:12:37 +01:00
parent a14c87510b 9c7cd18ef9
commit 2b9d4e7fe3
29 changed files with 236 additions and 19 deletions
--- a/public/files/3yp/project-report.pdf
+++ b/public/files/3yp/project-report.pdf
--- a/public/images/3yp/browser.png
+++ b/public/images/3yp/browser.png
--- a/public/images/3yp/changed-peer.png
+++ b/public/images/3yp/changed-peer.png
--- a/public/images/3yp/cli.png
+++ b/public/images/3yp/cli.png
--- a/public/images/3yp/introductions.png
+++ b/public/images/3yp/introductions.png
--- a/public/images/3yp/new-peer.png
+++ b/public/images/3yp/new-peer.png
--- a/public/images/3yp/people.png
+++ b/public/images/3yp/people.png
--- a/public/images/3yp/security.png
+++ b/public/images/3yp/security.png
--- a/public/images/3yp/settings.png
+++ b/public/images/3yp/settings.png
--- a/public/images/3yp/shares.png
+++ b/public/images/3yp/shares.png
--- a/public/images/3yp/wizard-name.png
+++ b/public/images/3yp/wizard-name.png
--- a/public/images/3yp/wizard-shares.png
+++ b/public/images/3yp/wizard-shares.png
--- a/public/images/ripping-cluster/jobs.png
+++ b/public/images/ripping-cluster/jobs.png
--- a/public/images/ripping-cluster/overview.png
+++ b/public/images/ripping-cluster/overview.png
--- a/public/images/ripping-cluster/setup-rip.png
+++ b/public/images/ripping-cluster/setup-rip.png
--- a/public/styles/normal.css
+++ b/public/styles/normal.css
@@ -71,6 +71,15 @@
    #cv h4 {
        margin-top: 0.75em;
    }
+
+    /* Thumbnails */
+    #rsdss-screenshots li .thumbnail img {
+        max-height: 13em;
+    }
+
+    .thumbnail h5 {
+        clear: both;
+    }
 }

@media print {
--- a/source/lib/Homepage/Main.class.php
+++ b/source/lib/Homepage/Main.class.php
@@ -43,7 +43,6 @@ class Homepage_Main extends SihnonFramework_Main {
                 
                $this->smarty->assign('base_uri', $this->base_uri);
                $this->smarty->assign('base_url', static::absoluteUrl(''));
-                $this->smarty->assign('title', 'Homepage');
        
            } break;
        
--- a/source/webui/pages/cv.php
+++ b/source/webui/pages/cv.php
@@ -0,0 +1,7 @@
+<?php
+
+$smarty = Homepage_Main::instance()->smarty();
+
+$smarty->assign('title', 'Projects');
+
+?>
--- a/source/webui/pages/projects.php
+++ b/source/webui/pages/projects.php
@@ -0,0 +1,7 @@
+<?php
+
+$smarty = Homepage_Main::instance()->smarty();
+
+$smarty->assign('title', 'CV');
+
+?>
--- a/source/webui/pages/projects/3yp.php
+++ b/source/webui/pages/projects/3yp.php
@@ -0,0 +1,7 @@
+<?php
+
+$smarty = Homepage_Main::instance()->smarty();
+
+$smarty->assign('title', 'Third Year Project');
+
+?>
--- a/source/webui/pages/projects/ripping-cluster.php
+++ b/source/webui/pages/projects/ripping-cluster.php
@@ -0,0 +1,7 @@
+<?php
+
+$smarty = Homepage_Main::instance()->smarty();
+
+$smarty->assign('title', 'RippingCluster');
+
+?>
--- a/source/webui/pages/projects/sabayon-crepo.php
+++ b/source/webui/pages/projects/sabayon-crepo.php
@@ -0,0 +1,7 @@
+<?php
+
+$smarty = Homepage_Main::instance()->smarty();
+
+$smarty->assign('title', 'Entropy Repositories');
+
+?>
--- a/source/webui/pages/projects/scgen.php
+++ b/source/webui/pages/projects/scgen.php
@@ -0,0 +1,7 @@
+<?php
+
+$smarty = Homepage_Main::instance()->smarty();
+
+$smarty->assign('title', 'SCGen');
+
+?>
--- a/source/webui/pages/projects/sihnon-framework.php
+++ b/source/webui/pages/projects/sihnon-framework.php
@@ -0,0 +1,7 @@
+<?php
+
+$smarty = Homepage_Main::instance()->smarty();
+
+$smarty->assign('title', 'Sihnon Framework');
+
+?>
--- a/source/webui/pages/projects/status-board.php
+++ b/source/webui/pages/projects/status-board.php
@@ -0,0 +1,7 @@
+<?php
+
+$smarty = Homepage_Main::instance()->smarty();
+
+$smarty->assign('title', 'Status Board');
+
+?>
--- a/source/webui/templates/home.tpl
+++ b/source/webui/templates/home.tpl
@@ -4,6 +4,8 @@
    <p>
        I currently work as a Network Projects engineer for <a href="http://uk.atos.net/en-uk/" title="Atos - United Kingdom">Atos</a>
        in the Major Projects division. My role here includes design and implementation of LAN and WAN systems in Data Centre environments.
+        I have recently completed the Atos graduate programme, and am currently involved in a major internal infrastructure overhaul spanning
+        five sites for which I have been doing all the physical layer design and implementation.
    </p>
    <p>
        I previously worked for <a href="http://www.netcraft.com/" title="Netcraft homepage">Netcraft</a> in Bath,
@@ -13,7 +15,7 @@
        and performing occasional <a href="http://audited.netcraft.com/web-application" title="Netcraft's Application Penetration & Security Testing">penetration tests</a> against web applications for financial institutions.
    </p>
    <p>
-        I am a former graudate of Computer Science from ECS (University of Southampton) which I studied to the Masters level.
+        I am a former graudate of ECS (University of Southampton), earning a First in Computer Science with Distributed Systems and Networks to the Masters level.
    </p>
    
    <p>
@@ -23,7 +25,5 @@
    
    <p>
        You can contact me via {mailto address="me@benroberts.net" encode="hex"}, or via one of the Social Media sites listed on the top bar.
-    </p>
-    
-    
+    </p> 
 </div>
--- a/source/webui/templates/index.tpl
+++ b/source/webui/templates/index.tpl
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
    <head>
-        <title>{$title}</title>
+        <title>{if $title}{$title} -{/if} Ben Roberts</title>
        
        <!-- JQuery //-->
        <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
@@ -42,7 +42,7 @@
                <div class="span12" id="header">
                    <h1>
                        Ben Roberts
-                        <small>MEng Computer Science @ ecs.soton.ac.uk</small>
+                        <small>Network Projects Engineer @ Atos</small>
                    </h1>
                </div>
            </div>
--- a/source/webui/templates/projects/3yp.tpl
+++ b/source/webui/templates/projects/3yp.tpl
@@ -1,16 +1,140 @@
 <h2>Third Year Project</h2>

 <p>
-    I am still working on my project, but in the mean time I have some binaries available for user testing.
-    Please report any bugs you might find on the <a href="https://bugs.sihnon.net/" title="Sihnon Bug Tracker">bug tracker</a>.
+    My third year dissertation was a research/design/build project investigating the use of RSA keys and a web-of-trust to provide
+    simple and secure yet password-less and zero-configuration file sharing between users located on the same network segment. 
 </p>
 <p>
-    These binaries are solely for testing purposes, and may not be redistributed from anywhere other than this site.
-    I may find time to produce a source package in the future.
+    The source code is currently archived on CD, but I will attempt to locate and upload a copy of the version control repository in due course.
+    In the meantime, for anyone who might be interested in the rationale, design decisions and implementation detail, please see the
+    <a href="{$base_uri}files/3yp/project-report.pdf" title="RSDSS Post Project Report">post-project report</a>.
+</p>
+
+<h3>Releases</h3>
+<p>
+    The project was not completed beyond an alpha stage, so the binaries below are strictly for testing purposes only and are definitely
+    not ready for any kind of production use. These are provided as-is with no guarantees for functionality or safetly!
    
    <ul>
-        <li><a href="{$base_uri}files/rsdss_1.01_i386.deb" title="Ubuntu x86 deb package">rsdss-1.01-i386.deb</a></li>
-        <li><a href="{$base_uri}files/rsdss-1.0.1-i386.tar.bz2" title="Linux x86 binary archive">rsdss-1.0.1-i386.tar.bz2</a></li>
-        <li><a href="{$base_uri}files/rsdss-1.0.2-win32.zip" title="Windows 32-bit zip archive">rsdss-1.0.2-win32.zip</a></li>
+        <li><a href="{$base_uri}files/3yp/rsdss_1.01_i386.deb" title="Ubuntu x86 deb package">rsdss-1.01-i386.deb</a></li>
+        <li><a href="{$base_uri}files/3yp/rsdss-1.0.2-1-i386.tar.bz2" title="Linux x86 binary archive">rsdss-1.0.1-i386.tar.bz2</a></li>
+        <li><a href="{$base_uri}files/3yp/rsdss-1.0.2-win32.zip" title="Windows 32-bit zip archive">rsdss-1.0.2-win32.zip</a></li>
    </ul>
 </p>
+
+<h3>Screenshots</h3>
+<ul id="rsdss-screenshots" class="thumbnails">
+    <li class="span4">
+        <div class="thumbnail">
+            <img src="{$base_uri}images/3yp/wizard-name.png" alt="Name selection wizard" />
+            <a href="{$base_uri}images/3yp/wizard-name.png" class="viewmore" title="Name selection wizard">View larger</a>
+            <h5>Wizard - Name selection</h5>
+            <p>
+                The first question in the startup wizard - selecting a name for yourself so as to be recognisable by other people.
+            </p>
+        </div>
+    </li>
+    <li class="span4">
+        <div class="thumbnail">
+            <img src="{$base_uri}images/3yp/wizard-shares.png" alt="Shared folder selection wizard" />
+            <a href="{$base_uri}images/3yp/wizard-shares.png" class="viewmore" title="Shared folder selection wizard">View larger</a>
+            <h5>Wizard - Shared folders</h5>
+            <p>
+                The second question in the startup wizard - selecting the folders that will be shared to the network.
+            </p>
+        </div>
+    </li>
+    <li class="span4">
+        <div class="thumbnail">
+            <img src="{$base_uri}images/3yp/new-peer.png" alt="New Peer dialog" />
+            <a href="{$base_uri}images/3yp/new-peer.png" class="viewmore" title="New peer dialog">View larger</a>
+            <h5>New Peer</h5>
+            <p>
+                The dialog presented when a new, previously unknown person wishes to start sharing files with you.
+            </p>
+        </div>
+    </li>
+    <li class="span4">
+        <div class="thumbnail">
+            <img src="{$base_uri}images/3yp/people.png" alt="People" />
+            <a href="{$base_uri}images/3yp/people.png" class="viewmore" title="People">View larger</a>
+            <h5>People</h5>
+            <p>
+                Settings dialog showing the list of all people you've communicated with previously, and options to change the trust level
+                for each person - allowing people you trust to introduce new peers to you automatically.
+            </p>
+        </div>
+    </li>
+    <li class="span4">
+        <div class="thumbnail">
+            <img src="{$base_uri}images/3yp/introductions.png" alt="Introductions" />
+            <a href="{$base_uri}images/3yp/introductions.png" class="viewmore" title="Introductions">View larger</a>
+            <h5>Introductions</h5>
+            <p>
+               Settings dialog showing the list of users who have verified your identity which is automatically sent to all new peers
+               you wish to communicate with in an attempt to find some common friends and avoid the need to ask any security questions.
+            </p>
+        </div>
+    </li>
+    <li class="span4">
+        <div class="thumbnail">
+            <img src="{$base_uri}images/3yp/changed-peer.png" alt="Changed peer warning" />
+            <a href="{$base_uri}images/3yp/changed-peer.png" class="viewmore" title="Changed peer warning">View larger</a>
+            <h5>Changed Peer</h5>
+            <p>
+                Warning dialog displayed when the key for a previously known person has changed. This could be innocous such as a reinstall 
+                or name collision or could be the sign of a malicious user trying to access unauthorised shared files.
+            </p>
+        </div>
+    </li>
+    <li class="span4">
+        <div class="thumbnail">
+            <img src="{$base_uri}images/3yp/shares.png" alt="Shares" />
+            <a href="{$base_uri}images/3yp/shares.png" class="viewmore" title="Shares">View larger</a>
+            <h5>shares</h5>
+            <p>
+                Settings dialog showing the list of shared folders.
+            </p>
+        </div>
+    </li>
+    <li class="span4">
+        <div class="thumbnail">
+            <img src="{$base_uri}images/3yp/browser.png" alt="Browser" />
+            <a href="{$base_uri}images/3yp/browser.png" class="viewmore" title="Browser">View larger</a>
+            <h5>Browser</h5>
+            <p>
+                File browser allowing you to list the files shared by other users and download to your own machine.
+            </p>
+        </div>
+    </li>
+    <li class="span4">
+        <div class="thumbnail">
+            <img src="{$base_uri}images/3yp/cli.png" alt="Command line interface" />
+            <a href="{$base_uri}images/3yp/cli.png" class="viewmore" title="Command line interface">View larger</a>
+            <h5>CLI</h5>
+            <p>
+                Screenshot showing the simple CLI tool for displaying the shares of a remote user and downloading files.
+            </p>
+        </div>
+    </li>
+    <li class="span4">
+        <div class="thumbnail">
+            <img src="{$base_uri}images/3yp/security.png" alt="Security" />
+            <a href="{$base_uri}images/3yp/security.png" class="viewmore" title="Security">View larger</a>
+            <h5>Security</h5>
+            <p>
+                Settings dialog showing the security tab to assign permissions to different users and finely control which files can be accessed.
+            </p>
+        </div>
+    </li>
+    <li class="span4">
+        <div class="thumbnail">
+            <img src="{$base_uri}images/3yp/settings.png" alt="Advanced Settings" />
+            <a href="{$base_uri}images/3yp/settings.png" class="viewmore" title="Advanced Settings">View larger</a>
+            <h5>Advanced Settings</h5>
+            <p>
+                Settings dialog granting options to control advanced options within the application.
+            </p>
+        </div>
+    </li>
+</ul>
--- a/source/webui/templates/projects/ripping-cluster.tpl
+++ b/source/webui/templates/projects/ripping-cluster.tpl
@@ -7,10 +7,12 @@

 <div class="container">
    <div class="row">
-        <div class="span8 column">
-            <img class="span8" src="{$base_uri}images/ripping-cluster/overview.png" alt="RippingCluster Overview" />
+        <div class="span6 column">
+            <div class="thumbnail">
+                <img src="{$base_uri}images/ripping-cluster/overview.png" alt="RippingCluster Overview" />
+            </div>
        </div>
-        <div class="span8 column">
+        <div class="span6 column">
            <h3>Features</h3>
            <ul>
                <li>Multiple machines can participate in transcoding jobs using a worker daemon.</li>
@@ -22,7 +24,7 @@
    </div>
    
    <div class="row">
-        <div class="span16">
+        <div class="span12">
            <h3>Source</h3>
            <p>
                View or clone a copy of the Git repositories from one of the mirrors listed below:
@@ -33,4 +35,31 @@
            </ul>
        </div>
    </div>
-</div>
+
+    <div class="row">
+        <div class="span12">
+            <h3>Screenshots</h3>
+            <ul class="thumbnails">
+                <li class="span4">
+                    <div class="thumbnail">
+                        <img src="{$base_uri}images/ripping-cluster/setup-rip.png" alt="Setup Rip" />
+                        <a href="{$base_uri}images/ripping-cluster/setup-rip.png" class="viewmore">View larger</a>
+                        <h5>Setup Rip</h5>
+                        <p>
+                            Configure the titles, audio and subtitle tracks to be ripped.
+                        </p>
+                    </div>
+                </li>
+                <li class="span4">
+                    <div class="thumbnail">
+                        <img src="{$base_uri}images/ripping-cluster/jobs.png" alt="Job history" />
+                        <a href="{$base_uri}images/ripping-cluster/jobs.png" class="viewmore">View larger</a>
+                        <h5>Job History</h5>
+                        <p>
+                            View all jobs in detail, with options to re-run or remove info on past jobs.
+                        </p>        
+                    </div>
+                </li>
+            </ul>
+        </div>
+</div>