admin_data 1.1.14 → 1.1.15

Sign up to get free protection for your applications and to get access to all the features.
Files changed (41) hide show
  1. data/Gemfile.lock +2 -2
  2. data/README.md +11 -6
  3. data/{lib/public → app/assets}/images/add.png +0 -0
  4. data/{lib/public → app/assets}/images/no.png +0 -0
  5. data/{lib/public → app/assets}/images/site.png +0 -0
  6. data/{lib/public → app/assets}/images/sort_by_asc.jpg +0 -0
  7. data/{lib/public → app/assets}/images/sort_by_desc.jpg +0 -0
  8. data/{lib/public → app/assets}/images/sort_by_nothing.jpg +0 -0
  9. data/{lib/public → app/assets}/javascripts/advance_search/act_on_result.js +0 -0
  10. data/{lib/public → app/assets}/javascripts/advance_search/advance_search.js +0 -0
  11. data/{lib/public → app/assets}/javascripts/advance_search/advance_search_structure.js +0 -0
  12. data/{lib/public → app/assets}/javascripts/advance_search/ajaxify_advance_search.js +0 -0
  13. data/{lib/public → app/assets}/javascripts/advance_search/build_first_row.js +0 -0
  14. data/{lib/public → app/assets}/javascripts/advance_search/event_bindings.js +0 -0
  15. data/{lib/public → app/assets}/javascripts/advance_search/global_ajax_setting.js +0 -0
  16. data/{lib/public → app/assets}/javascripts/advance_search/sortby.js +0 -0
  17. data/{lib/public → app/assets}/javascripts/advance_search/trigger_submit_on_domready.js +0 -0
  18. data/{lib/public → app/assets}/javascripts/analytics/report.js +0 -0
  19. data/{lib/public → app/assets}/javascripts/misc/drop_down_change.js +0 -0
  20. data/{lib/public → app/assets}/javascripts/misc/js_util.js +0 -0
  21. data/{lib/public → app/assets}/javascripts/misc/quick_search_input_focus.js +0 -0
  22. data/{lib/public → app/assets}/javascripts/test/act_on_result.js +0 -0
  23. data/{lib/public → app/assets}/javascripts/test/advance_search.js +0 -0
  24. data/{lib/public → app/assets}/javascripts/test/ajaxify_advance_search.js +0 -0
  25. data/{lib/public → app/assets}/javascripts/test/build_first_row.js +0 -0
  26. data/{lib/public → app/assets}/javascripts/test/event_bindings.js +0 -0
  27. data/{lib/public → app/assets}/javascripts/vendor/jack.js +0 -0
  28. data/{lib/public → app/assets}/javascripts/vendor/jquery-1.4.2.js +0 -0
  29. data/{lib/public → app/assets}/javascripts/vendor/jquery-ui-1.7.2.custom.min.js +0 -0
  30. data/{lib/public → app/assets}/javascripts/vendor/jquery.ba-isjquery.js +0 -0
  31. data/{lib/public → app/assets}/javascripts/vendor/jquery_form.js +0 -0
  32. data/{lib/public → app/assets}/javascripts/vendor/log.js +0 -0
  33. data/{lib/public → app/assets}/javascripts/vendor/qunit.js +0 -0
  34. data/{lib/public → app/assets}/javascripts/vendor/rails.js +0 -0
  35. data/{lib/public → app/assets}/stylesheets/base.css +0 -0
  36. data/{lib/public → app/assets}/stylesheets/vendor/jquery-ui-1.7.2.custom.css +0 -0
  37. data/app/controllers/admin_data/public_controller.rb +7 -7
  38. data/app/helpers/admin_data/application_helper.rb +1 -1
  39. data/app/views/layouts/search.html.erb +63 -1
  40. data/lib/admin_data/version.rb +1 -1
  41. metadata +38 -38
@@ -1,14 +1,14 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- admin_data (1.1.14)
4
+ admin_data (1.1.15)
5
5
  will_paginate (>= 3.0.0)
