Merge branch 'development' into IDI-99

equipment-details.php

@@ -0,0 +1,27 @@
+<?php
+/*
+Template Name: Equipment List Details
+*/
+?>
+<?php get_header(); ?>
+
+<?php if ( is_user_logged_in() ): ?>
+<?php if(have_posts()) { the_post(); } ?>
+<div class="fl-centered fl-col-mixed fl-site-wrapper idi-equipment">
+    <div class="fl-col-fixed fl-force-left">
+        <?php get_sidebar('equipment');?>
+        <?php get_sidebar('equipment-categories');?>
+    </div>
+    <div id="content" class="fl-col-flex idi-3cols">
+    	<div class="idi-breadcrumbs">
+			<a href="<?php echo get_home_url(); ?>/booking/equipment">Back to Equipment</a>
+    	</div>
+		<h2><?php the_title(); ?></h2>
+
+		<?php the_content(); ?>
+	</div>
+</div> 
+<?php else: ?>
+	<p>You must login to view this content.</p>
+<?php endif; ?>
+<?php get_footer(); ?>

equipment.php

@@ -5,21 +5,24 @@
 ?>
 <?php get_header(); ?>
 
+<?php if ( is_user_logged_in() ): ?>
 <div class="idi-equipment fl-centered fl-col-mixed fl-site-wrapper">
     <div class="fl-col-fixed fl-force-left">
         <?php get_sidebar('equipment');?>
     </div>
-    <div id="content" class="fl-col-flex idi-two-column">
+    <div id="content" class="fl-col-flex idi-3cols">
 		<h2>Equipment</h2>
 		<ul class="fl-grid">
 			<li><a href="<?php echo get_home_url(); ?>/booking/equipment/keyboards"><img src="<?php bloginfo('stylesheet_directory');?>/images/people/peopleplaceholder.png"/>Keyboards</a></li>
 			<li><a href="<?php echo get_home_url(); ?>/booking/equipment/pointing-devices"><img src="<?php bloginfo('stylesheet_directory');?>/images/people/peopleplaceholder.png"/>Pointing devices</a></li>
 			<li><a href="<?php echo get_home_url(); ?>/booking/equipment/displays"><img src="<?php bloginfo('stylesheet_directory');?>/images/people/peopleplaceholder.png"/>Displays</a></li>
-			<li><img src="<?php bloginfo('stylesheet_directory');?>/images/people/peopleplaceholder.png"/>Magnifiers</li>
-			<li><img src="<?php bloginfo('stylesheet_directory');?>/images/people/peopleplaceholder.png"/>Cameras</li>
+			<li><a href="<?php echo get_home_url(); ?>/booking/equipment/magnifiers"><img src="<?php bloginfo('stylesheet_directory');?>/images/people/peopleplaceholder.png"/>Magnifiers</a></li>
+			<li><a href="<?php echo get_home_url(); ?>/booking/equipment/cameras"><img src="<?php bloginfo('stylesheet_directory');?>/images/people/peopleplaceholder.png"/>Cameras</a></li>
 		</ul>
 	</div>
-
 </div>
+<?php else: ?>
+	<p>You must login to view this content.</p>
+<?php endif; ?>
 
 <?php get_footer(); ?>