typus 3.1.0.rc9 → 3.1.0.rc10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (46) hide show
  1. data/Gemfile +21 -20
  2. data/app/helpers/admin/resources/data_types/date_helper.rb +2 -2
  3. data/app/helpers/admin/resources/data_types/datetime_helper.rb +3 -3
  4. data/app/helpers/admin/resources/data_types/has_and_belongs_to_many_helper.rb +1 -1
  5. data/app/helpers/admin/resources/data_types/has_many_helper.rb +1 -1
  6. data/app/helpers/admin/resources/data_types/string_helper.rb +8 -8
  7. data/app/themes/default/assets/javascripts/typus.js +2 -3
  8. data/app/themes/default/assets/javascripts/typus/jquery.application.js +31 -27
  9. data/app/themes/default/assets/stylesheets/typus.css +2 -2
  10. data/app/themes/default/views/admin/templates/_text_with_ckeditor.html.erb +1 -1
  11. data/app/themes/default/views/admin/templates/_text_with_ckeditor_and_assets.html.erb +1 -1
  12. data/lib/typus/authentication/session.rb +7 -1
  13. data/lib/typus/controller/actions.rb +0 -13
  14. data/lib/typus/orm/active_record/search.rb +2 -2
  15. data/lib/typus/version.rb +1 -1
  16. data/typus.gemspec +1 -0
  17. data/vendor/assets/{images → fancybox}/blank.gif +0 -0
  18. data/vendor/assets/{images → fancybox}/fancy_close.png +0 -0
  19. data/vendor/assets/{images → fancybox}/fancy_loading.png +0 -0
  20. data/vendor/assets/{images → fancybox}/fancy_nav_left.png +0 -0
  21. data/vendor/assets/{images → fancybox}/fancy_nav_right.png +0 -0
  22. data/vendor/assets/{images → fancybox}/fancy_shadow_e.png +0 -0
  23. data/vendor/assets/{images → fancybox}/fancy_shadow_n.png +0 -0
  24. data/vendor/assets/{images → fancybox}/fancy_shadow_ne.png +0 -0
  25. data/vendor/assets/{images → fancybox}/fancy_shadow_nw.png +0 -0
  26. data/vendor/assets/{images → fancybox}/fancy_shadow_s.png +0 -0
  27. data/vendor/assets/{images → fancybox}/fancy_shadow_se.png +0 -0
  28. data/vendor/assets/{images → fancybox}/fancy_shadow_sw.png +0 -0
  29. data/vendor/assets/{images → fancybox}/fancy_shadow_w.png +0 -0
  30. data/vendor/assets/{images → fancybox}/fancy_title_left.png +0 -0
  31. data/vendor/assets/{images → fancybox}/fancy_title_main.png +0 -0
  32. data/vendor/assets/{images → fancybox}/fancy_title_over.png +0 -0
  33. data/vendor/assets/{images → fancybox}/fancy_title_right.png +0 -0
  34. data/vendor/assets/{images → fancybox}/fancybox-x.png +0 -0
  35. data/vendor/assets/{images → fancybox}/fancybox-y.png +0 -0
  36. data/vendor/assets/{images → fancybox}/fancybox.png +0 -0
  37. data/vendor/assets/fancybox/jquery.easing-1.3.pack.js +72 -0
  38. data/vendor/assets/{stylesheets → fancybox}/jquery.fancybox-1.3.4.css +0 -0
  39. data/vendor/assets/fancybox/jquery.fancybox-1.3.4.js +1156 -0
  40. data/vendor/assets/{javascripts → fancybox}/jquery.fancybox-1.3.4.pack.js +0 -0
  41. data/vendor/assets/fancybox/jquery.mousewheel-3.0.4.pack.js +14 -0
  42. data/vendor/assets/{javascripts → jquery-searchField}/jquery.searchField.js +0 -0
  43. data/vendor/assets/{javascripts → jquery-tokeninput}/jquery.tokeninput.js +0 -0
  44. data/vendor/assets/{stylesheets → jquery-tokeninput}/token-input.css +0 -0
  45. metadata +57 -44
  46. data/vendor/assets/javascripts/jquery.rails.autocomplete.js +0 -32
@@ -0,0 +1,14 @@
1
+ /*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
2
+ * Licensed under the MIT License (LICENSE.txt).
3
+ *
4
+ * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
5
+ * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
6
+ * Thanks to: Seamus Leahy for adding deltaX and deltaY
7
+ *
8
+ * Version: 3.0.4
9
+ *
10
+ * Requires: 1.2.2+
11
+ */
12
+
13
+ (function(d){function g(a){var b=a||window.event,i=[].slice.call(arguments,1),c=0,h=0,e=0;a=d.event.fix(b);a.type="mousewheel";if(a.wheelDelta)c=a.wheelDelta/120;if(a.detail)c=-a.detail/3;e=c;if(b.axis!==undefined&&b.axis===b.HORIZONTAL_AXIS){e=0;h=-1*c}if(b.wheelDeltaY!==undefined)e=b.wheelDeltaY/120;if(b.wheelDeltaX!==undefined)h=-1*b.wheelDeltaX/120;i.unshift(a,c,h,e);return d.event.handle.apply(this,i)}var f=["DOMMouseScroll","mousewheel"];d.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=
14
+ f.length;a;)this.addEventListener(f[--a],g,false);else this.onmousewheel=g},teardown:function(){if(this.removeEventListener)for(var a=f.length;a;)this.removeEventListener(f[--a],g,false);else this.onmousewheel=null}};d.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery);
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: typus
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0.rc9
4
+ version: 3.1.0.rc10
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -9,12 +9,23 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-06-25 00:00:00.000000000 +02:00
12
+ date: 2011-06-27 00:00:00.000000000 +02:00
13
13
  default_executable:
14
14
  dependencies:
15
+ - !ruby/object:Gem::Dependency
16
+ name: ckeditor-rails
17
+ requirement: &2158217800 !ruby/object:Gem::Requirement
18
+ none: false
19
+ requirements:
20
+ - - =
21
+ - !ruby/object:Gem::Version
22
+ version: 0.0.2
23
+ type: :development
24
+ prerelease: false
25
+ version_requirements: *2158217800
15
26
  - !ruby/object:Gem::Dependency
16
27
  name: dragonfly
17
- requirement: &2162532220 !ruby/object:Gem::Requirement
28
+ requirement: &2158217280 !ruby/object:Gem::Requirement
18
29
  none: false
19
30
  requirements:
20
31
  - - ~>
@@ -22,10 +33,10 @@ dependencies:
22
33
  version: '0.9'
23
34
  type: :development
24
35
  prerelease: false
25
- version_requirements: *2162532220
36
+ version_requirements: *2158217280
26
37
  - !ruby/object:Gem::Dependency
27
38
  name: jquery-rails
28
- requirement: &2162531540 !ruby/object:Gem::Requirement
39
+ requirement: &2158216860 !ruby/object:Gem::Requirement
29
40
  none: false
30
41
  requirements:
31
42
  - - ! '>='
@@ -33,10 +44,10 @@ dependencies:
33
44
  version: '0'
34
45
  type: :development
35
46
  prerelease: false
36
- version_requirements: *2162531540
47
+ version_requirements: *2158216860
37
48
  - !ruby/object:Gem::Dependency
38
49
  name: paperclip
39
- requirement: &2162530800 !ruby/object:Gem::Requirement
50
+ requirement: &2158216380 !ruby/object:Gem::Requirement
40
51
  none: false
41
52
  requirements:
42
53
  - - ! '>='
@@ -44,10 +55,10 @@ dependencies:
44
55
  version: '0'
45
56
  type: :development
46
57
  prerelease: false
47
- version_requirements: *2162530800
58
+ version_requirements: *2158216380
48
59
  - !ruby/object:Gem::Dependency
