adding new photos. Reworking the exhibit page

application/views/common/homeheader.php

@@ -71,8 +71,7 @@
     <div class="row-fluid">
       <div class="span12 logo-nav">
         <div class="container">
-          <h1 class="span3"><a href="/">Bruce Peel Special Collections &amp;
-Archives</a></h1>
+          <h1 class="span3"><a href="/">Bruce Peel Special Collections</a></h1>
           <ul class="main-nav span9">
                <li><a href="/exhibits">Exhibitions</a></li>
                 <li><a href="/collections" class="line">Research <br/> Collections</a></li>

application/views/exhibits/index.php

@@ -11,15 +11,10 @@
          </script>
       <?php endif?>
 
-<div class="row-fluid">
-        <div class="span12"><h2>Exhibitions</h2></div>  
-
-      </div>
-    </div>
-  </div>
-</div>
-<div class="row-fluid">
-  <div class="span12 main-content">
+        <div class="span5 main-content"><h2>Exhibitions</h2>
+
+
+
 
       <div class="current-exhibit">
         <h3><a name="current"></a>Current In-House Exhibition</h3>
@@ -51,18 +46,18 @@
               <?php endif?>  
       </div>
 
-    </div></div>
+
      <a href="/exhibits/past" class="myButton top-margin" id="past">Previous In-House Exhibitions</a>
-<div class="row-fluid top-margin">
-  <div class="span12 main-content">
-    <div class="container" id="collections">
-      <div class="row-fluid bottom-margin">
-         <h3><a name="online"></a>Digital Exhibitions</h3>
-       </div>
-       <div class="container" id="exhibits">
+     </div>
+
+
+  <div class="span7 main-content online-exhibits">
+
+         <h2>Digital Exhibitions</h2>
+
       <?php foreach ($exhibits as $exhibit_item): ?>
        <?php if ($exhibit_item['subjects'] == 'online'): ?>
-      	<div class="acollection <?php echo $exhibit_item['subjects'] ?> <?php echo str_replace(',', ' ', $exhibit_item['subjects']) ?> ">
+        <div class="acollection <?php echo $exhibit_item['subjects'] ?> <?php echo str_replace(',', ' ', $exhibit_item['subjects']) ?> ">
 
 
 
@@ -105,11 +100,6 @@
 
 <script>
 
