lolita 3.1.10 → 3.1.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (239) hide show
  1. data/.document +5 -5
  2. data/.rspec +2 -2
  3. data/GUIDELINES.rdoc +24 -24
  4. data/Gemfile +26 -26
  5. data/History.rdoc +162 -154
  6. data/LICENSE.txt +22 -22
  7. data/README.rdoc +98 -98
  8. data/Rakefile +40 -40
  9. data/VERSION +1 -1
  10. data/app/controllers/lolita/info_controller.rb +41 -41
  11. data/app/controllers/lolita/rest_controller.rb +130 -130
  12. data/app/helpers/components/lolita/configuration/list_component.rb +10 -10
  13. data/app/helpers/lolita_helper.rb +11 -11
  14. data/app/views/components/lolita/configuration/column/_display.html.erb +4 -4
  15. data/app/views/components/lolita/configuration/column/_header.html.erb +7 -7
  16. data/app/views/components/lolita/configuration/column/_sort.html.erb +4 -4
  17. data/app/views/components/lolita/configuration/columns/_body.html.erb +4 -4
  18. data/app/views/components/lolita/configuration/columns/_display.html.erb +1 -1
  19. data/app/views/components/lolita/configuration/columns/_first.html.erb +2 -2
  20. data/app/views/components/lolita/configuration/columns/_first_column_header.html.erb +3 -3
  21. data/app/views/components/lolita/configuration/columns/_header.html.erb +8 -8
  22. data/app/views/components/lolita/configuration/columns/_last.html.erb +4 -4
  23. data/app/views/components/lolita/configuration/columns/_last_column_header.html.erb +2 -2
  24. data/app/views/components/lolita/configuration/columns/_row.html.erb +7 -7
  25. data/app/views/components/lolita/configuration/field/_display.html.erb +9 -9
  26. data/app/views/components/lolita/configuration/field/_label.html.erb +1 -1
  27. data/app/views/components/lolita/configuration/field/_object.html.erb +1 -1
  28. data/app/views/components/lolita/configuration/field/array/_display.html.erb +4 -4
  29. data/app/views/components/lolita/configuration/field/array/habtm/_display.html.erb +26 -26
  30. data/app/views/components/lolita/configuration/field/array/select/_display.html.erb +5 -5
  31. data/app/views/components/lolita/configuration/field/boolean/filter/_display.html.erb +1 -1
  32. data/app/views/components/lolita/configuration/field/date/_display.html.erb +1 -1
  33. data/app/views/components/lolita/configuration/field/date_time/date/_display.html.erb +1 -1
  34. data/app/views/components/lolita/configuration/field/integer/_display.html.erb +1 -1
  35. data/app/views/components/lolita/configuration/field/string/_display.html.erb +4 -4
  36. data/app/views/components/lolita/configuration/field/string/disabled/_display.html.erb +1 -1
  37. data/app/views/components/lolita/configuration/field/string/password/_display.html.erb +3 -3
  38. data/app/views/components/lolita/configuration/field/string/text/_display.html.erb +18 -18
  39. data/app/views/components/lolita/configuration/field_set/_display.html.erb +5 -5
  40. data/app/views/components/lolita/configuration/list/_display.html.erb +10 -10
  41. data/app/views/components/lolita/configuration/list/_filter.html.erb +7 -7
  42. data/app/views/components/lolita/configuration/list/_new_resource.html.erb +4 -4
  43. data/app/views/components/lolita/configuration/list/_title.html.erb +4 -4
  44. data/app/views/components/lolita/configuration/tab/_display.html.erb +17 -17
  45. data/app/views/components/lolita/configuration/tab/_fields.html.erb +6 -6
  46. data/app/views/components/lolita/configuration/tab/content/_display.html.erb +1 -1
  47. data/app/views/components/lolita/configuration/tab/default/_display.html.erb +8 -8
  48. data/app/views/components/lolita/configuration/tabs/_display.html.erb +10 -10
  49. data/app/views/components/lolita/navigation/_display.html.erb +2 -2
  50. data/app/views/components/lolita/navigation/_tree.html.erb +38 -38
  51. data/app/views/components/lolita/shared/_flash.html.erb +5 -5
  52. data/app/views/components/lolita/shared/_header.html.erb +8 -8
  53. data/app/views/components/lolita/shared/_right_sidebar.html.erb +13 -13
  54. data/app/views/layouts/lolita/application.html.erb +44 -44
  55. data/app/views/lolita/info/index.html.erb +232 -232
  56. data/app/views/lolita/rest/form.html.erb +1 -1
  57. data/app/views/lolita/rest/index.html.erb +1 -1
  58. data/author +1 -1
  59. data/config/locales/default/lv.yml +180 -180
  60. data/config/locales/en.yml +20 -20
  61. data/config/locales/lv.yml +20 -20
  62. data/config/routes.rb +3 -3
  63. data/db/seed.rb +1 -1
  64. data/features/create_page.feature +19 -19
  65. data/features/step_definitions/lolita_steps.rb +7 -7
  66. data/features/step_definitions/web_steps.rb +219 -219
  67. data/features/support/env.rb +73 -73
  68. data/features/support/paths.rb +35 -35
  69. data/lib/generators/helpers/file_helper.rb +22 -22
  70. data/lib/generators/lolita/assets_generator.rb +18 -18
  71. data/lib/generators/lolita/install_generator.rb +28 -28
  72. data/lib/generators/templates/lolita.rb +19 -19
  73. data/lib/lolita.rb +184 -184
  74. data/lib/lolita/adapter/abstract_adapter.rb +13 -13
  75. data/lib/lolita/adapter/active_record.rb +148 -148
  76. data/lib/lolita/adapter/mongoid.rb +127 -127
  77. data/lib/lolita/base_configuration.rb +165 -165
  78. data/lib/lolita/builder.rb +249 -249
  79. data/lib/lolita/configuration/base.rb +76 -76
  80. data/lib/lolita/configuration/column.rb +93 -94
  81. data/lib/lolita/configuration/columns.rb +66 -66
  82. data/lib/lolita/configuration/factory.rb +55 -55
  83. data/lib/lolita/configuration/field.rb +216 -216
  84. data/lib/lolita/configuration/field/array.rb +75 -75
  85. data/lib/lolita/configuration/field/big_decimal.rb +12 -12
  86. data/lib/lolita/configuration/field/boolean.rb +12 -12
  87. data/lib/lolita/configuration/field/date.rb +12 -12
  88. data/lib/lolita/configuration/field/date_time.rb +13 -13
  89. data/lib/lolita/configuration/field/integer.rb +12 -12
  90. data/lib/lolita/configuration/field/string.rb +13 -13
  91. data/lib/lolita/configuration/field/time.rb +13 -13
  92. data/lib/lolita/configuration/field_set.rb +25 -25
  93. data/lib/lolita/configuration/fields.rb +35 -35
  94. data/lib/lolita/configuration/filter.rb +108 -108
  95. data/lib/lolita/configuration/list.rb +104 -104
  96. data/lib/lolita/configuration/page.rb +125 -124
  97. data/lib/lolita/configuration/tab.rb +187 -187
  98. data/lib/lolita/configuration/tab/content.rb +21 -21
  99. data/lib/lolita/configuration/tab/default.rb +25 -25
  100. data/lib/lolita/configuration/tabs.rb +132 -132
  101. data/lib/lolita/controllers/component_helpers.rb +127 -127
  102. data/lib/lolita/controllers/internal_helpers.rb +109 -109
  103. data/lib/lolita/controllers/url_helpers.rb +111 -111
  104. data/lib/lolita/controllers/user_helpers.rb +32 -32
  105. data/lib/lolita/controllers/view_user_helpers.rb +12 -12
  106. data/lib/lolita/dbi/base.rb +50 -50
  107. data/lib/lolita/errors.rb +12 -12
  108. data/lib/lolita/hooks.rb +355 -355
  109. data/lib/lolita/hooks/named_hook.rb +125 -125
  110. data/lib/lolita/lazy_loader.rb +46 -46
  111. data/lib/lolita/mapping.rb +55 -55
  112. data/lib/lolita/modules.rb +6 -6
  113. data/lib/lolita/modules/rest.rb +10 -10
  114. data/lib/lolita/navigation/branch.rb +132 -132
  115. data/lib/lolita/navigation/tree.rb +116 -116
  116. data/lib/lolita/observed_array.rb +74 -74
  117. data/lib/lolita/rails.rb +20 -20
  118. data/lib/lolita/rails/all.rb +10 -10
  119. data/lib/lolita/rails/routes.rb +133 -133
  120. data/lib/lolita/ruby_ext/accessors.rb +26 -26
  121. data/lib/lolita/support/formatter.rb +62 -62
  122. data/lib/lolita/support/formatter/rails.rb +56 -56
  123. data/lib/lolita/test/matchers.rb +77 -77
  124. data/lolita.gemspec +2 -2
  125. data/public/javascripts/jquery-1.6.min.js +15 -15
  126. data/public/javascripts/jquery-ui-1.8.13.min.js +407 -407
  127. data/public/javascripts/lolita/main.js +39 -39
  128. data/public/javascripts/lolita/tab.js +41 -41
  129. data/public/javascripts/modernizr-1.7.min.js +1 -1
  130. data/public/javascripts/rails.js +137 -137
  131. data/public/javascripts/tinymce/langs/en.js +221 -221
  132. data/public/javascripts/tinymce/license.txt +504 -504
  133. data/public/javascripts/tinymce/themes/advanced/about.htm +52 -52
  134. data/public/javascripts/tinymce/themes/advanced/anchor.htm +26 -26
  135. data/public/javascripts/tinymce/themes/advanced/charmap.htm +51 -51
  136. data/public/javascripts/tinymce/themes/advanced/color_picker.htm +74 -74
  137. data/public/javascripts/tinymce/themes/advanced/editor_template_src.js +1328 -1328
  138. data/public/javascripts/tinymce/themes/advanced/image.htm +80 -80
  139. data/public/javascripts/tinymce/themes/advanced/js/about.js +73 -73
  140. data/public/javascripts/tinymce/themes/advanced/js/anchor.js +42 -42
  141. data/public/javascripts/tinymce/themes/advanced/js/charmap.js +354 -354
  142. data/public/javascripts/tinymce/themes/advanced/js/color_picker.js +329 -329
  143. data/public/javascripts/tinymce/themes/advanced/js/image.js +247 -247
  144. data/public/javascripts/tinymce/themes/advanced/js/link.js +153 -153
  145. data/public/javascripts/tinymce/themes/advanced/js/source_editor.js +56 -56
  146. data/public/javascripts/tinymce/themes/advanced/langs/en.js +68 -68
  147. data/public/javascripts/tinymce/themes/advanced/langs/en_dlg.js +53 -53
  148. data/public/javascripts/tinymce/themes/advanced/link.htm +57 -57
  149. data/public/javascripts/tinymce/themes/advanced/shortcuts.htm +47 -47
  150. data/public/javascripts/tinymce/themes/advanced/skins/cirkuit/content.css +66 -66
  151. data/public/javascripts/tinymce/themes/advanced/skins/cirkuit/dialog.css +117 -117
  152. data/public/javascripts/tinymce/themes/advanced/skins/cirkuit/ui.css +988 -988
  153. data/public/javascripts/tinymce/themes/advanced/source_editor.htm +25 -25
  154. data/public/javascripts/tinymce/tiny_mce_popup.js +4 -4
  155. data/public/javascripts/tinymce_config.js +15 -15
  156. data/public/stylesheets/lolita/default.css +169 -169
  157. data/public/stylesheets/lolita/style.css +253 -253
  158. data/spec/adapter_helper.rb +43 -43
  159. data/spec/builder_spec.rb +120 -120
  160. data/spec/configuration/base_spec.rb +44 -44
  161. data/spec/configuration/column_spec.rb +89 -89
  162. data/spec/configuration/columns_spec.rb +54 -54
  163. data/spec/configuration/field_set_spec.rb +12 -12
  164. data/spec/configuration/field_spec.rb +118 -118
  165. data/spec/configuration/filter_spec.rb +122 -122
  166. data/spec/configuration/list_spec.rb +76 -76
  167. data/spec/configuration/page_spec.rb +19 -19
  168. data/spec/configuration/tab_spec.rb +165 -165
  169. data/spec/configuration/tabs_spec.rb +106 -106
  170. data/spec/controllers/component_helpers_spec.rb +5 -5
  171. data/spec/controllers/internal_helpers_spec.rb +76 -76
  172. data/spec/controllers/lolita_rest_nested_resources_spec.rb +33 -33
  173. data/spec/controllers/lolita_rest_spec.rb +53 -53
  174. data/spec/dbi/base_spec.rb +44 -44
  175. data/spec/hooks_spec.rb +257 -257
  176. data/spec/lolita_spec.rb +13 -13
  177. data/spec/mapping_spec.rb +29 -29
  178. data/spec/navigation/branch_spec.rb +81 -81
  179. data/spec/navigation/tree_spec.rb +73 -73
  180. data/spec/orm/mongoid.rb +11 -11
  181. data/spec/rails_app/app/controllers/application_controller.rb +3 -3
  182. data/spec/rails_app/app/helpers/application_helper.rb +3 -3
  183. data/spec/rails_app/app/mongoid/address.rb +7 -7
  184. data/spec/rails_app/app/mongoid/category.rb +5 -5
  185. data/spec/rails_app/app/mongoid/comment.rb +5 -5
  186. data/spec/rails_app/app/mongoid/post.rb +18 -18
  187. data/spec/rails_app/app/mongoid/preference.rb +5 -5
  188. data/spec/rails_app/app/mongoid/profile.rb +13 -13
  189. data/spec/rails_app/app/mongoid/tag.rb +3 -3
  190. data/spec/rails_app/app/views/components/lolita/configuration/list/_body_cell.html.erb +1 -1
  191. data/spec/rails_app/config/application.rb +26 -26
  192. data/spec/rails_app/config/boot.rb +13 -13
  193. data/spec/rails_app/config/environment.rb +5 -5
  194. data/spec/rails_app/config/environments/development.rb +19 -19
  195. data/spec/rails_app/config/environments/production.rb +33 -33
  196. data/spec/rails_app/config/environments/test.rb +33 -33
  197. data/spec/rails_app/config/initializers/backtrace_silencers.rb +7 -7
  198. data/spec/rails_app/config/initializers/inflections.rb +2 -2
  199. data/spec/rails_app/config/initializers/secret_token.rb +1 -1
  200. data/spec/rails_app/config/routes.rb +2 -2
  201. data/spec/rails_app/lib/lolita/configuration/field/my_custom_collection.rb +13 -13
  202. data/spec/rails_app/public/javascripts/jquery-1.5.1.min.js +15 -15
  203. data/spec/rails_app/public/javascripts/lolita/main.js +6 -6
  204. data/spec/rails_app/public/javascripts/lolita/tab.js +40 -40
  205. data/spec/rails_app/public/javascripts/modernizr-1.7.min.js +1 -1
  206. data/spec/rails_app/public/javascripts/rails.js +137 -137
  207. data/spec/rails_app/public/javascripts/tinymce/langs/en.js +221 -221
  208. data/spec/rails_app/public/javascripts/tinymce/license.txt +504 -504
  209. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/about.htm +52 -52
  210. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/anchor.htm +26 -26
  211. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/charmap.htm +51 -51
  212. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/color_picker.htm +74 -74
  213. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/editor_template_src.js +1328 -1328
  214. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/image.htm +80 -80
  215. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/about.js +73 -73
  216. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/anchor.js +42 -42
  217. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/charmap.js +354 -354
  218. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/color_picker.js +329 -329
  219. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/image.js +247 -247
  220. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/link.js +153 -153
  221. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/source_editor.js +56 -56
  222. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/langs/en.js +68 -68
  223. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/langs/en_dlg.js +53 -53
  224. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/link.htm +57 -57
  225. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/shortcuts.htm +47 -47
  226. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/skins/cirkuit/content.css +66 -66
  227. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/skins/cirkuit/dialog.css +117 -117
  228. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/skins/cirkuit/ui.css +988 -988
  229. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/source_editor.htm +25 -25
  230. data/spec/rails_app/public/javascripts/tinymce/tiny_mce_popup.js +4 -4
  231. data/spec/rails_app/public/stylesheets/lolita/default.css +169 -169
  232. data/spec/rails_app/public/stylesheets/lolita/style.css +214 -214
  233. data/spec/routing/routes_spec.rb +15 -15
  234. data/spec/spec_helper.rb +46 -46
  235. data/spec/support/factories/category.rb +3 -3
  236. data/spec/support/factories/post.rb +4 -4
  237. data/spec/support/factories/tag.rb +2 -2
  238. data/spec/support/formatter_spec.rb +42 -42
  239. metadata +31 -31
