woople-theme 0.5.8 → 0.5.9

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

@@ -2,7 +2,7 @@
 @import "woople-theme/colours.css.less";
 
 body {
-  background: @background;
+  background:@background;
 }
 
 body > .container {
@@ -134,4 +134,4 @@ a.loading_indicator {
       text-align: left;
     }  
   }
-}
+}

data/app/assets/stylesheets/woople-theme/dashboard/base.css.less

@@ -19,6 +19,44 @@ section.certification-content {
   }
   .nav {
     margin-bottom: 0;
+
+    a {
+      outline: none
+    }
   }
 
+  .styled-table();
+
+  table {
+    tr > td:first-child, tr > th:first-child {
+      color: @secondaryTextColour;
+      width: 20%;
+      padding-top:@tableCellPadding * 1.6;
+    }
+
+    tr {
+      border-bottom:solid 1px @insetContentBorder;
+    }
+
+    h2 {
+      .content-title();
+
+      margin-bottom: 0;
+    }
+  }
+
+  @media (max-width: 767px) {
+    table {
+      tr > td:first-child, tr > th:first-child {
+        padding-left:@phoneMargin;
+        text-indent:@phoneMargin * 1.5;
+        width: 35%;
+
+        > *:first-child {
+          text-indent:0;
+          margin-left:@phoneMargin;
+        }
+      }
+    }
+  }
 }

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

@@ -78,102 +78,11 @@
     }
   }
 
