diff --git a/public/files/3yp/project-report.pdf b/public/files/3yp/project-report.pdf new file mode 100644 index 0000000..0224ac2 Binary files /dev/null and b/public/files/3yp/project-report.pdf differ diff --git a/public/images/3yp/browser.png b/public/images/3yp/browser.png new file mode 100755 index 0000000..9e2db9d Binary files /dev/null and b/public/images/3yp/browser.png differ diff --git a/public/images/3yp/changed-peer.png b/public/images/3yp/changed-peer.png new file mode 100755 index 0000000..c8d31b6 Binary files /dev/null and b/public/images/3yp/changed-peer.png differ diff --git a/public/images/3yp/cli.png b/public/images/3yp/cli.png new file mode 100755 index 0000000..bb0f39a Binary files /dev/null and b/public/images/3yp/cli.png differ diff --git a/public/images/3yp/introductions.png b/public/images/3yp/introductions.png new file mode 100755 index 0000000..ceba8ae Binary files /dev/null and b/public/images/3yp/introductions.png differ diff --git a/public/images/3yp/new-peer.png b/public/images/3yp/new-peer.png new file mode 100755 index 0000000..a82e6dd Binary files /dev/null and b/public/images/3yp/new-peer.png differ diff --git a/public/images/3yp/people.png b/public/images/3yp/people.png new file mode 100755 index 0000000..c9de38d Binary files /dev/null and b/public/images/3yp/people.png differ diff --git a/public/images/3yp/security.png b/public/images/3yp/security.png new file mode 100755 index 0000000..7c02e45 Binary files /dev/null and b/public/images/3yp/security.png differ diff --git a/public/images/3yp/settings.png b/public/images/3yp/settings.png new file mode 100755 index 0000000..48c5ee5 Binary files /dev/null and b/public/images/3yp/settings.png differ diff --git a/public/images/3yp/shares.png b/public/images/3yp/shares.png new file mode 100755 index 0000000..a1a294a Binary files /dev/null and b/public/images/3yp/shares.png differ diff --git a/public/images/3yp/wizard-name.png b/public/images/3yp/wizard-name.png new file mode 100755 index 0000000..96d0a8f Binary files /dev/null and b/public/images/3yp/wizard-name.png differ diff --git a/public/images/3yp/wizard-shares.png b/public/images/3yp/wizard-shares.png new file mode 100755 index 0000000..43b35f8 Binary files /dev/null and b/public/images/3yp/wizard-shares.png differ diff --git a/public/images/ripping-cluster/jobs.png b/public/images/ripping-cluster/jobs.png new file mode 100644 index 0000000..ca0ebc0 Binary files /dev/null and b/public/images/ripping-cluster/jobs.png differ diff --git a/public/images/ripping-cluster/overview.png b/public/images/ripping-cluster/overview.png index e395cfc..0048e9d 100644 Binary files a/public/images/ripping-cluster/overview.png and b/public/images/ripping-cluster/overview.png differ diff --git a/public/images/ripping-cluster/setup-rip.png b/public/images/ripping-cluster/setup-rip.png new file mode 100644 index 0000000..15e9d89 Binary files /dev/null and b/public/images/ripping-cluster/setup-rip.png differ diff --git a/public/styles/normal.css b/public/styles/normal.css index d4aa567..e078090 100644 --- 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 { diff --git a/source/lib/Homepage/Main.class.php b/source/lib/Homepage/Main.class.php index ef944ab..43d891f 100644 --- 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; diff --git a/source/webui/pages/cv.php b/source/webui/pages/cv.php new file mode 100644 index 0000000..c8b6ea9 --- /dev/null +++ b/source/webui/pages/cv.php @@ -0,0 +1,7 @@ +smarty(); + +$smarty->assign('title', 'Projects'); + +?> diff --git a/source/webui/pages/projects.php b/source/webui/pages/projects.php new file mode 100644 index 0000000..d6fddf8 --- /dev/null +++ b/source/webui/pages/projects.php @@ -0,0 +1,7 @@ +smarty(); + +$smarty->assign('title', 'CV'); + +?> diff --git a/source/webui/pages/projects/3yp.php b/source/webui/pages/projects/3yp.php new file mode 100644 index 0000000..a891774 --- /dev/null +++ b/source/webui/pages/projects/3yp.php @@ -0,0 +1,7 @@ +smarty(); + +$smarty->assign('title', 'Third Year Project'); + +?> diff --git a/source/webui/pages/projects/ripping-cluster.php b/source/webui/pages/projects/ripping-cluster.php new file mode 100644 index 0000000..7662164 --- /dev/null +++ b/source/webui/pages/projects/ripping-cluster.php @@ -0,0 +1,7 @@ +smarty(); + +$smarty->assign('title', 'RippingCluster'); + +?> diff --git a/source/webui/pages/projects/sabayon-crepo.php b/source/webui/pages/projects/sabayon-crepo.php new file mode 100644 index 0000000..734ea21 --- /dev/null +++ b/source/webui/pages/projects/sabayon-crepo.php @@ -0,0 +1,7 @@ +smarty(); + +$smarty->assign('title', 'Entropy Repositories'); + +?> diff --git a/source/webui/pages/projects/scgen.php b/source/webui/pages/projects/scgen.php new file mode 100644 index 0000000..57b60c1 --- /dev/null +++ b/source/webui/pages/projects/scgen.php @@ -0,0 +1,7 @@ +smarty(); + +$smarty->assign('title', 'SCGen'); + +?> diff --git a/source/webui/pages/projects/sihnon-framework.php b/source/webui/pages/projects/sihnon-framework.php new file mode 100644 index 0000000..35e66a3 --- /dev/null +++ b/source/webui/pages/projects/sihnon-framework.php @@ -0,0 +1,7 @@ +smarty(); + +$smarty->assign('title', 'Sihnon Framework'); + +?> diff --git a/source/webui/pages/projects/status-board.php b/source/webui/pages/projects/status-board.php new file mode 100644 index 0000000..ffb1fe9 --- /dev/null +++ b/source/webui/pages/projects/status-board.php @@ -0,0 +1,7 @@ +smarty(); + +$smarty->assign('title', 'Status Board'); + +?> diff --git a/source/webui/templates/home.tpl b/source/webui/templates/home.tpl index afe480c..01e976b 100644 --- a/source/webui/templates/home.tpl +++ b/source/webui/templates/home.tpl @@ -4,6 +4,8 @@

I currently work as a Network Projects engineer for Atos 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.

I previously worked for Netcraft in Bath, @@ -13,7 +15,7 @@ and performing occasional penetration tests against web applications for financial institutions.

- 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.

@@ -23,7 +25,5 @@

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. -

- - +

diff --git a/source/webui/templates/index.tpl b/source/webui/templates/index.tpl index 7256979..2b0a8ac 100644 --- a/source/webui/templates/index.tpl +++ b/source/webui/templates/index.tpl @@ -1,7 +1,7 @@ - {$title} + {if $title}{$title} -{/if} Ben Roberts @@ -42,7 +42,7 @@ diff --git a/source/webui/templates/projects/3yp.tpl b/source/webui/templates/projects/3yp.tpl index 4da7fd5..67f6eff 100644 --- a/source/webui/templates/projects/3yp.tpl +++ b/source/webui/templates/projects/3yp.tpl @@ -1,16 +1,140 @@

Third Year Project

- 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 bug tracker. + 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.

- 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 + post-project report. +

+ +

Releases

+

+ 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!

+ +

Screenshots

+ diff --git a/source/webui/templates/projects/ripping-cluster.tpl b/source/webui/templates/projects/ripping-cluster.tpl index 1a46c53..a59521f 100644 --- a/source/webui/templates/projects/ripping-cluster.tpl +++ b/source/webui/templates/projects/ripping-cluster.tpl @@ -7,10 +7,12 @@
-
- RippingCluster Overview +
+
+ RippingCluster Overview +
-
+

Features

  • Multiple machines can participate in transcoding jobs using a worker daemon.
    • @@ -22,7 +24,7 @@
-
+

Source

View or clone a copy of the Git repositories from one of the mirrors listed below: @@ -33,4 +35,31 @@

-
\ No newline at end of file + +
+
+

Screenshots

+
    +
  • +
    + Setup Rip + View larger +
    Setup Rip
    +

    + Configure the titles, audio and subtitle tracks to be ripped. +

    +
    +
    • +
  • +
    + Job history + View larger +
    Job History
    +

    + View all jobs in detail, with options to re-run or remove info on past jobs. +

    +
    +
    • +
+
+