@@ -1,11 +1,11 @@
1
- module Components
2
- module Lolita
3
- module Configuration
4
- module ListComponent
5
- def sort_options
6
- params[:sort]
7
- end
8
- end
9
- end
10
- end
1
+ module Components
2
+ module Lolita
3
+ module Configuration
4
+ module ListComponent
5
+ def sort_options
6
+ params[:sort]
7
+ end
8
+ end
9
+ end
10
+ end
11
11
  end
@@ -1,12 +1,12 @@
1
- module LolitaHelper
2
-
3
- # Classes for div block that is located to the right of menu
4
- # This is helpful because different positionings within it exist depending on action
5
- def content_classes
6
- classes = []
7
- if params[:action] == "edit" || params[:action] == "new"
8
- classes << "with-secondary"
9
- end
10
- classes.join(" ")
11
- end
1
+ module LolitaHelper
2
+
3
+ # Classes for div block that is located to the right of menu
4
+ # This is helpful because different positionings within it exist depending on action
5
+ def content_classes
6
+ classes = []
7
+ if params[:action] == "edit" || params[:action] == "new"
8
+ classes << "with-secondary"
9
+ end
10
+ classes.join(" ")
11
+ end
12
12
  end
@@ -1,4 +1,4 @@
1
- <td>
2
- <% value=column.formatter.with(record.send(column.name.to_sym),record,self) %>
3
- <%= value.to_s %>
4
- </td>
1
+ <td>
2
+ <% value=column.formatter.with(record.send(column.name.to_sym),record,self) %>
3
+ <%= value.to_s %>
4
+ </td>
@@ -1,7 +1,7 @@
1
- <th <%=column.currently_sorting?(params) ? "class='active'" : ""%> >
2
- <% if column.sortable? %>
3
- <%= render_component column, :sort %>
4
- <% else %>
5
- <%= column.title.to_s.capitalize %>
6
- <% end %>
7
- </th>
1
+ <th <%=column.currently_sorting?(params) ? "class='active'" : ""%> >
2
+ <% if column.sortable? %>
3
+ <%= render_component column, :sort %>
4
+ <% else %>
5
+ <%= column.title.to_s.capitalize %>
6
+ <% end %>
7
+ </th>
@@ -1,4 +1,4 @@
1
- <% param_options=params.reject{|k,v| [:controller,:action].include?(k)} %>
2
- <% options=param_options.merge(column.sort_options(params)) %>
3
- <% direction_indicator=column.currently_sorting?(params) && options[:sd].to_s=="desc" ? raw('&uArr;') : raw('&dArr;') %>
4
- <%= link_to raw("#{column.title.to_s.capitalize } #{direction_indicator}"), lolita_resources_path(options) %>
1
+ <% param_options=params.reject{|k,v| [:controller,:action].include?(k)} %>
2
+ <% options=param_options.merge(column.sort_options(params)) %>
3
+ <% direction_indicator=column.currently_sorting?(params) && options[:sd].to_s=="desc" ? raw('&uArr;') : raw('&dArr;') %>
4
+ <%= link_to raw("#{column.title.to_s.capitalize } #{direction_indicator}"), lolita_resources_path(options) %>
@@ -1,5 +1,5 @@
1
- <tbody>
2
- <% page.each_with_index do |record,index| %>
3
- <%= render_component columns, :row, :record=>record,:index=>index%>
4
- <% end %>
1
+ <tbody>
2
+ <% page.each_with_index do |record,index| %>
3
+ <%= render_component columns, :row, :record=>record,:index=>index%>
4
+ <% end %>
5
5
  </tbody>
@@ -1,2 +1,2 @@
1
- <%= render_component columns,:header %>
1
+ <%= render_component columns,:header %>
2
2
  <%= render_component columns,:body,:page=>page %>
@@ -1,3 +1,3 @@
1
- <td class="checkbox-cell">
2
- <%= check_box_tag "#{resource_name}[id]", record.id %>
1
+ <td class="checkbox-cell">
2
+ <%= check_box_tag "#{resource_name}[id]", record.id %>
3
3
  </td>
@@ -1,3 +1,3 @@
1
- <th class="checkbox-header">
2
- *
3
- </th>
1
+ <th class="checkbox-header">
2
+ *
3
+ </th>
@@ -1,9 +1,9 @@
1
- <thead>
2
- <tr>
3
- <%= render_component columns,:first_column_header %>
4
- <% columns.each do |column| %>
5
- <%= render_component column,:header %>
6
- <% end %>
7
- <%= render_component columns,:last_column_header %>
8
- </tr>
1
+ <thead>
2
+ <tr>
3
+ <%= render_component columns,:first_column_header %>
4
+ <% columns.each do |column| %>
5
+ <%= render_component column,:header %>
6
+ <% end %>
7
+ <%= render_component columns,:last_column_header %>
8
+ </tr>
9
9
  </thead>
@@ -1,4 +1,4 @@
1
- <td class="tool-cell">
2
- <%= link_to ::I18n.t("lolita.shared.edit"),edit_lolita_resource_path(:id=>record.id) %>
3
- <%= link_to ::I18n.t("lolita.shared.delete"), lolita_resource_path(:id=>record.id),:method=>:delete,:confirm=>I18n.t("lolita.list.confirm") %>
4
- </td>
1
+ <td class="tool-cell">
2
+ <%= link_to ::I18n.t("lolita.shared.edit"),edit_lolita_resource_path(:id=>record.id) %>
3
+ <%= link_to ::I18n.t("lolita.shared.delete"), lolita_resource_path(:id=>record.id),:method=>:delete,:confirm=>I18n.t("lolita.list.confirm") %>
4
+ </td>
@@ -1,3 +1,3 @@
1
- <th class="tool-header">
2
- -
1
+ <th class="tool-header">
2
+ -
3
3
  </th>
@@ -1,7 +1,7 @@
1
- <tr class="<%= index%2==0 ? "even" : "odd" %>">
2
- <%= render_component columns,:first,:record=>record %>
3
- <% columns.each do |column| %>
4
- <%= render_component column, :record=>record %>
5
- <% end %>
6
- <%= render_component columns,:last,:record=>record %>
7
- </tr>
1
+ <tr class="<%= index%2==0 ? "even" : "odd" %>">
2
+ <%= render_component columns,:first,:record=>record %>
3
+ <% columns.each do |column| %>
4
+ <%= render_component column, :record=>record %>
5
+ <% end %>
6
+ <%= render_component columns,:last,:record=>record %>
7
+ </tr>
@@ -1,9 +1,9 @@
1
- <div class="field" id="field_<%=field.__id__%>">
2
- <%= render_component *field.build(:name=>"/lolita/configuration/field", :state => :"label") %>
3
- <div class="field-value" id="field_<%=field.__id__%>_value">
4
- <%= render_component *field.build %>
5
- </div>
6
- <% unless resource.errors[field.name.to_s.gsub(/_id$/,"").to_sym].empty? %>
7
- <p class="inline-errors"><%= raw resource.errors[field.name.to_s.gsub(/_id$/,"").to_sym].join("<br>") %></p>
8
- <% end %>
9
- </div>
1
+ <div class="field" id="field_<%=field.__id__%>">
2
+ <%= render_component *field.build(:name=>"/lolita/configuration/field", :state => :"label") %>
3
+ <div class="field-value" id="field_<%=field.__id__%>_value">
4
+ <%= render_component *field.build %>
5
+ </div>
6
+ <% unless resource.errors[field.name.to_s.gsub(/_id$/,"").to_sym].empty? %>
7
+ <p class="inline-errors"><%= raw resource.errors[field.name.to_s.gsub(/_id$/,"").to_sym].join("<br>") %></p>
8
+ <% end %>
9
+ </div>
@@ -1 +1 @@
1
- <%= label resource_name, field.name, raw(field.title.to_s.capitalize), :id=>"field_#{field.__id__}_label" %>
1
+ <%= label resource_name, field.name, raw(field.title.to_s.capitalize), :id=>"field_#{field.__id__}_label" %>
@@ -1 +1 @@
1
- <div class="object"></div>
1
+ <div class="object"></div>
@@ -1,5 +1,5 @@
1
- <% if field.association_type == :one %>
2
- <%= render_component :"lolita/configuration/field/array/select", :display, :field=>field %>
3
- <% else %>
4
- <%= render_component :"lolita/configuration/field/array/habtm", :display, :field=>field %>
1
+ <% if field.association_type == :one %>
2
+ <%= render_component :"lolita/configuration/field/array/select", :display, :field=>field %>
3
+ <% else %>
4
+ <%= render_component :"lolita/configuration/field/array/habtm", :display, :field=>field %>
5
5
  <% end %>
