best_boy 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.2.1
+* added some styling gimmicks (active navigation highlighting, wording)
+* moved google charts javascript to ssl for better backend integration
+* changed year view to scope first year of each owner type separately
+* initial list view includes now every owner type
+* list view shows owner type and event source if given
+
 ## 0.2.0
 * added charts
 * added event_source to best_boy_events for better logging. see update section in README for update instructions

data/app/controllers/best_boy/best_boy_events_controller.rb

@@ -117,7 +117,7 @@ module BestBoy
     end
 
     def available_years
-      @available_years = (BestBoyEvent.order("best_boy_events.created_at ASC").first.created_at.to_date.year..Time.zone.now.year).map{ |year| year.to_s } rescue [Time.zone.now.year]
+      @available_years = (BestBoyEvent.where("best_boy_events.owner_type = ?", current_owner_type).order("best_boy_events.created_at ASC").first.created_at.to_date.year..Time.zone.now.year).map{ |year| year.to_s } rescue [Time.zone.now.year]
     end
 
     def available_owner_types
@@ -126,7 +126,8 @@ module BestBoy
 
     def collection
       @best_boy_events ||= (
-        scope = BestBoyEvent.where("best_boy_events.owner_type = ?", current_owner_type)
+        scope = BestBoyEvent
+        scope = scope.where("best_boy_events.owner_type = ?", params[:owner_type]) if params[:owner_type].present?
         scope = scope.where("best_boy_events.event = ?", current_event) if current_event.present?
         scope = scope.per_day(current_date) if current_date.present?
         scope = scope.order("best_boy_events.created_at DESC, best_boy_events.event ASC")

data/app/views/best_boy/best_boy_events/charts.html.erb

@@ -1,5 +1,5 @@
 <% content_for :javascripts do %>
-  <script src='http://www.google.com/jsapi'></script>
+  <script src='https://www.google.com/jsapi'></script>
 <% end %>
 
 

data/app/views/best_boy/best_boy_events/lists.html.erb

@@ -26,14 +26,18 @@
     <table class="table table-striped table-bordered">
       <thead>
         <tr>
+          <th>Owner Type</th>
           <th>Event</th>
+          <th>Event source</th>
           <th>created_at</th>
         </tr>
       </thead>
       <tbody>
         <% collection.each do |best_boy_event| %>
           <tr>
+            <td><%= best_boy_event.owner_type %></td>
             <td><%= best_boy_event.event %></td>
+            <td><%= best_boy_event.event_source %></td>
             <td><%= best_boy_event.created_at %></td>
           </tr>
         <% end %>

data/app/views/layouts/best_boy_backend.html.erb

@@ -37,12 +37,12 @@
         <div class="container">
           <%= link_to "BBAC", best_boy_admin_path, :class => "brand" %>
           <ul class="nav">
-            <li><%= link_to "Statistics", best_boy_admin_stats_path %></li>
-            <li><%= link_to "List & Logs", best_boy_admin_lists_path %></li>
-            <li><%= link_to "Charts", best_boy_admin_charts_path %></li>
+            <li class="<%= action_name == 'stats' ? 'active' : nil %>"><%= link_to "Statistics", best_boy_admin_stats_path %></li>
+            <li class="<%= action_name == 'lists' ? 'active' : nil %>"><%= link_to "List & Logs", best_boy_admin_lists_path %></li>
+            <li class="<%= action_name == 'charts' ? 'active' : nil %>"><%= link_to "Charts", best_boy_admin_charts_path %></li>
           </ul>
           <% if BestBoy.custom_redirect.present? %>
-            <p class="navbar-text pull-right"><%= link_to("back", Rails.application.routes.recognize_path(BestBoy.custom_redirect)) %></p>
+            <p class="navbar-text pull-right"><%= link_to("back to application", Rails.application.routes.recognize_path(BestBoy.custom_redirect)) %></p>
           <% end %>
         </div>
       </div>

data/lib/best_boy/version.rb

@@ -1,3 +1,3 @@
 module BestBoy
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: best_boy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Christoph Seydel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-27 00:00:00 +02:00
+date: 2012-06-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency