website improvements wip

lib/resources/structured_content/json_organisations

@@ -1,2 +0,0 @@
-{"business_name":"Ebert-Hegmann","business_motto":"Total holistic monitoring","business_address":"1494 Hagenes Square, East Samir, North Dakota, 26077","domain":"sandra_coleman.com","office_telephone":"0500 870390","office_email":"nettie_doyle@kaulke.net","industry":"Recreational Goods, Other","manager":{"name":"Heather Schmidt","address":"800 Bogisich Avenue, Oswaldohaven, Highlands and Islands, Z9 6NB","phone_number":"07836 581948","email_address":"rosalinda@hillsmoore.name","username":"short-channel","password":"joshua"},"employees":[{"name":"Zion Jacobson","address":"104 Cole Square, North Kamren, Kent, WS8 3NL","phone_number":"07880 057670","email_address":"charlotte.wyman@colerunolfsdottir.org","username":"spooky-hall","password":"UeYtdks7bM6t5ZID38h"},{"name":"Jonathan Ray","address":"6444 Jackson Path, Lake Libbieburgh, Hertfordshire, R3A 0LY","phone_number":"(270) 317-5032","email_address":"vivienne@becker.net","username":"scientific_bells","password":"mona"},{"name":"Virginia Sullivan","address":"51413 Roberts Trail, Dinoberg, Florida, 86873","phone_number":"07826 576277","email_address":"dicki-jarret@eichmann-feest-and-towne.org","username":"typicalcoil","password":"letmein"}],"product_name":"Stim","intro_paragraph":["Ex ut excepturi consequatur. Ut est nihil fugiat veritatis aut voluptas. Ipsum rerum omnis rerum.Rerum ipsam et. Et ipsum ut. Illum ullam officiis corrupti ducimus sed sit dolor.Libero iusto amet. Perspiciatis quia qui ut dolorem. Ut et sit rerum. Dignissimos quaerat dolores ad et praesentium nemo. Et reiciendis est.Illum facere praesentium mollitia natus. Ullam velit modi vel sed. Consequuntur eum animi facilis dolores tempore. A corrupti nulla aut et.Ea asperiores impedit pariatur. Deserunt explicabo cupiditate quasi animi quidem. Ipsam non et explicabo tempora et facere eos. Voluptatem suscipit nulla non alias asperiores culpa non."]}
-{"business_name":"Davis, Ortiz and Lang","business_motto":"Centralized next generation archive","business_address":"3180 Kirlin Roads, East Darrickfurt, Shropshire, ZH7B 9UB","domain":"gary_clark.co.uk","office_telephone":"0181 101 2503","office_email":"garry_huels@macgyverkeler.biz","industry":"Electronics Stores","manager":{"name":"Tyree Wilkinson","address":"39570 Lucy Center, Maiyamouth, Rhode Island, 62120","phone_number":"0800 327525","email_address":"sanford-karlie@welch-bogan-and-swaniawski.co.uk","username":"unable-note","password":"waste15"},"employees":[{"name":"Aurelia MacGyver","address":"4848 Cummerata Haven, New Faustino, Georgia, 24461","phone_number":"484-475-9067","email_address":"phd-jettie-johns@brekke-group.org","username":"eatabledrum","password":"XK7W2lUQ5IyL9RG7KAg"},{"name":"Laura Hansen","address":"79260 Purdy Inlet, New Flavieburgh, Shropshire, ZE27 2NJ","phone_number":"0121 088 7581","email_address":"nick_hilll@hoppehayes.com","username":"idioticstomach","password":"petSmiMQTPFgNsHoiIcb"},{"name":"Louis Edwards","address":"79118 Ratke Heights, Lake Boville, County Down, W2N 3AQ","phone_number":"0131 129 1078","email_address":"jarvis-halvorson@ankunding-parker.com","username":"guiltless_string","password":"crowd32"}],"product_name":"Tres-Zap","intro_paragraph":["Impedit ipsa aut omnis et aut. Blanditiis non et assumenda. Molestias porro ut id aut facere praesentium beatae.Enim aliquam totam commodi aspernatur. Non fuga dolorem voluptas qui. Nulla aliquam iusto enim rem non laborum voluptas. Vitae veritatis sint maiores.Animi est perspiciatis aut amet placeat corporis dolorem. Nisi eos odit eius. Aut accusamus magnam aut consequatur mollitia ea. Illum officia non voluptatum fuga quasi.Est et eos. Et quia aut consequatur neque. Deleniti culpa aliquam excepturi.Sint at est non harum porro. Quo beatae facilis fugiat occaecati hic aut. Laudantium aut cumque quia tempora."]}

