woople-theme 0.0.6 → 0.1.0

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

@@ -5,28 +5,6 @@ header + .outline h2 {
   border-top:0;
 }
 
-#course {
-  overflow:hidden;
-
-  .page-header {
-    img {
-      .course-image();
-      max-width:@imageWidth;
-      float:left;
-      margin-right:@gridGutterWidth;
-    }
-
-    p, h1 {
-      margin-left: @gridGutterWidth + @imageWidth;
-    }
-  }
-
-  > header {
-    margin:0;
-  }
-
-}
-
 @media (max-width: 767px) {
   #course {
     .modal-body {

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

@@ -3,16 +3,12 @@
 
 .outline {
   margin-bottom:20px;
+  overflow:hidden;
 
   h2 {
     .outline-title();
   }
 
-  p {
-    padding-left:@leftColumnOffset;
-    padding-right:@contentPadding;
-  }
-
   .assessment {
     margin-left:@leftColumnOffset;
     margin-top:@contentPadding;

data/app/assets/stylesheets/woople-theme/page-header.css.less

@@ -1,6 +1,19 @@
 @import "woople-theme/variables.css.less";
 @import "woople-theme/colours.css.less";
 
+.page-header-with-image {
+  img {
+    .course-image();
+    max-width:@imageWidth;
+    float:left;
+    margin-right:@gridGutterWidth;
+  }
+
+  p, h1 {
+    margin-left: @gridGutterWidth + @imageWidth;
+  }
+}
+
 .page-header {
   border-color:fade(@highlight, 10%);
   padding-left:@contentPadding;

data/app/helpers/theme_helper.rb

@@ -19,9 +19,11 @@ module ThemeHelper
     render partial: 'woople-theme/content_item_header'
   end
 
-  def outline(items, presenter = nil)
-    collection = ThemePresentation.wrap_collection(items, OutlinePresenter, presenter)
-    render partial: 'woople-theme/outline', collection: collection
+  def outline(item, &block)
+    presenter = ThemePresentation.wrap(item, OutlinePresenter)
+    presenter.view_context = self
+
+    render partial: 'woople-theme/outline', locals: { outline: presenter, block: block }
   end
 
   def profile

data/app/presenters/content_image.rb

@@ -1,7 +1,18 @@
 module ContentImage
   DEFAULT_IMAGE = 'woople-theme/missing.png'
+  MISSING_WOOPLE_IMAGE = '/images/original/missing.png'
 
   def image(&block)
-    yield(__getobj__.image || DEFAULT_IMAGE) if __getobj__.respond_to? :image
+    yield(normalized(__getobj__.image) || DEFAULT_IMAGE) if __getobj__.respond_to? :image
+  end
+
+  private
+
+  def normalized(image)
+    if image.is_a?(Paperclip::Attachment) && image.to_s == MISSING_WOOPLE_IMAGE
+      DEFAULT_IMAGE
+    else
+      image
+    end
   end
 end

data/app/presenters/outline_presenter.rb

@@ -1,31 +1,38 @@
+require 'action_view'
 require 'delegate'
 
 class OutlinePresenter < SimpleDelegator
-  def assessment
-    css_class = "assessment"
-    css_class << " disabled" if assessment_disabled?
+  include ActionView::Helpers::TagHelper
 
-    yield(css_class) if has_assessment?
-  end
+  attr_accessor :view_context
 
-  def render_downloads(view_context)
-    wrapped_downloads = ThemePresentation.wrap_collection(downloads, OutlineDownloadPresenter)
-    view_context.render partial: 'woople-theme/outline_download', collection: wrapped_downloads
+  def name
+    content_tag(:h2, outline.name)
   end
 
-  def render_videos(view_context)
+  def videos(videos = outline.videos)
     wrapped_videos = ThemePresentation.wrap_collection(videos, OutlineVideoPresenter)
-    view_context.render partial: 'woople-theme/outline_video', collection: wrapped_videos
+    view_context.render partial: 'woople-theme/outline_videos', locals: { videos: wrapped_videos }
   end
 
-  def downloads
-    outline.downloads
+  def downloads(downloads = outline.downloads)
+    wrapped_downloads = ThemePresentation.wrap_collection(downloads, OutlineDownloadPresenter)
+    view_context.render partial: 'woople-theme/outline_downloads', locals: { downloads: wrapped_downloads }
   end
 
-  def videos
-    outline.videos
+  def assessment
+    view_context.render partial: 'woople-theme/outline_assessment', locals: { outline: self }
   end
 
+  def render_assessment
+    css_class = "assessment"
+    css_class << " disabled" if assessment_disabled?
+
+    yield(css_class) if has_assessment?
+  end
+
+  private
+
   def assessment_disabled?
     outline.respond_to?(:assessment_enabled) && !outline.assessment_enabled
   end

data/app/presenters/page_header_presenter.rb

@@ -3,4 +3,30 @@ require_relative 'content_image'
 
 class PageHeaderPresenter < SimpleDelegator
   include ContentImage
+
+  def title
+    name || header.title
+  end
+
+  def image_class
+    'page-header-with-image' if has_image?
+  end
+
+  private
+
+  def has_image?
+    header.respond_to?(:image)
+  end
+
+  def name
+    if header.respond_to?(:name)
+      header.name
+    else
+      nil
+    end
+  end
+
+  def header
+    __getobj__
+  end
 end

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

@@ -1,20 +1,3 @@
 <div class="outline">
-  <h2><%= outline.name %></h2>
-  <table class="table">
-    <thead>
-      <tr>
-        <th></th>
-        <th class="string"><%=t 'woople_theme.outline.name' %></th>
-        <th class="count"><%=t 'woople_theme.outline.duration' %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <%= outline.render_downloads(self) %>
-      <%= outline.render_videos(self) %>
-    </tbody>
-  </table>
-
-  <% outline.assessment do |assessment_class| %>
-    <p class="<%= assessment_class %>"><a><%=t 'woople_theme.outline.start_assessment' %></a></p>
-  <% end %>
+  <% block.call(outline) %>
 </div>

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

@@ -0,0 +1,3 @@
+<% outline.render_assessment do |assessment_class| %>
+  <p class="<%= assessment_class %>"><a><%=t 'woople_theme.outline.start_assessment' %></a></p>
+<% end %>

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

@@ -0,0 +1,10 @@
+<table class="table">
+  <thead>
+    <tr>
+      <th colspan='3'></th>
+    </tr>
+  </thead>
+  <tbody>
+    <%= render partial: 'woople-theme/outline_download', collection: downloads %>
+  </tbody>
+</table>

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

@@ -0,0 +1,12 @@
+<table class="table">
+  <thead>
+    <tr>
+      <th></th>
+      <th class="string"><%=t 'woople_theme.outline.name' %></th>
+      <th class="count"><%=t 'woople_theme.outline.duration' %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <%= render partial: 'woople-theme/outline_video', collection: videos %>
+  </tbody>
+</table>

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

@@ -1,4 +1,4 @@
-<header class="page-header">
+<header class="page-header <%= header.image_class %>">
   <% header.image do |url| %>
     <%= image_tag(url) %>
   <% end %>

data/lib/woople-theme/version.rb

@@ -1,3 +1,3 @@
 module WoopleTheme
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: woople-theme
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70294236106240 !ruby/object:Gem::Requirement
+  requirement: &70259944353220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70294236106240
+  version_requirements: *70259944353220
 - !ruby/object:Gem::Dependency
   name: less-rails-bootstrap
-  requirement: &70294236105820 !ruby/object:Gem::Requirement
+  requirement: &70259944352800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70294236105820
+  version_requirements: *70259944352800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70294236105360 !ruby/object:Gem::Requirement
+  requirement: &70259944352340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294236105360
+  version_requirements: *70259944352340
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70294236104940 !ruby/object:Gem::Requirement
+  requirement: &70259944351920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294236104940
+  version_requirements: *70259944351920
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70294236104440 !ruby/object:Gem::Requirement
+  requirement: &70259944351420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70294236104440
+  version_requirements: *70259944351420
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70294236104020 !ruby/object:Gem::Requirement
+  requirement: &70259944351000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294236104020
+  version_requirements: *70259944351000
 description: All Front-End all the Time
 email:
 - developers@bigbangtechnology.com
@@ -149,8 +149,11 @@ files:
 - app/views/woople-theme/_content_item_header.html.erb
 - app/views/woople-theme/_menu.html.erb
 - app/views/woople-theme/_outline.html.erb
+- app/views/woople-theme/_outline_assessment.html.erb
 - app/views/woople-theme/_outline_download.html.erb
+- app/views/woople-theme/_outline_downloads.html.erb
 - app/views/woople-theme/_outline_video.html.erb
+- app/views/woople-theme/_outline_videos.html.erb
 - app/views/woople-theme/_page_header.html.erb
 - app/views/woople-theme/_profile.html.erb
 - app/views/woople-theme/_video_modal.html.erb
@@ -181,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2123981156988969400
+      hash: -2849809229566666187
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -190,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2123981156988969400
+      hash: -2849809229566666187
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10