noodall-ui 0.0.20 → 0.0.21

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 (5) hide show
  1. data/Gemfile.lock +1 -1
  2. data/app/helpers/noodall/nodes_helper.rb +6 -6
  3. data/app/views/noodall/admin/nodes/index.html.erb +2 -2
  4. data/lib/noodall/ui/version.rb +1 -1
  5. metadata +14 -14
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- noodall-ui (0.0.20)
4
+ noodall-ui (0.0.21)
5
5
  dynamic_form
6
6
  noodall-core
7
7
  thoughtbot-sortable_table (= 0.0.6)
data/app/helpers/noodall/nodes_helper.rb CHANGED
@@ -59,14 +59,14 @@ module Noodall
59
59
  options[:_type] = {'$in' => types} unless types.empty?
60
60
 
61
61
  nodes = ref_node.related(options.merge(:order => 'published_at DESC', :published_at => { :$lte => Time.zone.now }, :published_to => { :$gte => Time.zone.now }))
62
+
62
63
  return if nodes.empty?
63
64
 
64
- content_tag('h2', 'Related Content') +
65
- content_tag('ul', :id => 'related-content') do
66
- nodes.collect do |node|
67
- content_tag('li', link_to(h(node.title), node_path(node)) + node.published_at.to_formatted_s(:short_dot))
68
- end
69
- end
65
+ content_tag('h2', 'Related Content') + content_tag('ul', :id => 'related-content') do
66
+ nodes.collect do |node|
67
+ content_tag('li', link_to(node.title, node_path(node)) + node.published_at.to_formatted_s(:short_dot))
68
+ end.join.html_safe
69
+ end
70
70
  end
71
71
  end
72
72
  end
data/app/views/noodall/admin/nodes/index.html.erb CHANGED
@@ -6,7 +6,7 @@
6
6
  <% if Noodall::Node.root_templates.any? -%>
7
7
  <li><%= link_to 'New', new_noodall_admin_node_path, :class => 'button', :title => "Add new" %></li>
8
8
  <% end -%>
9
- <% else %>
9
+ <% elsif @parent.class.template_names.any? %>
10
10
  <li><%= link_to 'New', new_noodall_admin_node_node_path(@parent), :class => 'button', :title => "Add content under #{@parent.title}" %></li>
11
11
  <% end -%>
12
12
 
@@ -44,7 +44,7 @@
44
44
  <td class="child">
45
45
  <% unless node.class.template_classes.blank? -%>
46
46
  <%= link_to pluralize(node.children.size, "Child"), noodall_admin_node_nodes_path(node), :title => "View content under #{h(node.title)}", :class => 'child-no' %>
47
- <%= link_to 'Add', new_noodall_admin_node_node_path(node), :title => "Add content under #{h(node.title)}", :class => 'child' %>
47
+ <%= link_to('Add', new_noodall_admin_node_node_path(node), :title => "Add content under #{h(node.title)}", :class => 'child') if node.class.template_names.any? %>
48
48
  <% end -%>
49
49
  </td>
50
50
  <td class="date" title="by <%= node.updater.full_name if node.updater %>"><%=h node.updated_at.to_formatted_s(:short_ordinal) %></td>
data/lib/noodall/ui/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Noodall
2
2
  module UI
3
- VERSION = "0.0.20"
3
+ VERSION = "0.0.21"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: noodall-ui
3
3
  version: !ruby/object:Gem::Version
4
- hash: 55
4
+ hash: 53
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 0
9
- - 20
10
- version: 0.0.20
9
+ - 21
10
+ version: 0.0.21
11
11
  platform: ruby
12
12
  authors:
13
13
  - Steve England
@@ -15,11 +15,11 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-12-22 00:00:00 +00:00
18
+ date: 2011-01-05 00:00:00 +00:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
- version_requirements: &id001 !ruby/object:Gem::Requirement
22
+ requirement: &id001 !ruby/object:Gem::Requirement
23
23
  none: false
24
24
  requirements:
25
25
  - - ">="
@@ -28,12 +28,12 @@ dependencies:
28
28
  segments:
29
29
  - 0
30
30
  version: "0"
31
- requirement: *id001
32
31
  type: :runtime
33
32
  name: noodall-core
34
33
  prerelease: false
34
+ version_requirements: *id001
35
35
  - !ruby/object:Gem::Dependency
36
- version_requirements: &id002 !ruby/object:Gem::Requirement
36
+ requirement: &id002 !ruby/object:Gem::Requirement
37
37
  none: false
38
38
  requirements:
39
39
  - - "="
@@ -44,12 +44,12 @@ dependencies:
44
44
  - 0
45
45
  - 6
46
46
  version: 0.0.6
47
- requirement: *id002
48
47
  type: :runtime
49
48
  name: thoughtbot-sortable_table
50
49
  prerelease: false
50
+ version_requirements: *id002
51
51
  - !ruby/object:Gem::Dependency
52
- version_requirements: &id003 !ruby/object:Gem::Requirement
52
+ requirement: &id003 !ruby/object:Gem::Requirement
53
53
  none: false
54
54
  requirements:
55
55
  - - ~>
@@ -60,12 +60,12 @@ dependencies:
60
60
  - 0
61
61
  - pre2
62
62
  version: 3.0.pre2
63
- requirement: *id003
64
63
  type: :runtime
65
64
  name: will_paginate
66
65
  prerelease: false
66
+ version_requirements: *id003
67
67
  - !ruby/object:Gem::Dependency
68
- version_requirements: &id004 !ruby/object:Gem::Requirement
68
+ requirement: &id004 !ruby/object:Gem::Requirement
69
69
  none: false
70
70
  requirements:
71
71
  - - ">="
@@ -74,12 +74,12 @@ dependencies:
74
74
  segments:
75
75
  - 0
76
76
  version: "0"
77
- requirement: *id004
78
77
  type: :runtime
79
78
  name: dynamic_form
80
79
  prerelease: false
80
+ version_requirements: *id004
81
81
  - !ruby/object:Gem::Dependency
82
- version_requirements: &id005 !ruby/object:Gem::Requirement
82
+ requirement: &id005 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ">="
@@ -90,10 +90,10 @@ dependencies:
90
90
  - 0
91
91
  - 0
92
92
  version: 1.0.0
93
- requirement: *id005
94
93
  type: :development
95
94
  name: bundler
96
95
  prerelease: false
96
+ version_requirements: *id005
97
97
  description: Noodall Rails User Interface Engine. Requires Noodall Core
98
98
  email:
99
99
  - steve@wearebeef.co.uk