spree_grid_faq 0.0.8 → 0.0.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/app/controllers/spree/admin/questions_controller.rb +2 -0
  2. data/app/views/spree/admin/questions/index.html.erb +35 -3
  3. data/lib/spree_grid_faq/version.rb +1 -1
  4. metadata +18 -18
data/app/controllers/spree/admin/questions_controller.rb CHANGED
@@ -17,6 +17,8 @@ module Spree
17
17
 
18
18
  def collection
19
19
  return @collection if @collection.present?
20
+ params[:q] ||= {}
21
+ params[:q][:s] ||= "created_at desc"
20
22
  @search = Spree::Question.search(params[:q])
21
23
  @collection = @search.result.page(params[:page]).per(20)
22
24
  end
data/app/views/spree/admin/questions/index.html.erb CHANGED
@@ -1,7 +1,7 @@
1
1
  <div class='toolbar'>
2
2
  <ul class='actions'>
3
- <li id="new_product_link">
4
- <%= button_link_to t("new_question"), new_object_url, {:icon => 'add'} %>
3
+ <li>
4
+ <%= button_link_to 'New Question', new_object_url, { :icon => 'add' } %>
5
5
  </li>
6
6
  </ul>
7
7
  <br class='clear' />
@@ -13,6 +13,7 @@
13
13
  <tr>
14
14
  <th><%= Spree::Question.human_attribute_name(:question) %></th>
15
15
  <th><%= Spree::Question.human_attribute_name(:answer) %></th>
16
+ <th><%= sort_link @search,:created_at, t(:created_at), { :default_order => "desc" }, {:title => 'admin_products_listing_created_at_title'} %></th>
16
17
  <th><%= t("action") %></th>
17
18
  </tr>
18
19
  <tbody>
@@ -24,7 +25,10 @@
24
25
  <td>
25
26
  <%= question.answer %>
26
27
  </td>
27
- <td>
28
+ <td style="white-space:nowrap;">
29
+ <%= time_tag question.created_at, :format => '%B %e, %Y %l:%M %P' %>
30
+ </td>
31
+ <td style="white-space:nowrap;">
28
32
  <%= link_to_edit question %> &nbsp;
29
33
  <%= link_to_delete question %>
30
34
  </td>
@@ -34,3 +38,31 @@
34
38
  </table>
35
39
 
36
40
  <%= paginate @questions %>
41
+
42
+ <% content_for :sidebar do %>
43
+ <div data-hook="admin_questions_sidebar">
44
+ <%= search_form_for [:admin, @search] do |f| %>
45
+ <div class="box">
46
+ <h3><%= t(:search) %></h3>
47
+
48
+ <%- locals = {:f => f} %>
49
+ <div data-hook="admin_questions_index_search">
50
+ <p>
51
+ <%= f.label :question_cont, t(:question) %><br />
52
+ <%= f.text_field :question_cont, :size => 40 %>
53
+ </p>
54
+ <p>
55
+ <%= f.label :answer_cont, t(:answer) %><br />
56
+ <%= f.text_field :answer_cont, :size => 40 %>
57
+ </p>
58
+ </div>
59
+
60
+ <div data-hook="admin_questions_index_search_buttons">
61
+ <p class="form-buttons">
62
+ <%= button t(:search) %>
63
+ </p>
64
+ </div>
65
+ </div>
66
+ <% end %>
67
+ </div>
68
+ <% end %>
data/lib/spree_grid_faq/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module SpreeGridFaq
2
- VERSION = "0.0.8"
2
+ VERSION = "0.0.9"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_grid_faq
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.8
4
+ version: 0.0.9
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: 2012-07-08 00:00:00.000000000 Z
12
+ date: 2012-08-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: spree_core
16
- requirement: &70202760696500 !ruby/object:Gem::Requirement
16
+ requirement: &70240515984900 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 1.1.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70202760696500
24
+ version_requirements: *70240515984900
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: haml
27
- requirement: &70202760696120 !ruby/object:Gem::Requirement
27
+ requirement: &70240520258900 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70202760696120
35
+ version_requirements: *70240520258900
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: capybara
38
- requirement: &70202760695580 !ruby/object:Gem::Requirement
38
+ requirement: &70240520277480 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - =
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 1.0.1
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70202760695580
46
+ version_requirements: *70240520277480
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: factory_girl
49
- requirement: &70202742211120 !ruby/object:Gem::Requirement
49
+ requirement: &70240520274900 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 2.6.4
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70202742211120
57
+ version_requirements: *70240520274900
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: ffaker
60
- requirement: &70202742209780 !ruby/object:Gem::Requirement
60
+ requirement: &70240520274200 !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: :development
67
67
  prerelease: false
68
- version_requirements: *70202742209780
68
+ version_requirements: *70240520274200
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rspec-rails
71
- requirement: &70202742207760 !ruby/object:Gem::Requirement
71
+ requirement: &70240520271580 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '2.9'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70202742207760
79
+ version_requirements: *70240520271580
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: sqlite3
82
- requirement: &70202742206600 !ruby/object:Gem::Requirement
82
+ requirement: &70240520283480 !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: :development
89
89
  prerelease: false
90
- version_requirements: *70202742206600
90
+ version_requirements: *70240520283480
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: launchy
93
- requirement: &70202742334400 !ruby/object:Gem::Requirement
93
+ requirement: &70240520280220 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70202742334400
101
+ version_requirements: *70240520280220
102
102
  description: Spree Grid FAQ adds a Frequently Asked Question section to your spree
103
103
  store. It allows questions to be attached to existing taxons and products and was
104
104
  designe for Alarm Grid.