jekyll-attendease 0.4.9 → 0.5.0

data/README.md

@@ -141,9 +141,7 @@ During development, you can create and install local builds:
 
 And then install it:
 
-`gem install jekyll-attendease-``cat jekyll-attendease.gemspec|grep s.version|awk '{print $3}'|sed s/\'//g```
-
-(where `x.x.x` is the version you've defined in the gemspec)
+    gem install jekyll-attendease-`cat jekyll-attendease.gemspec|grep s.version|awk '{print $3}'|sed s/\'//g`.gem
 
 ## License
 

data/lib/jekyll-attendease.rb

@@ -21,6 +21,20 @@ module Jekyll
         end
       end
 
+      def self.parameterize(string, sep = '-')
+        string.downcase!
+        # Turn unwanted chars into the separator
+        string.gsub!(/[^a-z0-9\-_]+/, sep)
+        unless sep.nil? || sep.empty?
+          re_sep = Regexp.escape(sep)
+          # No more than one of the separator in a row.
+          string.gsub!(/#{re_sep}{2,}/, sep)
+          # Remove leading/trailing separator.
+          string.gsub!(/^#{re_sep}|#{re_sep}$/, '')
+        end
+        string
+      end
+
       def generate(site)
         if @attendease_config = site.config['attendease']
 
@@ -543,16 +557,30 @@ module Jekyll
 
         session['filters'] = filters_for_session
 
+        filter_tags = []
+        filters_for_session.each do |filter|
+          item_names = []
+          if !filter['items'].nil?
+            filter['items'].each do |item|
+              filter_tags << EventData.parameterize('attendease-filter-' + filter['name'] + "-" + item['name'])
+            end
+          end
+        end
+        session['filter_tags'] = filter_tags.join(" ")
+
         if s['instances']
           instances = []
           s['instances'].each do |i|
             instance = {
               'id' => i['id'],
-              'time' => i['time'],
               'date' => i['date'],
-              'time_formatted' => i['time_formatted'],
-              'date_formatted' => i['date_formatted'],
+              'time' => i['time'],
+              'end_time' => i['end_time'],
               'duration' => i['duration'],
+              'date_formatted' => i['date_formatted'],
+              'time_formatted' => i['time_formatted'],
+              'end_time_formatted' => i['end_time_formatted'],
+              'duration_formatted' => i['duration_formatted'],
               'room_id' => i['room_id'],
             }
 

data/templates/_includes/attendease/presenters/index.html

@@ -6,7 +6,9 @@
   {% for presenter in page.presenters %}
     <div class="attendease-presenter" data-presenter-id="{{ presenter.id }}">
       <div class="attendease-presenter-profile-image">
-        <img height="100" src="{{ presenter.profile_url }}">
+        <a href="/presenters/{{ presenter.id }}">
+          <img height="100" src="{{ presenter.profile_url }}">
+        </a>
       </div>
 
       <div class="attendease-presenter-name">

data/templates/_includes/attendease/presenters/presenter.html

@@ -29,7 +29,7 @@
     {% endif %}
 
     {% for session in page.presenter.sessions %}
-      <div class="attendease-session-and-instances" data-session-id="{{ session.id }}">
+      <div class="attendease-session-and-instances {{ session.filter_tags }}" data-session-id="{{ session.id }}">
         <div class="attendease-session-name">
           <h3><a href="/schedule/{{ session.code }}">{{ session.name }}</a></h3>
         </div>
@@ -42,10 +42,10 @@
 
             <div class="attendease-instance-details">
               <div class="attendease-instance-detail attendease-time-range" data-duration="{{ instance.duration }}" data-start-time="{{ instance.time }}">
-                {{ instance.time_formatted }}
+                {{ instance.time_formatted }} - {{ instance.end_time_formatted}}
 
                 <div class="attendease-duration" data-duration="{{ instance.duration }}">
-                  {{ instance.duration }} minutes
+                  {{ instance.duration_formatted }}
                 </div>
               </div>
 

data/templates/_includes/attendease/schedule/day.html

@@ -17,7 +17,7 @@
   </div>
 
   {% for instance in page.instances %}
-    <div class="attendease-session-and-instance" data-instance-id="{{ instance.id }}" data-session-id="{{ instance.session.id }}">
+    <div class="attendease-session-and-instance {{ instance.session.filter_tags }}" data-instance-id="{{ instance.id }}" data-session-id="{{ instance.session.id }}">
       <div class="attendease-name">
         <h2><a href="/schedule/{{ instance.session.code }}">{{ instance.session.name }}</a></h2>
       </div>
@@ -38,10 +38,10 @@
 
       <div class="attendease-instance-details">
         <div class="attendease-instance-detail attendease-time-range" data-duration="{{ instance.duration }}" data-start-time="{{ instance.time }}">
-          {{ instance.time_formatted }}
+          {{ instance.time_formatted }} - {{ instance.end_time_formatted}}
 
           <div class="attendease-duration" data-duration="{{ instance.duration }}">
-            {{ instance.duration }} minutes
+            {{ instance.duration_formatted }}
           </div>
         </div>
 

data/templates/_includes/attendease/schedule/session.html

@@ -1,4 +1,4 @@
-<div class="attendease-session" data-session-id="{{ page.session.id }}">
+<div class="attendease-session {{ page.session.filter_tags }}" data-session-id="{{ page.session.id }}">
   <div class="attendease-name-and-description">
     <div class="attendease-name">
       <h1>{{ page.session.name }}</h1>
@@ -25,9 +25,9 @@
 
             <div class="attendease-instance-details">
               <div class="attendease-instance-detail attendease-time-range" data-duration="{{ instance.duration }}" data-start-time="{{ instance.time }}">
-                {{ instance.time_formatted }}
+                {{ instance.time_formatted }} - {{ instance.end_time_formatted}}
                 <div class="attendease-duration" data-duration="{{ instance.duration }}">
-                  {{ instance.duration }} minutes
+                  {{ instance.duration_formatted }}
                 </div>
               </div>
 
@@ -68,7 +68,7 @@
       {% for presenter in page.session.presenters %}
         <div class="attendease-presenter" data-presenter-id="{{ presenter.id }}">
           <div class="attendease-presenter-profile-image">
-            <img height="100" src="{{ presenter.profile_url }}">
+            <a href="/presenters/{{ presenter.id }}"><img height="100" src="{{ presenter.profile_url }}"></a>
           </div>
 
           <div class="attendease-presenter-name">

data/templates/_includes/attendease/schedule/sessions.html

@@ -18,7 +18,7 @@
   </div>
 
   {% for session in page.sessions %}
-    <div class="attendease-session-and-instance" data-session-id="{{ session.id }}">
+    <div class="attendease-session-and-instance {{ session.filter_tags }}" data-session-id="{{ session.id }}">
       <div class="attendease-name">
         <h2><a href="/schedule/{{ session.code }}">{{ session.name }}</a></h2>
       </div>

data/templates/_includes/attendease/venues/index.html

@@ -17,7 +17,7 @@
 
         <div class="attendease-venue-map">
           <div class="attendease-venue-map-image">
-            <img src="https://maps.google.com/maps/api/staticmap?center={{ venue.address.latitude }},{{ venue.address.longitude }}&zoom=13&size=100x100&sensor=false&markers=color:{{ marker_colour }}%7C{{ venue.address.latitude }},{{ venue.address.longitude }}" width="100" height="100" /">
+            <a href="/venues/{{ venue.id }}"><img src="https://maps.google.com/maps/api/staticmap?center={{ venue.address.latitude }},{{ venue.address.longitude }}&zoom=13&size=100x100&sensor=false&markers=color:{{ marker_colour }}%7C{{ venue.address.latitude }},{{ venue.address.longitude }}" width="100" height="100" /"></a>
           </div>
         </div>
       {% endif %}

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Michael Wood
@@ -10,62 +11,70 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Bring your event data into Jekyll for amazing event websites.
@@ -88,25 +97,26 @@ files:
 homepage: https://attendease.com/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Attendease event helper for Jekyll
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 0eae3c3f25ad6736d4f32786fb5bc1e18ce386a7
-  data.tar.gz: 0988c6f4717cd235e2e49a7b1de920425aac6470
-SHA512:
-  metadata.gz: c4f755d58baab9b6314e0376de26f395027b51514012cbc84e8d99bfaa52d0d3a5f0430b6627163eb0cc65445d2a6e442236a95ce1252521190cb4b41428cf54
-  data.tar.gz: 68d7faae6343f9c3d59decb1cef89e270386b34d6821373792291b2a53972ab2c69b98e4e3db95a9e0e52cb5f7d19c30c4c0474b2baaebde765d12cf4611e6c8