ecm_courses2 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fba9341f016c7273c043a4c7eb204bc96872bded
-  data.tar.gz: 3fca2092291765ca34969dfe1a0593de2b7e1f00
+  metadata.gz: 23e37aad68451d4f7eea065d36f6a082b299bbde
+  data.tar.gz: d1a50b0bb9a911c99610c80d449e85e1f7595d08
 SHA512:
-  metadata.gz: 8900661aaa13f841f7f47193f0747430e06559868ffaa40c11f4c4475626a2bc04a23064ae1f6a0b6705b1518ca38547ce9f1062b847ac100867bc35d9c842d9
-  data.tar.gz: 8d946e4305789cefd273c7f707a272a809dbb3943eb3777a209e45757d0cc8a02d40d673b4d5da3fc2f9d719b5d15181c080b082f6a24c44cb4cc90b177d19ee
+  metadata.gz: 94158eef61f8db31def1767dc56a0712b63e78dc7b1cf3fffd29dd7fbf57023fc6b83c7beaec446817a93fad322b53501544e7cfed27ef8f1209f94e46a6cfa7
+  data.tar.gz: fc94c93f984b96396ac7e2735e5f44326e5556d062860aab68d2b6f604bed3c032723c30f1080bcd32d56f2db5052201c1335156b2a9d162ed022df333f5b31c

data/app/views/ecm/courses/course_categories/_course_category.haml

@@ -4,26 +4,25 @@
   - else
     %h2.courses_category-name= course_category.name
 
-  - if action_name == 'show'
-    .course-calendar.bottom-margin-2
-      = month_calendar_pagination(date)
-      = month_calendar date, course_dates, display_method: :course, start_day: :monday
-    .bottom-margin-4 
-      = link_to(url_for(format: :ics, nocache: true), class: 'btn btn-default') do
-        %span.glyphicon.glyphicon-calendar
-        = url_for(format: :ics)
-
-  .course_categories-tree
+  .course_categories-tree.bottom-margin-4
     = nested_li(course_category.descendants, {}) do |course_category, level|
       = link_to course_category.tree_name, course_category
   - unless course_category.description.blank?
     .course_categories-description
       %p= course_category.description
 
-  .course_category-courses
-    / %h2= Ecm::Courses::CourseCategory.human_attribute_name(:courses)
+  .course_category-courses.bottom-margin-4
     - if course_category.courses_count == 0
       = t('ecm.courses.course_category.messages.no_courses_available')
       %hr/
     - else
-      = render course_category.courses
+      = render course_category.courses
+
+  - if action_name == 'show'
+    .course-calendar.bottom-margin-4
+      = month_calendar_pagination(date)
+      = month_calendar date, course_dates, display_method: :course, start_day: :monday
+    .bottom-margin-4
+      = link_to(url_for(format: :ics, nocache: true), class: 'btn btn-default') do
+        %span.glyphicon.glyphicon-calendar
+        = url_for(format: :ics)

data/app/views/ecm/courses/course_categories/show.haml

@@ -1,14 +1,10 @@
 - content_for(:title) { @course_category.name }
-= render partial: 'course_category', locals: { course_category: @course_category, date: @date, course_dates: @course_dates }
 
-.course_category-calendar{ id: "course_category-#{@course_category.to_param}" }
-  - if @course_category.courses.any?
-    / %h2= t('.calendar_heading', month: l(@date, format: :month_with_year))
-    / = month_calendar_pagination(@date)
-    / = month_calendar @date, @course_dates, display_method: :course, start_day: :monday
+= render partial: 'course_category', locals: { course_category: @course_category, date: @date, course_dates: @course_dates }
 
-%p
-  - if @course_category.root?
-    = link_to(t('ecm.courses.course_category.actions.back_to_index'), course_categories_path) if respond_to?(:course_categories_path)
-  - else
-    = link_to(Ecm::Courses::CourseCategory.human_attribute_name(:parent), @course_category.parent)
+.row
+  .col-lg-12
+    - if @course_category.root?
+      = link_to(t('ecm.courses.course_category.actions.back_to_index'), course_categories_path) if respond_to?(:course_categories_path)
+    - else
+      = link_to(Ecm::Courses::CourseCategory.human_attribute_name(:parent), @course_category.parent)

data/db/migrate/20180227210548_initialize_seats_columns_in_ecm_courses_courses.rb

@@ -1,11 +1,11 @@
 class InitializeSeatsColumnsInEcmCoursesCourses < ActiveRecord::Migration[4.2]
-  class Ecm::Courses::Courses < ActiveRecord::Base; end
+  class Ecm::Courses::Course < ActiveRecord::Base; end
 
   def up
-    Ecm::Courses::Courses.update_all(seats: 0, used_seats: 0, free_seats: 0)
+    Ecm::Courses::Course.update_all(seats: 0, used_seats: 0, free_seats: 0)
   end
 
   def down
-    Ecm::Courses::Courses.update_all(seats: nil, used_seats: nil, free_seats: nil)
+    Ecm::Courses::Course.update_all(seats: nil, used_seats: nil, free_seats: nil)
   end
 end

data/lib/ecm/courses/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Courses
-    VERSION = '1.1.2'.freeze
+    VERSION = '1.1.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_courses2
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails