woople-theme 0.3.02 → 0.3.03

data/app/assets/javascripts/{assessment_flipper.js → woople-theme/assessment_overview.js}

@@ -31,4 +31,8 @@ $(document).ready(function() {
     var front = assessment.find('.front');
     removeFrontHeight(front);
   });
+
+  $('.touch .alert').click(function() {
+    $(this).alert('close');
+  });
 });

data/app/assets/javascripts/woople-theme/theme.js

@@ -2,14 +2,13 @@
 //= require jquery_ujs
 //= require modernizr
 //= require spin.min
+//= require twitter/bootstrap/transition
 //= require twitter/bootstrap/dropdown
 //= require twitter/bootstrap/modal
 //= require twitter/bootstrap/button
 //= require twitter/bootstrap/alert
 //= require fastclick.min_
 //= require video.min
-//= require assessment_flipper
-//= require assessment_form
 //= require_tree .
 
 function resizeFix() {

data/app/presenters/outline_assessment_presenter.rb

@@ -36,6 +36,23 @@ class OutlineAssessmentPresenter < SimpleDelegator
     end
   end
 
+  def render_pass_fail_alert
+    return unless respond_to? :passed?
+    if passed?
+      yield OpenStruct.new(
+        css_class: 'alert-success',
+        heading: I18n.t('woople_theme.assessment.pass_alert.heading'),
+        message: I18n.t('woople_theme.assessment.pass_alert.message')
+      )
+    else
+      yield OpenStruct.new(
+        css_class: 'alert-error',
+        heading: I18n.t('woople_theme.assessment.fail_alert.heading'),
+        message: I18n.t('woople_theme.assessment.fail_alert.message')
+      )
+    end
+  end
+
   private
 
   def normalize history_item

data/app/views/woople-theme/_outline_assessment.html.erb

@@ -1,5 +1,5 @@
 <% assessment.render do %>
-  <div class="assessment">
+  <div id="assessment-<%= assessment.assessment_id %>" class="assessment">
     <div class="front">
       <div class="assessment-pad">
         <div class="flip-action pull-right">
@@ -14,10 +14,12 @@
           <span class="badge"><%= t 'woople_theme.assessment.duration', count: assessment.estimated_duration %></span>
         </p>
 
-        <!-- <div class="alert alert-error">
-          <a class="close" data-dismiss="alert">×</a>
-          <%# t 'woople_theme.assessment.fail_html' %>
-        </div> -->
+        <% assessment.render_pass_fail_alert do |alert| %>
+          <div class="alert <%= alert.css_class %> fade in">
+            <button class="close" data-dismiss="alert">×</button>
+            <strong><%= alert.heading %></strong> <%= alert.message %>
+          </div>
+        <% end %>
 
         <% assessment.render_relearnings do %>
           <h4><%= t 'woople_theme.assessment.required_relearning' %></h4>

data/config/locales/en.yml

@@ -26,7 +26,6 @@ en:
       duration:
         one: 1 minute
         other: '%{count} minutes'
-      fail_html: You failed! Please watch the <strong>Require Relearning</strong> before attempting the assessment again.
       required_relearning: Required Relearning
       name: Assessment
       assessment_history: Assessment History
@@ -35,6 +34,12 @@ en:
       result_title: Result
       pass: Pass
       fail: Fail
+      pass_alert:
+        heading: Passed!
+        message: Congratulations, you've passed! You may review your history to see your scores and results. You may also retake the assessment to achieve a better result.
+      fail_alert:
+        heading: Failed!
+        message: Thank you for completing the assessment. You may review your history to see your scores and results. You may also retake the assessment to achieve a better result. You must rewatch the required relearnings below before retaking the assessment.
     assessment_form:
       unanswered_questions:
         one: 1 unanswered question

data/lib/woople-theme/version.rb

@@ -1,3 +1,3 @@
 module WoopleTheme
-  VERSION = "0.3.02"
+  VERSION = '0.3.03'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: woople-theme
 version: !ruby/object:Gem::Version
-  version: 0.3.02
+  version: 0.3.03
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70228387473960 !ruby/object:Gem::Requirement
+  requirement: &70247223075560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70228387473960
+  version_requirements: *70247223075560
 - !ruby/object:Gem::Dependency
   name: less-rails-bootstrap
-  requirement: &70228387473260 !ruby/object:Gem::Requirement
+  requirement: &70247223074880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *70228387473260
+  version_requirements: *70247223074880
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70228387472860 !ruby/object:Gem::Requirement
+  requirement: &70247223074480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70228387472860
+  version_requirements: *70247223074480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70228387472340 !ruby/object:Gem::Requirement
+  requirement: &70247223074000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70228387472340
+  version_requirements: *70247223074000
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70228387471580 !ruby/object:Gem::Requirement
+  requirement: &70247223073560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,21 +65,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70228387471580
+  version_requirements: *70247223073560
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70228387470680 !ruby/object:Gem::Requirement
+  requirement: &70247223073000 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70228387470680
+  version_requirements: *70247223073000
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70228387469700 !ruby/object:Gem::Requirement
+  requirement: &70247223072540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70228387469700
+  version_requirements: *70247223072540
 description: All Front-End all the Time
 email:
 - developers@bigbangtechnology.com
@@ -124,8 +124,8 @@ files:
 - app/assets/images/woople-theme/star-icon.png
 - app/assets/images/woople-theme/star-icon2x.png
 - app/assets/images/woople-theme/video-js.png
-- app/assets/javascripts/assessment_flipper.js
-- app/assets/javascripts/assessment_form.js.erb
+- app/assets/javascripts/woople-theme/assessment_form.js.erb
+- app/assets/javascripts/woople-theme/assessment_overview.js
 - app/assets/javascripts/woople-theme/theme.js
 - app/assets/stylesheets/woople-theme/assessment.css.less
 - app/assets/stylesheets/woople-theme/base.css.less
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Our Front-End CSS Framework/Theme