49
60
  name: rack-cache
50
- requirement: &2162529540 !ruby/object:Gem::Requirement
61
+ requirement: &2158205180 !ruby/object:Gem::Requirement
51
62
  none: false
52
63
  requirements:
53
64
  - - ! '>='
@@ -55,10 +66,10 @@ dependencies:
55
66
  version: '0'
56
67
  type: :development
57
68
  prerelease: false
58
- version_requirements: *2162529540
69
+ version_requirements: *2158205180
59
70
  - !ruby/object:Gem::Dependency
60
71
  name: rails-trash
61
- requirement: &2162527320 !ruby/object:Gem::Requirement
72
+ requirement: &2158204680 !ruby/object:Gem::Requirement
62
73
  none: false
63
74
  requirements:
64
75
  - - ~>
@@ -66,10 +77,10 @@ dependencies:
66
77
  version: 1.1.1
67
78
  type: :development
68
79
  prerelease: false
69
- version_requirements: *2162527320
80
+ version_requirements: *2158204680
70
81
  - !ruby/object:Gem::Dependency
71
82
  name: jquery-rails
72
- requirement: &2162526640 !ruby/object:Gem::Requirement
83
+ requirement: &2158204260 !ruby/object:Gem::Requirement
73
84
  none: false
74
85
  requirements:
75
86
  - - ! '>='
@@ -77,10 +88,10 @@ dependencies:
77
88
  version: '0'
78
89
  type: :runtime
79
90
  prerelease: false
80
- version_requirements: *2162526640
91
+ version_requirements: *2158204260
81
92
  - !ruby/object:Gem::Dependency
82
93
  name: kaminari
83
- requirement: &2162525700 !ruby/object:Gem::Requirement
94
+ requirement: &2158203780 !ruby/object:Gem::Requirement
84
95
  none: false
85
96
  requirements:
86
97
  - - ! '>='
@@ -88,10 +99,10 @@ dependencies:
88
99
  version: '0'
89
100
  type: :runtime
90
101
  prerelease: false
91
- version_requirements: *2162525700
102
+ version_requirements: *2158203780
92
103
  - !ruby/object:Gem::Dependency
93
104
  name: rails
94
- requirement: &2162524720 !ruby/object:Gem::Requirement
105
+ requirement: &2158203280 !ruby/object:Gem::Requirement
95
106
  none: false
96
107
  requirements:
97
108
  - - ~>
@@ -99,7 +110,7 @@ dependencies:
99
110
  version: 3.1.0.rc4
100
111
  type: :runtime
101
112
  prerelease: false
102
- version_requirements: *2162524720
113
+ version_requirements: *2158203280
103
114
  description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
104
115
  content.
105
116
  email:
@@ -295,32 +306,34 @@ files:
295
306
  - lib/typus/resources.rb
296
307
  - lib/typus/version.rb
297
308
  - typus.gemspec
