ecm_courses2 1.1.2 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/ecm/courses/course_categories/_course_category.haml +12 -13
  3. data/app/views/ecm/courses/course_categories/show.haml +7 -11
  4. data/db/migrate/20180227210548_initialize_seats_columns_in_ecm_courses_courses.rb +3 -3
  5. data/lib/ecm/courses/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fba9341f016c7273c043a4c7eb204bc96872bded
4
- data.tar.gz: 3fca2092291765ca34969dfe1a0593de2b7e1f00
3
+ metadata.gz: 23e37aad68451d4f7eea065d36f6a082b299bbde
4
+ data.tar.gz: d1a50b0bb9a911c99610c80d449e85e1f7595d08
5
5
  SHA512:
6
- metadata.gz: 8900661aaa13f841f7f47193f0747430e06559868ffaa40c11f4c4475626a2bc04a23064ae1f6a0b6705b1518ca38547ce9f1062b847ac100867bc35d9c842d9
7
- data.tar.gz: 8d946e4305789cefd273c7f707a272a809dbb3943eb3777a209e45757d0cc8a02d40d673b4d5da3fc2f9d719b5d15181c080b082f6a24c44cb4cc90b177d19ee
6
+ metadata.gz: 94158eef61f8db31def1767dc56a0712b63e78dc7b1cf3fffd29dd7fbf57023fc6b83c7beaec446817a93fad322b53501544e7cfed27ef8f1209f94e46a6cfa7
7
+ data.tar.gz: fc94c93f984b96396ac7e2735e5f44326e5556d062860aab68d2b6f604bed3c032723c30f1080bcd32d56f2db5052201c1335156b2a9d162ed022df333f5b31c
data/app/views/ecm/courses/course_categories/_course_category.haml CHANGED
@@ -4,26 +4,25 @@
4
4
  - else
5
5
  %h2.courses_category-name= course_category.name
6
6
 
7
- - if action_name == 'show'
8
- .course-calendar.bottom-margin-2
9
- = month_calendar_pagination(date)
10
- = month_calendar date, course_dates, display_method: :course, start_day: :monday
11
- .bottom-margin-4
12
- = link_to(url_for(format: :ics, nocache: true), class: 'btn btn-default') do
13
- %span.glyphicon.glyphicon-calendar
14
- = url_for(format: :ics)
15
-
16
- .course_categories-tree
7
+ .course_categories-tree.bottom-margin-4
17
8
  = nested_li(course_category.descendants, {}) do |course_category, level|
18
9
  = link_to course_category.tree_name, course_category
19
10
  - unless course_category.description.blank?
20
11
  .course_categories-description
21
12
  %p= course_category.description
22
13
 
23
- .course_category-courses
24
- / %h2= Ecm::Courses::CourseCategory.human_attribute_name(:courses)
14
+ .course_category-courses.bottom-margin-4
25
15
  - if course_category.courses_count == 0
26
16
  = t('ecm.courses.course_category.messages.no_courses_available')
27
17
  %hr/
28
18
  - else
29
- = render course_category.courses
19
+ = render course_category.courses
20
+
21
+ - if action_name == 'show'
22
+ .course-calendar.bottom-margin-4
23
+ = month_calendar_pagination(date)
24
+ = month_calendar date, course_dates, display_method: :course, start_day: :monday
25
+ .bottom-margin-4
26
+ = link_to(url_for(format: :ics, nocache: true), class: 'btn btn-default') do
27
+ %span.glyphicon.glyphicon-calendar
28
+ = url_for(format: :ics)
data/app/views/ecm/courses/course_categories/show.haml CHANGED
@@ -1,14 +1,10 @@
1
1
  - content_for(:title) { @course_category.name }
2
- = render partial: 'course_category', locals: { course_category: @course_category, date: @date, course_dates: @course_dates }
3
2
 
4
- .course_category-calendar{ id: "course_category-#{@course_category.to_param}" }
5
- - if @course_category.courses.any?
6
- / %h2= t('.calendar_heading', month: l(@date, format: :month_with_year))
7
- / = month_calendar_pagination(@date)
8
- / = month_calendar @date, @course_dates, display_method: :course, start_day: :monday
3
+ = render partial: 'course_category', locals: { course_category: @course_category, date: @date, course_dates: @course_dates }
9
4
 
10
- %p
11
- - if @course_category.root?
12
- = link_to(t('ecm.courses.course_category.actions.back_to_index'), course_categories_path) if respond_to?(:course_categories_path)
13
- - else
14
- = link_to(Ecm::Courses::CourseCategory.human_attribute_name(:parent), @course_category.parent)
5
+ .row
6
+ .col-lg-12
7
+ - if @course_category.root?
8
+ = link_to(t('ecm.courses.course_category.actions.back_to_index'), course_categories_path) if respond_to?(:course_categories_path)
9
+ - else
10
+ = link_to(Ecm::Courses::CourseCategory.human_attribute_name(:parent), @course_category.parent)
data/db/migrate/20180227210548_initialize_seats_columns_in_ecm_courses_courses.rb CHANGED
@@ -1,11 +1,11 @@
1
1
  class InitializeSeatsColumnsInEcmCoursesCourses < ActiveRecord::Migration[4.2]
2
- class Ecm::Courses::Courses < ActiveRecord::Base; end
2
+ class Ecm::Courses::Course < ActiveRecord::Base; end
3
3
 
4
4
  def up
5
- Ecm::Courses::Courses.update_all(seats: 0, used_seats: 0, free_seats: 0)
5
+ Ecm::Courses::Course.update_all(seats: 0, used_seats: 0, free_seats: 0)
6
6
  end
7
7
 
8
8
  def down
9
- Ecm::Courses::Courses.update_all(seats: nil, used_seats: nil, free_seats: nil)
9
+ Ecm::Courses::Course.update_all(seats: nil, used_seats: nil, free_seats: nil)
10
10
  end
11
11
  end
data/lib/ecm/courses/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Ecm
2
2
  module Courses
3
- VERSION = '1.1.2'.freeze
3
+ VERSION = '1.1.3'.freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ecm_courses2
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Roberto Vasquez Angel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-02-28 00:00:00.000000000 Z
11
+ date: 2018-03-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails