Merge branch 'develop'

This commit is contained in:
2012-04-12 00:45:52 +01:00
11 changed files with 62 additions and 7 deletions

View File

@@ -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;

View File

@@ -0,0 +1,7 @@
<?php
$smarty = Homepage_Main::instance()->smarty();
$smarty->assign('title', 'Projects');
?>

View File

@@ -0,0 +1,7 @@
<?php
$smarty = Homepage_Main::instance()->smarty();
$smarty->assign('title', 'CV');
?>

View File

@@ -0,0 +1,7 @@
<?php
$smarty = Homepage_Main::instance()->smarty();
$smarty->assign('title', 'Third Year Project');
?>

View File

@@ -0,0 +1,7 @@
<?php
$smarty = Homepage_Main::instance()->smarty();
$smarty->assign('title', 'RippingCluster');
?>

View File

@@ -0,0 +1,7 @@
<?php
$smarty = Homepage_Main::instance()->smarty();
$smarty->assign('title', 'Entropy Repositories');
?>

View File

@@ -0,0 +1,7 @@
<?php
$smarty = Homepage_Main::instance()->smarty();
$smarty->assign('title', 'SCGen');
?>

View File

@@ -0,0 +1,7 @@
<?php
$smarty = Homepage_Main::instance()->smarty();
$smarty->assign('title', 'Sihnon Framework');
?>

View File

@@ -0,0 +1,7 @@
<?php
$smarty = Homepage_Main::instance()->smarty();
$smarty->assign('title', 'Status Board');
?>

View File

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

View File

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