298
- - vendor/assets/images/blank.gif
299
- - vendor/assets/images/fancy_close.png
300
- - vendor/assets/images/fancy_loading.png
301
- - vendor/assets/images/fancy_nav_left.png
302
- - vendor/assets/images/fancy_nav_right.png
303
- - vendor/assets/images/fancy_shadow_e.png
304
- - vendor/assets/images/fancy_shadow_n.png
305
- - vendor/assets/images/fancy_shadow_ne.png
306
- - vendor/assets/images/fancy_shadow_nw.png
307
- - vendor/assets/images/fancy_shadow_s.png
308
- - vendor/assets/images/fancy_shadow_se.png
309
- - vendor/assets/images/fancy_shadow_sw.png
310
- - vendor/assets/images/fancy_shadow_w.png
311
- - vendor/assets/images/fancy_title_left.png
312
- - vendor/assets/images/fancy_title_main.png
313
- - vendor/assets/images/fancy_title_over.png
314
- - vendor/assets/images/fancy_title_right.png
315
- - vendor/assets/images/fancybox-x.png
316
- - vendor/assets/images/fancybox-y.png
317
- - vendor/assets/images/fancybox.png
318
- - vendor/assets/javascripts/jquery.fancybox-1.3.4.pack.js
319
- - vendor/assets/javascripts/jquery.rails.autocomplete.js
320
- - vendor/assets/javascripts/jquery.searchField.js
321
- - vendor/assets/javascripts/jquery.tokeninput.js
322
- - vendor/assets/stylesheets/jquery.fancybox-1.3.4.css
323
- - vendor/assets/stylesheets/token-input.css
309
+ - vendor/assets/fancybox/blank.gif
310
+ - vendor/assets/fancybox/fancy_close.png
311
+ - vendor/assets/fancybox/fancy_loading.png
312
+ - vendor/assets/fancybox/fancy_nav_left.png
313
+ - vendor/assets/fancybox/fancy_nav_right.png
314
+ - vendor/assets/fancybox/fancy_shadow_e.png
315
+ - vendor/assets/fancybox/fancy_shadow_n.png
316
+ - vendor/assets/fancybox/fancy_shadow_ne.png
317
+ - vendor/assets/fancybox/fancy_shadow_nw.png
318
+ - vendor/assets/fancybox/fancy_shadow_s.png
319
+ - vendor/assets/fancybox/fancy_shadow_se.png
320
+ - vendor/assets/fancybox/fancy_shadow_sw.png
321
+ - vendor/assets/fancybox/fancy_shadow_w.png
322
+ - vendor/assets/fancybox/fancy_title_left.png
323
+ - vendor/assets/fancybox/fancy_title_main.png
324
+ - vendor/assets/fancybox/fancy_title_over.png
325
+ - vendor/assets/fancybox/fancy_title_right.png
326
+ - vendor/assets/fancybox/fancybox-x.png
327
+ - vendor/assets/fancybox/fancybox-y.png
328
+ - vendor/assets/fancybox/fancybox.png
329
+ - vendor/assets/fancybox/jquery.easing-1.3.pack.js
330
+ - vendor/assets/fancybox/jquery.fancybox-1.3.4.css
331
+ - vendor/assets/fancybox/jquery.fancybox-1.3.4.js
332
+ - vendor/assets/fancybox/jquery.fancybox-1.3.4.pack.js
333
+ - vendor/assets/fancybox/jquery.mousewheel-3.0.4.pack.js
334
+ - vendor/assets/jquery-searchField/jquery.searchField.js
335
+ - vendor/assets/jquery-tokeninput/jquery.tokeninput.js
336
+ - vendor/assets/jquery-tokeninput/token-input.css
324
337
  has_rdoc: true
325
338
  homepage: http://core.typuscms.com/
326
339
  licenses: []
@@ -1,32 +0,0 @@
1
- /*
2
- * Unobtrusive autocomplete
3
- *
4
- * To use it, you just have to include the HTML attribute autocomplete
5
- * with the autocomplete URL as the value
6
- *
7
- * Example:
8
- * <input type="text" autocomplete="/url/to/autocomplete">
9
- *
10
- * Optionally, you can use a jQuery selector to specify a field that can
11
- * be updated with the element id whenever you find a matching value
12
- *
13
- * Example:
14
- * <input type="text" autocomplete="/url/to/autocomplete" id_element="#id_field">
15
- */
16
-
17
- $(document).ready(function(){
18
- $('input[data-autocomplete]').each(function(i){
19
- $(this).autocomplete({
20
- minLength: 3,
21
- source: $(this).attr('data-autocomplete'),
22
-
23
- select: function(event, ui) {
24
- $(this).val(ui.item.value);
25
- if ($(this).attr('id_element')) {
26
- $($(this).attr('id_element')).val(ui.item.id);
27
- }
28
- return false;
29
- }
30
- });
31
- });
32
- });