lib/resources/structured_content/organisations/json_organisations

@@ -0,0 +1,9 @@
+{"business_name":"Artisan Bakery","business_motto":"The loaves are in the oven.","business_address":"1080 Headingley Lane, Headingley, Leeds, LS6 1BN","domain":"artisan-bakery.co.uk","office_telephone":"0113 222 1080","office_email":"orders@artisan-bakery.co.uk","industry":"Bakers","manager":{"name":"Maxie Durgan","address":"1080 Headingley Lane, Headingley, Leeds, LS6 1BN","phone_number":"0113 222 1080","email_address":"maxie@artisan-bakery.co.uk","username":"maxie","password":""},"employees":[{"name":"Matthew Riley","address":"1080 Headingley Lane, Headingley, Leeds, LS6 1BN","phone_number":"0113 222 1080","email_address":"matt@artisan-bakery.co.uk","username":"matt","password":""},{"name":"Emelie Lowe","address":"1080 Headingley Lane, Headingley, Leeds, LS6 1BN","phone_number":"0113 222 1080","email_address":"emelie@artisan-bakery.co.uk","username":"emelie","password":""},{"name":"Antonio Durgan","address":"1080 Headingley Lane, Headingley, Leeds, LS6 1BN","phone_number":"0113 222 1080","email_address":"antonio@artisan-bakery.co.uk","username":"antonio","password":""}],"product_name":"Baked goods","intro_paragraph":["Finest bakery in Headingley since 1900. Baked fresh daily. Bread loaves, teacakes, sweet and savoury treats. We are open from 9 am til 6 pm, every day except for bank holidays."]}
+{"business_name":"Northern Banking","business_motto":"We'll keep your money safe!","business_address":"123 The Headrow, Leeds, LS1 5RD","domain":"northernbanking.co.uk","office_telephone":"0113 000 0123","office_email":"enquiries@northernbanking.co.uk","industry":"Finance","manager":{"name":"Heather Schmidt","address":"800 Bogisich Avenue, Oswaldohaven, Leeds, LS9 6NB","phone_number":"07836 581948","email_address":"h.schmidt@northernbanking.co.uk","username":"h_schmidt","password":""},"employees":[{"name":"Zion Jacobson","address":"104 Cole Square, ","phone_number":"07880 057670","email_address":"z.jacobson@northernbanking.co.uk","username":"z_jacobson","password":""},{"name":"Jonathan Ray","address":"644 Jackson Path, Leeds, LS2 4AJ","phone_number":"07893 001623","email_address":"j.ray@northernbanking.co.uk","username":"j_ray","password":""},{"name":"Virginia Sullivan","address":"23 Jane Street, Harrogate, HG1 4DJ","phone_number":"07826 576277","email_address":"v.sullivan@northernbanking.co.uk","username":"v_sullivan","password":""}],"product_name":"Financial Services","intro_paragraph":["About Northern Bank","With roots back to its establishment in Huddersfield, West Yorkshire in 1805. Northern bank has a strong personal customer base and business banking capability though a UK-wide network. Northern Bank is a trading name of Big Bank PLC."]}
+{"business_name":"The Yorkshire Fitness Company","business_motto":"Get thi sen down't gym!","business_address":"15 Sheepscar Court, Leeds LS7 2BB","domain":"yorkshirefitco.co.uk","office_telephone":"0113 026 9999","office_email":"office@yorkshirefitco.co.uk","industry":"Health and Fitness","manager":{"name":"Jerry Rivera","address":"15 Sheepscar Court, Leeds LS7 2BB","phone_number":"0113 026 9999","email_address":"jerry.rivera@yorkshirefitco.co.uk","username":"jerry_rivera","password":""},"employees":[{"name":"Immanuel Bahringer IV","address":"15 Sheepscar Court, Leeds LS7 2BB","phone_number":"07688 112479","email_address":"immanuel.bahringer.iv@yorkshirefitco.co.uk","username":"immanuel_bahringer_iv","password":""},{"name":"Anne Hunter","address":"15 Sheepscar Court, Leeds LS7 2BB","phone_number":"07791 179177","email_address":"anne.hunter@yorkshirefitco.co.uk","username":"anne_hunter","password":""},{"name":"Katelin Langworth","address":"15 Sheepscar Court, Leeds LS7 2BB","phone_number":"07550 561978","email_address":"katelin.langworth@yorkshirefitco.co.uk","username":"katelin_langworth","password":""}],"product_name":"","intro_paragraph":["Experience Yorkshire's leading health and fitness club in the not far from the city centre. Established in 1990 The Yorkshire Fitness Company is committed to getting you the results you want.","If you like classes, the gym or a combo of both, our dedicated professional team of coaches & teachers are always available to motivate you and guide you towards your goals."]}
+{"business_name":"Abacus Technology Solutions","business_motto":"Solving your problems so you don't have to.","business_address":"Unit 12, Lincoln St, Huddersfield HD1 6RX","domain":"abacus-technology.co.uk","office_telephone":"01484 850963","office_email":"office@abacus-technology.co.uk","industry":"IT Services","manager":{"name":"Ellie Bosco","address":"Office 1, Unit 12, Lincoln St, Huddersfield HD1 6RX","phone_number":"07528 347828","email_address":"e.bosco@abacus-technology.co.uk","username":"ebosco","password":""},"employees":[{"name":"Keara Harris","address":"Office 2, Unit 12, Lincoln St, Huddersfield HD1 6RX","phone_number":"07674 358645","email_address":"k.harris@abacus-technology.co.uk","username":"kharris","password":""},{"name":"Janessa Rempel","address":"Office 2, Unit 12, Lincoln St, Huddersfield HD1 6RX","phone_number":"07644 118595","email_address":"j.rempel@abacus-technology.co.uk","username":"jrempel","password":""},{"name":"Russell Ramirez","address":"Office 3, Unit 12, Lincoln St, Huddersfield HD1 6RX","phone_number":"01484 850963","email_address":"r.ramirez@abacus-technology.co.uk","username":"rramirez","password":""}],"product_name":"IT Solutions","intro_paragraph":["Providers of cloud services, backups, data recovery, hardware, off-the-shelf and bespoke software. 24/7 technical support available. Custom design and installation based on your companies needs!"]}
+{"business_name":"Leeds Beckett- Computer Forensics and Security","business_motto":"","business_address":"43 Church Wood Ave, Leeds LS16 5LF","domain":"leedsbeckett.ac.uk","office_telephone":"0113 81 23000","office_email":"study@leedsbeckett.ac.uk","industry":"Higher Education","manager":{"name":"Emlyn Butterfield","address":"115, Caedmon Hall, Headingley Campus","phone_number":"0113 81 24440","email_address":"E.Butterfield@leedsbeckett.ac.uk","username":"ebutterfield","password":""},"employees":[{"name":"Dr. Z. Cliffe Schreuders","address":"105, Caedmon Hall, Headingley Campus","phone_number":"0113 81 28608","email_address":"C.Schreuders@leedsbeckett.ac.uk","username":"zschreuders","password":""},{"name":"Dr. Maurice Calvert","address":"117, Caedmon, Headingley Campus","phone_number":"0113 81 27429","email_address":"M.Calvert@leedsbeckett.ac.uk","username":"mcalvert","password":""},{"name":"Dr. John Elliott","address":"108, Caedmon, Headingley Campus","phone_number":"0113 81 27379","email_address":"J.Elliott@leedsbeckett.ac.uk","username":"jelliott","password":""}],"product_name":"University Education","intro_paragraph":["Computer forensics involves the analysis of digital devices such as hard drives to identify and investigate their contents. Computer security involves using knowledge of computer systems and networks to protect businesses and users from malicious attacks.","This course combines these two fields of national importance and will teach you practical investigative and 'hacking' techniques. You will develop the skills to undertake rigorous forensic analysis and implement robust security mechanisms.","This is a hands-on course where you will learn through doing, gaining an in-depth knowledge of how to hack a computer to be able to protect it. You will learn where a computer hides data and how to recover information from a device."]}
+{"business_name":"Leeds Beckett- Leeds Law School","business_motto":"","business_address":"City Campus, Leeds LS1 3HE","domain":"leedsbeckett.ac.uk","office_telephone":"0113 81 23000","office_email":"study@leedsbeckett.ac.uk","industry":"Higher Education","manager":{"name":"Deveral Capps","address":"306, Portland Building, City Campus","phone_number":"0113 81 26085","email_address":"d.capps@leedsbeckett.ac.uk","username":"d_capps","password":""},"employees":[{"name":"Dr. Simon Hale-Ross","address":"306, Portland Building, City Campus","phone_number":"0113 8129526","email_address":"S.Haleross@leedsbeckett.ac.uk","username":"s_haleross","password":""},{"name":"Professor Simon Gardiner","address":"204, Rose Bowl, City Campus","phone_number":"0113 81 26414","email_address":"S.Gardiner@leedsbeckett.ac.uk","username":"s_gardiner","password":""},{"name":"Dr. Jessica Guth","address":"306, Portland Building, City Campus","phone_number":"0113 81 26403","email_address":"J.Guth@leedsbeckett.ac.uk","username":"j_guth","password":""}],"product_name":"University Education","intro_paragraph":["Our Law School sits in the heart of the great city of Leeds, the most important legal centre outside London and home to over 180 law firms employing in excess of 8,000 professionals. It is perfectly placed to ensure all our undergraduate, postgraduate, full and part-time students are able to mine the wealth of practical experience and employment opportunities available on our doorstep.","With state-of-the-art facilities, mentoring and career development opportunities, placements and a courtroom, students who choose Leeds Law School can expect a successful career founded on high calibre, practical teaching. We offer a broad variety of courses including our LLB, LLM Legal Practice (incorporating the LPC), LLM Qualifying Law Degree (incorporating the GDL) and LLM International Business Law, and each aims to give our graduates the enthusiasm, sharpness of mind and practical tools to thrive in competitive and fast-paced professional environments."]}
+{"business_name":"Leeds Beckett- Music and Performing Arts","business_motto":"","business_address":"43 Church Wood Ave, Leeds LS16 5LF","domain":"leedsbeckett.ac.uk","office_telephone":"0113 81 23000","office_email":"study@leedsbeckett.ac.uk","industry":"Higher Education","manager":{"name":"Dr Richard Stevens","address":"209, Caedmon, Headingley Campus","phone_number":"0113 81 23690","email_address":"R.C.Stevens@leedsbeckett.ac.uk","username":"r_stevens","password":""},"employees":[{"name":"Dr. Laura Griffiths","address":"Reception, Priestley Hall, Headingley Campus","phone_number":"n/a","email_address":"Laura.Griffiths@leedsbeckett.ac.uk","username":"l_griffiths","password":""},{"name":"Carl Flattery","address":"104, Caedmon, Headingley Campus","phone_number":"0113 81 27372","email_address":"C.Flattery@leedsbeckett.ac.uk","username":"c_flattery","password":""},{"name":"Sam Nicholls","address":"212, Caedmon, Headingley Campus","phone_number":"0113 81 23726","email_address":"S.Nicholls@leedsbeckett.ac.uk","username":"s_nicholls","password":""}],"product_name":"University Education","intro_paragraph":["The School of Film, Music & Performing Arts fosters a culture of creation and participation. We are proud shapers of, and contributors to, the cultural life of this great Northern city – a city that is the original birthplace of film. We nurture the arts pioneers of the future: influencers who will not just reflect the outside world, but impact upon it."]}
+{"business_name":"Yorkshire Personal Health","business_motto":"We'll have you as good as new in no time.","business_address":"159 Longlands St, Bradford BD1 2PX","domain":"yorkspersonalhealth.co.uk","office_telephone":"01274 200700","office_email":"info@yorkspersonalhealth.co.uk","industry":"Medical Services","manager":{"name":"Angela Dickinson","address":"76103 Joshuah Path, Port Magali, Cambridgeshire, R1 1TR","phone_number":"01274 200700 ext 100","email_address":"a.dickinson@yorkspersonalhealth.co.uk","username":"dickinson_a","password":""},"employees":[{"name":"Abdullah Carroll","address":"Office A, 160 Longlands St, Bradford BD1 2PX","phone_number":"01274 200700 ext 101","email_address":"a.carroll@yorkspersonalhealth.co.uk","username":"carroll_a","password":""},{"name":"Annie Williamson","address":"Office B, 160 Longlands St, Bradford BD1 2PX","phone_number":"01274 200700 ext 103","email_address":"a.williamson@yorkspersonalhealth.co.uk","username":"williamson_a","password":""},{"name":"Jammie Marks","address":"Office B, 160 Longlands St, Bradford BD1 2PX","phone_number":"01274 200700 ext 110","email_address":"j.marks@yorkspersonalhealth.co.uk","username":"marks_j","password":""}],"product_name":"Check up","intro_paragraph":["A health assessment is more than a check up. It can be the start of a journey towards better health.","We use our health expertise to build a clear picture of where your current health is and identify potential future health risks. After your health assessment, we’ll give you guidance and support to help you become healthier today and in the future."]}
+{"business_name":"Speedy Pizzas","business_motto":"Pizza done quick.","business_address":"195 Headingley Lane, Headingley, Leeds, LS6 1BN","domain":"speedypizzas.co.uk","office_telephone":"0113 123 3214","office_email":"info@speedypizzas.co.uk","industry":"Food","manager":{"name":"David Sand","address":"195 Headingley Lane, Headingley, Leeds, LS6 1BN","phone_number":"07879 635412","email_address":"dave@speedypizzas.co.uk","username":"d_sand","password":""},"employees":[{"name":"Cydney Hermann","address":"195 Headingley Lane, Headingley, Leeds, LS6 1BN","phone_number":"0113 123 3214","email_address":"cydney@speedypizzas.co.uk","username":"c_hermann","password":""},{"name":"Lori Marshall","address":"195 Headingley Lane, Headingley, Leeds, LS6 1BN","phone_number":"0113 123 3214","email_address":"lori@speedypizzas.co.uk","username":"l_marshall","password":""},{"name":"Andrea Martinez","address":"195 Headingley Lane, Headingley, Leeds, LS6 1BN","phone_number":"0113 123 3214","email_address":"andrea@speedypizzas.co.uk","username":"a_martinez","password":""}],"product_name":"Pizza","intro_paragraph":["Welcome to speedy pizzas. Piping hot food either in store or delivered to your door. Pizza takeaway, parmesan, kebabs and much more.","We are based in the centre of Headingley on Headingley lane and will deliver up to 3 miles for free, £1 per additional mile. Red hot pizza on delivery or your money back."]}

