woople-theme 0.3.5 → 0.3.6

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

@@ -1,37 +1,4 @@
 $(document).ready(function() {
-  function setFrontHeight(element) {
-    var height = element.height();
-    element.css({ height: height + 'px' }).attr('data-original-height', height);
-  }
-
-  function removeFrontHeight(element) {
-    element.css({ height: 'inherit' });
-  }
-
-  $('.assessment .flip-action a').on('click', function() {
-    $(this).closest('.assessment').addClass('flip');
-
-    var front = $(this).closest('.front');
-    setFrontHeight(front);
-
-    var frontHeight = front.height();
-
-    var back = $(this).closest('.front').next('.back');
-    var backHeight = back.height();
-
-    if (frontHeight > backHeight) {
-      back.css({ height: '100%' });
-    } else {
-      front.css({ height: backHeight + 'px' });
-    }
-  });
-
-  $('.assessment .flip-action-back a').on('click', function() {
-    var assessment = $(this).closest('.assessment').removeClass('flip');
-    var front = assessment.find('.front');
-    removeFrontHeight(front);
-  });
-
   $('.touch .alert').click(function() {
     $(this).alert('close');
   });

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

@@ -7,6 +7,7 @@
 //= require twitter/bootstrap/modal
 //= require twitter/bootstrap/button
 //= require twitter/bootstrap/alert
+//= require twitter/bootstrap/tab
 //= require fastclick.min_
 //= require video.min
 //= require_tree .
@@ -62,7 +63,7 @@ function mobileSearchToggle() {
 
   $('a.search-page').on('click', function(e) {
     e.preventDefault();
-    
+
     var masthead        = $('#masthead');
     var menu            = $('.container .menu');
     var form            = $('form.search');

data/app/assets/stylesheets/woople-theme/outline.css.less

@@ -2,7 +2,6 @@
 @import "woople-theme/colours.css.less";
 
 .outline {
-  overflow:hidden;
   border-bottom:solid 1px fade(@contentBorder, 35%);
 
   h2 {
@@ -44,87 +43,30 @@
       }
     }
 
-    .flip-action, .flip-action-back {
-      width:75px;
-      padding:@contentPadding / 2;
-
-      a {
-        cursor: pointer;
-      }
-    }
-
-    &.flip .front {
-      z-index: 900;
-
-      -webkit-transform: rotateY(180deg);
-      -moz-transform: rotateY(180deg);
-    }
-
-    .front {
-      position:relative;
-      z-index:900;
-      background:white;
-      border-bottom:solid 1px transparent;
-
-      .box-shadow(@default-shadow);
-
-      -webkit-transform: rotateY(0deg);
-      -webkit-transform-style: preserve-3d;
-      -webkit-backface-visibility: hidden;
-
-      -moz-transform: rotateY(0deg);
-      -moz-transform-style: preserve-3d;
-      -moz-backface-visibility: hidden;
+    .assessment-pad {
+      .nav-tabs {
+        margin-bottom: 0;
 
-      -o-transition: -o-transform .4s ease-in-out;
-      -ms-transition: -ms-transform .4s ease-in-out;
-      -moz-transition: -moz-transform .4s ease-in-out;
-      -webkit-transition: -webkit-transform .4s ease-in-out;
-      transition: transform .4s ease-in-out;
-    }
+        li:first-child {
+          margin-left: 10px;
+        }
 
-    .front.completed {
-      background-image:url(/assets/woople-theme/completed-triangle.png);
-      background-position:top right;
-      background-repeat:no-repeat;
-    }
+        a {
+          outline: 0;
+        }
+      }
 
-    &.flip .back {
-      z-index:1000;
-      -webkit-transform: rotateY(0deg);
-      -moz-transform: rotateY(0deg);
-    }
+      .tab-content.completed {
+        background-image:url(/assets/woople-theme/completed-triangle.png);
+        background-position:top right;
+        background-repeat:no-repeat;
+      }
 
-    .back {
-      position:absolute;
-      z-index:800;
-      background:white;
-      top:0;
-      left:0;
-      width:100%;
-      /*height:100%;*/
-
-      .box-shadow(@default-shadow);
-
-      -webkit-transform: rotateY(-180deg);
-      -webkit-transform-style: preserve-3d;
-      -webkit-backface-visibility: hidden;
-
-      -moz-transform: rotateY(-180deg);
-      -moz-transform-style: preserve-3d;
-      -moz-backface-visibility: hidden;
-
-      /* -- transition is the magic sauce for animation -- */
-      -o-transition: -o-transform .4s ease-in-out;
-      -ms-transition: -ms-transform .4s ease-in-out;
-      -moz-transition: -moz-transform .4s ease-in-out;
-      -webkit-transition: -webkit-transform .4s ease-in-out;
-      transition: transform .4s ease-in-out;
-    }
+      .tab-content {
+        background: white;
+      }
 
-    .assessment-pad {
       .assessment-history {
-
         a {
           color: @primary;
         }
@@ -243,7 +185,7 @@
     }
 
     .assessment {
-      .back {
+      .assessment-history {
         table tr > td:first-child, tr > th:first-child {
           text-indent:0;
         }
@@ -251,14 +193,3 @@
     }
   }
 }
-
-.no-csstransforms3d {
-
-  .back {
-    display:none;
-  }
-
-  .flip .back {
-    display:block;
-  }
-}

data/app/assets/stylesheets/woople-theme/variables.css.less

@@ -75,7 +75,7 @@
       #theme_video_html5_api {
         margin: 0;
       }
-      
+
       img {
         display: block;
       }
@@ -99,4 +99,4 @@
   -webkit-border-radius: 0 0 @radius @radius;
      -moz-border-radius: 0 0 @radius @radius;
           border-radius: 0 0 @radius @radius;
-}
+}

data/app/presenters/outline_assessment_presenter.rb

@@ -31,8 +31,8 @@ class OutlineAssessmentPresenter < ExplicitDelegator
     end
   end
 
-  def history_link_tag
-    history.empty? ? '' : content_tag(:a, I18n.t('woople_theme.assessment.history'))
+  def render_history_link
+    yield unless history.empty?
   end
 
   def each_history_item

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

@@ -1,68 +1,62 @@
 <% assessment.render do %>
   <div id="assessment-<%= assessment.assessment_id %>" class="assessment">
-    <div class="front <%= assessment.completed_class %>">
-      <div class="assessment-pad">
-        <div class="flip-action pull-right">
-          <%= assessment.history_link_tag %>
-        </div>
-
-        <h3><%=t('woople_theme.outline.assessment')%></h3>
-
-        <p class="assessment-attributes">
-          <span class="badge"><%=t('woople_theme.outline.assessment_questions', count: assessment.questions_asked) %></span>
-          <span class="badge"><%=t('woople_theme.outline.assessment_requirement', percent: assessment.pass_requirement) %></span>
-          <span class="badge"><%= t 'woople_theme.assessment.duration', count: assessment.estimated_duration %></span>
-        </p>
-
-        <% 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>
+    <div class="assessment-pad">
+      <ul class="nav nav-tabs">
+        <li class="active"><a href="#assessment-details-<%= assessment.assessment_id %>" data-toggle="tab"><%=t('woople_theme.outline.assessment')%></a></li>
+        <% assessment.render_history_link do %>
+        <li><a href="#assessment-history-<%= assessment.assessment_id %>" data-toggle="tab"><%= t('woople_theme.assessment.history') %></a></li>
         <% end %>
+      </ul>
+      <div class="tab-content <%= assessment.completed_class %>">
+        <div class="tab-pane active" id="assessment-details-<%= assessment.assessment_id %>">
+          <p class="assessment-attributes">
+            <span class="badge"><%=t('woople_theme.outline.assessment_questions', count: assessment.questions_asked) %></span>
+            <span class="badge"><%=t('woople_theme.outline.assessment_requirement', percent: assessment.pass_requirement) %></span>
+            <span class="badge"><%= t 'woople_theme.assessment.duration', count: assessment.estimated_duration %></span>
+          </p>
 
-        <% assessment.render_relearnings do %>
-          <h4><%= t 'woople_theme.assessment.required_relearning' %></h4>
-          <%= outline(assessment) do |outline| %>
-            <%= outline.videos(assessment.relearnings) %>
+          <% 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 %>
-        <% end %>
 
-        <div class="assessment-start">
-          <%= form_tag assessment.url, method: :post do %>
-            <%= hidden_field_tag :assessment_id, assessment.assessment_id %>
-            <%= assessment.start_button_tag %>
+          <% assessment.render_relearnings do %>
+            <h4><%= t 'woople_theme.assessment.required_relearning' %></h4>
+            <%= outline(assessment) do |outline| %>
+              <%= outline.videos(assessment.relearnings) %>
+            <% end %>
           <% end %>
-        </div>
-      </div>
-    </div>
 
-    <div class="back">
-      <div class="assessment-pad">
-        <div class="flip-action-back pull-right">
-          <a><%= t 'woople_theme.assessment.name' %></a>
+          <div class="assessment-start">
+            <%= form_tag assessment.url, method: :post do %>
+              <%= hidden_field_tag :assessment_id, assessment.assessment_id %>
+              <%= assessment.start_button_tag %>
+            <% end %>
+          </div>
         </div>
-
-        <h3><%= t 'woople_theme.assessment.assessment_history' %></h3>
-        <div class="assessment-history">
-          <table class="table">
-            <thead>
-              <tr>
-                <th style="width:50%"><%= t 'woople_theme.assessment.date_title' %></th>
-                <th><%= t 'woople_theme.assessment.score_title' %></th>
-                <th class="count"><%= t 'woople_theme.assessment.result_title' %></th>
-              </tr>
-            </thead>
-            <tbody>
-              <% assessment.each_history_item do |history_item| %>
+        <div class="tab-pane" id="assessment-history-<%= assessment.assessment_id %>">
+          <div class="assessment-history">
+            <table class="table">
+              <thead>
                 <tr>
-                  <td><%= history_item.date %></td>
-                  <td><%= history_item.score %></td>
-                  <td><%= link_to history_item.result_name, history_item.url %></td>
+                  <th style="width:50%"><%= t 'woople_theme.assessment.date_title' %></th>
+                  <th><%= t 'woople_theme.assessment.score_title' %></th>
+                  <th class="count"><%= t 'woople_theme.assessment.result_title' %></th>
                 </tr>
-              <% end %>
-            </tbody>
-          </table>
+              </thead>
+              <tbody>
+                <% assessment.each_history_item do |history_item| %>
+                  <tr>
+                    <td><%= history_item.date %></td>
+                    <td><%= history_item.score %></td>
+                    <td><%= link_to history_item.result_name, history_item.url %></td>
+                  </tr>
+                <% end %>
+              </tbody>
+            </table>
+          </div>
         </div>
       </div>
     </div>

data/lib/woople-theme/version.rb

@@ -1,3 +1,3 @@
 module WoopleTheme
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: woople-theme
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70284694912860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,31 @@ dependencies:
         version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70284694912860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: less-rails-bootstrap
-  requirement: &70284694912280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *70284694912280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.13
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70284694911900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70284694911900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70284694911420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284694911420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70284694947240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,21 +85,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284694947240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70284694946660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70284694946660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70284694946180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +117,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284694946180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: All Front-End all the Time
 email:
 - developers@bigbangtechnology.com
@@ -231,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Our Front-End CSS Framework/Theme