-  var $container = $('#exhibits');
-   $container.isotope({
-      layoutMode : 'fitRows' 
-
-      });
   $(".acollection").hoverIntent(function () {
     $(this).find(".col-details").fadeToggle(600);
     return false;

application/views/pages/about.php

@@ -2,6 +2,7 @@
 <div class="row">
 	<div class="span7">
 				<h2>About Bruce Peel Special Collections</h2>
+					<img src="/assets/img/faq.jpg" class="hidden-phone on-now-image"/>
 
 		<p>Thanks to visionary collectors and generous donors, a range of important collections in 
 			Bruce Peel Special Collections treat numerous local and international subjects, from the Aboriginal peoples of North and South 

application/views/pages/contact.php

@@ -1,11 +1,11 @@
 
 <div class="row">
-	<h2>Contact Bruce Peel Special Collections</h2>
+
 	<div class="span9">
 		
 			<div class="row">
 				<div class="span9">
-					<img src="/assets/img/interior.jpg" class="contact-image hidden-phone"/>
+					<img src="/assets/img/contact.jpg" class="contact-image hidden-phone"/>
 					<strong> Mailing address:</strong><br/>
 					Bruce Peel Special Collections<br/>
 					University of Alberta<br/>

application/views/pages/home.php

@@ -10,7 +10,9 @@
                   houses a world class collection of more than 100,000 rare books and a significant collection of archival 
                   materials that explore a range of local and international subjects. Open on weekday afternoons throughout 
                   the year, researchers and visitors are welcome to browse the current exhibition or examine rare materials 
-                  in the Gregory Javitch Reading Room.</p><p class="welcome"><strong>Please Note</strong> - Visitors must submit either a <a href="https://docs.google.com/forms/d/126ZJ6r6L42AeoWVyOQRWdY9b0SYv7VxUljx6V1d56Po">Retrieval Request Form (for books)</a> or a <a href="https://docs.google.com/forms/d/1-L6cAek91koI7lU5_4j6kpp_4-AUYIhETM26Xjg1uEw">Discover Archives Retrieval Request Form (for archival materials)</a> at least 24 hours before their visit.</p>
+                  in the Gregory Javitch Reading Room.</p>
+                   <p class="welcome">Researchers must submit either a <a href="https://docs.google.com/forms/d/126ZJ6r6L42AeoWVyOQRWdY9b0SYv7VxUljx6V1d56Po">Retrieval Request Form (for books)</a> or a <a href="https://docs.google.com/forms/d/1-L6cAek91koI7lU5_4j6kpp_4-AUYIhETM26Xjg1uEw">Discover Archives Retrieval Request Form (for archival materials)</a> before 8am on the day of their visit in order to be sure that library materials have been retrieved from storage and are available for their use.</p>
+
                 </div>
 
     <div class="span2 front">

application/views/pages/visit.php

@@ -15,7 +15,7 @@
 </div>
 <p>Submit a <a href="https://docs.google.com/a/ualberta.ca/forms/d/126ZJ6r6L42AeoWVyOQRWdY9b0SYv7VxUljx6V1d56Po/edit">Retrieval Request Form</a> at least 24 hours before your visit to ensure that library materials are available for your use.</p>
 	<h3><a name="finding"></a>Finding Library Materials</h3>
-<img src="/assets/img/int4.jpg" class="int3 hidden-phone" alt="photograph of the interior of the special collections library"/>
+<img src="/assets/img/finding.jpg" class="int3 hidden-phone" alt="photograph of the interior of the special collections library"/>
 <p>Books housed in Bruce Peel Special Collection are listed in the 
 	<a href="https://neos.library.ualberta.ca/uhtbin/cgisirsi/x/0/0/57/49?user_id=WUAARCHIVE">University of Alberta Libraries' "Classic Catalogue."</a>
 You can narrow your search to the Peel library by selecting “University of Alberta Bruce Peel Special Collections” under “Libraries.”  The 

application/views/pages/workshops.php

@@ -9,7 +9,7 @@
 
 </div>
 <div class="span5 getting">
-
+	<img src="/assets/img/workshop.jpg" class="hidden-phone" style="margin: 20px;" />
 <p>Bruce Peel Special Collections is home to important collections of rare and sometimes fragile materials. Like researchers and other visitors, Peel Workshop participants are asked to help preserve these materials for future generations. Here is what you need to know before you come to a workshop:</p>
 
 	<ul class="visit-rules">

docroot/assets/css/custom.css

@@ -35,7 +35,7 @@ body.creamy{
   padding:0;
 }
 .slide-area{
-  height: 250px;
+  height: 200px;
 }
 .main-content{
   background-color: rgba(255, 255, 255, 0.5);
@@ -154,95 +154,39 @@ h3{
   font-size: 15px;
   line-height: 27px;
 }
-
-.front-column{
+.front{
   background-color: #fff;
-  max-height: 275px;
-  overflow: scroll;
-
-}
-.front-column h2{
-  font-size:19px;
-  font-weight: 600;
-  color: #333;
-  padding: 0 20px;
-  margin:0;
-  background-color: #fff;
-  text-transform: uppercase;
-  letter-spacing: 1px;
-}
-.front-column h2.dates{
- background-color: #333;
- color: #fff;
- text-align: center;
- text-transform: none;
-  padding: 1px 0;
-  font-size: 17px;
-  }
-.front-column p, address{
-  font-size: 15px;
-  line-height: 27px;
-  padding: 15px 25px;
+  height: 320px;
 }
-.front-column p.welcome{
-  font-size: 17px;
-    line-height: 34px;
-      padding: 18px 20px 9px 20px;
-}
-.front-column ul{
-  margin: 0;
+.front h2{
+  font-size:20px;
+  margin:0 0 0 10px;
+  padding:0;
 }
-.front-column li{
+.front ul{
   list-style: none;
-  margin:0 0 6px 0;
-}
-.front-column li a{
-  color: #333;
-   padding: 10px 20px;
-   font-size: 18px;
-}
-.front-column li a:hover, .front-column li a:active, .front-column li a:focus{
-  color: #000;
-  background-color: #e8e298;
-text-decoration: none;
-}
-.front-column li h3{
-  margin: 0;
-  padding: 0;
-    font-size:17px;
-  font-family: 'Dosis', sans-serif;
-  line-height: 28px;
-  }
-.front-column li p{
   margin: 0;
   padding: 0;
-  line-height: 19px;
-  font-size: 13px;
-  }
-  .on-now{
-    position: relative;
-  }
-.front-column a{
-  margin: 0px;
-  padding:0px;
-  display: block;
 }
-.front-column p.det{
-  font-size: 18px;
-  padding: 0px 20px;
+.front ul li a{
+  padding: 5px 15px;
+  background-color: #efefef; 
+  display:block;
+  margin-bottom: 3px;
+}
+.front ul li a:hover{
+  background-color: #ddddde; 
+  }
+.container p.welcome{
+  font-size: 16px;
+  margin: 16px 16px 0 16px;
 }
 .col img{
   width: 130px;
   height: 160px;
 }
-.on-now-details, .col-details{
-  height: 192px;
-  width: 270px;
-   background-color: rgba(40, 46, 48, 0.85);
-  position: absolute;
-  top:0;
-  left:0;
-  display: none;
+.on-now img{
+  width: 100%;
 }
 .col-details{
   height: 160px;
@@ -285,6 +229,11 @@ text-decoration: none;
   -webkit-box-shadow: 0 0 10px #888;
   box-shadow: 0 0 10px #888;
   border:solid 2px #fff;
+  float: left;
+}
+.current-exhibit{
+  padding-right:40px;
+
 }
 #logout{
   font-size: 12px;
@@ -311,7 +260,7 @@ text-decoration: none;
 }
 .main-nav{
   margin:0; 
-  padding-left: 30px;
+  padding-left: 20px;
 }
 .main-nav li{
   float: left;
@@ -620,6 +569,10 @@ input{
       margin:10px 0 0 10px;
 
     }
+    .container p.sm-workshop{
+      font-size: 12px;
+      padding:120px 80px 0 0;
+    }
     .container li span{
       display: block;
     }
@@ -646,12 +599,14 @@ input{
     .rem{
       margin: 0;
     }
-    .rem .myButton, #past{
+    .rem .myButton, #past, .workshops .myButton{
       margin-left: 0;
     }
+    .archive-vids{
+      margin-bottom: 60px;
+    }
     #past{
-      float:right;
-      margin: 20px 0; 
+
     }
 #btnDel, #btnAdd{
         -moz-box-shadow:inset 0px 1px 0px 0px #ffffff;