6
6
 
7
7
  GEM
8
8
  remote: http://rubygems.org/
9
9
  specs:
10
10
  rake (0.8.7)
11
- will_paginate (3.0.1)
11
+ will_paginate (3.0.2)
12
12
 
13
13
  PLATFORMS
14
14
  ruby
data/README.md CHANGED
@@ -1,12 +1,17 @@
1
- admin_data
1
+ # admin_data
2
2
 
3
+ If you are using Rails 3.0.x then use
3
4
 
4
- * Live demo is available at http://admin-data-demo.heroku.com/admin_data (read only version)
5
+ gem 'admin_data', '= 1.1.14'
5
6
 
6
- * admin_data works with both Rails 2.3.x and Rails 3
7
+ If you are using Rails 3.1.x then use
7
8
 
8
- * Documentation is available at https://github.com/bigbinary/admin_data/wiki
9
+ gem 'admin_data', '>= 1.1.15'
9
10
 
10
- * To execute tests for this gem <tt>cd test/rails_root</tt> and read the instructions mentioned at README.md there.
11
+ Live demo is available at http://admin-data-demo.heroku.com/admin_data (read only version)
11
12
 
12
- * Released under [MIT](http://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) License
13
+ Documentation is available at https://github.com/bigbinary/admin_data/wiki
14
+
15
+ To execute tests for this gem <tt>cd test/rails_root</tt> and read the instructions mentioned at README.md there.
16
+
17
+ Released under [MIT](http://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) License
File without changes
@@ -2,26 +2,26 @@ module AdminData
2
2
  class PublicController < ApplicationController
3
3
 
4
4
  def serve
5
- path = File.join(AdminData::LIBPATH, 'public', params[:file])
5
+ path = File.join(AdminData::LIBPATH, '..', 'app', 'assets', params[:file])
6
6
 
7
7
  unless File.expand_path(path) =~ /admin_data/
8
8
  render :nothing => true, :status => 404 and return
9
9
  end
10
10
 
11
- case params[:file]
12
- when /\.css$/i
11
+ case params[:format].to_s.downcase
12
+ when 'css'
13
13
  content_type = "text/css"
14
- when /\.js$/i
14
+ when 'js'
15
15
  content_type = "text/javascript"
16
- when /\.png$/i
16
+ when 'png'
17
17
  content_type = "image/png"
18
- when /\.jpg$/i
18
+ when 'jpg'
19
19
  content_type = "image/jpg"
20
20
  else
21
21
  render :nothing => true, :status => 404 and return
22
22
  end
23
23
 
24
- render({:text => File.read(path), :cache => true, :content_type => content_type})
24
+ render({:text => File.read("#{path}.#{params[:format]}"), :cache => true, :content_type => content_type})
25
25
  end
26
26
 
27
27
  end
@@ -23,7 +23,7 @@ module AdminData
23
23
  end
24
24
 
25
25
  def parent_layout(layout)
26
- @_content_for[:layout] = self.output_buffer
26
+ content_for(:layout, self.output_buffer)
27
27
  self.output_buffer = render(:file => "layouts/#{layout}")
28
28
  end
29
29
 
@@ -1,3 +1,58 @@
1
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2
+ <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
3
+ <head>
4
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5
+ <title>
6
+ <%= @page_title.blank? ? 'admin_data' : "#{@page_title} - admin_data" %>
7
+ </title>
8
+
9
+ <%= stylesheet_link_tag('vendor/jquery-ui-1.7.2.custom.css') %>
10
+
11
+ <%= stylesheet_link_tag('base') %>
12
+
13
+ <%= javascript_include_tag('vendor/jquery-1.4.2.js', 'vendor/jquery-ui-1.7.2.custom.min.js') %>
14
+
15
+ <%= javascript_include_tag('vendor/jquery_form') %>
16
+
17
+ <%= javascript_include_tag('vendor/log',
18
+ 'vendor/rails',
19
+ 'misc/drop_down_change',
20
+ 'misc/quick_search_input_focus',
21
+ 'advance_search/global_ajax_setting',
22
+ 'misc/js_util') %>
23
+
24
+ <% if params[:action] == 'advance_search' %>
25
+ <%= javascript_include_tag(
26
+ 'advance_search/advance_search',
27
+ 'advance_search/advance_search_structure',
28
+ 'advance_search/ajaxify_advance_search',
29
+ 'advance_search/act_on_result',
30
+ 'advance_search/build_first_row',
31
+ 'advance_search/event_bindings',
32
+ 'advance_search/trigger_submit_on_domready',
33
+ 'advance_search/sortby'
34
+ ) %>
35
+ <% elsif params[:controller] == 'admin_data/analytics' %>
36
+ <%= javascript_include_tag('analytics/report') %>
37
+ <% end %>
38
+
39
+ <%= csrf_meta_tag %>
40
+
41
+ </head>
42
+
43
+ <body>
44
+ <noscript>
45
+ <div id="noscript-warning">JavaScript is disabled. A few things might not work properly.</div>
46
+ <br />
47
+ <br />
48
+ </noscript>
49
+ <div>
50
+ <%= render 'admin_data/shared/header', :drop_down_for_klasses => @drop_down_for_klasses %>
51
+ <div class='clear'></div>
52
+ </div>
53
+ <div id="container">
54
+ <div id="wrapper">
55
+
1
56
  <div id='main'>
2
57
  <div class="block" id="block-text">
3
58
 
@@ -34,4 +89,11 @@
34
89
  </div>
35
90
  </div>
36
91
 
37
- <%= parent_layout 'admin_data' %>
92
+ <div class="clear"></div>
93
+ </div>
94
+ <%= render :partial => 'admin_data/shared/powered_by' %>
95
+ </div>
96
+ </body>
97
+
98
+ </html>
99
+
@@ -1,3 +1,3 @@
1
1
  module AdminData
2
- VERSION = '1.1.14'
2
+ VERSION = '1.1.15'
3
3
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: admin_data
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 1.1.14
5
+ version: 1.1.15
6
6
  platform: ruby
7
7
  authors:
8
8
  - Neeraj Singh
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2011-10-10 00:00:00 -04:00
13
+ date: 2011-10-17 00:00:00 -04:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
@@ -41,6 +41,40 @@ files:
41
41
  - README.md
42
42
  - Rakefile
43
43
  - admin_data.gemspec
44
+ - app/assets/images/add.png
45
+ - app/assets/images/no.png
46
+ - app/assets/images/site.png
47
+ - app/assets/images/sort_by_asc.jpg
48
+ - app/assets/images/sort_by_desc.jpg
49
+ - app/assets/images/sort_by_nothing.jpg
50
+ - app/assets/javascripts/advance_search/act_on_result.js
51
+ - app/assets/javascripts/advance_search/advance_search.js
52
+ - app/assets/javascripts/advance_search/advance_search_structure.js
53
+ - app/assets/javascripts/advance_search/ajaxify_advance_search.js
54
+ - app/assets/javascripts/advance_search/build_first_row.js
55
+ - app/assets/javascripts/advance_search/event_bindings.js
56
+ - app/assets/javascripts/advance_search/global_ajax_setting.js
57
+ - app/assets/javascripts/advance_search/sortby.js
58
+ - app/assets/javascripts/advance_search/trigger_submit_on_domready.js
59
+ - app/assets/javascripts/analytics/report.js
60
+ - app/assets/javascripts/misc/drop_down_change.js
61
+ - app/assets/javascripts/misc/js_util.js
62
+ - app/assets/javascripts/misc/quick_search_input_focus.js
63
+ - app/assets/javascripts/test/act_on_result.js
64
+ - app/assets/javascripts/test/advance_search.js
65
+ - app/assets/javascripts/test/ajaxify_advance_search.js
66
+ - app/assets/javascripts/test/build_first_row.js
67
+ - app/assets/javascripts/test/event_bindings.js
68
+ - app/assets/javascripts/vendor/jack.js
69
+ - app/assets/javascripts/vendor/jquery-1.4.2.js
70
+ - app/assets/javascripts/vendor/jquery-ui-1.7.2.custom.min.js
71
+ - app/assets/javascripts/vendor/jquery.ba-isjquery.js
72
+ - app/assets/javascripts/vendor/jquery_form.js
73
+ - app/assets/javascripts/vendor/log.js
74
+ - app/assets/javascripts/vendor/qunit.js
75
+ - app/assets/javascripts/vendor/rails.js
76
+ - app/assets/stylesheets/base.css
77
+ - app/assets/stylesheets/vendor/jquery-ui-1.7.2.custom.css
44
78
  - app/controllers/admin_data/analytics_controller.rb
45
79
  - app/controllers/admin_data/application_controller.rb
46
80
  - app/controllers/admin_data/crud_controller.rb
@@ -98,40 +132,6 @@ files:
98
132
  - lib/admin_data/setup_config.rb
99
133
  - lib/admin_data/util.rb
100
134
  - lib/admin_data/version.rb
101
- - lib/public/images/add.png
102
- - lib/public/images/no.png
103
- - lib/public/images/site.png
104
- - lib/public/images/sort_by_asc.jpg
105
- - lib/public/images/sort_by_desc.jpg
106
- - lib/public/images/sort_by_nothing.jpg
107
- - lib/public/javascripts/advance_search/act_on_result.js
108
- - lib/public/javascripts/advance_search/advance_search.js
109
- - lib/public/javascripts/advance_search/advance_search_structure.js
110
- - lib/public/javascripts/advance_search/ajaxify_advance_search.js
111
- - lib/public/javascripts/advance_search/build_first_row.js
112
- - lib/public/javascripts/advance_search/event_bindings.js
113
- - lib/public/javascripts/advance_search/global_ajax_setting.js
114
- - lib/public/javascripts/advance_search/sortby.js
115
- - lib/public/javascripts/advance_search/trigger_submit_on_domready.js
116
- - lib/public/javascripts/analytics/report.js
117
- - lib/public/javascripts/misc/drop_down_change.js
118
- - lib/public/javascripts/misc/js_util.js
119
- - lib/public/javascripts/misc/quick_search_input_focus.js
120
- - lib/public/javascripts/test/act_on_result.js
121
- - lib/public/javascripts/test/advance_search.js
122
- - lib/public/javascripts/test/ajaxify_advance_search.js
123
- - lib/public/javascripts/test/build_first_row.js
124
- - lib/public/javascripts/test/event_bindings.js
125
- - lib/public/javascripts/vendor/jack.js
126
- - lib/public/javascripts/vendor/jquery-1.4.2.js
127
- - lib/public/javascripts/vendor/jquery-ui-1.7.2.custom.min.js
128
- - lib/public/javascripts/vendor/jquery.ba-isjquery.js
129
- - lib/public/javascripts/vendor/jquery_form.js
130
- - lib/public/javascripts/vendor/log.js
131
- - lib/public/javascripts/vendor/qunit.js
132
- - lib/public/javascripts/vendor/rails.js
133
- - lib/public/stylesheets/base.css
134
- - lib/public/stylesheets/vendor/jquery-ui-1.7.2.custom.css
135
135
  - test/rails_root/Gemfile
136
136
  - test/rails_root/Gemfile.lock
137
137
  - test/rails_root/README.md
@@ -222,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
222
222
  requirements:
223
223
  - - ">="
224
224
  - !ruby/object:Gem::Version
225
- hash: 2368908511276204323
225
+ hash: 3555869678715374085
226
226
  segments:
227
227
  - 0
228
228
  version: "0"
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
231
231
  requirements:
232
232
  - - ">="
233
233
  - !ruby/object:Gem::Version
234
- hash: 2368908511276204323
234
+ hash: 3555869678715374085
235
235
  segments:
236
236
  - 0
237
237
  version: "0"