-  tr.completed {
-    .action {
-      display:none;
-    }
-  }
-
-  .disabled td {
-    .opacity(50);
-
-    a:hover {
-      text-decoration:none;
-    }
-
-    .action {
-      display:none;
-    }
-
-  }
-
-  tr.disabled {
-   &:hover {
-     td {
-       background:none;
-     }
-   }
-
-   td {
-      background-color:transparent;
-      text-shadow:none;
-      color:@primaryTextColour;
-
-      a {
-        color:@primaryTextColour;
-      }
-
-      .action {
-        display:none;
-      }
-    }
-  }
-
-  table {
-    margin-bottom:0;
-
-    th {
-      color: @secondaryTextColour;
-    }
-
-    th, td {
-      padding:@tableCellPadding;
-      border-top:none;
-      a {
-        color:@primaryTextColour;
-      }
-    }
-
-    .count {
-      width:75px;
-    }
-
-    th {
-      border-top:none;
-    }
-
-    tr > td:first-child, tr > th:first-child {
-      padding-left:@contentPadding;
-      width:@gridGutterWidth + @imageWidth - (@tableCellPadding * 2);
-    }
-
-    .action {
-      display:block;
-    }
-
-    tr:hover {
-      td {
-        background-color:@highlightBackground;
-      }
-    }
-  }
+  .styled-table();
 }
 
 @media (max-width: 767px) {
   .outline {
-    table {
-      tr > td:first-child, tr > th:first-child {
-        padding-left:@phoneMargin;
-        text-indent:@phoneMargin * 1.5;
-
-        > *:first-child {
-          text-indent:0;
-          margin-left:@phoneMargin;
-        }
-
-      }
-
-    }
 
     h2 {
       .outline-title(@phoneLeftColumnOffset);

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

@@ -109,3 +109,97 @@
      -moz-border-radius: 0 0 @radius @radius;
           border-radius: 0 0 @radius @radius;
 }
+
+.styled-table() {
+  table {
+    margin-bottom:0;
+
+    th {
+      color: @secondaryTextColour;
+    }
+
+    th, td {
+      padding:@tableCellPadding;
+      border-top:none;
+      a {
+        color:@primaryTextColour;
+      }
+    }
+
+    .count {
+      width:75px;
+    }
+
+    th {
+      border-top:none;
+    }
+
+    tr > td:first-child, tr > th:first-child {
+      padding-left:@contentPadding;
+      width:@gridGutterWidth + @imageWidth - (@tableCellPadding * 2);
+    }
+
+    .action {
+      display:block;
+    }
+
+    tr:hover {
+      td {
+        background-color:@highlightBackground;
+      }
+    }
+    tr.completed {
+      .action {
+        display:none;
+      }
+    }
+
+    .disabled td {
+      .opacity(50);
+
+      a:hover {
+        text-decoration:none;
+      }
+
+      .action {
+        display:none;
+      }
+
+    }
+
+    tr.disabled {
+      &:hover {
+        td {
+          background:none;
+        }
+      }
+
+      td {
+        background-color:transparent;
+        text-shadow:none;
+        color:@primaryTextColour;
+
+        a {
+          color:@primaryTextColour;
+        }
+
+        .action {
+          display:none;
+        }
+      }
+    }
+
+    @media (max-width: 767px) {
+      tr > td:first-child, tr > th:first-child {
+        padding-left:@phoneMargin;
+        text-indent:@phoneMargin * 1.5;
+
+        > *:first-child {
+          text-indent:0;
+          margin-left:@phoneMargin;
+        }
+      }
+    }
+  }
+
+}

data/app/helpers/dashboard_helper.rb

@@ -9,18 +9,31 @@ module DashboardHelper
            object: ThemePresentation.wrap(presenter, WoopleTheme::Dashboard::EssentialsSectionPresenter)
   end
 
+  def essentials_completed(items)
+    render_collection_partial(items, WoopleTheme::Dashboard::EssentialCompletedPresenter, 'woople-theme/content_item')
+  end
+
+  def essentials_exceptions(items)
+    render_collection_partial(items, WoopleTheme::Dashboard::EssentialExceptionPresenter, 'dashboard/exception')
+  end
+
   def electives_section(presenter)
     render partial: 'dashboard/electives_section',
            object: ThemePresentation.wrap(presenter, WoopleTheme::Dashboard::ElectivesSectionPresenter)
   end
 
-  def completed_essentials(items)
-    collection = ThemePresentation.wrap_collection(items, WoopleTheme::Dashboard::CompletedEssentialPresenter)
-    render partial: 'dashboard/completed_essential', collection: collection
+  def electives_history(items)
+    render_collection_partial(items, WoopleTheme::Dashboard::ElectiveHistoryPresenter, 'woople-theme/content_item')
   end
 
-  def total_courses(total)
-    render partial: 'dashboard/total_courses', locals: {total: total}
+  def electives_exceptions(items)
+    render_collection_partial(items, WoopleTheme::Dashboard::ElectiveExceptionPresenter, 'dashboard/exception')
   end
 
+  private
+
+  def render_collection_partial(items, presenter, partial)
+    collection = ThemePresentation.wrap_collection(items, presenter)
+    render partial: partial, collection: collection
+  end
 end

data/app/presenters/content_item_presenter.rb

@@ -1,13 +1,36 @@
 require 'delegate'
 require_relative 'content_image'
 
-class ContentItemPresenter < SimpleDelegator
+class ContentItemPresenter < ExplicitDelegator
   include ContentImage
 
-  def certification_metadata(&block)
+  enforce_definitions :image, :name, :url
+
+  def render_time_remaining(&block)
+    yield(source.time_remaining, source.time_total)
+  end
+
+  def render_popularity(&block)
+    yield(source.popularity)
+  end
+
+  def render_certification_metadata(&block)
     yield(source.certification_metadata) if source.certification_metadata.present?
   end
 
+  def render_progress_bar(&block)
+    yield(source.percent_complete) if source.percent_complete.present?
+  end
+
+  def render_completed_on(&block)
+  end
+
+  def render_elective_points(&block)
+  end
+
+  def render_essential_duration(&block)
+  end
+
   def completed_class
     'completed' if source.completed?
   end
@@ -15,4 +38,4 @@ class ContentItemPresenter < SimpleDelegator
   def source
     __getobj__
   end
-end
+end

data/app/presenters/woople_theme/dashboard/elective_exception_presenter.rb

@@ -0,0 +1,13 @@
+require 'woople_theme_i18n'
+
+module WoopleTheme
+  module Dashboard
+    class ElectiveExceptionPresenter < ExceptionPresenter
+
+      def subtitle
+        I18n.t('woople_theme.dashboards.member.points', count: source.description, points: source.description)
+      end
+
+    end
+  end
+end

data/app/presenters/woople_theme/dashboard/elective_history_presenter.rb

@@ -0,0 +1,52 @@
+require 'woople_theme_i18n'
+
+module WoopleTheme
+  module Dashboard
+    class ElectiveHistoryPresenter < ContentItemPresenter
+      include ContentImage
+
+      enforce_definitions :completed_on,
+                          :current_points,
+                          :total_points
+
+      def render_time_remaining(&block)
+      end
+
+      def render_popularity(&block)
+      end
+
+      def render_certification_metadata(&block)
+      end
+
+      def render_progress_bar(&block)
+      end
+
+      def render_elective_points(&block)
+        yield(points_metadata)
+      end
+
+      def render_completed_on(&block)
+        yield(formatted_date)
+      end
+
+      private
+
+      def formatted_date
+        WoopleThemeI18n.l(completed_on.to_date)
+      end
+
+      def points_metadata
+        if in_progress?
+          I18n.t('woople_theme.dashboards.member.points', count: total_points, points: "#{current_points}/#{total_points}")
+        else
+          I18n.t('woople_theme.dashboards.member.points', count: total_points, points: total_points)
+        end
+      end
+
+      def in_progress?
+        current_points < total_points
+      end
+
+    end
+  end
+end

data/app/presenters/woople_theme/dashboard/electives_section_presenter.rb

@@ -2,6 +2,22 @@ require 'action_view'
 module WoopleTheme
   module Dashboard
     class ElectivesSectionPresenter < SectionPresenter
+      enforce_definitions :electives_history,
+                          :electives_exceptions
+
+      def render_history
+        yield if render?(section.electives_history)
+      end
+
+      def render_exceptions
+        yield if render?(section.electives_exceptions)
+      end
+
+      private
+
+      def render?(tab)
+        tab.count > 0
+      end
     end
   end
 end

data/app/presenters/woople_theme/dashboard/essential_completed_presenter.rb

@@ -0,0 +1,40 @@
+require 'duration'
+require 'woople_theme_i18n'
+
+module WoopleTheme
+  module Dashboard
+    class EssentialCompletedPresenter < ContentItemPresenter
+
+      def render_time_remaining(&block)
+      end
+
+      def render_popularity(&block)
+      end
+
+      def render_certification_metadata(&block)
+      end
+
+      def render_progress_bar(&block)
+      end
+
+      def render_completed_on(&block)
+        yield(formatted_date)
+      end
+
+      def render_essential_duration(&block)
+        yield(formatted_duration)
+      end
+
+      private
+
+      def formatted_date
+        WoopleThemeI18n.l(completed_on.to_date)
+      end
+
+      def formatted_duration
+        Duration.format_time(time_total)
+      end
+
+    end
+  end
+end

data/app/presenters/woople_theme/dashboard/essential_exception_presenter.rb

@@ -0,0 +1,21 @@
+require 'action_view/helpers/url_helper'
+require 'woople_theme_i18n'
+
+module WoopleTheme
+  module Dashboard
+    class EssentialExceptionPresenter < ExceptionPresenter
+      include ActionView::Helpers::UrlHelper
+
+      enforce_definitions :url
+
+      def title
+        link_to(source.name, source.url)
+      end
+
+      def subtitle
+        I18n.t('woople_theme.dashboards.member.exceptions.reason', reason: source.description)
+      end
+
+    end
+  end
+end

data/app/presenters/woople_theme/dashboard/essentials_section_presenter.rb

@@ -1,9 +1,11 @@
 require 'action_view'
+
 module WoopleTheme
   module Dashboard
     class EssentialsSectionPresenter < SectionPresenter
       enforce_definitions :essentials_remaining,
-                          :essentials_completed
+                          :essentials_completed,
+                          :essentials_exceptions
 
       def render_remaining
         yield if render?(section.essentials_remaining)
@@ -13,12 +15,8 @@ module WoopleTheme
         yield if render?(section.essentials_completed)
       end
 
-      def total_completed_courses
-        section.essentials_completed.count
-      end
-
-      def total_completed_minutes
-        Duration.format_time(section.essentials_completed.map(&:time_total).inject(0, :+))
+      def render_exceptions
+        yield if render?(section.essentials_exceptions)
       end
 
       private

data/app/presenters/woople_theme/dashboard/exception_presenter.rb

@@ -0,0 +1,28 @@
+require 'woople_theme_i18n'
+
+module WoopleTheme
+  module Dashboard
+    class ExceptionPresenter < ExplicitDelegator
+      enforce_definitions :name, :description, :completed_on
+
+      def title
+        source.name
+      end
+
+      def subtitle
+        raise "not implemented"
+      end
+
+      def date
+        WoopleThemeI18n.l(source.completed_on.to_date)
+      end
+
+      private
+
+      def source
+        __getobj__
+      end
+
+    end
+  end
+end

data/app/views/dashboard/_electives_section.html.erb

@@ -1,5 +1,35 @@
 <% electives_section.render do %>
   <section id="electives-section" class="certification-content">
     <h2><%= t 'woople_theme.dashboards.member.electives_section.title' %></h2>
+    <ul class="nav nav-tabs" id="electives_tab_nav">
+      <% electives_section.render_history do %>
+        <li><a href="#electives_history" data-toggle="tab"><%= t 'woople_theme.dashboards.member.electives_section.history_tab_name' %></a></li>
+      <% end %>
+      <% electives_section.render_exceptions do %>
+        <li><a href="#electives_exceptions" data-toggle="tab"><%= t 'woople_theme.dashboards.member.exceptions.title' %></a></li>
+      <% end %>
+    </ul>
+    <div class="tab-content">
+    <% electives_section.render_history do %>
+      <div class="tab-pane" id="electives_history">
+        <%= electives_history(electives_section.electives_history) %>
+      </div>
+    <% end %>
+    <% electives_section.render_exceptions do %>
+      <div class="tab-pane" id="electives_exceptions">
+        <table class="table">
+          <thead>
+            <tr>
+              <th><%= t 'woople_theme.date_title' %></th>
+              <th><%= t 'woople_theme.dashboards.member.electives_section.reason_points' %></th>
+            </tr>
+          </thead>
+          <tbody>
+            <%= electives_exceptions(electives_section.electives_exceptions) %>
+          </tbody>
+        </table>
+      </div>
+    <% end %>
+    </div>
   </section>
 <% end %>

data/app/views/dashboard/_essentials_section.html.erb

@@ -8,6 +8,9 @@
     <% essentials_section.render_completed do %>
       <li><a href="#essentials_completed" data-toggle="tab"><%= t 'woople_theme.dashboards.member.essentials_section.completed_tab_name' %></a></li>
     <% end %>
+    <% essentials_section.render_exceptions do %>
+      <li><a href="#essentials_exceptions" data-toggle="tab"><%= t 'woople_theme.dashboards.member.exceptions.title' %></a></li>
+    <% end %>
   </ul>
   <div class="tab-content">
     <% essentials_section.render_remaining do %>
@@ -17,16 +20,22 @@
     <% end %>
     <% essentials_section.render_completed do %>
       <div class="tab-pane" id="essentials_completed">
-        <%= completed_essentials(essentials_section.essentials_completed) %>
-        <div class="content-item row">
-          <div class="span1 content-item-spacer">
-            &nbsp;
-          </div>
-          <%= total_courses(essentials_section.total_completed_courses) %>
-          <div class="content-item-duration span2">
-            <%= essentials_section.total_completed_minutes %>
-          </div>
-        </div>
+        <%= essentials_completed(essentials_section.essentials_completed) %>
+      </div>
+    <% end %>
+    <% essentials_section.render_exceptions do %>
+      <div class="tab-pane" id="essentials_exceptions">
+        <table class="table">
+          <thead>
+            <tr>
+              <th><%= t 'woople_theme.date_title' %></th>
+              <th><%= t 'woople_theme.dashboards.member.essentials_section.course_reason' %></th>
+            </tr>
+          </thead>
+          <tbody>
+            <%= essentials_exceptions(essentials_section.essentials_exceptions) %>
+          </tbody>
+        </table>
       </div>
     <% end %>
   </div>

data/app/views/dashboard/_exception.html.erb

@@ -0,0 +1,7 @@
+<tr>
+  <td><%= exception.date %></td>
+  <td>
+    <h2><%= exception.title %></h2>
+    <span class="subtitle"><%= exception.subtitle %></span>
+  </td>
+</tr>

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

@@ -7,22 +7,41 @@
     </a>
   </div>
   <div class="content-item-content span7">
-    <h2><a href="<%= content_item.url %>"><%= content_item.name %></a></h2>
+    <h2><%= link_to(content_item.name, content_item.url) %></h2>
 
     <div class="content-item-metadata row">
+      <% content_item.render_time_remaining do |time_remaining, time_total| %>
       <div class="span2">
-        <em class="timeRemaining"><%= content_item.time_remaining %></em> / <%= content_item.time_total %>
+        <em class="timeRemaining"><%= time_remaining %></em> / <%= time_total %>
       </div>
+      <% end %>
+      <% content_item.render_popularity do |popularity| %>
       <div class="span2">
-        <i class="icon-star"></i> <span class="popularity"><%= content_item.popularity %></span>
+        <i class="icon-star"></i> <span class="popularity"><%= popularity %></span>
+      </div>
+      <% end %>
+      <% content_item.render_certification_metadata do |data| %>
+      <div class="span2">
+        <span class="badge certificationValue"><%= data %></span>
+      </div>
+      <% end %>
+      <% content_item.render_completed_on do |date| %>
+      <div class="span2"><%= date %></div>
+      <% end %>
+      <% content_item.render_elective_points do |points| %>
+      <div class="span2">
+        <span class="badge"><%= points %></span>
+      </div>
+      <% end %>
+      <% content_item.render_essential_duration do |duration| %>
+      <div class="span2">
+        <span class="badge"><%= duration %></span>
       </div>
-
-      <% content_item.certification_metadata do |data| %>
-        <div class="span2">
-          <span class="badge certificationValue"><%= data %></span>
-        </div>
       <% end %>
     </div>
   </div>
-  <div class="content-item-progress-bar" style="width:<%= content_item.percent_complete %>%"></div>
+
+  <% content_item.render_progress_bar do |percent_complete| %>
+  <div class="content-item-progress-bar" style="width:<%= percent_complete %>%"></div>
+  <% end %>
 </div>

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

@@ -41,7 +41,7 @@
             <table class="table">
               <thead>
                 <tr>
-                  <th style="width:50%"><%= t 'woople_theme.assessment.date_title' %></th>
+                  <th style="width:50%"><%= t 'woople_theme.date_title' %></th>
                   <th><%= t 'woople_theme.assessment.score_title' %></th>
                   <th class="count"><%= t 'woople_theme.assessment.result_title' %></th>
                 </tr>

data/config/locales/en.yml

@@ -29,7 +29,6 @@ en:
       required_relearning: Required Relearning
       name: Assessment
       assessment_history: Assessment History
-      date_title: Date
       score_title: Score
       result_title: Result
       pass: Pass
@@ -59,18 +58,29 @@ en:
     impersonating: impersonating
     cancel: Cancel
     return_to_course: Return to Course
+    date_title: Date
 
     dashboards:
+      titles:
+        reason: Reason
+        name: Name
+        time: Time
       member:
+        exceptions:
+          title: Exceptions
+          reason: 'Reason: %{reason}'
+        points:
+          one: '%{points} point'
+          other: '%{points} points'
         essentials_section:
           title: Essentials
           remaining_tab_name: Remaining
           completed_tab_name: Completed
-          courses:
-            one: 1 course
-            other: '%{count} courses'
+          course_reason: Course/Reason
         electives_section:
           title: Electives
+          history_tab_name: History
+          reason_points: Reason/Points
 
   date:
     formats:

data/lib/woople-theme/version.rb

@@ -1,3 +1,3 @@
 module WoopleTheme
-  VERSION = '0.5.8'
+  VERSION = '0.5.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: woople-theme
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -209,21 +209,23 @@ files:
 - app/presenters/submitted_assessment_form_presenter.rb
 - app/presenters/theme_presentation.rb
 - app/presenters/woople_theme/answer_presenter.rb
-- app/presenters/woople_theme/dashboard/completed_content_item_presenter.rb
-- app/presenters/woople_theme/dashboard/completed_essential_presenter.rb
+- app/presenters/woople_theme/dashboard/elective_exception_presenter.rb
+- app/presenters/woople_theme/dashboard/elective_history_presenter.rb
 - app/presenters/woople_theme/dashboard/electives_section_presenter.rb
+- app/presenters/woople_theme/dashboard/essential_completed_presenter.rb
+- app/presenters/woople_theme/dashboard/essential_exception_presenter.rb
 - app/presenters/woople_theme/dashboard/essentials_section_presenter.rb
+- app/presenters/woople_theme/dashboard/exception_presenter.rb
 - app/presenters/woople_theme/dashboard/section_presenter.rb
 - app/presenters/woople_theme/dashboard/status_alert_presenter.rb
 - app/presenters/woople_theme/question_presenter.rb
 - app/presenters/woople_theme/submitted_answer_presenter.rb
 - app/presenters/woople_theme/submitted_question_presenter.rb
 - app/presenters/woople_theme/video_presenter.rb
-- app/views/dashboard/_completed_essential.html.erb
 - app/views/dashboard/_electives_section.html.erb
 - app/views/dashboard/_essentials_section.html.erb
+- app/views/dashboard/_exception.html.erb
 - app/views/dashboard/_status_alert.html.erb
-- app/views/dashboard/_total_courses.html.erb
 - app/views/layouts/theme.html.erb
 - app/views/woople-theme/_assessment_form.html.erb
 - app/views/woople-theme/_assessment_form_answer.html.erb

data/app/presenters/woople_theme/dashboard/completed_content_item_presenter.rb

@@ -1,7 +0,0 @@
-module WoopleTheme
-  module Dashboard
-    class CompletedContentItemPresenter < ExplicitDelegator
-
-    end
-  end
-end

data/app/presenters/woople_theme/dashboard/completed_essential_presenter.rb

@@ -1,16 +0,0 @@
-require 'duration'
-module WoopleTheme
-  module Dashboard
-    class CompletedEssentialPresenter < CompletedContentItemPresenter
-
-      def date
-        completed_on.strftime('%b %d')
-      end
-
-      def formatted_time_total
-        Duration.format_time(time_total)
-      end
-
-    end
-  end
-end

data/app/views/dashboard/_completed_essential.html.erb

@@ -1,12 +0,0 @@
-<div class="content-item completed-item row">
-  <div class="content-item-date span1">
-    <a href="<%= completed_essential.url %>"><%= completed_essential.date %></a>
-  </div>
-  <div class="content-item-content span5">
-    <h2><a href="<%= completed_essential.url %>"><%= completed_essential.name %></a></h2>
-  </div>
-  <div class="content-item-duration span2">
-    <%= completed_essential.formatted_time_total %>
-  </div>
-</div>
-

data/app/views/dashboard/_total_courses.html.erb

@@ -1,3 +0,0 @@
-<div class="content-item-content span5">
-  <h2 class="total"><%= t 'woople_theme.dashboards.member.essentials_section.courses', count: total %></h2>
-</div>