Merge branch 'develop'

This commit is contained in:
2012-04-06 17:24:09 +01:00
8 changed files with 70 additions and 127 deletions

View File

@@ -1,88 +1,16 @@
/**
* StatusBoard main script file
* Homepage main script file
*
*
*/
var sb = {
var hp = {
init: function() {
// Properly format any alert boxes
$('.alert-data').alert();
// Properly format any tab widgets
$('.tabs').tabs();
// Display popovers on all configured items
$("a[rel=popover]").popover({
offset: 10,
html: true,
});
},
admin: {
init: function() {
$('#confirm_delete').modal({
backdrop: true,
keyboard: true
});
$('#confirm_delete_cancel').click(function() {
$('#confirm_delete').modal('hide');
});
},
deleteItem: function(url) {
$('#confirm_delete_do').click(function() {
sb.request.post(url);
});
$('#confirm_delete').modal('show');
},
},
usercp: {
init: function() {
$('#usercp_newpassword,#usercp_confirmpassword').bind('keyup', sb.usercp.checkPassword);
},
checkPassword: function() {
password = $('#usercp_newpassword');
confirm = $('#usercp_confirmpassword');
confirm_container = confirm.parent().parent();
if (password.val() == confirm.val()) {
console.log("passwords match");
confirm_container.removeClass('error').addClass('success');
$('#usercp_confirmpassword_help').hide();
} else {
console.log("passwords do not match");
confirm_container.addClass('error').removeClass('success');
$('#usercp_confirmpassword_help').show();
}
}
},
request: {
post: function(url, data) {
console.log('Posting');
var form = $('<form />').attr('method', 'post').attr('action', url);
for (var key in data) {
form.appendChild($('<input type="hidden">').attr('name', key).val(data[key]));
}
form.submit();
}
}
};
$('document').ready(sb.init);
$('document').ready(hp.init);

View File

@@ -2,15 +2,11 @@
* StatusBoard normal stylesheet
*
*/
@import url('http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css');
@CHARSET "UTF-8";
@media all {
body {
margin: 0em;
margin-top: 60px;
padding-top: 40px;
padding: 0em;
font-family: verdana, helvetica, sans-serif;
background: #F7F7F7;
}
@@ -55,6 +51,17 @@
list-style: none;
margin-left: 0px;
}
/*
CV
*/
#cv div.row {
margin-bottom: 1.0em;
}
#cv h4 {
margin-top: 0.75em;
}
}
@media print {

View File

@@ -1,12 +1,12 @@
<h2 class="no-print">Curriculum Vitae</h2>
<div class="container">
<div class="container" id="cv">
<div class="row no-print">
<div class="span4 column">
<div class="span2 column">
<h3>Download</h3>
</div>
<div class="span12 column">
<div class="span10 column">
<p>
<a href="{$base_uri}files/BenRobertsCv.pdf" title="Ben Roberts' CV">
<img src="{$base_uri}images/acrobat.png" alt="Download PDF copy of Ben Roberts' CV" style="width: 3em; height: 3em; vertical-align: middle;" />
@@ -18,10 +18,10 @@
</div>
<div class="row" id="personal-info">
<div class="span4 column">
<div class="span2 column">
<h3>Personal Information</h3>
</div>
<div class="span12 column">
<div class="span10 column">
<dl>
<dt>Full Name</dt>
<dd><p>Benjamin Austin Roberts</p></dd>
@@ -39,20 +39,20 @@
</div>
<div class="row" id="employment">
<div class="span4 column">
<div class="span2 column">
<h3>Employment</h3>
</div>
<div class="span12 column">
<div class="span10 column">
<ol class="employment">
<li>
<h4>
Atos IT Services UK
<small>July 2010 - Present</small>
</h4>
<h5>Graduate Technical Specialist</h5>
<h5>Network Technical Specialist - Major Projects</h5>
<p>
Design and implementation of network solutions for Atos customers in the Transport and Financial
Services industries.
Services industries.
</p>
<p>
Installed, configured and managed an out of band console service for remote management of core
@@ -114,11 +114,11 @@
</div>
<div class="row" id="certification">
<div class="span4 column">
<div class="span2 column">
<h3>Certification</h3>
</div>
<div class="span12 column">
<table>
<div class="span10 column">
<table class="table">
<thead>
<tr>
<th>Certification</th>
@@ -136,17 +136,17 @@
</div>
<div class="row" id="education">
<div class="span4 column">
<div class="span2 column">
<h3>Education</h3>
</div>
<div class="span12 column">
<div class="span10 column">
<ol class="education">
<li>
<h4>
University of Southampton
<small>October 2005 - June 2010</small>
</h4>
<table>
<table class="table">
<thead>
<tr>
<th>Subject</th>
@@ -173,7 +173,7 @@
<small>September 2003 - June 2005</small>
</h4>
<table>
<table class="table">
<thead>
<tr>
<th>Subject</th>
@@ -211,10 +211,10 @@
</div>
<div class="row" id="skills">
<div class="span4 column">
<div class="span2 column">
<h3>Skills</h3>
</div>
<div class="span12 column">
<div class="span10 column">
<dl>
<dt>Networking<dt>
<dd>
@@ -247,7 +247,7 @@
<li>Installation, configuration and operation of Operating Systems (Linux [many distributions], Windows, Mac OS X).</li>
<li>Writing and maintaining Linux software packages and package repositories (Gentoo Portage, Sabayon Entropy)</li>
<li>System automation (Puppet, Molecule, Kickstart).</li>
<li>Virtualisation (KVM, libvirt, VMWare)</li>
<li>Virtualisation (KVM, libvirt, Ganeti, VMWare/ESX)</li>
</ul>
</p>
<p>
@@ -297,10 +297,10 @@
</div>
<div class="row" id="interests">
<div class="span4 column">
<div class="span2 column">
<h3>Interests</h3>
</div>
<div class="span12 column">
<div class="span10 column">
<p>
I am a supporter of the opensource movement, and try to use free/libre software
and code where I can. I also release all my code under free licenses where possible
@@ -330,4 +330,4 @@
</div>
</div>
</div>
</div>

View File

@@ -22,7 +22,7 @@
</p>
<p>
You can contact me via {mailto address="me@benroberts.net" encode="hex"}, or via one of the Social Media sites listedon the top bar.
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>

View File

@@ -5,6 +5,7 @@
<!-- JQuery //-->
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
<link type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/smoothness/jquery-ui.css" rel="Stylesheet" />
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script>
<!-- JQuery Plugins //-->
<script type="text/javascript" src="{$base_uri}scripts/3rdparty/jquery.chained.js"></script>
@@ -13,6 +14,8 @@
<script type="text/javascript" src="{$base_uri}scripts/3rdparty/less-1.1.5.min.js"></script>
<!-- Bootstrap //-->
<link rel="stylesheet/less" href="{$base_uri}less/bootstrap.less" media="all" />
<link type="text/css" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.css" rel="stylesheet" />
<script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-alerts.js"></script>
<script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-twipsy.js"></script>
<script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-popover.js"></script>
@@ -21,25 +24,22 @@
<script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-modal.js"></script>
<!-- Local //-->
<script type="text/javascript" src="{$base_uri}scripts/main.js"></script>
<link type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/smoothness/jquery-ui.css" rel="Stylesheet" />
<link rel="stylesheet/less" href="{$base_uri}less/bootstrap.less" media="all" />
<link rel="stylesheet" type="text/css" href="{$base_uri}styles/normal.css" />
<script type="text/javascript" src="{$base_uri}scripts/main.js"></script>
</head>
<body>
<div class="topbar no-print">
<div class="topbar-inner">
<div class="navbar navbar-fixed-top no-print">
<div class="navbar-inner">
<div class="container-fluid">
{$page->include_template('navigation')}
</div><!-- /tobar-inner -->
</div><!-- /navbar-inner -->
</div><!-- /container-fliud -->
</div><!-- /topbar -->
<div class="container">
<div class="row">
<div class="span16">
<div class="span12">
<h1>
Ben Roberts
<small>MEng Computer Science @ ecs.soton.ac.uk</small>
@@ -80,11 +80,10 @@
Powered by
<a href="https://github.com/optiz0r/homepage/" title="Homepage">Homepage</a>
and <a href="https://github.com/optiz0r/sihnon-php-lib/" title="Sihnon PHP Library">Sihnon PHP Lib</a>
written by Ben Roberts.
written by <a xmlns:cc="http://creativecommons.org/ns#" href="http://benroberts.net" property="cc:attributionName" rel="cc:attributionURL">Ben Roberts</a>.
<br />
This work by <a xmlns:cc="http://creativecommons.org/ns#" href="http://benroberts.net" property="cc:attributionName" rel="cc:attributionURL">Ben Roberts</a>
is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.
This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.
<br />
<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">

View File

@@ -10,7 +10,10 @@
</li>
<li class="dropdown {if $requested_page == "projects"}active{/if}" data-dropdown="dropdown">
<a href="#" class="dropdown-toggle" title="Projects">Projects</a>
<a href="#" class="dropdown-toggle" title="Projects">
Projects
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="{$base_uri}projects/" title="Projects Home">Home</a></li>
<li><a href="https://wiki.sihnon.net/" title="Sihnon Wiki">Sihnon Wiki</a></li>
@@ -24,16 +27,22 @@
</li>
<li class="dropdown" data-dropdown="dropdown">
<a href="#" class="dropdown-toggle" title="Code">Code</a>
<a href="#" class="dropdown-toggle" title="Code">
Code
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="https://git.sihnon.net/" title="Sihnon Git Repository Browser">Sihnon Git Repository Browser</a></li>
<li><a href="https://subversion.sihnon.net/" title="Sihnon SVN Repository Browser">Sihnon Subversion Repository Browser</a></li>
<li><a href="http://github.com/optiz0r/" title="GitHub Repositores">GitHub Repositories</a></li>
<li><a href="https://git.sihnon.net/" title="Sihnon Git Repository Browser">Git Repositories</a></li>
<li><a href="https://subversion.sihnon.net/" title="Sihnon SVN Repository Browser">Subversion Repositories</a></li>
</ul>
</li>
<li class="dropdown" data-dropdown="dropdown">
<a href="#" class="dropdown-toggle" title="Social Media">Social Media</a>
<a href="#" class="dropdown-toggle" title="Social Media">
Social Media
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="https://twitter.com/optiz0r" title="optiz0r on Twitter">Twitter</a></li>
<li><a href="https://plus.google.com/104283756158326784792/about" title="Ben Roberts on Google+">Google+</a></li>

View File

@@ -7,7 +7,7 @@
<div class="container">
<div class="row">
<div class="span10 column">
<div class="span7 column">
<h3>Features</h3>
<ul>
<li>Database abstraction</li>
@@ -20,13 +20,13 @@
<li>Input Validation</li>
</ul>
</div>
<div class="span6 column">
<img class="span6" src="{$base_uri}images/sihnon-framework/overview.png" alt="SihnonFramework Overview" />
<div class="span5 column">
<img class="span5" src="{$base_uri}images/sihnon-framework/overview.png" alt="SihnonFramework Overview" />
</div>
</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:

View File

@@ -8,7 +8,7 @@
<div class="container">
<div class="row">
<div class="span8 column">
<div class="span7 column">
<h3>Features</h3>
<ul>
<li>Customisable list of Services and Sites.</li>
@@ -17,13 +17,13 @@
<li>Full admin UI.</li>
</ul>
</div>
<div class="span8 column">
<img class="span8" src="{$base_uri}images/status-board/overview.png" alt="StatusBoard Overview" />
<div class="span5 column">
<img class="span5" src="{$base_uri}images/status-board/overview.png" alt="StatusBoard Overview" />
</div>
</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: