From 94da855782e3f2d76c20763ef92131ea5f8766f9 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Fri, 20 Jan 2012 20:25:39 +0000 Subject: [PATCH 1/5] Remove erroneously copied javascript code from previous project --- public/scripts/main.js | 80 +++--------------------------------------- 1 file changed, 4 insertions(+), 76 deletions(-) diff --git a/public/scripts/main.js b/public/scripts/main.js index 23c3a78..7e65543 100644 --- a/public/scripts/main.js +++ b/public/scripts/main.js @@ -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 = $('
').attr('method', 'post').attr('action', url); - for (var key in data) { - form.appendChild($('').attr('name', key).val(data[key])); - } - - form.submit(); - } - - } - }; -$('document').ready(sb.init); +$('document').ready(hp.init); From 89083e74697318ff3575c8bfb7d5e19c84a9448f Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sun, 5 Feb 2012 23:26:49 +0000 Subject: [PATCH 2/5] Update to Bootstrap 2.0 --- public/styles/normal.css | 15 +++++--- source/webui/templates/cv.tpl | 36 +++++++++---------- source/webui/templates/index.tpl | 21 ++++++----- source/webui/templates/navigation.tpl | 19 +++++++--- .../templates/projects/sihnon-framework.tpl | 8 ++--- .../webui/templates/projects/status-board.tpl | 8 ++--- 6 files changed, 61 insertions(+), 46 deletions(-) diff --git a/public/styles/normal.css b/public/styles/normal.css index fd1de03..a8549ab 100644 --- a/public/styles/normal.css +++ b/public/styles/normal.css @@ -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 { diff --git a/source/webui/templates/cv.tpl b/source/webui/templates/cv.tpl index 947b992..7dba895 100644 --- a/source/webui/templates/cv.tpl +++ b/source/webui/templates/cv.tpl @@ -1,12 +1,12 @@

Curriculum Vitae

-
+
-
+

Download

-
+

Download PDF copy of Ben Roberts' CV @@ -18,10 +18,10 @@

-
+

Personal Information

-
+
Full Name

Benjamin Austin Roberts

@@ -39,10 +39,10 @@
-
+

Employment

-
+

  1. @@ -114,11 +114,11 @@

-
+

Certification

-
- +
+
@@ -136,17 +136,17 @@
-
+

Education

-
+

  1. University of Southampton October 2005 - June 2010

    -
Certification
+
@@ -173,7 +173,7 @@ September 2003 - June 2005 -
Subject
+
@@ -211,10 +211,10 @@
-
+

Skills

-
+
Networking
@@ -297,10 +297,10 @@
-
+

Interests

-
+

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 diff --git a/source/webui/templates/index.tpl b/source/webui/templates/index.tpl index fd6f172..78cadc1 100644 --- a/source/webui/templates/index.tpl +++ b/source/webui/templates/index.tpl @@ -5,6 +5,7 @@ + @@ -13,6 +14,8 @@ + + @@ -21,25 +24,22 @@ - - - - + -

-
+
+
{$page->include_template('navigation')} -
+
-
+

Ben Roberts MEng Computer Science @ ecs.soton.ac.uk @@ -80,11 +80,10 @@ Powered by Homepage and Sihnon PHP Lib - written by Ben Roberts. + written by Ben Roberts.
- This work by Ben Roberts - is licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. + This work is licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
diff --git a/source/webui/templates/navigation.tpl b/source/webui/templates/navigation.tpl index 4a4f9f9..6d962de 100644 --- a/source/webui/templates/navigation.tpl +++ b/source/webui/templates/navigation.tpl @@ -10,7 +10,10 @@
  • - Projects + + Projects + +
    • Home
    • Sihnon Wiki
      • @@ -24,16 +27,22 @@
    • - Code + + Code + +
    • - Social Media + + Social Media + +
      • Twitter
      • Google+
        • diff --git a/source/webui/templates/projects/sihnon-framework.tpl b/source/webui/templates/projects/sihnon-framework.tpl index e03552d..f3ef1e0 100644 --- a/source/webui/templates/projects/sihnon-framework.tpl +++ b/source/webui/templates/projects/sihnon-framework.tpl @@ -7,7 +7,7 @@
        -
        +

        Features

        • Database abstraction
          • @@ -20,13 +20,13 @@
        • Input Validation
        -
        - SihnonFramework Overview +
        + SihnonFramework Overview
        -
        +

        Source

        View or clone a copy of the Git repositories from one of the mirrors listed below: diff --git a/source/webui/templates/projects/status-board.tpl b/source/webui/templates/projects/status-board.tpl index 7af3281..8341616 100644 --- a/source/webui/templates/projects/status-board.tpl +++ b/source/webui/templates/projects/status-board.tpl @@ -8,7 +8,7 @@

        -
        +

        Features

        • Customisable list of Services and Sites.
          • @@ -17,13 +17,13 @@
        • Full admin UI.
        -
        - StatusBoard Overview +
        + StatusBoard Overview
        -
        +

        Source

        View or clone a copy of the Git repositories from one of the mirrors listed below: From fdc1cd5ee2a445697cd58f4d5783788fd457cc9e Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sun, 5 Feb 2012 23:28:10 +0000 Subject: [PATCH 3/5] Update virtualisation section on CV --- source/webui/templates/cv.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/webui/templates/cv.tpl b/source/webui/templates/cv.tpl index 7dba895..72a0596 100644 --- a/source/webui/templates/cv.tpl +++ b/source/webui/templates/cv.tpl @@ -247,7 +247,7 @@

      • Installation, configuration and operation of Operating Systems (Linux [many distributions], Windows, Mac OS X).
      • Writing and maintaining Linux software packages and package repositories (Gentoo Portage, Sabayon Entropy)
      • System automation (Puppet, Molecule, Kickstart).
        • -
      • Virtualisation (KVM, libvirt, VMWare)
        • +
      • Virtualisation (KVM, libvirt, Ganeti, VMWare/ESX)

      From eae5a1c1d4b32b99adb7d4d481f1846539681c2c Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Thu, 22 Mar 2012 23:17:14 +0000 Subject: [PATCH 4/5] Updated job title at Atos --- source/webui/templates/cv.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/webui/templates/cv.tpl b/source/webui/templates/cv.tpl index 72a0596..9c89ad5 100644 --- a/source/webui/templates/cv.tpl +++ b/source/webui/templates/cv.tpl @@ -49,10 +49,10 @@ Atos IT Services UK July 2010 - Present

    • -
    Graduate Technical Specialist
    +
    Network Technical Specialist - Major Projects

    Design and implementation of network solutions for Atos customers in the Transport and Financial - Services industries. + Services industries.

    Installed, configured and managed an out of band console service for remote management of core @@ -330,4 +330,4 @@

    -
    \ No newline at end of file +
    From 5926463012a84477d20778a33fc54407696fac39 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Fri, 6 Apr 2012 17:18:24 +0100 Subject: [PATCH 5/5] Fix typo on homepage --- source/webui/templates/home.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/webui/templates/home.tpl b/source/webui/templates/home.tpl index 10f4a53..afe480c 100644 --- a/source/webui/templates/home.tpl +++ b/source/webui/templates/home.tpl @@ -22,7 +22,7 @@

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

    Subject