sbdevcore 0.2.26 → 0.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/app/assets/javascripts/sbdevcore-tools.js +25 -24
  2. data/app/views/indices/_form.html.haml +0 -1
  3. data/app/views/photos/_form.html.haml +1 -10
  4. data/lib/sbdevcore/version.rb +1 -1
  5. metadata +30 -30
data/app/assets/javascripts/sbdevcore-tools.js CHANGED
@@ -99,22 +99,31 @@ function fade_flash(){
99
99
  }
100
100
 
101
101
  function bind_slideshow(){
102
- $("#scrollable_tabs").tabs("#scrollable_tabs_content div", {
103
- effect:'fade',
104
- fadeOutSpeed: "slow",
105
- rotate: true
106
- }).slideshow({
107
- autoplay: true,
108
- autopause: true,
109
- clickable: true,
110
- next: '#forward',
111
- prev: '#backward'
112
- });
113
- var api = $("#scrollable_tabs").data("tabs");
114
- $("#forward").click(function(){api.stop();});
115
- $("#backward").click(function(){api.stop();});
116
- var slide_api = $("#scrollable_tabs").data("slideshow");
117
- $("#pause").click(function(){slide_api.stop();})
102
+ if(!jQuery.isEmptyObject($('#scrollable_tabs_content'))){
103
+ $("#scrollable_tabs").tabs("#scrollable_tabs_content div", {
104
+ effect:'fade',
105
+ fadeOutSpeed: "slow",
106
+ rotate: true
107
+ }).slideshow({
108
+ autoplay: true,
109
+ autopause: true,
110
+ clickable: true,
111
+ next: '#forward',
112
+ prev: '#backward'
113
+ });
114
+ var api = $("#scrollable_tabs").data("tabs");
115
+ $("#forward").click(function(){api.stop();});
116
+ $("#backward").click(function(){api.stop();});
117
+ var slide_api = $("#scrollable_tabs").data("slideshow");
118
+ $("#pause").click(function(){slide_api.stop();})
119
+ $(window).focus(function() {
120
+ $("#scrollable_tabs").data("slideshow").play();
121
+ });
122
+
123
+ $(window).blur(function() {
124
+ $("#scrollable_tabs").data("slideshow").stop();
125
+ });
126
+ }
118
127
  }
119
128
 
120
129
  function bind_functions(context){
@@ -136,13 +145,5 @@ function bind_functions(context){
136
145
  $(document).ready(function (){
137
146
  bind_functions(document);
138
147
  init_tinymce();
139
-
140
- $(window).focus(function() {
141
- $("#scrollable_tabs").data("slideshow").play();
142
- });
143
-
144
- $(window).blur(function() {
145
- $("#scrollable_tabs").data("slideshow").stop();
146
- });
147
148
  });
148
149
 
data/app/views/indices/_form.html.haml CHANGED
@@ -3,6 +3,5 @@
3
3
  %div{:id => f.object.id.to_s}
4
4
  = f.input :title
5
5
  = f.input(:page_title) unless index.owner.is_a?(Gallery)
6
- = f.input(:keywords, :input_html => { :rows => 5 }) unless index.owner.is_a?(Gallery)
7
6
  = f.input(:page_description, :input_html => { :rows => 5 }) unless index.owner.is_a?(Gallery)
8
7
  = render("shared/prioritizable_fields", :locals => {:f => f}) unless index.owner.nil?
data/app/views/photos/_form.html.haml CHANGED
@@ -4,16 +4,7 @@
4
4
  - unless f.object.new_record?
5
5
  = image_tag f.object.asset.url(:thumb), :width => "100", :class => "left"
6
6
  = f.input :name
7
- - if f.object.new_record?
8
- .input
9
- = label_tag "Upload"
10
- = radio_button_tag :asset_type, "file", true
11
- File
12
- = radio_button_tag :asset_type, "url"
13
- URL
14
- #asset_type
15
- = f.input :asset, :as => :file, :label => "Photo", :required => false, :input_html => { :validate => false }
16
- = f.input :url, :label => "Photo URL", :required => false, :input_html => { :validate => false }
7
+ = f.input :asset, :as => :file, :label => "Photo", :required => false, :input_html => { :validate => false }
17
8
  = f.input :description, :input_html => { :cols => 70, :rows => 3 }
18
9
  = f.input :klass, :as => :radio, :collection => ["left", "right", "center"], :label => "Alignment"
19
10
  = render "shared/prioritizable_fields", :locals => {:f => f}
data/lib/sbdevcore/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Sbdevcore
2
- VERSION = "0.2.26"
2
+ VERSION = "0.3.0"
3
3
  end
4
4
 
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.26
4
+ version: 0.3.0
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-10-22 00:00:00.000000000Z
12
+ date: 2011-10-28 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: tinymce-rails
16
- requirement: &2157038120 !ruby/object:Gem::Requirement
16
+ requirement: &2153076980 !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: *2157038120
24
+ version_requirements: *2153076980
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: prioritizable
27
- requirement: &2157037620 !ruby/object:Gem::Requirement
27
+ requirement: &2153076480 !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: *2157037620
35
+ version_requirements: *2153076480
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: devise
38
- requirement: &2157037200 !ruby/object:Gem::Requirement
38
+ requirement: &2153076060 !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: *2157037200
46
+ version_requirements: *2153076060
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: paperclip
49
- requirement: &2157036740 !ruby/object:Gem::Requirement
49
+ requirement: &2153075600 !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: *2157036740
57
+ version_requirements: *2153075600
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: haml-edge
60
- requirement: &2157036320 !ruby/object:Gem::Requirement
60
+ requirement: &2153075180 !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: *2157036320
68
+ version_requirements: *2153075180
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: sitemap_generator
71
- requirement: &2157035900 !ruby/object:Gem::Requirement
71
+ requirement: &2153074760 !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: *2157035900
79
+ version_requirements: *2153074760
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: hpricot
82
- requirement: &2157035480 !ruby/object:Gem::Requirement
82
+ requirement: &2153074340 !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: *2157035480
90
+ version_requirements: *2153074340
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: simple_form
93
- requirement: &2157035060 !ruby/object:Gem::Requirement
93
+ requirement: &2153073920 !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: *2157035060
101
+ version_requirements: *2153073920
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: client_side_validations
104
- requirement: &2157034640 !ruby/object:Gem::Requirement
104
+ requirement: &2153073500 !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: *2157034640
112
+ version_requirements: *2153073500
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: formalize-rails
115
- requirement: &2157034220 !ruby/object:Gem::Requirement
115
+ requirement: &2157279400 !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: *2157034220
123
+ version_requirements: *2157279400
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: will_paginate
126
- requirement: &2157033720 !ruby/object:Gem::Requirement
126
+ requirement: &2157278900 !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: *2157033720
134
+ version_requirements: *2157278900
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: aws-s3
137
- requirement: &2157033300 !ruby/object:Gem::Requirement
137
+ requirement: &2157278480 !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: *2157033300
145
+ version_requirements: *2157278480
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: inherited_resources
148
- requirement: &2157032840 !ruby/object:Gem::Requirement
148
+ requirement: &2157278020 !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: *2157032840
156
+ version_requirements: *2157278020
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: friendly_id
159
- requirement: &2157032340 !ruby/object:Gem::Requirement
159
+ requirement: &2157277520 !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: *2157032340
167
+ version_requirements: *2157277520
168
168
  description: Core
169
169
  email:
170
170
  - aosalias@gmail.com