modules/services/unix/http/parameterised_website/manifests/install.pp

@@ -177,4 +177,11 @@ class parameterised_website::install {
     }
   }
 
+  file { "$docroot/themes/":
+    ensure => directory,
+    recurse => true,
+    source => 'puppet:///modules/parameterised_website/themes',
+    require => File[$docroot],
+  }
+
 }

modules/services/unix/http/parameterised_website/templates/acceptable_use_page.html.erb

@@ -4,6 +4,6 @@
 <body>
   <%= scope.function_template(['parameterised_website/subtemplates/navbar.html.erb']) %>
   <%= scope.function_template(['parameterised_website/subtemplates/acceptable_use_policy.html.erb']) %>
+  <%= scope.function_template(['parameterised_website/subtemplates/scripts.html.erb']) %>
 </body>
-<%= scope.function_template(['parameterised_website/subtemplates/footer.html.erb']) %>
 </html>

modules/services/unix/http/parameterised_website/templates/contact.html.erb

@@ -2,42 +2,42 @@
 <html>
 <%= scope.function_template(['parameterised_website/subtemplates/header.html.erb']) %>
 <body>
-<%= scope.function_template(['parameterised_website/subtemplates/navbar.html.erb']) %>
-<div id="main_container" class="container">
-  <div class="row">
-    <div class="col-lg-12">
-      <div class="intro-text">
-        <h1 class="name"><%= @business_name %></h1>
-        <hr class="star-light">
-        <h3> <%= @business_motto %></h3>
-      </div>
+  <%= scope.function_template(['parameterised_website/subtemplates/navbar.html.erb']) %>
+  <div id="main_container" class="container">
+    <div class="row">
+      <div class="col-lg-12">
+        <div class="intro-text">
+          <h1 class="name"><%= @business_name %></h1>
+          <hr class="star-light">
+          <h3> <%= @business_motto %></h3>
+        </div>
 
-      <div id="business_address">
-        <p><strong>Contact <%= @business_name %></strong></p>
-        <p>Address: <%= @business_address %></p>
-        <p>Telephone: <%= @office_telephone %></p>
-        <p>Email: <%= @office_email %></p>
-      </div>
+        <div id="business_address">
+          <p><strong>Contact <%= @business_name %></strong></p>
+          <p>Address: <%= @business_address %></p>
+          <p>Telephone: <%= @office_telephone %></p>
+          <p>Email: <%= @office_email %></p>
+        </div>
 
-      <div id="manager">
-        <h4>Manager</h4>
-        <p><%= @manager_profile['name'] %></p>
-        <p><%= @manager_profile['phone_number'] %></p>
-        <p><%= @manager_profile['email_address'] %></p>
-      </div>
+        <div id="manager">
+          <h4>Manager</h4>
+          <p><%= @manager_profile['name'] %></p>
+          <p><%= @manager_profile['phone_number'] %></p>
+          <p><%= @manager_profile['email_address'] %></p>
+        </div>
 
-        <h4>Employees</h4>
-        <% @employees.each do |employee| -%>
-            <p><strong><%= employee['name'] %></strong></p>
-            <p><%= employee['phone_number'] %></p>
-            <p><%= employee['email_address'] %></p>
-            <p/>
+          <h4>Employees</h4>
+          <% @employees.each do |employee| -%>
+              <p><strong><%= employee['name'] %></strong></p>
+              <p><%= employee['phone_number'] %></p>
+              <p><%= employee['email_address'] %></p>
+              <p/>
 