@@ -1,26 +1,26 @@
1
- <% options = field.association_values.respond_to?(:call) ? field.association_values.call(self) : field.association_values %>
2
- <% values = self.instance_variable_get("@#{resource_name}").send("#{field.name}") %>
3
- <% subject_habtm_fieldname = "#{field.name.to_s.singularize}_ids" %>
4
- <% values.each{|value|%>
5
- <%
6
- option_tags = options.collect{|option|
7
- option_tag_attributes = {:value=>option[1]}
8
- option_tag_attributes[:selected] = "selected" if option[1] == value.id
9
- content_tag :option, option[0], option_tag_attributes
10
- }.join("").html_safe
11
- %>
12
- <div style="height:30px;">
13
- <%= select_tag "#{resource_name}[#{subject_habtm_fieldname}][]", option_tags ,{:include_blank=>true} %>
14
- </div>
15
- <% } %>
16
- <% empty_fields = (values.size < 5) ? (5 - values.size) : 0 %>
17
- <%
18
- option_tags = options.collect{|option|
19
- content_tag :option, option[0], {:value=>option[1]}
20
- }.join("").html_safe
21
- %>
22
- <% empty_fields.times{ %>
23
- <div style="height:30px;">
24
- <%= select_tag "#{resource_name}[#{subject_habtm_fieldname}][]", option_tags ,{:include_blank=>true} %>
25
- </div>
26
- <% } %>
1
+ <% options = field.association_values.respond_to?(:call) ? field.association_values.call(self) : field.association_values %>
2
+ <% values = self.instance_variable_get("@#{resource_name}").send("#{field.name}") %>
3
+ <% subject_habtm_fieldname = "#{field.name.to_s.singularize}_ids" %>
4
+ <% values.each{|value|%>
5
+ <%
6
+ option_tags = options.collect{|option|
7
+ option_tag_attributes = {:value=>option[1]}
8
+ option_tag_attributes[:selected] = "selected" if option[1] == value.id
9
+ content_tag :option, option[0], option_tag_attributes
10
+ }.join("").html_safe
11
+ %>
12
+ <div style="height:30px;">
13
+ <%= select_tag "#{resource_name}[#{subject_habtm_fieldname}][]", option_tags ,{:include_blank=>true} %>
14
+ </div>
15
+ <% } %>
16
+ <% empty_fields = (values.size < 5) ? (5 - values.size) : 0 %>
17
+ <%
18
+ option_tags = options.collect{|option|
19
+ content_tag :option, option[0], {:value=>option[1]}
20
+ }.join("").html_safe
21
+ %>
22
+ <% empty_fields.times{ %>
23
+ <div style="height:30px;">
24
+ <%= select_tag "#{resource_name}[#{subject_habtm_fieldname}][]", option_tags ,{:include_blank=>true} %>
25
+ </div>
26
+ <% } %>
@@ -1,5 +1,5 @@
1
- <%= select resource_name,
2
- field.name,
3
- (field.association_values.respond_to?(:call) ? field.association_values.call(self) : field.association_values),
4
- {:include_blank => field.include_blank},
5
- field.html_options || {} %>
1
+ <%= select resource_name,
2
+ field.name,
3
+ (field.association_values.respond_to?(:call) ? field.association_values.call(self) : field.association_values),
4
+ {:include_blank => field.include_blank},
5
+ field.html_options || {} %>
@@ -1,2 +1,2 @@
1
- <label for="<%= filter.field_name(field) %>"><%= field.title %></label>
1
+ <label for="<%= filter.field_name(field) %>"><%= field.title %></label>
2
2
  <%= check_box_tag filter.field_name(field), 1, params[filter.field_name(field)], field.html_options || {} %>
