adding new fixtures

ualbertalib · Apr 20, 2015 · ae565ed · ae565ed
1 parent 5b23e25
commit ae565ed
Show file tree

Hide file tree

Showing 147 changed files with 395 additions and 163 deletions.
diff --git a/app/assets/fonts/.DS_Store b/app/assets/fonts/.DS_Store
diff --git a/app/assets/images/account-icon-white.png b/app/assets/images/account-icon-white.png
diff --git a/app/assets/images/destress.jpg b/app/assets/images/destress.jpg
diff --git a/app/assets/images/hours.jpg b/app/assets/images/hours.jpg
diff --git a/app/assets/images/lib-icons/1.png b/app/assets/images/lib-icons/1.png
diff --git a/app/assets/images/lib-icons/10.png b/app/assets/images/lib-icons/10.png
diff --git a/app/assets/images/lib-icons/11.png b/app/assets/images/lib-icons/11.png
diff --git a/app/assets/images/lib-icons/12.png b/app/assets/images/lib-icons/12.png
diff --git a/app/assets/images/lib-icons/13.png b/app/assets/images/lib-icons/13.png
diff --git a/app/assets/images/lib-icons/14.png b/app/assets/images/lib-icons/14.png
diff --git a/app/assets/images/lib-icons/15.png b/app/assets/images/lib-icons/15.png
diff --git a/app/assets/images/lib-icons/16.png b/app/assets/images/lib-icons/16.png
diff --git a/app/assets/images/lib-icons/17.png b/app/assets/images/lib-icons/17.png
diff --git a/app/assets/images/lib-icons/18.png b/app/assets/images/lib-icons/18.png
diff --git a/app/assets/images/lib-icons/2.png b/app/assets/images/lib-icons/2.png
diff --git a/app/assets/images/lib-icons/20.png b/app/assets/images/lib-icons/20.png
diff --git a/app/assets/images/lib-icons/3.png b/app/assets/images/lib-icons/3.png
diff --git a/app/assets/images/lib-icons/4.png b/app/assets/images/lib-icons/4.png
diff --git a/app/assets/images/lib-icons/5.png b/app/assets/images/lib-icons/5.png
diff --git a/app/assets/images/lib-icons/6.png b/app/assets/images/lib-icons/6.png
diff --git a/app/assets/images/lib-icons/7.png b/app/assets/images/lib-icons/7.png
diff --git a/app/assets/images/lib-icons/8.png b/app/assets/images/lib-icons/8.png
diff --git a/app/assets/images/lib-icons/9.png b/app/assets/images/lib-icons/9.png
diff --git a/app/assets/images/lib-icons/hours.jpg b/app/assets/images/lib-icons/hours.jpg
diff --git a/app/assets/images/pet.jpg b/app/assets/images/pet.jpg
diff --git a/app/assets/images/ruthlibrary.jpg b/app/assets/images/ruthlibrary.jpg
diff --git a/app/assets/images/sarah.jpg b/app/assets/images/sarah.jpg
diff --git a/app/assets/images/twitter_normal.png b/app/assets/images/twitter_normal.png
diff --git a/app/assets/images/widget-hours-js.php b/app/assets/images/widget-hours-js.php
@@ -0,0 +1,21 @@
+
+var hourswidget = "";
+
+
+hourswidget = '<div class="hours-widget"><p><strong><span class="open">Open</span> until 9PM</strong></p></div>';
+
+
+if (typeof jQuery != 'undefined') {  
+
+
+document.write(hourswidget);
+
+jQuery('.hours-widget').css('margin', '10px 0');
+jQuery('.hours-widget .open, .hours-widget .closed').css({ 'font-variant' : 'small-caps', 'font-size' : '120%' });
+
+
+} else {
+
+document.write(hourswidget);
+
+}//closes if-else
diff --git a/app/assets/javascripts/.DS_Store b/app/assets/javascripts/.DS_Store
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -19,5 +19,5 @@
 //
 // Required by Blacklight
 //= require blacklight/blacklight
-
+//= require jquery.hoverIntent.minified
 
diff --git a/app/assets/javascripts/ualib-home.js b/app/assets/javascripts/ualib-home.js
@@ -72,5 +72,23 @@ $(document).ready(function () {
   $( "#ejournals-limit" ).click(function() { 
     $('#main-search').attr('action', '/ejournals');
     $('#q').attr('placeholder', 'search ejournals...');
+  });
+  $( ".hours-select" ).change(function () {
+    var library = "";
+    var location = "";
+    $( "select option:selected" ).each(function() {
+      library += $( this ).text() + " ";
+      location = $(this).val();
+    });
+    imagestring ="/assets/lib-icons/"+location+".png";
+    $( ".library-picker" ).text(library);
+    $( ".lib-pick img" ).attr( "src", imagestring);
+  })
+ $(".news-square").hoverIntent(
+    function() {
+      $(this).find(".details").fadeIn(250);
+    },    
+    function() {
+      $(this).find(".details").fadeOut(250);
   });
     });