sbdevcore 0.2.13 → 0.2.14

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 (7) hide show
  1. data/app/models/index.rb +4 -0
  2. data/app/views/indices/_form.html.haml +2 -0
  3. data/app/views/indices/_show.html.haml +3 -3
  4. data/app/views/indices/edit.html.haml +1 -1
  5. data/lib/sbdevcore/engine.rb +0 -1
  6. data/lib/sbdevcore/version.rb +1 -1
  7. metadata +30 -30
data/app/models/index.rb CHANGED
@@ -42,4 +42,8 @@ class Index < ActiveRecord::Base
42
42
  self.name ||= (self.title ||= self.owner.name).tableize rescue nil
43
43
  self.title ||= self.name.titleize rescue nil
44
44
  end
45
+
46
+ def title
47
+ owner.try('title') ? owner.title : read_attribute(:title)
48
+ end
45
49
  end
data/app/views/indices/_form.html.haml CHANGED
@@ -1,7 +1,9 @@
1
1
  - f ||= local_assigns[:locals][:f]
2
2
  - index ||= f.object
3
+ - index ||= f.object
3
4
  %div{:id => f.object.id.to_s}
4
5
  = f.input :title
6
+
5
7
  = f.input(:page_title) unless index.owner.is_a?(Gallery)
6
8
  = f.input(:keywords, :input_html => { :rows => 5 }) unless index.owner.is_a?(Gallery)
7
9
  = f.input(:page_description, :input_html => { :rows => 5 }) unless index.owner.is_a?(Gallery)
data/app/views/indices/_show.html.haml CHANGED
@@ -2,6 +2,9 @@
2
2
  - render_seo index
3
3
  .asset
4
4
  %h1.title=index.title.titleize
5
+ %p.asset-admin
6
+ = link_to "Edit Page", edit_index_path(index.id), :rel=>"#overlay", :class => "overlayed"
7
+ = link_to("Remove Page", index, :confirm => 'Are you sure?', :method => :delete) if index.owner.is_a?(Gallery)
5
8
  = render :partial => 'shared/asset_show', :collection => index.assets, :as => :asset
6
9
  - if admin_signed_in?
7
10
  .asset
@@ -11,9 +14,6 @@
11
14
  = link_to "Add Video", new_index_video_path(index.id), :rel=>"#overlay", :class => "overlayed"
12
15
  = link_to "Add Downloadable File", new_index_downloadable_path(index.id), :rel=>"#overlay", :class => "overlayed"
13
16
  = link_to "Add Gallery", new_index_gallery_path(index.id), :rel=>"#overlay", :class => "overlayed" if (index.gallery.nil? && !index.owner.is_a?(Gallery))
14
- %p.asset-admin
15
- = link_to "Edit Page", edit_index_path(index.id), :rel=>"#overlay", :class => "overlayed"
16
- = link_to("Remove Page", index, :confirm => 'Are you sure?', :method => :delete) if index.owner.is_a?(Gallery)
17
17
  - unless index.gallery.nil?
18
18
  =content_for(:post_content) do
19
19
  - if admin_signed_in?
data/app/views/indices/edit.html.haml CHANGED
@@ -1,3 +1,3 @@
1
1
  = simple_form_for @index, :validate => true, :html => { :multipart => true } do |f|
2
- = render :partial => 'form', :locals => {:f => f, :index => @index}
2
+ = render :partial => 'form', :object => f, :as => "f"
3
3
  = f.button :submit
data/lib/sbdevcore/engine.rb CHANGED
@@ -13,7 +13,6 @@ require 'pg'
13
13
  require 'formalize-rails'
14
14
  require 'will_paginate'
15
15
  require 'aws/s3'
16
- require 'aasm'
17
16
  require 'inherited_resources'
18
17
  require 'friendly_id'
19
18
  require 'sbdevcore'
data/lib/sbdevcore/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Sbdevcore
2
- VERSION = "0.2.13"
2
+ VERSION = "0.2.14"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sbdevcore
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.13
4
+ version: 0.2.14
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-09-24 00:00:00.000000000Z
12
+ date: 2011-09-25 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: tinymce-rails
16
- requirement: &2160327700 !ruby/object:Gem::Requirement
16
+ requirement: &2160329100 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2160327700
24
+ version_requirements: *2160329100
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: prioritizable
27
- requirement: &2160327200 !ruby/object:Gem::Requirement
27
+ requirement: &2160328480 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 0.0.5
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2160327200
35
+ version_requirements: *2160328480
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: devise
38
- requirement: &2160326640 !ruby/object:Gem::Requirement
38
+ requirement: &2160316600 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *2160326640
46
+ version_requirements: *2160316600
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: paperclip
49
- requirement: &2160326040 !ruby/object:Gem::Requirement
49
+ requirement: &2160316060 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *2160326040
57
+ version_requirements: *2160316060
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: haml-edge
60
- requirement: &2160325580 !ruby/object:Gem::Requirement
60
+ requirement: &2160315520 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *2160325580
68
+ version_requirements: *2160315520
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: sitemap_generator
71
- requirement: &2160325040 !ruby/object:Gem::Requirement
71
+ requirement: &2160314920 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *2160325040
79
+ version_requirements: *2160314920
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: hpricot
82
- requirement: &2160324620 !ruby/object:Gem::Requirement
82
+ requirement: &2160314420 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *2160324620
90
+ version_requirements: *2160314420
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: simple_form
93
- requirement: &2160311160 !ruby/object:Gem::Requirement
93
+ requirement: &2160313920 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *2160311160
101
+ version_requirements: *2160313920
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: client_side_validations
104
- requirement: &2160310340 !ruby/object:Gem::Requirement
104
+ requirement: &2160313300 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *2160310340
112
+ version_requirements: *2160313300
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: formalize-rails
115
- requirement: &2160309760 !ruby/object:Gem::Requirement
115
+ requirement: &2160312760 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *2160309760
123
+ version_requirements: *2160312760
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: will_paginate
126
- requirement: &2160308880 !ruby/object:Gem::Requirement
126
+ requirement: &2160312080 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 3.0.pre4
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *2160308880
134
+ version_requirements: *2160312080
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: aws-s3
137
- requirement: &2160308240 !ruby/object:Gem::Requirement
137
+ requirement: &2160311480 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0'
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *2160308240
145
+ version_requirements: *2160311480
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: inherited_resources
148
- requirement: &2160307500 !ruby/object:Gem::Requirement
148
+ requirement: &2160310840 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: '0'
154
154
  type: :runtime
155
155
  prerelease: false
156
- version_requirements: *2160307500
156
+ version_requirements: *2160310840
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: friendly_id
159
- requirement: &2160306840 !ruby/object:Gem::Requirement
159
+ requirement: &2160310140 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ~>
@@ -164,7 +164,7 @@ dependencies:
164
164
  version: 4.0.0.beta8
165
165
  type: :runtime
166
166
  prerelease: false
167
- version_requirements: *2160306840
167
+ version_requirements: *2160310140
168
168
  description: Core
169
169
  email:
170
170
  - aosalias@gmail.com