@@ -1 +1 @@
1
- <%= date_select resource_name, field.name, field.options, field.html_options %>
1
+ <%= date_select resource_name, field.name, field.options, field.html_options %>
@@ -1 +1 @@
1
- <%= date_select resource_name, field.name,field.options,field.html_options %>
1
+ <%= date_select resource_name, field.name,field.options,field.html_options %>
@@ -1 +1 @@
1
- <%= render_component :"lolita/configuration/field/string", :display,:field=>field %>
1
+ <%= render_component :"lolita/configuration/field/string", :display,:field=>field %>
@@ -1,5 +1,5 @@
1
- <% if field.options[:native_type] == "text" %>
2
- <%= render_component :"lolita/configuration/field/string/text", :display, :field=>field %>
3
- <% else %>
4
- <%= text_field resource_name, field.name, field.html_options %>
1
+ <% if field.options[:native_type] == "text" %>
2
+ <%= render_component :"lolita/configuration/field/string/text", :display, :field=>field %>
3
+ <% else %>
4
+ <%= text_field resource_name, field.name, field.html_options %>
5
5
  <% end %>
@@ -1 +1 @@
1
- <div class="disabled-field"><%= resource.send(field.name) %></div>
1
+ <div class="disabled-field"><%= resource.send(field.name) %></div>
@@ -1,3 +1,3 @@
1
- <div class="field-value" id="field_<%=field.__id__%>_value">
2
- <%= password_field resource_name, field.name,field.html_options %>
3
- </div>
1
+ <div class="field-value" id="field_<%=field.__id__%>_value">
2
+ <%= password_field resource_name, field.name,field.html_options %>
3
+ </div>
@@ -1,18 +1,18 @@
1
- <% if @textarea_component_include_tinymce_once.nil? %>
2
- <% content_for :script do %>
3
- <%= javascript_include_tag "tinymce/jquery.tinymce" %>
4
- <%= javascript_include_tag "tinymce_config.js" %>
5
- <% end %>
6
- <% end %>
7
-
8
- <%= text_area resource_name, field.name, :rows=>(field.rows || 20), :"data-simple"=>field.simple %>
9
- <% if @textarea_component_include_tinymce_once.nil? %>
10
- <script type="text/javascript">
11
- $(document).ready(
12
- $(function(){
13
- load_tinymce();
14
- })
15
- )
16
- </script>
17
- <% end %>
18
- <% @textarea_component_include_tinymce_once = "done" %>
1
+ <% if @textarea_component_include_tinymce_once.nil? %>
2
+ <% content_for :script do %>
3
+ <%= javascript_include_tag "tinymce/jquery.tinymce" %>
4
+ <%= javascript_include_tag "tinymce_config.js" %>
5
+ <% end %>
6
+ <% end %>
7
+
8
+ <%= text_area resource_name, field.name, :rows=>(field.rows || 20), :"data-simple"=>field.simple %>
9
+ <% if @textarea_component_include_tinymce_once.nil? %>
10
+ <script type="text/javascript">
11
+ $(document).ready(
12
+ $(function(){
13
+ load_tinymce();
14
+ })
15
+ )
16
+ </script>
17
+ <% end %>
18
+ <% @textarea_component_include_tinymce_once = "done" %>
@@ -1,5 +1,5 @@
1
- <div class="fieldset" id="<%=field_set.name%>">
2
- <% fields.each do |field| %>
3
- <%= render_component *field.builder %>
4
- <% end %>
5
- </div>
1
+ <div class="fieldset" id="<%=field_set.name%>">
2
+ <% fields.each do |field| %>
3
+ <%= render_component *field.builder %>
4
+ <% end %>
5
+ </div>
@@ -1,11 +1,11 @@
1
- <div class="box">
2
- <%= render_component list, :title %>
3
- <%= render_component list, :new_resource%>
4
- <%= render_component list, :filter %>
5
- <div class="list">
6
- <table>
7
- <%= render_component list.columns,:page=>page %>
8
- </table>
9
- </div>
10
- <%= render_component list,:paginator,:page=>page %>
1
+ <div class="box">
2
+ <%= render_component list, :title %>
3
+ <%= render_component list, :new_resource%>
4
+ <%= render_component list, :filter %>
5
+ <div class="list">
6
+ <table>
7
+ <%= render_component list.columns,:page=>page %>
8
+ </table>
9
+ </div>
10
+ <%= render_component list,:paginator,:page=>page %>
11
11
  </div>
@@ -1,8 +1,8 @@
1
- <% if list.filter? -%>
2
- <form action="" action="get" class="filter">
3
- <% list.filter.fields.each do |field| %>
4
- <%= render_component *field.build(:filter, :filter=>list.filter) %>
5
- <% end %>
6
- <button type="submit"><%= ::I18n.t "lolita.filter.apply_button" %></button>
7
- </form>
1
+ <% if list.filter? -%>
2
+ <form action="" action="get" class="filter">
3
+ <% list.filter.fields.each do |field| %>
4
+ <%= render_component *field.build(:filter, :filter=>list.filter) %>
5
+ <% end %>
6
+ <button type="submit"><%= ::I18n.t "lolita.filter.apply_button" %></button>
7
+ </form>
8
8
  <% end -%>
@@ -1,4 +1,4 @@
1
- <a href="<%= new_lolita_resource_path%>" class="create">
2
- <%= ::I18n.t("lolita.list.add_new",:name=>resource_class.model_name.human.downcase) %>
3
- <%= image_tag "lolita/plus.png", :alt=>"+" %>
4
- </a>
1
+ <a href="<%= new_lolita_resource_path%>" class="create">
2
+ <%= ::I18n.t("lolita.list.add_new",:name=>resource_class.model_name.human.downcase) %>
3
+ <%= image_tag "lolita/plus.png", :alt=>"+" %>
4
+ </a>
@@ -1,5 +1,5 @@
1
- <div class="boxtitle">
2
- <h1 class="black"><%= resource_class.model_name.human(:count=>2) %></h1>
3
- <div class="arrow">
4
- </div>
1
+ <div class="boxtitle">
2
+ <h1 class="black"><%= resource_class.model_name.human(:count=>2) %></h1>
3
+ <div class="arrow">
4
+ </div>
5
5
  </div>