-        <% end %>
+          <% end %>
+        </div>
       </div>
     </div>
   </div>
-</div>
+  <%= scope.function_template(['parameterised_website/subtemplates/scripts.html.erb']) %>
 </body>
-<%= scope.function_template(['parameterised_website/subtemplates/footer.html.erb']) %>
 </html>

modules/services/unix/http/parameterised_website/templates/default.css.erb

@@ -1,13 +1,3 @@
-body {
-  background: #f8f8f8;
-  color: #666;
-  padding-top: 70px;
-}
-
-body p {
-  align-content: center
-}
-
 <% if @white_text -%>
 #white_text {
   color: white;

modules/services/unix/http/parameterised_website/templates/index.html.erb

@@ -8,6 +8,7 @@
 <body>
   <%= scope.function_template(['parameterised_website/subtemplates/navbar.html.erb']) %>
   <%= scope.function_template(['parameterised_website/subtemplates/main_container.html.erb']) %>
+  <%= scope.function_template(['parameterised_website/subtemplates/scripts.html.erb']) %>
+  <%= scope.function_template(['parameterised_website/subtemplates/scripts.html.erb']) %>
 </body>
-<%= scope.function_template(['parameterised_website/subtemplates/footer.html.erb']) %>
 </html>

modules/services/unix/http/parameterised_website/templates/intranet_index.html.erb

@@ -4,6 +4,6 @@
 <body>
   <%= scope.function_template(['parameterised_website/subtemplates/navbar.html.erb']) %>
   <%= scope.function_template(['parameterised_website/subtemplates/main_container.html.erb']) %>
+  <%= scope.function_template(['parameterised_website/subtemplates/scripts.html.erb']) %>
 </body>
-<%= scope.function_template(['parameterised_website/subtemplates/footer.html.erb']) %>
 </html>

modules/services/unix/http/parameterised_website/templates/security_audit_remit_page.html.erb

@@ -10,6 +10,6 @@
       </div>
     </div>
   </div>
+  <%= scope.function_template(['parameterised_website/subtemplates/scripts.html.erb']) %>
 </body>
-<%= scope.function_template(['parameterised_website/subtemplates/footer.html.erb']) %>
 </html>

modules/services/unix/http/parameterised_website/templates/subtemplates/footer.html.erb

@@ -1,7 +0,0 @@
-<footer>
-  <!-- Latest compiled JavaScript -->
-  <script type="text/javascript" src="js/jquery-1.12.4.js"></script>
-  <script type="text/javascript" src="js/jquery-ui.js"></script>
-  <script type="text/javascript" src="js/bootstrap.min.js"></script>
-  <script type="text/javascript" src="js/default.js"></script>
-</footer>

modules/services/unix/http/parameterised_website/templates/subtemplates/header.html.erb

@@ -7,8 +7,9 @@
   <title><%= $page_title %></title>
 
   <!-- Default stylesheet -->
+  <link rel="stylesheet" type="text/css" href="themes/cerulean.min.css" />
+  <!--<link rel="stylesheet" type="text/css" href="css/randomly_selected.css"/>-->
   <link rel="stylesheet" type="text/css" href="css/default.css"/>
-  <link rel="stylesheet" type="text/css" href="css/randomly_selected.css"/>
   <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css" />
 
 </head>

modules/services/unix/http/parameterised_website/templates/subtemplates/main_container.html.erb

@@ -13,7 +13,7 @@
       <% # Externally input / default style -%>
       <% elsif @manager_profile != '' or @employees[0] != '' or @business_address != ''-%>
           <h1><%= @business_name %></h1>
-          <h2><%= @product_name %></h2>
+          <p class="lead"><%= @product_name %></p>
           <p><%= @main_page_paragraph_content.join %></p>
     <% elsif @main_page_paragraph_content-%>
           <p><%= @main_page_paragraph_content.join %></p>

modules/services/unix/http/parameterised_website/templates/subtemplates/navbar.html.erb

@@ -1,16 +1,16 @@
-  <nav class="navbar navbar-inverse navbar-fixed-top">
+  <nav class="navbar navbar-expand-lg fixed-top navbar-dark bg-primary">
     <div class="container">
-      <div id="navbar" class="collapse navbar-collapse">
+      <div id="navbarResponsive" class="collapse navbar-collapse">
         <ul class="nav navbar-nav">
-          <li><a href="index.html">Home</a></li>
+          <li class="nav-item"><a class="nav-link" href="index.html">Home</a></li>
           <% if @organisation and @organisation != '' -%>
-          <li><a href="contact.html">Contact Us</a></li>
+          <li class="nav-item"><a class="nav-link" href="contact.html">Contact Us</a></li>
           <% end -%>
           <% if @security_audit -%>
-          <li><a href="security_audit_remit.html">Security Audit Remit</a></li>
+          <li class="nav-item"><a class="nav-link" href="security_audit_remit.html">Security Audit Remit</a></li>
           <% end -%>
           <% if @acceptable_use_policy -%>
-          <li><a href="acceptable_use_policy.html">Acceptable Use Policy</a></li>
+          <li class="nav-item"><a class="nav-link" href="acceptable_use_policy.html">Acceptable Use Policy</a></li>
           <% end -%>
         </ul>
       </div><!--/.nav-collapse -->

modules/services/unix/http/parameterised_website/templates/subtemplates/scripts.html.erb

@@ -0,0 +1,5 @@
+<!-- Latest compiled JavaScript -->
+<script type="text/javascript" src="js/jquery-1.12.4.js"></script>
+<script type="text/javascript" src="js/jquery-ui.js"></script>
+<script type="text/javascript" src="js/bootstrap.min.js"></script>
+<script type="text/javascript" src="js/default.js"></script>