@@ -1,17 +1,17 @@
1
- <div class="tab box" id="tab_<%=tab.__id__%>">
2
- <div class="tab-title boxtitle black" data-closed="false">
3
- <h1><%= tab.title %></h1>
4
- <div class="arrow"></div> <%# FIXME more DRY solution is needed for .arrow within .boxtitle, maybe box helper %>
5
- </div>
6
- <% if resource.errors.any? %>
7
- <p class="errorExplanation" id="errorExplanation">
8
- <%= raw resource.errors.keys.collect{|k|
9
- if error_tab = tab.fields.by_name(k)
10
- "#{error_tab.title.humanize.capitalize}: "+
11
- "#{resource.errors[k].collect{|m| m.capitalize}.join(" and ")}"
12
- end
13
- }.compact.join("<br>") %>
14
- </p>
15
- <% end %>
16
- <%= render_component *tab.build %>
17
- </div>
1
+ <div class="tab box" id="tab_<%=tab.__id__%>">
2
+ <div class="tab-title boxtitle black" data-closed="false">
3
+ <h1><%= tab.title %></h1>
4
+ <div class="arrow"></div> <%# FIXME more DRY solution is needed for .arrow within .boxtitle, maybe box helper %>
5
+ </div>
6
+ <% if resource.errors.any? %>
7
+ <p class="errorExplanation" id="errorExplanation">
8
+ <%= raw resource.errors.keys.collect{|k|
9
+ if error_tab = tab.fields.by_name(k)
10
+ "#{error_tab.title.humanize.capitalize}: "+
11
+ "#{resource.errors[k].collect{|m| m.capitalize}.join(" and ")}"
12
+ end
13
+ }.compact.join("<br>") %>
14
+ </p>
15
+ <% end %>
16
+ <%= render_component *tab.build %>
17
+ </div>